[java-identity-provider COMMIT] in /trunk: idp-authn-impl/pom.xml idp-authn-impl/src/main/java/net/shibboleth/idp/aut...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug  3 13:23:19 2015
New Revision: 7665

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7665&view=rev
Log:
IDP-748 - Localize handling of consent revocation signaling to avoid cross-flow dependencies

Added:
    trunk/idp-consent-api/src/main/java/net/
    trunk/idp-consent-api/src/main/java/net/shibboleth/
    trunk/idp-consent-api/src/main/java/net/shibboleth/idp/
    trunk/idp-consent-api/src/main/java/net/shibboleth/idp/consent/
    trunk/idp-consent-api/src/main/java/net/shibboleth/idp/consent/context/
    trunk/idp-consent-api/src/main/java/net/shibboleth/idp/consent/context/ConsentManagementContext.java   (with props)
    trunk/idp-consent-api/src/main/java/net/shibboleth/idp/consent/context/package-info.java   (with props)
Modified:
    trunk/idp-authn-impl/pom.xml
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExternalAuthenticationImpl.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/RemoteUserAuthServlet.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X509AuthServlet.java
    trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
    trunk/idp-consent-impl/pom.xml
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/interceptor/ProfileInterceptorFlowDescriptor.java
    trunk/idp-war/src/main/webapp/x509-prompt.jsp

Modified: trunk/idp-authn-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/pom.xml?rev=7665&r1=7664&r2=7665&view=diff
==============================================================================
--- trunk/idp-authn-impl/pom.xml	(original)
+++ trunk/idp-authn-impl/pom.xml	Mon Aug  3 13:23:19 2015
@@ -25,6 +25,11 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>idp-authn-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-consent-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExternalAuthenticationImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExternalAuthenticationImpl.java?rev=7665&r1=7664&r2=7665&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExternalAuthenticationImpl.java	(original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExternalAuthenticationImpl.java	Mon Aug  3 13:23:19 2015
@@ -38,6 +38,7 @@
 import net.shibboleth.idp.authn.ExternalAuthenticationException;
 import net.shibboleth.idp.authn.context.AuthenticationContext;
 import net.shibboleth.idp.authn.context.ExternalAuthenticationContext;
+import net.shibboleth.idp.consent.context.ConsentManagementContext;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
 import net.shibboleth.idp.profile.interceptor.ProfileInterceptorFlowDescriptor;
 import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -160,8 +161,9 @@
         
         attr = request.getAttribute(REVOKECONSENT_KEY);
         if (attr != null && attr instanceof Boolean && ((Boolean) attr).booleanValue()) {
-            response.sendRedirect(extContext.getFlowExecutionUrl()
-                    + "&" + ProfileInterceptorFlowDescriptor.REVOKE_CONSENT_PARAM + "=1");        
+            final ConsentManagementContext consentCtx =
+                    getProfileRequestContext(request).getSubcontext(ConsentManagementContext.class, true);
+            consentCtx.setRevokeConsent(true);
         } else {
             response.sendRedirect(extContext.getFlowExecutionUrl());
         }

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/RemoteUserAuthServlet.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/RemoteUserAuthServlet.java?rev=7665&r1=7664&r2=7665&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/RemoteUserAuthServlet.java	(original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/RemoteUserAuthServlet.java	Mon Aug  3 13:23:19 2015
@@ -39,7 +39,6 @@
 import net.shibboleth.idp.authn.ExternalAuthenticationException;
 import net.shibboleth.idp.authn.context.AuthenticationContext;
 import net.shibboleth.idp.authn.principal.UsernamePrincipal;
-import net.shibboleth.idp.profile.interceptor.ProfileInterceptorFlowDescriptor;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;

[... 145 lines stripped ...]