[java-identity-provider COMMIT] in /trunk: idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X500SubjectCano...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep 16 23:05:23 2014
New Revision: 6539

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6539&view=rev
Log:
IDP-229 - c14n flow for X.500 principals

Added:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X500SubjectCanonicalization.java   (with props)
    trunk/idp-conf/src/main/resources/conf/c14n/x500-subject-c14n-config.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/c14n/x500-subject-c14n-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/c14n/x500-subject-c14n-flow.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/c14n/subject-c14n.xml
    trunk/idp-conf/src/main/resources/system/conf/subject-c14n-system.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml

Modified: trunk/idp-conf/src/main/resources/conf/c14n/subject-c14n.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/c14n/subject-c14n.xml?rev=6539&r1=6538&r2=6539&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/c14n/subject-c14n.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/c14n/subject-c14n.xml Tue Sep 16 23:05:23 2014
@@ -30,6 +30,12 @@
         set an activationCondition property to a condition function to use to control when it should run. 
         -->
         <!-- <bean id="c14n/attribute" parent="shibboleth.PostLoginSubjectCanonicalizationFlow" /> -->
+
+        <!--
+        This is an alternative that handles Subjects containing an X500Principal object and
+        allows extraction from the DN.
+        -->
+        <ref bean="c14n/x500" />
 
         <!--
         This is the standard post-login step that returns a username derived from the login process. If you

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=6539&r1=6538&r2=6539&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 Tue Sep 16 23:05:23 2014
@@ -20,6 +20,12 @@
     <bean id="c14n/simple" parent="shibboleth.PostLoginSubjectCanonicalizationFlow">
         <property name="activationCondition">
             <bean class="net.shibboleth.idp.authn.impl.SimpleSubjectCanonicalization.ActivationCondition" />
+        </property>
+    </bean>
+
+    <bean id="c14n/x500" parent="shibboleth.PostLoginSubjectCanonicalizationFlow">
+        <property name="activationCondition">
+            <bean class="net.shibboleth.idp.authn.impl.X500SubjectCanonicalization.ActivationCondition" />
         </property>
     </bean>
 

Modified: trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml?rev=6539&r1=6538&r2=6539&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml Tue Sep 16 23:05:23 2014
@@ -78,6 +78,7 @@
 
         <!-- Standard post-login C14N methods. -->
         <webflow:flow-location id="c14n/simple" path="../system/flows/c14n/simple-subject-c14n-flow.xml" />
+        <webflow:flow-location id="c14n/x500" path="../system/flows/c14n/x500-subject-c14n-flow.xml" />
         <webflow:flow-location id="c14n/attribute" path="../system/flows/c14n/attribute-sourced-subject-c14n-flow.xml" />
         
         <!-- Master post-authn flow. -->