[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/authn/authn-comparison.xml conf/relying-p...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jul  9 13:33:16 2014
New Revision: 6257

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6257&view=rev
Log:
IDP-435 - addtitional related fix so SAML 1 authn method matching works

Modified:
    trunk/idp-conf/src/main/resources/conf/authn/authn-comparison.xml
    trunk/idp-conf/src/main/resources/conf/relying-party.xml
    trunk/idp-conf/src/main/resources/system/conf/general-authn-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn/authn-comparison.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/authn-comparison.xml?rev=6257&r1=6256&r2=6257&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/authn-comparison.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/authn-comparison.xml Wed Jul  9 13:33:16 2014
@@ -45,6 +45,7 @@
     <util:map id="shibboleth.AuthnComparisonRules">
     
         <!-- Exact matching, this can be left as-is. -->
+        <entry key-ref="shibboleth.SAMLAuthnMethodExact" value-ref="shibboleth.ExactMatchFactory"/>
         <entry key-ref="shibboleth.SAMLACClassRefExact" value-ref="shibboleth.ExactMatchFactory"/>
         <entry key-ref="shibboleth.SAMLACDeclRefExact" value-ref="shibboleth.ExactMatchFactory"/>
 

Modified: trunk/idp-conf/src/main/resources/conf/relying-party.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/relying-party.xml?rev=6257&r1=6256&r2=6257&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/relying-party.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/relying-party.xml Wed Jul  9 13:33:16 2014
@@ -51,10 +51,24 @@
         <bean parent="RelyingPartyByName" c:relyingPartyIds="https://sp.example.org">
             <property name="profileConfigurations">
                 <util:list>
-                    <ref bean="Shibboleth.SSO" />
+                    <bean parent="Shibboleth.SSO">
+                        <property name="defaultAuthenticationMethods">
+                            <util:list>
+                                <bean parent="shibboleth.SAML1AuthenticationMethod"
+                                    c:method="urn:oasis:names:tc:SAML:1.0:am:password" />
+                            </util:list>
+                        </property>
+                    </bean>
                     <ref bean="SAML1.AttributeQuery" />
                     <ref bean="SAML1.ArtifactResolution" />
-                    <ref bean="SAML2.SSO" />
+                    <bean parent="SAML2.SSO">
+                        <property name="defaultAuthenticationMethods">
+                            <util:list>
+                                <bean parent="shibboleth.SAML2AuthnContextClassRef"
+                                    c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" />
+                            </util:list>
+                        </property>
+                    </bean>
                     <ref bean="SAML2.ECP" />
                     <ref bean="SAML2.AttributeQuery" />
                     <ref bean="SAML2.ArtifactResolution" />

Modified: trunk/idp-conf/src/main/resources/system/conf/general-authn-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/general-authn-system.xml?rev=6257&r1=6256&r2=6257&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/general-authn-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/general-authn-system.xml Wed Jul  9 13:33:16 2014
@@ -117,6 +117,9 @@
         class="net.shibboleth.idp.authn.principal.impl.InexactPrincipalEvalPredicateFactory" />
 
     <!-- Boilerplate objects needed to key the installation of matching rules in the comparison registry. -->
+
+    <bean id="shibboleth.SAMLAuthnMethodExact" class="net.shibboleth.utilities.java.support.collection.Pair"
+        p:first="#{ T(net.shibboleth.idp.saml.authn.principal.AuthenticationMethodPrincipal) }" p:second="exact"/>
     
     <bean id="shibboleth.SAMLACClassRefExact" class="net.shibboleth.utilities.java.support.collection.Pair"
         p:first="#{ T(net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal) }" p:second="exact"/>