[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src: main/java/org/opensaml/saml/common/binding/SAMLMetadataLooku...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Dec 31 11:37:18 2013
New Revision: 3541

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3541&view=rev
Log:
Was attaching metadata context to wrong spot.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/SAMLMetadataLookupHandler.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/SAMLMetadataLookupHandlerTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/SAMLMetadataLookupHandler.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/SAMLMetadataLookupHandler.java?rev=3541&r1=3540&r2=3541&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/SAMLMetadataLookupHandler.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/SAMLMetadataLookupHandler.java Tue Dec 31 11:37:18 2013
@@ -44,7 +44,8 @@
 
 /**
  * Handler for inbound SAML protocol messages that attempts to locate SAML metadata for
- * the message issuer, and attaches it with a {@link SAMLMetadataContext}.
+ * the message issuer, and attaches it with a {@link SAMLMetadataContext} as a child of the
+ * pre-existing {@link SAMLPeerEntityContext}.
  * 
  * <p>The handler will no-op in the absence of a populated {@link SAMLPeerEntityContext} for
  * the message with an entityID and role to look up. A protocol from a {@link SAMLProtocolContext}
@@ -113,7 +114,7 @@
             metadataCtx.setEntityDescriptor((EntityDescriptor) roleMetadata.getParent());
             metadataCtx.setRoleDescriptor(roleMetadata);
 
-            messageContext.addSubcontext(metadataCtx);
+            peerCtx.addSubcontext(metadataCtx);
 
             log.debug("{} {} added to MessageContext", getLogPrefix(), SAMLMetadataContext.class.getName());
         } catch (ResolverException e) {

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/SAMLMetadataLookupHandlerTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/SAMLMetadataLookupHandlerTest.java?rev=3541&r1=3540&r2=3541&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/SAMLMetadataLookupHandlerTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/SAMLMetadataLookupHandlerTest.java Tue Dec 31 11:37:18 2013
@@ -99,10 +99,10 @@
         handler.initialize();
         
         handler.invoke(messageContext);
-        Assert.assertNull(messageContext.getSubcontext(SAMLMetadataContext.class, false));
+        Assert.assertNull(messageContext.getSubcontext(SAMLPeerEntityContext.class, false));
         
-        messageContext.getSubcontext(SAMLPeerEntityContext.class, true).setRole(
-                org.opensaml.saml.saml2.metadata.SPSSODescriptor.DEFAULT_ELEMENT_NAME);
+        SAMLPeerEntityContext peerContext = messageContext.getSubcontext(SAMLPeerEntityContext.class, true);
+        peerContext.setRole(org.opensaml.saml.saml2.metadata.SPSSODescriptor.DEFAULT_ELEMENT_NAME);
         
         handler.invoke(messageContext);
         Assert.assertNull(messageContext.getSubcontext(SAMLMetadataContext.class, false));
@@ -113,14 +113,15 @@
         handler.setRoleDescriptorResolver(roleResolver);
         handler.initialize();
         
-        messageContext.getSubcontext(SAMLPeerEntityContext.class, true).setRole(IDPSSODescriptor.DEFAULT_ELEMENT_NAME);
+        SAMLPeerEntityContext peerContext = messageContext.getSubcontext(SAMLPeerEntityContext.class, true);
+        peerContext.setRole(IDPSSODescriptor.DEFAULT_ELEMENT_NAME);
         
         Request request = SAML1ActionTestingSupport.buildAttributeQueryRequest(null);
         ((AttributeQuery) request.getQuery()).setResource("urn:notfound");
         messageContext.setMessage(request);
 
         handler.invoke(messageContext);
-        Assert.assertNull(messageContext.getSubcontext(SAMLMetadataContext.class, false));
+        Assert.assertNull(peerContext.getSubcontext(SAMLMetadataContext.class, false));
     }
  
     @Test
@@ -128,14 +129,15 @@
         handler.setRoleDescriptorResolver(roleResolver);
         handler.initialize();
         
-        messageContext.getSubcontext(SAMLPeerEntityContext.class, true).setRole(SPSSODescriptor.DEFAULT_ELEMENT_NAME);
+        SAMLPeerEntityContext peerContext = messageContext.getSubcontext(SAMLPeerEntityContext.class, true);
+        peerContext.setRole(SPSSODescriptor.DEFAULT_ELEMENT_NAME);
         
         Request request = SAML1ActionTestingSupport.buildAttributeQueryRequest(null);
         ((AttributeQuery) request.getQuery()).setResource("urn:mace:incommon:osu.edu");
         messageContext.setMessage(request);
 
         handler.invoke(messageContext);

[... 44 lines stripped ...]