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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Oct  1 12:49:57 2014
New Revision: 6611

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6611&view=rev
Log:
Conditionalize client cert handler for non-browser profiles.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/security-beans.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/utilities.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/utilities.xml?rev=6611&r1=6610&r2=6611&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml Wed Oct  1 12:49:57 2014
@@ -13,12 +13,12 @@
        default-destroy-method="destroy">
 
     <bean id="shibboleth.Pair" class="net.shibboleth.utilities.java.support.collection.Pair" abstract="true" />
-
-    <bean id="shibboleth.Conditions.True" class="com.google.common.base.Predicates" factory-method="alwaysTrue" />
-    <bean id="shibboleth.Conditions.False" class="com.google.common.base.Predicates" factory-method="alwaysFalse" />
     
     <bean id="shibboleth.Conditions.RelyingPartyId"
         class="net.shibboleth.idp.profile.logic.RelyingPartyIdPredicate" abstract="true" />
+        
+    <bean id="shibboleth.Conditions.BrowserProfile"
+        class="org.opensaml.profile.logic.BrowserProfilePredicate" />
 
     <bean id="shibboleth.MessageContextLookup.Inbound"
         class="org.opensaml.profile.context.navigate.InboundMessageContextLookup" />

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/security-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/security-beans.xml?rev=6611&r1=6610&r2=6611&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/security-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/security-beans.xml Wed Oct  1 12:49:57 2014
@@ -105,6 +105,10 @@
             <bean class="org.opensaml.saml.common.binding.security.impl.SAMLMDClientCertAuthSecurityHandler" scope="prototype"
                     p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
         </constructor-arg>
+        <property name="activationCondition">
+            <bean class="com.google.common.base.Predicates" factory-method="not"
+                c:predicate-ref="shibboleth.Conditions.BrowserProfile" />
+        </property>
         <property name="errorEvent">
             <util:constant static-field="org.opensaml.profile.action.EventIds.MESSAGE_AUTHN_ERROR" />
         </property>