[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/post-authn/post-authn.xml idp-conf/src/ma...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Oct  8 17:21:51 2014
New Revision: 6657

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6657&view=rev
Log:
Checkpoint work on attribute consent. Implement attribute whitelist / blacklist / match expression.

Added:
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/PopulateAttributeConsentContext.java
      - copied, changed from r6614, trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/ProcessAttributes.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AttributePredicate.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-beans.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-flow.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/per-attribute-consent/per-attribute-consent-beans.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/per-attribute-consent/per-attribute-consent-flow.xml
    trunk/idp-conf/src/main/resources/system/conf/post-authn-system.xml
    trunk/idp-conf/src/main/resources/views/post-authn/consent/attribute-consent.vm
    trunk/idp-conf/src/main/resources/views/post-authn/consent/per-attribute-consent.vm
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/context/AttributeConsentContext.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/context/ConsentContext.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/CreateAttributeConsentChoices.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/IsAttributeConsentRequired.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/ProcessAttributes.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/CreateResult.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/storage/ConsentResult.java

Modified: trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml?rev=6657&r1=6656&r2=6657&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml Wed Oct  8 17:21:51 2014
@@ -25,7 +25,7 @@
                 p:lifetime="P1Y"
                 p:idMessageCode="idp.tou.id"
                 p:textMessageCode="idp.tou.text" />
-        
+
         <bean id="post-authn/consent/attribute-consent" parent="shibboleth.consent.AttributeConsentFlow"
                 p:activationCondition-ref="shibboleth.consent.RelyingPartyPredicate"
                 p:storageService-ref="shibboleth.ClientStorageService"
@@ -49,7 +49,27 @@
         </constructor-arg>
     </bean>
 
+    <!-- IdP attribute used to determine the unique user identifier. -->
     <bean id="shibboleth.consent.StorageKey" parent="shibboleth.consent.StorageKeyLookupFunction"
             c:attributeId="email" />
+            
+    <!-- Uncomment/configure to install attribute ID whitelist, blacklist, and/or match expressions. -->
+    
+    <util:list id="shibboleth.consent.AttributeConsent.whitelistedAttributeIDs">
+        <!--
+        <value>email</value>
+        -->
+    </util:list>
+
+    <util:list id="shibboleth.consent.AttributeConsent.blacklistedAttributeIDs">
+        <value>transientId</value>
+        <value>persistentId</value>
+        <value>eduPersonTargetedID</value>
+    </util:list>
+    
+    <!-- 
+    <bean id="shibboleth.consent.AttributeConsent.matchExpression" class="java.util.regex.Pattern" factory-method="compile" 
+        c:regex="^exampleAttribute.*$" />
+     -->
 
 </beans>

Modified: trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-beans.xml?rev=6657&r1=6656&r2=6657&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-beans.xml Wed Oct  8 17:21:51 2014
@@ -15,14 +15,15 @@
 
     <bean id="InitializeAttributeConsentContext" class="net.shibboleth.idp.consent.flow.ar.InitializeAttributeConsentContext" scope="prototype" />
 
+    <bean id="PopulateAttributeConsentContext" class="net.shibboleth.idp.consent.flow.ar.PopulateAttributeConsentContext" scope="prototype"
+        p:attributePredicate-ref="shibboleth.consent.AttributeConsent.AttributePredicate" />
+
     <bean id="RevokeConsent" class="net.shibboleth.idp.consent.flow.storage.RevokeConsent" scope="prototype"

[... 496 lines stripped ...]