[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/services.properties idp-conf/src/main/res...

[noreply at shibboleth.net]

Author: scantor
Date: Sat Jan 24 15:36:13 2015
New Revision: 7281

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7281&view=rev
Log:
IDP-578 - Also need to mask filter errors

Modified:
    trunk/idp-conf/src/main/resources/conf/services.properties
    trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java

Modified: trunk/idp-conf/src/main/resources/conf/services.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/services.properties?rev=7281&r1=7280&r2=7281&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/services.properties Sat Jan 24 15:36:13 2015
@@ -26,6 +26,7 @@
 # NOTE: Failing the filter fast leaves no filters enabled.
 #idp.service.attribute.filter.failFast = false
 idp.service.attribute.filter.checkInterval = PT15M
+#idp.service.attribute.filter.maskFailures = true
 
 #idp.service.nameidGeneration.resources = shibboleth.NameIdentifierGenerationResources
 #idp.service.nameidGeneration.failFast = false

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml?rev=7281&r1=7280&r2=7281&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml Sat Jan 24 15:36:13 2015
@@ -115,7 +115,8 @@
         p:maskFailures="%{idp.service.attribute.resolver.maskFailures:true}" />
 
     <bean id="FilterAttributes" class="net.shibboleth.idp.profile.impl.FilterAttributes" scope="prototype"
-        c:filterService-ref="shibboleth.AttributeFilterService" />
+        c:filterService-ref="shibboleth.AttributeFilterService"
+        p:maskFailures="%{idp.service.attribute.filter.maskFailures:true}" />
         
     <util:map id="ProtocolStateMap">
         <entry>

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-beans.xml?rev=7281&r1=7280&r2=7281&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-beans.xml Sat Jan 24 15:36:13 2015
@@ -47,7 +47,8 @@
     <bean id="filterAttributes"
           class="net.shibboleth.idp.profile.impl.FilterAttributes"
           scope="prototype"
-          c:filterService-ref="shibboleth.AttributeFilterService" />
+          c:filterService-ref="shibboleth.AttributeFilterService"
+          p:maskFailures="%{idp.service.attribute.filter.maskFailures:true}" />
 
     <bean id="extractAttributesAction"
           class="net.shibboleth.idp.cas.flow.ExtractAttributesAction" />

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=7281&r1=7280&r2=7281&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 Sat Jan 24 15:36:13 2015
@@ -204,7 +204,8 @@
         p:maskFailures="%{idp.service.attribute.resolver.maskFailures:true}" />
 
     <bean id="FilterAttributes" class="net.shibboleth.idp.profile.impl.FilterAttributes" scope="prototype"
-        c:filterService-ref="shibboleth.AttributeFilterService" />
+        c:filterService-ref="shibboleth.AttributeFilterService"
+        p:maskFailures="%{idp.service.attribute.filter.maskFailures:true}" />
 
     <bean id="FilterByQueriedAttributeDesignators"
         class="net.shibboleth.idp.saml.saml1.profile.impl.FilterByQueriedAttributeDesignators" scope="prototype"

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java?rev=7281&r1=7280&r2=7281&view=diff

[... 126 lines stripped ...]