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

[noreply at shibboleth.net]

Author: scantor
Date: Fri May 29 19:28:03 2015
New Revision: 7538

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7538&view=rev
Log:
IDP-730 - add trim to various authn properties

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

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml?rev=7538&r1=7537&r2=7538&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml	Fri May 29 19:28:03 2015
@@ -20,12 +20,12 @@
     
     <bean id="PopulateAuthenticationContext"
         class="net.shibboleth.idp.authn.impl.PopulateAuthenticationContext" scope="prototype"
-        p:availableFlows="#{@'shibboleth.AvailableAuthenticationFlows'.?[id matches 'authn/(%{idp.authn.flows:})']}"
+        p:availableFlows="#{@'shibboleth.AvailableAuthenticationFlows'.?[id matches 'authn/(' + '%{idp.authn.flows:}'.trim() + ')']}"
         p:principalEvalPredicateFactoryRegistry-ref="shibboleth.AuthnComparisonRegistry" />
 
     <bean id="PopulateAuthenticationContextWithInitialFlow"
         class="net.shibboleth.idp.authn.impl.PopulateAuthenticationContext" scope="prototype"
-        p:availableFlows="#{@'shibboleth.AvailableAuthenticationFlows'.?[id matches 'authn/(%{idp.authn.flows.initial:})']}"
+        p:availableFlows="#{@'shibboleth.AvailableAuthenticationFlows'.?[id matches 'authn/(' + '%{idp.authn.flows.initial:}'.trim() + ')']}"
         p:principalEvalPredicateFactoryRegistry-ref="shibboleth.AuthnComparisonRegistry" />
 
     <bean id="PopulateSessionContext"
@@ -44,7 +44,7 @@
             p:activationCondition="#{ '%{idp.authn.resolveAttribute:null}' != 'null' }"
             p:maskFailures="%{idp.service.attribute.resolver.maskFailures:true}">
         <property name="attributesToResolve">
-            <bean parent="shibboleth.CommaDelimStringArray" c:_0="%{idp.authn.resolveAttribute:null}" />
+            <bean parent="shibboleth.CommaDelimStringArray" c:_0="#{ '%{idp.authn.resolveAttribute:null}'.trim() }" />
         </property>
         <property name="principalNameLookupStrategy">
             <bean class="com.google.common.base.Functions" factory-method="compose"
@@ -61,7 +61,7 @@
     <bean id="FilterFlowsByAttribute"
         class="net.shibboleth.idp.authn.impl.FilterFlowsByAttribute" scope="prototype"
         p:activationCondition="#{ '%{idp.authn.resolveAttribute:null}' != 'null' }"
-        p:attributeId="#{ T(org.springframework.util.StringUtils).commaDelimitedListToStringArray('%{idp.authn.resolveAttribute:null}')[0] }"/>
+        p:attributeId="#{ T(org.springframework.util.StringUtils).commaDelimitedListToStringArray('%{idp.authn.resolveAttribute:null}'.trim())[0] }"/>
 
     <bean id="FilterFlowsByForcedAuthn"
         class="net.shibboleth.idp.authn.impl.FilterFlowsByForcedAuthn" scope="prototype" />

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=7538&r1=7537&r2=7538&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	Fri May 29 19:28:03 2015
@@ -194,7 +194,7 @@
         class="net.shibboleth.idp.saml.profile.impl.InitializeAuthenticationContext" scope="prototype" />
 
     <bean id="InitialAuthenticationFlag" class="java.lang.Boolean">
-        <constructor-arg value="#{ '%{idp.authn.flows.initial:}'.length() gt 0 }" type="boolean" />
+        <constructor-arg value="#{ '%{idp.authn.flows.initial:}'.trim().length() gt 0 }" type="boolean" />
     </bean>
 
     <bean id="InitializeRequestedPrincipalContext"