[java-identity-provider COMMIT] in /trunk: idp-conf/ idp-conf/src/main/resources/system/conf/relying-party-system.xml...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jun 10 08:52:37 2015
New Revision: 7553

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7553&view=rev
Log:
IDP-739 - EntityAttributesPredicate needs more boolean flexibility

Modified:
    trunk/idp-conf/   (props changed)
    trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/relyingparty/impl/RelyingPartyConfigurationSupport.java

Modified: trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml?rev=7553&r1=7552&r2=7553&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml	Wed Jun 10 08:52:37 2015
@@ -39,7 +39,7 @@
     <!-- Parent bean for RelyingParty overrides based on activation by tag. -->
     <bean id="RelyingPartyByTag" abstract="true"
         class="net.shibboleth.idp.saml.relyingparty.impl.RelyingPartyConfigurationSupport" factory-method="byTag"
-        p:responderId-ref="entityID" p:detailedErrors="%{idp.errors.detailed:false}" c:trim="false" />
+        p:responderId-ref="entityID" p:detailedErrors="%{idp.errors.detailed:false}" c:trim="false" c:matchAll="false" />
         
     <bean id="TagCandidate" abstract="true"
         class="org.opensaml.saml.common.profile.logic.EntityAttributesPredicate.Candidate"

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/relyingparty/impl/RelyingPartyConfigurationSupport.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/relyingparty/impl/RelyingPartyConfigurationSupport.java?rev=7553&r1=7552&r2=7553&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/relyingparty/impl/RelyingPartyConfigurationSupport.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/relyingparty/impl/RelyingPartyConfigurationSupport.java	Wed Jun 10 08:52:37 2015
@@ -115,11 +115,13 @@
      * 
      * @param candidates the candidate rules
      * @param trim true iff tag values in metadata should be trimmed before comparison
+     * @param matchAll true iff all the candidate rules are required to match
      * 
      * @return  a default-constructed configuration with the appropriate condition set
      */
     @Nonnull public static RelyingPartyConfiguration byTag(
-            @Nonnull @NonnullElements final Collection<Candidate> candidates, final boolean trim) {
+            @Nonnull @NonnullElements final Collection<Candidate> candidates, final boolean trim,
+            final boolean matchAll) {
         Constraint.isNotNull(candidates, "Candidate list cannot be null");
         
         // We adapt an OpenSAML Predicate applying to an EntityDescriptor by indirecting the lookup of the
@@ -128,7 +130,7 @@
         final StrategyIndirectedPredicate<ProfileRequestContext,EntityDescriptor> indirectPredicate =
                 new StrategyIndirectedPredicate<>(
                         Functions.compose(new EntityDescriptorLookupFunction(),new SAMLMetadataContextLookupFunction()),
-                        new EntityAttributesPredicate(candidates, trim));
+                        new EntityAttributesPredicate(candidates, trim, matchAll));
         
         final RelyingPartyConfiguration config = new RelyingPartyConfiguration();
         config.setActivationCondition(indirectPredicate);