[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system: conf/utilities.xml flows/saml/saml2/sso...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Mar 24 17:20:12 2014
New Revision: 5630

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5630&view=rev
Log:
Reworked design of NameIDPolicy checking to allow for more generic use in different places.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/utilities.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/utilities.xml?rev=5630&r1=5629&r2=5630&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml Mon Mar 24 17:20:12 2014
@@ -22,4 +22,10 @@
         class="org.opensaml.messaging.context.navigate.ChildContextLookup"
         c:type="#{ T(org.opensaml.xmlsec.context.SecurityParametersContext) }" />
 
+    <bean id="shibboleth.ResponderIdLookup.Simple"
+        class="net.shibboleth.idp.profile.context.navigate.ResponderIdLookupFunction" />
+
+    <bean id="shibboleth.RelyingPartyIdLookup.Simple"
+        class="net.shibboleth.idp.profile.context.navigate.RelyingPartyIdLookupFunction" />
+
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml?rev=5630&r1=5629&r2=5630&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml Mon Mar 24 17:20:12 2014
@@ -100,12 +100,10 @@
 
     <alias name="shibboleth.OutgoingSAML2SSOBindings" alias="shibboleth.OutgoingBindings"/>
         
-    <bean id="AddResponseShell" class="org.opensaml.saml.saml2.profile.impl.AddResponseShell" scope="prototype">
+    <bean id="AddResponseShell" class="org.opensaml.saml.saml2.profile.impl.AddResponseShell" scope="prototype"
+            p:issuerLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple">
         <property name="identifierGeneratorLookupStrategy">
             <bean class="net.shibboleth.idp.profile.config.navigate.IdentifierGenerationStrategyLookupFunction" />
-        </property>
-        <property name="issuerLookupStrategy">
-            <bean class="net.shibboleth.idp.profile.context.navigate.ResponderIdLookupFunction" />
         </property>
     </bean>
 
@@ -124,7 +122,9 @@
         </property>
         <property name="nameIDPolicyPredicate">
             <bean class="org.opensaml.saml.saml2.profile.impl.AffiliationNameIDPolicyPredicate"
-                p:metadataResolver-ref="ExampleMetadataResolver" />
+                p:metadataResolver-ref="ExampleMetadataResolver"
+                p:responderIdLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple"
+                p:requesterIdLookupStrategy-ref="shibboleth.RelyingPartyIdLookup.Simple" />
         </property>
     </bean>