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

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Oct 22 12:32:18 2014
New Revision: 6767

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6767&view=rev
Log:
Property to enable post-authn flows.

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

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6767&r1=6766&r2=6767&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Wed Oct 22 12:32:18 2014
@@ -163,3 +163,5 @@
 idp.resolvertest.accessPolicy = AccessByIPAddress
 idp.reload.accessPolicy = AccessByIPAddress
 
+# Regular expression matching post-authn flows to enable
+#idp.post-authn.flows = consent/terms-of-use|consent/attribute-consent

Modified: trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml?rev=6767&r1=6766&r2=6767&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml Wed Oct 22 12:32:18 2014
@@ -14,14 +14,14 @@
 
     <!-- Flows executed after authentication. -->
     <util:list id="shibboleth.PostAuthnFlows">
-        <!-- 
+
         <bean id="post-authn/consent/terms-of-use" parent="shibboleth.consent.TermsOfUseFlow" />
 
         <bean id="post-authn/consent/attribute-consent" parent="shibboleth.consent.AttributeConsentFlow"
              p:doNotRememberConsentAllowed="true" 
              p:globalConsentAllowed="true"
              p:perAttributeConsentEnabled="true" />
-        -->
+
     </util:list>
 
     <!-- TODO doc -->

Modified: trunk/idp-conf/src/main/resources/system/flows/post-authn/post-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/post-authn/post-authn-beans.xml?rev=6767&r1=6766&r2=6767&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/post-authn/post-authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/post-authn/post-authn-beans.xml Wed Oct 22 12:32:18 2014
@@ -12,11 +12,14 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
+    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
+        p:placeholderPrefix="%{" p:placeholderSuffix="}" />
+
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
     <bean id="PopulatePostAuthnContext" class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext" scope="prototype"
-        p:availableFlows-ref="shibboleth.PostAuthnFlows" />
+        p:availableFlows="#{@'shibboleth.PostAuthnFlows'.?[id matches 'post-authn/(%{idp.post-authn.flows:})']}" />
 
     <bean id="SelectPostAuthnFlow" class="net.shibboleth.idp.profile.interceptor.impl.SelectProfileInterceptorFlow" scope="prototype" />