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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug 18 21:55:54 2014
New Revision: 6445

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6445&view=rev
Log:
Add RP UIInfo action to external flows.

Modified:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExternalAuthenticationImpl.java
    trunk/idp-conf/src/main/resources/conf/authn/external-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/remoteuser-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/remoteuser-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-flow.xml
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/SetRPUIInformation.java

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=6445&r1=6444&r2=6445&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 18 21:55:54 2014
@@ -42,7 +42,8 @@
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 /**
- * Constants supporting external authentication outside the webflow engine.
+ * Implementation of the {@link ExternalAuthentication} API that handles moving information in and out
+ * of request attributes.
  */
 public class ExternalAuthenticationImpl extends ExternalAuthentication {
 
@@ -75,16 +76,10 @@
         relyingPartyContextLookupStrategy =
                 Constraint.isNotNull(strategy, "RelyingPartyContext lookup strategy cannot be null");
     }
-    
-    /**
-     * Initialize a request for external authentication by seeking out the information stored in
-     * the servlet session and exposing it as request attributes.
-     * 
-     * @param request servlet request
-     * 
-     * @throws ExternalAuthenticationException if an error occurs
-     */
+
+    /** {@inheritDoc} */
     @SuppressWarnings("deprecation")
+    @Override
     protected void doStart(@Nonnull final HttpServletRequest request) throws ExternalAuthenticationException {
         final AuthenticationContext authnContext = profileRequestContext.getSubcontext(AuthenticationContext.class);
         if (authnContext == null) {
@@ -109,18 +104,9 @@
         }
     }
 
-    /**
-     * Complete a request for external authentication by seeking out the information stored in
-     * request attributes and transferring to the session's conversation state, and then transfer
-     * control back to the authentication web flow.
-     * 
-     * @param request servlet request
-     * @param response servlet response
-     * 
-     * @throws ExternalAuthenticationException if an error occurs
-     * @throws IOException if the redirect cannot be issued
-     */
  // Checkstyle: CyclomaticComplexity OFF
+    /** {@inheritDoc} */
+    @Override
     protected void doFinish(@Nonnull final HttpServletRequest request, @Nonnull final HttpServletResponse response)
             throws ExternalAuthenticationException, IOException {
         final AuthenticationContext authnContext = profileRequestContext.getSubcontext(AuthenticationContext.class);

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=6445&r1=6444&r2=6445&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 Mon Aug 18 21:55:54 2014
@@ -15,6 +15,9 @@
     <!-- Servlet context-relative path to wherever your implementation lives. -->
     <bean id="shibboleth.authn.External.externalAuthnPath" class="java.lang.String"
         c:_0="contextRelative:Authn/External" />
+
+    <!-- Populate RP UI info from metadata? -->
+    <util:constant id="shibboleth.authn.External.populateUIInfo" static-field="java.lang.Boolean.FALSE" />
 
     <!--
     Define entries here to map error messages returned by external modules and classify them as particular

Modified: trunk/idp-conf/src/main/resources/conf/authn/remoteuser-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/remoteuser-authn-config.xml?rev=6445&r1=6444&r2=6445&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/remoteuser-authn-config.xml (original)

[... 129 lines stripped ...]