[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/authn/external-authn-config.xml conf/auth...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Aug 18 16:23:13 2016
New Revision: 8330

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8330&view=rev
Log:
IDP-981 - Allow RemoteUser Auth method on multiple URLs selected by AuthContextClass

https://issues.shibboleth.net/jira/browse/IDP-981

Extend dynamic redirection to all the external flows.

Modified:
    trunk/idp-conf/src/main/resources/conf/authn/external-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/x509-authn-config.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/spnego-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/spnego-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/x509-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/x509-authn-flow.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn/external-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/external-authn-config.xml?rev=8330&r1=8329&r2=8330&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/external-authn-config.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/authn/external-authn-config.xml	Thu Aug 18 16:23:13 2016
@@ -15,6 +15,12 @@
     <!-- Servlet context-relative path to wherever your implementation lives. -->
     <bean id="shibboleth.authn.External.externalAuthnPath" class="java.lang.String"
         c:_0="contextRelative:Authn/External" />
+
+    <!--
+    Default is to always use the path in the bean above. If you want to determine it
+    dynamically, define a bean called "shibboleth.authn.External.externalAuthnPathStrategy"
+    of type Function<ProfileRequestContext,String> that returns the path to use.
+    -->
 
     <!--
     Add authentication flow descriptor's supportedPrincipals collection to the resulting Subject?

Modified: trunk/idp-conf/src/main/resources/conf/authn/x509-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/x509-authn-config.xml?rev=8330&r1=8329&r2=8330&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/x509-authn-config.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/authn/x509-authn-config.xml	Thu Aug 18 16:23:13 2016
@@ -15,6 +15,12 @@
     <!-- Servlet context-relative path to wherever your implementation lives. -->
     <bean id="shibboleth.authn.X509.externalAuthnPath" class="java.lang.String"
         c:_0="contextRelative:x509-prompt.jsp" />
+
+    <!--
+    Default is to always use the path in the bean above. If you want to determine it
+    dynamically, define a bean called "shibboleth.authn.X509.externalAuthnPathStrategy"
+    of type Function<ProfileRequestContext,String> that returns the path to use.
+    -->
 
     <!--
     Define entries here to map error messages returned by external modules and classify them as particular

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-beans.xml?rev=8330&r1=8329&r2=8330&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-beans.xml	Thu Aug 18 16:23:13 2016
@@ -18,6 +18,11 @@
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
+    <!-- Default strategy function to obtain the external path. -->
+    <bean id="shibboleth.authn.External.externalAuthnPathStrategy"
+        class="com.google.common.base.Functions" factory-method="constant"
+        c:_0-ref="shibboleth.authn.External.externalAuthnPath" />
+
     <import resource="../../../conf/authn/external-authn-config.xml" />
 
     <bean id="ValidateExternalAuthentication"

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-flow.xml?rev=8330&r1=8329&r2=8330&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-flow.xml	Thu Aug 18 16:23:13 2016
@@ -5,7 +5,7 @@
 
     <!-- This is a login flow for external authentication handled outside the webflow engine. -->
     

[... 83 lines stripped ...]