[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/subject-config.xml conf/webflow-config.xm...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Feb 20 14:23:40 2014
New Revision: 5424

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5424&view=rev
Log:
IDP-371 IDP-359 Action for Direct NameID C14N and test

Added:
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-direct-subject-c14n-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-direct-subject-c14n-flow.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/subject-config.xml
    trunk/idp-conf/src/main/resources/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-crypto-transient-subject-c14n-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/subject-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/subject-config.xml?rev=5424&r1=5423&r2=5424&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/subject-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/subject-config.xml Thu Feb 20 14:23:40 2014
@@ -61,6 +61,18 @@
             </property>
         </bean>
         
+        <bean c:id="SubjectC14NFlow/SAML2/Direct" class="net.shibboleth.idp.saml.nameid.NameIDCanonicalizationFlowDescriptor"> 
+            <property name="activationCondition">
+                <bean
+                    class="net.shibboleth.idp.saml.impl.nameid.NameIDCanonicalization.ActivationCondition" />
+            </property>
+            <property name="formats">
+                <util:list>
+                    <value>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</value>
+                    <value>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</value>
+                </util:list>
+            </property>
+        </bean>
 
         <bean c:id="SubjectC14NFlow/LegacyPrincipalConnector" class="net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor">
             <property name="activationCondition">

Modified: trunk/idp-conf/src/main/resources/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/webflow-config.xml?rev=5424&r1=5423&r2=5424&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/webflow-config.xml Thu Feb 20 14:23:40 2014
@@ -49,6 +49,8 @@
         <webflow:flow-location id="SubjectC14NFlow/Simple" path="/c14n/simple-subject-c14n-flow.xml" />
         <webflow:flow-location id="SubjectC14NFlow/SAML2/Transient" path="/c14n/saml2-transient-subject-c14n-flow.xml"  />
         <webflow:flow-location id="SubjectC14NFlow/SAML2/CryptoTransient" path="/c14n/saml2-crypto-transient-subject-c14n-flow.xml"  />
+        <webflow:flow-location id="SubjectC14NFlow/SAML2/Direct" path="/c14n/saml2-direct-subject-c14n-flow.xml"  />
+
         <webflow:flow-location id="SubjectC14NFlow/LegacyPrincipalConnector" path="/c14n/legacy-pc-subject-c14n-flow.xml"  />
                 
     </webflow:flow-registry>

Modified: trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-crypto-transient-subject-c14n-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-crypto-transient-subject-c14n-beans.xml?rev=5424&r1=5423&r2=5424&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-crypto-transient-subject-c14n-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-crypto-transient-subject-c14n-beans.xml Thu Feb 20 14:23:40 2014
@@ -12,7 +12,7 @@
 	<bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
 
 	<bean id="SAML2CryptoTransientDecoder" class="net.shibboleth.idp.saml.impl.nameid.CryptoTransientNameIDDecoder"
-		scope="prototype" p:id="SAML2TransientDecoder" p:dataSealer-ref="shibboleth.DataSealer" />
+		scope="prototype" p:id="SAML2CryptoTransientDecoder" p:dataSealer-ref="shibboleth.DataSealer" />
 
 	<bean id="SAML2CrypoTransientCanonicalization" class="net.shibboleth.idp.saml.impl.nameid.NameIDCanonicalization"
 		scope="prototype" p:decoder-ref="SAML2CryptoTransientDecoder" />