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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Feb 11 07:05:41 2014
New Revision: 5367

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5367&view=rev
Log:
IDP-359  Move the formats that are understood from the Canonicalization bean to the condition bean.  This allows some simplification in config as well as saves time in running dead end flows.

Modified:
    trunk/idp-conf/src/main/resources/conf/subject-config.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=5367&r1=5366&r2=5367&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/subject-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/subject-config.xml Tue Feb 11 07:05:41 2014
@@ -34,11 +34,8 @@
             </property>
         </bean>
         
-        <bean c:id="SubjectC14NFlow/SAML2/Transient" class="net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor">
-            <property name="activationCondition">
-                <bean class="net.shibboleth.idp.saml.impl.nameid.NameIDCanonicalization.ActivationCondition" />
-            </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/LegacyPrincipalConnector" class="net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor">
             <property name="activationCondition">
@@ -49,4 +46,15 @@
 
     </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>
+    
 </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=5367&r1=5366&r2=5367&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java Tue Feb 11 07:05:41 2014
@@ -17,11 +17,15 @@
 
 package net.shibboleth.idp.saml.impl.nameid;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.Set;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.idp.authn.AbstractSubjectCanonicalizationAction;
 import net.shibboleth.idp.authn.AuthnEventIds;
 import net.shibboleth.idp.authn.SubjectCanonicalizationException;
 import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
@@ -29,6 +33,8 @@
 import net.shibboleth.idp.saml.nameid.NameDecoderException;
 import net.shibboleth.idp.saml.nameid.NameIDDecoder;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+import net.shibboleth.utilities.java.support.collection.CollectionSupport;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -37,8 +43,11 @@
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.opensaml.saml.saml2.core.NameID;
 import org.opensaml.saml.saml2.profile.SAML2ObjectSupport;
+import org.springframework.beans.factory.InitializingBean;
 
 import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.collect.ImmutableSet;
 
 /**
  * An action that operates on a {@link SubjectCanonicalizationContext} child of the current
@@ -55,7 +64,7 @@
  * SubjectCanonicalizationContext.getPrincipalName() != null || SubjectCanonicalizationContext.getException() != null
  * </pre>
  */

[... 293 lines stripped ...]