[java-identity-provider COMMIT] in /trunk/idp-cas-impl/src: main/java/net/shibboleth/idp/cas/flow/BuildSAMLMetadataCo...

[noreply at shibboleth.net]

Author: serac
Date: Tue Nov 18 15:14:24 2014
New Revision: 6936

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6936&view=rev
Log:
Fix bugs in CAS SAML metadata impl.

Modified:
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/BuildSAMLMetadataContextAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/ServiceEntityDescriptor.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/BuildSAMLMetadataContextActionTest.java

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/BuildSAMLMetadataContextAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/BuildSAMLMetadataContextAction.java?rev=6936&r1=6935&r2=6936&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/BuildSAMLMetadataContextAction.java (original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/BuildSAMLMetadataContextAction.java Tue Nov 18 15:14:24 2014
@@ -44,7 +44,7 @@
         }
         final SAMLMetadataContext mdCtx = new SAMLMetadataContext();
         mdCtx.setEntityDescriptor(new ServiceEntityDescriptor(getCASService(profileRequestContext)));
-        rpCtx.addSubcontext(mdCtx);
+        rpCtx.setRelyingPartyIdContextTree(mdCtx);
 
         return ActionSupport.buildProceedEvent(this);
     }

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/ServiceEntityDescriptor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/ServiceEntityDescriptor.java?rev=6936&r1=6935&r2=6936&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/ServiceEntityDescriptor.java (original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/ServiceEntityDescriptor.java Tue Nov 18 15:14:24 2014
@@ -74,7 +74,7 @@
         this.service = Constraint.isNotNull(service, "Service cannot be null");
         this.objectMetadata = new LockableClassToInstanceMultiMap<>(true);
         if (StringSupport.trimOrNull(service.getGroup()) != null) {
-            this.objectMetadata.put(new EntityGroupName(service.getName()));
+            this.objectMetadata.put(new EntityGroupName(service.getGroup()));
         }
     }
 

Modified: trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/BuildSAMLMetadataContextActionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/BuildSAMLMetadataContextActionTest.java?rev=6936&r1=6935&r2=6936&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/BuildSAMLMetadataContextActionTest.java (original)
+++ trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/BuildSAMLMetadataContextActionTest.java Tue Nov 18 15:14:24 2014
@@ -22,6 +22,7 @@
 import net.shibboleth.idp.cas.config.LoginConfiguration;
 import net.shibboleth.idp.cas.service.Service;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.idp.saml.profile.context.navigate.SAMLMetadataContextLookupFunction;
 import org.opensaml.messaging.context.navigate.ChildContextLookup;
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
@@ -44,9 +45,7 @@
     private BuildSAMLMetadataContextAction action;
 
     private Function<ProfileRequestContext, SAMLMetadataContext> mdLookupFunction =
-            Functions.compose(
-                    new ChildContextLookup<RelyingPartyContext, SAMLMetadataContext>(SAMLMetadataContext.class),
-                    new ChildContextLookup<ProfileRequestContext, RelyingPartyContext>(RelyingPartyContext.class));
+            new SAMLMetadataContextLookupFunction();
 
     @Test
     public void testServiceWithGroup() throws Exception {
@@ -60,7 +59,7 @@
         assertNotNull(mdc);
         final List<EntityGroupName> groups = mdc.getEntityDescriptor().getObjectMetadata().get(EntityGroupName.class);
         assertEquals(groups.size(), 1);
-        assertEquals(groups.get(0).getName(), service.getName());
+        assertEquals(groups.get(0).getName(), service.getGroup());
     }
 
     @Test