[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLPeer...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Apr 30 12:32:51 2014
New Revision: 3829

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3829&view=rev
Log:
Add message handler to resolve issuer of SAML 1 artifact requests.

Added:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/impl/SAML1ArtifactRequestIssuerHandler.java   (with props)
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/impl/
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/impl/SAML1ArtifactRequestIssuerHandlerTest.java   (with props)
Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLPeerEntityContext.java
    trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/saml1/profile/SAML1ActionTestingSupport.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLPeerEntityContext.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLPeerEntityContext.java?rev=3829&r1=3828&r2=3829&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLPeerEntityContext.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLPeerEntityContext.java Wed Apr 30 12:32:51 2014
@@ -28,7 +28,6 @@
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.saml1.core.Assertion;
-import org.opensaml.saml.saml1.core.AssertionArtifact;
 import org.opensaml.saml.saml1.core.AttributeQuery;
 import org.opensaml.saml.saml1.core.AuthorizationDecisionQuery;
 import org.opensaml.saml.saml2.core.Issuer;
@@ -222,13 +221,6 @@
                 return entityId;
             }
         }
-
-        if (request.getAssertionArtifacts() != null) {
-            entityId = processSaml1AssertionArtifacts(request.getAssertionArtifacts());
-            if (entityId != null) {
-                return entityId;
-            }
-        }
         
         return null;
     }
@@ -270,32 +262,6 @@
                 return resource;
             }
         }
-        return null;
-    }
-    
-    /**
-     * Resolve the SAML entity ID from a SAML 1 AssertionArtifact list.
-     * 
-     * @param artifacts the artifact list
-     * 
-     * @return the entity ID, or null if it could not be resolved
-     */
-    @Nullable protected String processSaml1AssertionArtifacts(@Nonnull final List<AssertionArtifact> artifacts) {
-        if (artifacts.size() == 0) {
-            return null;
-        }
-        
-        //TODO can we support this?  Would need the artifact map.
-        /*
-        log.debug("Attempting to extract issuer based on first AssertionArtifact in request");
-        AssertionArtifact artifact = artifacts.get(0);
-        SAMLArtifactMapEntry artifactEntry = artifactMap.get(artifact.getAssertionArtifact());
-        String issuer = artifactEntry.getRelyingPartyId();
-        log.debug("Extracted issuer from SAML 1.x AssertionArtifact: {}", issuer);
-        return issuer;
-        */
-        
-        log.info("Dynamic resolution of SAML peer entity ID from SAML 1 AssertionArtifacts is not currently supported");
         return null;
     }
 

Modified: trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/saml1/profile/SAML1ActionTestingSupport.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/saml1/profile/SAML1ActionTestingSupport.java?rev=3829&r1=3828&r2=3829&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/saml1/profile/SAML1ActionTestingSupport.java (original)
+++ trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/saml1/profile/SAML1ActionTestingSupport.java Wed Apr 30 12:32:51 2014
@@ -26,6 +26,7 @@
 import org.opensaml.saml.common.SAMLObjectBuilder;
 import org.opensaml.saml.common.SAMLVersion;
 import org.opensaml.saml.saml1.core.Assertion;
+import org.opensaml.saml.saml1.core.AssertionArtifact;
 import org.opensaml.saml.saml1.core.AttributeQuery;
 import org.opensaml.saml.saml1.core.AttributeStatement;
 import org.opensaml.saml.saml1.core.AuthenticationStatement;
@@ -164,10 +165,10 @@
             query.setSubject(subject);
         }
 
-        SAMLObjectBuilder<Request> requestBuilder = (SAMLObjectBuilder<Request>)
+        final SAMLObjectBuilder<Request> requestBuilder = (SAMLObjectBuilder<Request>)
                 XMLObjectProviderRegistrySupport.getBuilderFactory().<Request>getBuilderOrThrow(
                         Request.DEFAULT_ELEMENT_NAME);
-        Request request = requestBuilder.buildObject();
+        final Request request = requestBuilder.buildObject();
         request.setID(REQUEST_ID);
         request.setIssueInstant(new DateTime(0));
         request.setQuery(query);
@@ -176,4 +177,35 @@
         return request;
     }
     

[... 33 lines stripped ...]