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

[noreply at shibboleth.net]

Author: rdw
Date: Wed Feb 12 08:28:22 2014
New Revision: 5378

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5378&view=rev
Log:
IDP-359  A better way to configure.  Move the formats into the descriptors and have the Actions look for the descriptor and thus the formats.

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameIDCanonicalizationFlowDescriptor.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/subject-config.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-transient-subject-c14n-beans.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/CryptoTransientNameIDDecoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalizationTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/TransientDecoderTest.java

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=5378&r1=5377&r2=5378&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/subject-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/subject-config.xml Wed Feb 12 08:28:22 2014
@@ -34,9 +34,20 @@
             </property>
         </bean>
         
-        <bean c:id="SubjectC14NFlow/SAML2/Transient" class="net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor" 
-              p:activationCondition-ref="SubjectC14NFlow/SAML2/Transient/Condition"/>
         
+        <bean c:id="SubjectC14NFlow/SAML2/Transient" 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">
                 <bean class="net.shibboleth.idp.saml.impl.nameid.LegacyCanonicalization.ActivationCondition" 
@@ -44,17 +55,5 @@
             </property>
         </bean>
 
-    </util:list>
-    
-    <!-- Each type of NameID and NameIdentifier flow has formats associated.  These beans are used inside the Canonicalization as well -->
-    
-    <bean id="SubjectC14NFlow/SAML2/Transient/Condition" class="net.shibboleth.idp.saml.impl.nameid.NameIDCanonicalization.ActivationCondition">
-        <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>
-    
+    </util:list>   
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-transient-subject-c14n-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-transient-subject-c14n-beans.xml?rev=5378&r1=5377&r2=5378&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-transient-subject-c14n-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-transient-subject-c14n-beans.xml Wed Feb 12 08:28:22 2014
@@ -14,10 +14,7 @@
 	<bean id="SAML2TransientDecoder" class="net.shibboleth.idp.saml.impl.nameid.NameID"
 		scope="prototype" p:id="SAML2TransientDecoder" p:idStore-ref="shibboleth.StorageService" />
 
-	<bean id="SAML2TransientCanonicalization"
-		class="net.shibboleth.idp.saml.impl.nameid.NameIDCanonicalization"
-		scope="prototype" 
-		c:condition-ref="SubjectC14NFlow/SAML2/Transient/Condition" 
-		p:decoder-ref="SAML2TransientDecoder"/>
+	<bean id="SAML2TransientCanonicalization" class="net.shibboleth.idp.saml.impl.nameid.NameIDCanonicalization"
+		scope="prototype" p:decoder-ref="SAML2TransientDecoder" />
 
 </beans>

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java?rev=5378&r1=5377&r2=5378&view=diff
==============================================================================

[... 295 lines stripped ...]