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

[noreply at shibboleth.net]

Author: scantor
Date: Mon May 26 00:07:01 2014
New Revision: 5965

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5965&view=rev
Log:
IDP-234 - Draft implementation of external authn flow, also rename of conversation variable for PRC.

Added:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java   (with props)
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthenticationException.java   (with props)
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/ExternalAuthenticationContext.java   (with props)
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExternalAuthenticationImpl.java   (with props)
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java   (with props)
    trunk/idp-conf/src/main/resources/conf/authn/external-authn-config.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-flow.xml   (with props)
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/WebFlowCurrentEventLookupFunction.java   (with props)
    trunk/idp-war/src/main/webapp/resources/external-authn/
    trunk/idp-war/src/main/webapp/resources/external-authn/container.jsp   (with props)
Modified:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAAS.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstLDAP.java
    trunk/idp-conf/src/main/resources/conf/authn/general-authn-config.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/status/status-flow.xml
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/WebflowRequestContextProfileRequestContextLookup.java
    trunk/idp-war/pom.xml

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAAS.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAAS.java?rev=5965&r1=5964&r2=5965&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAAS.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAAS.java Mon May 26 00:07:01 2014
@@ -60,10 +60,11 @@
  *  
  * @event {@link EventIds#PROCEED_EVENT_ID}
  * @event {@link EventIds#INVALID_PROFILE_CTX}
+ * @event {@link AuthnEventIds#AUTHN_EXCEPTION}
  * @event {@link AuthnEventIds#INVALID_CREDENTIALS}
  * @event {@link AuthnEventIds#NO_CREDENTIALS}
- * @pre <pre>ProfileRequestContext.getSubcontext(AuthenticationContext.class, false).getAttemptedFlow() != null</pre>
- * @post If AuthenticationContext.getSubcontext(UsernamePasswordContext.class, false) != null, then
+ * @pre <pre>ProfileRequestContext.getSubcontext(AuthenticationContext.class).getAttemptedFlow() != null</pre>
+ * @post If AuthenticationContext.getSubcontext(UsernamePasswordContext.class) != null, then
  * an {@link net.shibboleth.idp.authn.AuthenticationResult} is saved to the {@link AuthenticationContext} on a
  * successful login. On a failed login, the
  * {@link AbstractValidationAction#handleError(ProfileRequestContext, AuthenticationContext, Exception, String)}
@@ -137,16 +138,12 @@
      * 
      * @param names list of JAAS application names to use
      */
-    public void setLoginConfigNames(@Nonnull @NonnullElements List<String> names) {
+    public void setLoginConfigNames(@Nonnull @NonnullElements @NotEmpty List<String> names) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        
-        loginConfigNames = Lists.newArrayList();
-        for (String name : Constraint.isNotNull(names, "Configuration name list cannot be null")) {
-            String trimmed = StringSupport.trimOrNull(name);
-            if (trimmed != null) {
-                loginConfigNames.add(trimmed);
-            }
-        }
+        Constraint.isNotNull(names, "Configuration name list cannot be null");
+        
+        loginConfigNames = Lists.newArrayList(StringSupport.normalizeStringCollection(names));
+        
         if (loginConfigNames.isEmpty()) {

[... 471 lines stripped ...]