[java-idp-testbed COMMIT] in /trunk/src/main/resources: conf/authn-flow-descriptors.xml conf/idp.properties conf/sess...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Oct 16 15:02:40 2013
New Revision: 12

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=12&view=rev
Log:
Idea for enabling flows without affecting bean declarations.

Modified:
    trunk/src/main/resources/conf/authn-flow-descriptors.xml
    trunk/src/main/resources/conf/idp.properties
    trunk/src/main/resources/conf/session-manager.xml
    trunk/src/main/resources/flows/authn/authn-beans.xml

Modified: trunk/src/main/resources/conf/authn-flow-descriptors.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/conf/authn-flow-descriptors.xml?rev=12&r1=11&r2=12&view=diff
==============================================================================
--- trunk/src/main/resources/conf/authn-flow-descriptors.xml (original)
+++ trunk/src/main/resources/conf/authn-flow-descriptors.xml Wed Oct 16 15:02:40 2013
@@ -73,7 +73,7 @@
                 </list>
             </property>
         </bean>
-        
+
     </util:list>
 
 </beans>

Modified: trunk/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/conf/idp.properties?rev=12&r1=11&r2=12&view=diff
==============================================================================
--- trunk/src/main/resources/conf/idp.properties (original)
+++ trunk/src/main/resources/conf/idp.properties Wed Oct 16 15:02:40 2013
@@ -28,6 +28,9 @@
 # Support lookup by SP for SAML logout
 idp.session.secondaryServiceIndex = false
 
+# Regular expression expressing flows to enable 
+idp.authn.flows = JAASForm
+
 # Default lifetime and timeout of various authentication methods
 idp.authn.defaultLifetime = PT60M
 idp.authn.defaultTimeout = PT30M

Modified: trunk/src/main/resources/conf/session-manager.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/conf/session-manager.xml?rev=12&r1=11&r2=12&view=diff
==============================================================================
--- trunk/src/main/resources/conf/session-manager.xml (original)
+++ trunk/src/main/resources/conf/session-manager.xml Wed Oct 16 15:02:40 2013
@@ -12,9 +12,12 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
+    <bean id="shibboleth.SessionIDGenerator" class="net.shibboleth.utilities.java.support.security.SecureRandomIdentifierGenerationStrategy"
+        c:identifierSize="${idp.session.idSize}" />
+
     <bean id="shibboleth.SessionManager" class="net.shibboleth.idp.session.impl.StorageBackedSessionManager"
             p:httpServletRequest-ref="shibboleth.HttpServletRequest" p:httpServletResponse-ref="shibboleth.HttpServletResponse"
-            p:authenticationFlowDescriptors-ref="shibboleth.AvailableAuthenticationFlows"
+            p:authenticationFlowDescriptors="#{@'shibboleth.AvailableAuthenticationFlows'.?[id matches 'AuthenticationFlow/(${idp.authn.flows})']}"
             p:cookieManager-ref="shibboleth.CookieManager"
             p:storageService-ref="shibboleth.StorageService"
             p:consistentAddress="${idp.session.consistentAddress}"
@@ -22,11 +25,7 @@
             p:sessionSlop="${idp.session.slop}"
             p:maskStorageFailure="${idp.session.maskStorageFailure}"
             p:trackSPSessions="${idp.session.trackSPSessions}"
-            p:secondaryServiceIndex="${idp.session.secondaryServiceIndex}">
-        <property name="IDGenerator">
-            <bean class="net.shibboleth.utilities.java.support.security.SecureRandomIdentifierGenerationStrategy"
-                c:identifierSize="${idp.session.idSize}" />
-        </property>
-    </bean>
+            p:secondaryServiceIndex="${idp.session.secondaryServiceIndex}"
+            p:IDGenerator-ref="shibboleth.SessionIDGenerator" />
 
 </beans>

Modified: trunk/src/main/resources/flows/authn/authn-beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/flows/authn/authn-beans.xml?rev=12&r1=11&r2=12&view=diff
==============================================================================
--- trunk/src/main/resources/flows/authn/authn-beans.xml (original)
+++ trunk/src/main/resources/flows/authn/authn-beans.xml Wed Oct 16 15:02:40 2013
@@ -19,7 +19,7 @@
     <!-- The beans to inject to configure the initialization of the subsystem come from the imported files above. -->
     
     <bean id="InitializeAuthenticationContext" class="net.shibboleth.idp.authn.impl.InitializeAuthenticationContext" scope="prototype"
-        p:availableFlows-ref="shibboleth.AvailableAuthenticationFlows"
+        p:availableFlows="#{@'shibboleth.AvailableAuthenticationFlows'.?[id matches 'AuthenticationFlow/(${idp.authn.flows})']}"
         p:principalEvalPredicateFactoryRegistry-ref="shibboleth.AuthnComparisonRegistry" />
 
     <bean id="PopulateSessionContext" class="net.shibboleth.idp.session.impl.PopulateSessionContext" scope="prototype"