[java-identity-provider COMMIT] in /trunk: idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegatio...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Jun 19 19:23:09 2015
New Revision: 7580

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7580&view=rev
Log:
Get rid of special delegation handling of SAML presenter in favor of new standard SAMLPresenterEntityContext.

Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/LibertySSOSContext.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/ProcessSenderHandler.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/ProcessSenderHandlerTest.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/LibertySSOSContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/LibertySSOSContext.java?rev=7580&r1=7579&r2=7580&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/LibertySSOSContext.java	(original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/LibertySSOSContext.java	Fri Jun 19 19:23:09 2015
@@ -24,35 +24,13 @@
  * Context for storing information related to Liberty SSOS delegation.
  */
 public class LibertySSOSContext extends BaseContext {
-    
-    /** The entityID of the presenter of the AuthnRequest. */
-    private String presenterEntityId;
-    
+
     /** The SAML 2 Assertion which serves as the authentication token for the AuthnRequest and
      * has been successfully attested by the AuthnRequest presenter. */
     private Assertion attestedToken;
     
     /** Get the confirmation method that was successfully used by the attesting entity. */
     private String attestedSubjectConfirmationMethod;
-    
-    /**
-     * Get the entityID of the presenter of the AuthnRequest.
-     * 
-     * @return Returns the presenter entityId
-     */
-    public String getPresenterEntityId() {
-        return presenterEntityId;
-    }
-
-    /**
-     * Set the entityID of the presenter of the AuthnRequest.
-     * 
-     * @param newPresenterEntityId The presenter entityId to set
-     */
-    public void setPresenterEntityId(String newPresenterEntityId) {
-        presenterEntityId = newPresenterEntityId;
-    }
-
     
     /**
      * Get the SAML 2 Assertion which serves as the authentication token for the AuthnRequest and

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/ProcessSenderHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/ProcessSenderHandler.java?rev=7580&r1=7579&r2=7580&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/ProcessSenderHandler.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/ProcessSenderHandler.java	Fri Jun 19 19:23:09 2015
@@ -21,7 +21,6 @@
 
 import javax.annotation.Nonnull;
 
-import net.shibboleth.idp.saml.saml2.profile.delegation.LibertySSOSContext;
 import net.shibboleth.idp.saml.saml2.profile.delegation.impl.LibertyConstants;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
@@ -30,6 +29,7 @@
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.messaging.handler.AbstractMessageHandler;
 import org.opensaml.messaging.handler.MessageHandlerException;
+import org.opensaml.saml.common.messaging.context.SAMLPresenterEntityContext;
 import org.opensaml.soap.messaging.SOAPMessagingSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,7 +39,7 @@
  * 
  * <p>
  * If the header is present, the providerId value is stored in the message context via
- * {@link LibertySSOSContext#setPresenterEntityId(String)}.
+ * {@link SAMLPresenterEntityContext#setEntityId(String)}.
  * </p>
  */
 public class ProcessSenderHandler extends AbstractMessageHandler {
@@ -53,7 +53,7 @@
         String headerValue = header != null ? StringSupport.trimOrNull(header.getProviderID()) : null;
         log.debug("Extracted inbound Liberty ID-WSF Sender providerId value: {}", headerValue);
         if (header != null && headerValue != null) {
-            messageContext.getSubcontext(LibertySSOSContext.class, true).setPresenterEntityId(headerValue);
+            messageContext.getSubcontext(SAMLPresenterEntityContext.class, true).setEntityId(headerValue);
             SOAPMessagingSupport.registerUnderstoodHeader(messageContext, header);
         }
     }

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/ProcessSenderHandlerTest.java

[... 46 lines stripped ...]