[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml idp-...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar 25 14:23:34 2014
New Revision: 5637

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5637&view=rev
Log:
Hopefully "final" predicate design, working for NameIDPolicy checking and subject name extraction.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/ExtractSubjectFromRequest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/logic/NameQualifierFromCanonicalizationContextFunction.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/logic/SPNameQualifierFromCanonicalizationContextFunction.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/ExtractSubjectFromRequestTest.java

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml?rev=5637&r1=5636&r2=5637&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml Tue Mar 25 14:23:34 2014
@@ -55,7 +55,18 @@
         p:bindings-ref="shibboleth.OutgoingBindings" />
 
     <bean id="ExtractSubjectFromRequest"
-        class="net.shibboleth.idp.saml.impl.profile.ExtractSubjectFromRequest" scope="prototype" />
+            class="net.shibboleth.idp.saml.impl.profile.ExtractSubjectFromRequest" scope="prototype">
+        <property name="nameIDPolicyPredicate">
+            <bean class="org.opensaml.saml.common.profile.impl.logic.AffiliationNameIDPolicyPredicate"
+                    p:metadataResolver-ref="ExampleMetadataResolver"
+                    p:responderIdLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple"
+                    p:requesterIdLookupStrategy-ref="shibboleth.RelyingPartyIdLookup.Simple">
+                <property name="objectLookupStrategy">
+                    <bean class="net.shibboleth.idp.saml.impl.profile.ExtractSubjectFromRequest.SubjectNameLookupFunction" />
+                </property>
+            </bean>
+        </property>
+    </bean>
 
     <bean id="FinalizeSAMLSubjectCanonicalization"
         class="net.shibboleth.idp.saml.impl.profile.FinalizeSAMLSubjectCanonicalization" scope="prototype" />

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml?rev=5637&r1=5636&r2=5637&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml Tue Mar 25 14:23:34 2014
@@ -125,7 +125,7 @@
                     p:metadataResolver-ref="ExampleMetadataResolver"
                     p:responderIdLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple"
                     p:requesterIdLookupStrategy-ref="shibboleth.RelyingPartyIdLookup.Simple">
-                <property name="nameIDPolicyLookupStrategy">
+                <property name="objectLookupStrategy">
                     <bean class="org.opensaml.saml.saml2.profile.impl.AddNameIDToSubjects.NameIDPolicyLookupFunction" />
                 </property>
             </bean>

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/ExtractSubjectFromRequest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/ExtractSubjectFromRequest.java?rev=5637&r1=5636&r2=5637&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/ExtractSubjectFromRequest.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/ExtractSubjectFromRequest.java Tue Mar 25 14:23:34 2014
@@ -23,6 +23,7 @@
 import javax.annotation.Nullable;
 import javax.security.auth.Subject;
 
+import net.shibboleth.idp.authn.AuthnEventIds;
 import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
 import net.shibboleth.idp.profile.AbstractProfileAction;
 import net.shibboleth.idp.profile.context.navigate.RelyingPartyIdLookupFunction;
@@ -30,7 +31,9 @@
 import net.shibboleth.idp.saml.authn.principal.NameIDPrincipal;
 import net.shibboleth.idp.saml.authn.principal.NameIdentifierPrincipal;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;

[... 199 lines stripped ...]