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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Apr 15 11:49:26 2014
New Revision: 5728

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5728&view=rev
Log:
Implement NoPassive as an event and map to SAML status.

Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnEventIds.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectAuthenticationFlow.java
    trunk/idp-conf/src/main/resources/conf/global-user.xml
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnEventIds.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnEventIds.java?rev=5728&r1=5727&r2=5728&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnEventIds.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnEventIds.java Tue Apr 15 11:49:26 2014
@@ -17,6 +17,10 @@
 
 package net.shibboleth.idp.authn;
 
+import javax.annotation.Nonnull;
+
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+
 /**
  * Constants to use for {@link org.opensaml.profile.action.ProfileAction}
  * {@link org.opensaml.profile.context.EventContext} results related to
@@ -27,43 +31,46 @@
     /**
      * ID of event returned if the {@link net.shibboleth.idp.authn.context.AuthenticationContext} is missing or invalid.
      */
-    public static final String INVALID_AUTHN_CTX = "InvalidAuthenticationContext";
+    @Nonnull @NotEmpty public static final String INVALID_AUTHN_CTX = "InvalidAuthenticationContext";
     
     /** ID of event returned if there are no flows that could be used for authentication or c14n. */
-    public static final String NO_POTENTIAL_FLOW = "NoPotentialFlow";
+    @Nonnull @NotEmpty public static final String NO_POTENTIAL_FLOW = "NoPotentialFlow";
+
+    /** ID of the event returned if passive authentication isn't possible. */
+    @Nonnull @NotEmpty public static final String NO_PASSIVE = "NoPassive";
 
     /** ID of event returned if the request's authentication requirements can't be met by an action or flow. */
-    public static final String REQUEST_UNSUPPORTED = "RequestUnsupported";
+    @Nonnull @NotEmpty public static final String REQUEST_UNSUPPORTED = "RequestUnsupported";
     
     /** ID of event returned if there are no credentials available in the request. */
-    public static final String NO_CREDENTIALS = "NoCredentials";
-
+    @Nonnull @NotEmpty public static final String NO_CREDENTIALS = "NoCredentials";
+    
     /** ID of event returned if the given credentials are invalid. */
-    public static final String INVALID_CREDENTIALS = "InvalidCredentials";
+    @Nonnull @NotEmpty public static final String INVALID_CREDENTIALS = "InvalidCredentials";
 
     /** ID of event returned if the subject's account is in an invalid state. */
-    public static final String ACCOUNT_ERROR = "AccountError";
+    @Nonnull @NotEmpty public static final String ACCOUNT_ERROR = "AccountError";
 
     /** ID of event returned if the subject's account has non-fatal but potentially useful state to report. */
-    public static final String ACCOUNT_WARNING = "AccountWarning";
+    @Nonnull @NotEmpty public static final String ACCOUNT_WARNING = "AccountWarning";
     
     /** ID of event returned if a flow wishes to indicate that another flow should be selected instead. */
-    public static final String RESELECT_FLOW = "ReselectFlow";
+    @Nonnull @NotEmpty public static final String RESELECT_FLOW = "ReselectFlow";
     
     /**
      * ID of event returned if the {@link net.shibboleth.idp.authn.context.SubjectCanonicalizationContext}
      * is missing or invalid.
      */
-    public static final String INVALID_SUBJECT_C14N_CTX = "InvalidSubjectCanonicalizationContext";
+    @Nonnull @NotEmpty public static final String INVALID_SUBJECT_C14N_CTX = "InvalidSubjectCanonicalizationContext";
 
     /** ID of event returned if a Subject cannot be canonicalized. */
-    public static final String INVALID_SUBJECT = "InvalidSubject";
+    @Nonnull @NotEmpty public static final String INVALID_SUBJECT = "InvalidSubject";
 
     /** ID of event returned if an error occurs canonicalizing a Subject. */
-    public static final String SUBJECT_C14N_ERROR = "SubjectCanonicalizationError";
+    @Nonnull @NotEmpty public static final String SUBJECT_C14N_ERROR = "SubjectCanonicalizationError";
     
     /** ID of event returned if authentication throws an exception unrelated to credential validation. */
-    public static final String AUTHN_EXCEPTION = "AuthenticationException";
+    @Nonnull @NotEmpty public static final String AUTHN_EXCEPTION = "AuthenticationException";
 
     /** Constructor. */
     private AuthnEventIds() {

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectAuthenticationFlow.java

[... 135 lines stripped ...]