[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml i...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug 22 13:55:01 2016
New Revision: 8342

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8342&view=rev
Log:
IDP-961 - Use of IdP's authentication flow to protect itself

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

Rework parameter handling in reload flows, to accomodate authn.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/reload-service-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/reload-service-flow.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ReloadMetadata.java

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml?rev=8342&r1=8341&r2=8342&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml	Mon Aug 22 13:55:01 2016
@@ -31,14 +31,12 @@
         class="net.shibboleth.idp.profile.context.navigate.SpringExpressionContextLookupFunction"
         c:inClass="#{T(org.opensaml.profile.context.ProfileRequestContext)}"
         c:outputType="#{T(java.lang.String)}"
-        c:expression="T(net.shibboleth.utilities.java.support.primitive.StringSupport).trimOrNull(#custom.getParameter(T(net.shibboleth.idp.saml.profile.impl.ReloadMetadata).RESOLVER_ID))"
-        p:customObject-ref="shibboleth.HttpServletRequest" />
+        c:expression="#input.getSubcontext(T(net.shibboleth.idp.profile.context.SpringRequestContext)).getRequestContext().getFlowScope().get('resolverId')" />
 
     <!-- Work beans. -->
 
     <bean id="ReloadMetadata"
         class="net.shibboleth.idp.saml.profile.impl.ReloadMetadata" scope="prototype"
-        p:httpServletRequest-ref="shibboleth.HttpServletRequest"
         p:httpServletResponse-ref="shibboleth.HttpServletResponse"
         p:metadataResolver-ref="shibboleth.MetadataResolverService" />
         

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-flow.xml?rev=8342&r1=8341&r2=8342&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-flow.xml	Mon Aug 22 13:55:01 2016
@@ -4,7 +4,12 @@
     parent="admin.abstract">
 
     <!-- Start action. -->
-    
+
+    <on-start>
+        <!-- Extract 'id' parameter in case authentication disturbs the URL. -->
+        <evaluate expression="T(net.shibboleth.utilities.java.support.primitive.StringSupport).trimOrNull(externalContext.getNativeRequest().getParameter('id'))" result="flowScope.resolverId" />
+    </on-start>
+        
     <action-state id="InitializeProfileRequestContext">
         <evaluate expression="InitializeProfileRequestContext" />
         <evaluate expression="'proceed'" />

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/reload-service-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/reload-service-beans.xml?rev=8342&r1=8341&r2=8342&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/reload-service-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/reload-service-beans.xml	Mon Aug 22 13:55:01 2016
@@ -31,14 +31,12 @@
         class="net.shibboleth.idp.profile.context.navigate.SpringExpressionContextLookupFunction"
         c:inClass="#{T(org.opensaml.profile.context.ProfileRequestContext)}"
         c:outputType="#{T(java.lang.String)}"
-        c:expression="T(net.shibboleth.utilities.java.support.primitive.StringSupport).trimOrNull(#custom.getParameter(T(net.shibboleth.idp.profile.impl.ReloadServiceConfiguration).SERVICE_ID))"
-        p:customObject-ref="shibboleth.HttpServletRequest" />
+        c:expression="#input.getSubcontext(T(net.shibboleth.idp.profile.context.SpringRequestContext)).getRequestContext().getFlowScope().get('serviceId')" />
 
     <!-- Work beans. -->
 
     <bean id="ReloadServiceConfiguration"
         class="net.shibboleth.idp.profile.impl.ReloadServiceConfiguration" scope="prototype"
-        p:httpServletRequest-ref="shibboleth.HttpServletRequest"
         p:httpServletResponse-ref="shibboleth.HttpServletResponse" />
         

[... 176 lines stripped ...]