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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug 22 11:02:18 2016
New Revision: 8335

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

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

Finalizing APIs/actions.

Modified:
    trunk/idp-admin-api/   (props changed)
    trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/AdministrativeFlowDescriptor.java
    trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java
    trunk/idp-admin-impl/   (props changed)
    trunk/idp-admin-impl/.project
    trunk/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTree.java
    trunk/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTreeTest.java

Modified: trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/AdministrativeFlowDescriptor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/AdministrativeFlowDescriptor.java?rev=8335&r1=8334&r2=8335&view=diff
==============================================================================
--- trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/AdministrativeFlowDescriptor.java	(original)
+++ trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/AdministrativeFlowDescriptor.java	Mon Aug 22 11:02:18 2016
@@ -35,6 +35,13 @@
  * @since 3.3.0
  */
 public interface AdministrativeFlowDescriptor extends AuthenticationProfileConfiguration {
+    
+    /**
+     * Get a logging ID to use when auditing this profile.
+     * 
+     * @return logging ID
+     */
+    @Nullable String getLoggingId();
 
     /**
      * Get whether this flow supports non-browser clients (default is true).
@@ -42,13 +49,6 @@
      * @return whether this flow supports non-browser clients
      */
     boolean isNonBrowserSupported();
-
-    /**
-     * Get whether access to flow should be recorded in audit log (default is true).
-     * 
-     * @return whether access to flow should be audited
-     */
-    boolean isAudited();
     
     /**
      * Get whether user authentication is required (default is false).

Modified: trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java?rev=8335&r1=8334&r2=8335&view=diff
==============================================================================
--- trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java	(original)
+++ trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java	Mon Aug 22 11:02:18 2016
@@ -73,11 +73,11 @@
 public class BasicAdministrativeFlowDescriptor extends AbstractProfileConfiguration
         implements AdministrativeFlowDescriptor {
     
+    /** Logging ID. */
+    @Nullable private String loggingId;
+    
     /** Whether this flow supports non-browser clients. */
     private Predicate<ProfileRequestContext> supportsNonBrowserPredicate;
-    
-    /** Whether access to flow should be recorded in audit log. */
-    private Predicate<ProfileRequestContext> auditedPredicate;
 
     /** Whether user authentication is required. */
     private Predicate<ProfileRequestContext> authenticatedPredicate;
@@ -107,13 +107,12 @@
     /**
      * Constructor.
      * 
-     * @param profileId the profile identifier
-     */
-    public BasicAdministrativeFlowDescriptor(@Nonnull @NotEmpty final String profileId) {
-        super(profileId);
+     * @param id profile Id
+     */
+    public BasicAdministrativeFlowDescriptor(@Nonnull @NotEmpty final String id) {
+        super(id);
         
         supportsNonBrowserPredicate = Predicates.alwaysTrue();
-        auditedPredicate = Predicates.alwaysTrue();
         authenticatedPredicate = Predicates.alwaysFalse();
         policyNameLookupStrategy = FunctionSupport.constant(null);
         resolveAttributesPredicate = Predicates.alwaysFalse();
@@ -124,6 +123,20 @@
     }
     
     /** {@inheritDoc} */
+    @Nullable public String getLoggingId() {
+        return loggingId;
+    }
+    
+    /**
+     * Set a logging ID to use when auditing this profile.
+     * 
+     * @param id logging ID
+     */
+    public void setLoggingId(@Nullable final String id) {
+        loggingId = StringSupport.trimOrNull(id);
+    }
+    
+    /** {@inheritDoc} */
     public boolean isNonBrowserSupported() {
         return supportsNonBrowserPredicate.apply(getProfileRequestContext());
     }
@@ -147,30 +160,6 @@
         supportsNonBrowserPredicate = Constraint.isNotNull(condition, "Non-browser support condition cannot be null");
     }
     
-    /** {@inheritDoc} */
-    public boolean isAudited() {
-        return auditedPredicate.apply(getProfileRequestContext());
-    }
-    
-    /**

[... 102 lines stripped ...]