[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/subject-c14n-user.xml system/conf/subject...

[noreply at shibboleth.net]

Author: scantor
Date: Wed May 28 15:46:10 2014
New Revision: 5988

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5988&view=rev
Log:
Convert Direct c14n flows into Transform flows with no transforms.

Modified:
    trunk/idp-conf/src/main/resources/conf/subject-c14n-user.xml
    trunk/idp-conf/src/main/resources/system/conf/subject-c14n-system.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/subject-c14n-user.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/subject-c14n-user.xml?rev=5988&r1=5987&r2=5988&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/subject-c14n-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/subject-c14n-user.xml Wed May 28 15:46:10 2014
@@ -59,14 +59,14 @@
         
         <!--
         Finally we have beans for decoding arbitrary SAML formats directly. By default, these are turned off,
-        having *no* circumstances for which they apply (see shibboleth.DirectNamePredicate below).
+        having *no* circumstances for which they apply (see shibboleth.TransformNamePredicate below).
         -->
-        <ref bean="c14n/SAML2Direct" />
-        <ref bean="c14n/SAML1Direct" />
+        <ref bean="c14n/SAML2Transform" />
+        <ref bean="c14n/SAML1Transform" />
     </util:list>
     
-    <!-- What SAML NameID formats do you want to support direct mapping for? -->
-    <util:list id="shibboleth.DirectNameFormats">
+    <!-- What SAML NameID formats do you want to support direct transformations for? -->
+    <util:list id="shibboleth.NameTransformFormats">
         <value>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</value>
         <value>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</value>
         <value>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</value>
@@ -78,12 +78,22 @@
     Under what conditions should direct NameID mapping be allowed? By default, never.
     Any predicate can be used here; the example is suitable for enumerating a number of SPs to allow.
     -->
-    <bean id="shibboleth.DirectNamePredicate" class="net.shibboleth.idp.profile.logic.RelyingPartyIdPredicate">
+    <bean id="shibboleth.NameTransformPredicate" class="net.shibboleth.idp.profile.logic.RelyingPartyIdPredicate">
         <constructor-arg>
             <util:list>
                 <!-- <value>https://sp.example.org</value> -->
             </util:list>
         </constructor-arg>
     </bean>
-            
+    
+    <!--
+    Regular expression transforms to apply to incoming subject names. The default empty list just
+    echoes the name through unmodified.
+    -->
+    <util:list id="shibboleth.NameTransforms">
+        <!--
+        <bean class="net.shibboleth.utilities.java.support.collection.Pair" p:first="^(.+)@example\.edu$" p:second="$1" />
+        -->
+    </util:list>
+    
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/conf/subject-c14n-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/subject-c14n-system.xml?rev=5988&r1=5987&r2=5988&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/subject-c14n-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/subject-c14n-system.xml Wed May 28 15:46:10 2014
@@ -50,28 +50,28 @@
     <bean id="c14n/SAML1CryptoTransient" parent="shibboleth.AbstractSAML1C14NFlowBean" 
         p:formats="urn:mace:shibboleth:1.0:nameIdentifier" /> 
 
-    <bean id="c14n/SAML2Direct" parent="shibboleth.AbstractSAML2C14NFlowBean"
-            p:formats-ref="shibboleth.DirectNameFormats">
+    <bean id="c14n/SAML2Transform" parent="shibboleth.AbstractSAML2C14NFlowBean"
+            p:formats-ref="shibboleth.NameTransformFormats">
         <property name="activationCondition">
             <bean class="com.google.common.base.Predicates" factory-method="and">
                 <constructor-arg>
                     <util:list>
                         <bean class="net.shibboleth.idp.saml.nameid.impl.NameIDCanonicalization.ActivationCondition" />
-                        <ref bean="shibboleth.DirectNamePredicate" />
+                        <ref bean="shibboleth.NameTransformPredicate" />
                     </util:list>
                 </constructor-arg>
             </bean>
         </property>
     </bean>
                
-    <bean id="c14n/SAML1Direct" parent="shibboleth.AbstractSAML1C14NFlowBean"
-            p:formats-ref="shibboleth.DirectNameFormats"> 
+    <bean id="c14n/SAML1Transform" parent="shibboleth.AbstractSAML1C14NFlowBean"
+            p:formats-ref="shibboleth.NameTransformFormats"> 
         <property name="activationCondition">
             <bean class="com.google.common.base.Predicates" factory-method="and">

[... 64 lines stripped ...]