[java-identity-provider COMMIT] in /trunk: idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProt...

[noreply at shibboleth.net]

Author: serac
Date: Wed Oct 21 11:17:02 2015
New Revision: 7845

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7845&view=rev
Log:
IDP-834 Add flag to disable CASv2 attributes.

Added:
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/PrepareTicketValidationResponseAction.java
      - copied, changed from r7843, trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/ExtractAttributesAction.java
Modified:
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProtocolConfiguration.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/LoginConfiguration.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/ExtractAttributesAction.java
    trunk/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/samlValidate/samlValidate-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/validate-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/validate-abstract-flow.xml
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/SamlValidateFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ServiceValidateFlowTest.java
    trunk/idp-conf/src/test/resources/test/test-attribute-filter-cas.xml
    trunk/idp-conf/src/test/resources/test/test-relying-party-cas.xml

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProtocolConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProtocolConfiguration.java?rev=7845&r1=7844&r2=7845&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProtocolConfiguration.java	(original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProtocolConfiguration.java	Wed Oct 21 11:17:02 2015
@@ -50,6 +50,9 @@
     @Positive
     private long ticketValidityPeriod;
 
+    /** Flag to indicate whether attributes should be resolved for this profile. */
+    private boolean resolveAttributes = true;
+
     /**
      * Creates a new configuration instance.
      *
@@ -93,6 +96,20 @@
         this.ticketValidityPeriod = Constraint.isGreaterThan(0, millis, "Ticket validity period must be positive.");
     }
 
+    /** @return True if attribute resolution enabled for this profile, false otherwise. */
+    public boolean isResolveAttributes() {
+        return resolveAttributes;
+    }
+
+    /**
+     * Enables or disables attribute resolution.
+     *
+     * @param resolveAttributes True to enable attribute resolution (default), false otherwise.
+     */
+    public void setResolveAttributes(final boolean resolveAttributes) {
+        this.resolveAttributes = resolveAttributes;
+    }
+
     @Nonnull
     protected abstract String getDefaultTicketPrefix();
 

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/LoginConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/LoginConfiguration.java?rev=7845&r1=7844&r2=7845&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/LoginConfiguration.java	(original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/LoginConfiguration.java	Wed Oct 21 11:17:02 2015
@@ -76,10 +76,6 @@
     @Nonnull
     @NonnullElements
     private List<String> nameIDFormatPrecedence = Collections.emptyList();
-
-    /** Flag to indicate whether attributes should be resolved at login. */
-    private boolean resolveAttributes = true;
-
 
     /** Creates a new instance. */
     public LoginConfiguration() {
@@ -169,20 +165,7 @@
         nameIDFormatPrecedence = new ArrayList<>(Collections2.filter(formats, Predicates.notNull()));
     }
 
-    /** @return True if attribute resolution enabled for login flow, false otherwise. */
-    public boolean isResolveAttributes() {
-        return resolveAttributes;
-    }
 
-    /**
-     * Enables or disables attribute resolution. Note that disabling attribute resolution also disables invocation of
-     * post-authentication interceptors since all out-of-box interceptors rely on attributes.
-     *
-     * @param resolveAttributes True to enable attribute resolution (default), false otherwise.
-     */
-    public void setResolveAttributes(boolean resolveAttributes) {
-        this.resolveAttributes = resolveAttributes;
-    }
 
     @Override
     @Nonnull

Copied: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/PrepareTicketValidationResponseAction.java (from r7843, trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/ExtractAttributesAction.java)

[... 292 lines stripped ...]