[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/idp.properties idp-conf/src/main/resource...

[noreply at shibboleth.net]

Author: scantor
Date: Thu May  1 19:26:49 2014
New Revision: 5820

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5820&view=rev
Log:
IDP-403 - Streamline interface between actions and NameID generation

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/logic/DefaultNameIdentifierFormatStrategy.java

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=5820&r1=5819&r2=5820&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Thu May  1 19:26:49 2014
@@ -91,6 +91,10 @@
 # Regular expression expressing post-login subject c14n flows to enable
 idp.c14n.flows = Simple
 
+# Default NameID formats to use when nothing else is specified
+idp.saml1.nameid.default = urn:mace:shibboleth:1.0:nameIdentifier
+idp.saml2.nameid.default = urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+
 # Reload "failfast" (stop the IdP if a configuration is bad)
 # and reload check interval (0 == never reload). Specified in milliseconds
 idp.service.logging.failFast=true

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml?rev=5820&r1=5819&r2=5820&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml Thu May  1 19:26:49 2014
@@ -26,11 +26,15 @@
     <alias name="shibboleth.OutgoingSAML1SSOBindings" alias="shibboleth.OutgoingBindings"/>
 
     <bean id="AddNameIdentifierToSubjects"
-            class="org.opensaml.saml.saml1.profile.impl.AddNameIdentifierToSubjects" scope="prototype"
-            p:defaultNameIDGenerator="#{getObject('shibboleth.LegacySAML1NameIdentifierGenerator')}"
-            p:nameIdentifierGenerators-ref="shibboleth.SAML1NameIdentifierGenerators">
+            class="org.opensaml.saml.saml1.profile.impl.AddNameIdentifierToSubjects" scope="prototype">
         <property name="formatLookupStrategy">
-            <bean class="net.shibboleth.idp.saml.profile.logic.DefaultNameIdentifierFormatStrategy" />
+            <bean class="net.shibboleth.idp.saml.profile.logic.DefaultNameIdentifierFormatStrategy"
+                p:defaultFormat="${idp.saml1.nameid.default}" />
+        </property>
+        <property name="nameIdentifierGenerator">
+            <bean class="org.opensaml.saml.saml1.profile.impl.ChainingSAML1NameIdentifierGenerator"
+                p:nameIdentifierGenerators-ref="shibboleth.SAML1NameIdentifierGenerators"
+                p:defaultNameIDGenerator="#{getObject('shibboleth.LegacySAML1NameIdentifierGenerator')}" />
         </property>
     </bean>
 

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=5820&r1=5819&r2=5820&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 Thu May  1 19:26:49 2014
@@ -32,11 +32,15 @@
         class="net.shibboleth.idp.saml.saml2.profile.impl.ProcessRequestedAuthnContext" scope="prototype" />
         
     <bean id="AddNameIDToSubjects"
-            class="org.opensaml.saml.saml2.profile.impl.AddNameIDToSubjects" scope="prototype"
-            p:defaultNameIDGenerator="#{getObject('shibboleth.LegacySAML2NameIdentifierGenerator')}"
-            p:nameIDGenerators-ref="shibboleth.SAML2NameIDGenerators">
+            class="org.opensaml.saml.saml2.profile.impl.AddNameIDToSubjects" scope="prototype">
         <property name="formatLookupStrategy">
-            <bean class="net.shibboleth.idp.saml.profile.logic.DefaultNameIdentifierFormatStrategy" />
+            <bean class="net.shibboleth.idp.saml.profile.logic.DefaultNameIdentifierFormatStrategy"
+                p:defaultFormat="${idp.saml2.nameid.default}" />
+        </property>
+        <property name="nameIDGenerator">
+            <bean class="org.opensaml.saml.saml2.profile.impl.ChainingSAML2NameIDGenerator"
+                p:nameIdentifierGenerators-ref="shibboleth.SAML2NameIDGenerators"
+                p:defaultNameIDGenerator="#{getObject('shibboleth.LegacySAML2NameIDGenerator')}" />

[... 75 lines stripped ...]