SIDP-488: PeerEntityId property not set on SAML queries
authorcantor <cantor@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Fri, 6 May 2011 20:52:38 +0000 (20:52 +0000)
committercantor <cantor@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Fri, 6 May 2011 20:52:38 +0000 (20:52 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/branches/REL_2@3026 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

doc/RELEASE-NOTES.txt
src/main/java/edu/internet2/middleware/shibboleth/idp/profile/AbstractSAMLProfileHandler.java
src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSODecoder.java
src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java

index 9e680f7..34e9477 100644 (file)
@@ -20,6 +20,7 @@ Changes in Release 2.3.0
 [SIDP-483] - Log Completed, Unencrypted SAML Assertion
 [SIDP-485] - <img> inside HTML pages must have alt attribute.[SIDP-486] - login.jsp page contains old wiki link
 [SIDP-487] - More login.jsp changes (CR/LF issues, missing period)
+[SIDP-488] - PeerEntityId property not set on SAML queries
 
 Changes in Release 2.2.1
 =============================================
index a56b507..743a32d 100644 (file)
@@ -318,10 +318,10 @@ public abstract class AbstractSAMLProfileHandler extends
     /**
      * Populates the request context with information about the relying party.
      * 
-     * This method requires the the following request context properties to be populated: peer entity ID
+     * This method requires the the following request context properties to be populated: inbound message issuer
      * 
-     * This methods populates the following request context properties: peer entity metadata, relying party
-     * configuration
+     * This methods populates the following request context properties: peer entityID, peer entity metadata,
+     * relying party configuration
      * 
      * @param requestContext current request context
      * @throws ProfileException thrown if there is a problem looking up the relying party's metadata
@@ -330,6 +330,7 @@ public abstract class AbstractSAMLProfileHandler extends
             throws ProfileException {
         MetadataProvider metadataProvider = requestContext.getMetadataProvider();
         String relyingPartyId = requestContext.getInboundMessageIssuer();
+        requestContext.setPeerEntityId(relyingPartyId);
 
         EntityDescriptor relyingPartyMetadata;
         try {
index 94b1c65..4b09f22 100644 (file)
@@ -73,6 +73,7 @@ public class ShibbolethSSODecoder extends BaseSAML1MessageDecoder implements SAM
                     "No providerId parameter given in Shibboleth SSO authentication request.");
         }
         requestContext.setInboundMessageIssuer(providerId);
+        requestContext.setPeerEntityId(providerId);
 
         String shire = DatatypeHelper.safeTrimOrNullString(transport.getParameterValue("shire"));
         if (shire == null) {
index b9f2d00..b759fde 100644 (file)
@@ -189,6 +189,7 @@ public class SSOProfileHandler extends AbstractSAML2ProfileHandler {
             decodeRequest(requestContext, inTransport, outTransport);
 
             String relyingPartyId = requestContext.getInboundMessageIssuer();
+            requestContext.setPeerEntityId(relyingPartyId);
             RelyingPartyConfiguration rpConfig = getRelyingPartyConfiguration(relyingPartyId);
             ProfileConfiguration ssoConfig = rpConfig.getProfileConfiguration(getProfileId());
             if (ssoConfig == null) {