[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: Tue Oct  7 18:03:48 2014
New Revision: 6650

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6650&view=rev
Log:
Checkpoint work on consent. Implement consent record lifetime. Remove expiration field from Consent object.

Modified:
    trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml
    trunk/idp-conf/src/main/resources/system/conf/post-authn-system.xml
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/Consent.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ConsentFlowDescriptor.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/AttributeConsentFlowDescriptor.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
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/storage/ConsentSerializer.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/storage/AttributeConsentSerializerTest.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=6650&r1=6649&r2=6650&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 Tue Oct  7 18:03:48 2014
@@ -16,12 +16,13 @@
 
     <!-- Flows executed after authentication. -->
     <util:list id="shibboleth.PostAuthnFlows">
-        <!-- 
+        <!--
         <bean id="post-authn/consent/terms-of-use" parent="shibboleth.consent.TermsOfUseFlow"
                 p:activationCondition-ref="shibboleth.consent.RelyingPartyPredicate"
                 p:storageService-ref="shibboleth.ClientStorageService"
                 p:storageKeyLookupStrategy-ref="shibboleth.consent.StorageKey"
                 p:compareValues="true"
+                p:lifetime="P1Y"
                 p:idMessageCode="idp.tou.id"
                 p:textMessageCode="idp.tou.text" />
         
@@ -29,8 +30,9 @@
                 p:activationCondition-ref="shibboleth.consent.RelyingPartyPredicate"
                 p:storageService-ref="shibboleth.ClientStorageService"
                 p:storageKeyLookupStrategy-ref="shibboleth.consent.StorageKey"
-                p:compareValues="true" />
-        
+                p:compareValues="true"
+                p:lifetime="P1Y" />
+
         <bean id="post-authn/consent/per-attribute-consent" parent="shibboleth.consent.AttributeConsentFlow"
                 p:activationCondition-ref="shibboleth.consent.RelyingPartyPredicate"
                 p:storageService-ref="shibboleth.ClientStorageService"

Modified: trunk/idp-conf/src/main/resources/system/conf/post-authn-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/post-authn-system.xml?rev=6650&r1=6649&r2=6650&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/post-authn-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/post-authn-system.xml Tue Oct  7 18:03:48 2014
@@ -25,6 +25,7 @@
             p:storageService-ref="shibboleth.ClientStorageService"
             p:storageKeyLookupStrategy-ref="shibboleth.consent.StorageKeyLookupFunction"
             p:compareValues="true"
+            p:lifetime="P1Y"
             scope="prototype" />
 
     <!-- Parent bean for terms of use consent flows. -->
@@ -34,6 +35,7 @@
             p:storageService-ref="shibboleth.ClientStorageService"
             p:storageKeyLookupStrategy-ref="shibboleth.consent.StorageKeyLookupFunction"
             p:compareValues="true"
+            p:lifetime="P1Y"
             p:idMessageCode="idp.tou.id"
             p:textMessageCode="idp.tou.text"
             scope="prototype" />

Modified: trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/Consent.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/Consent.java?rev=6650&r1=6649&r2=6650&view=diff
==============================================================================
--- trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/Consent.java (original)
+++ trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/Consent.java Tue Oct  7 18:03:48 2014
@@ -27,8 +27,6 @@
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
-import org.joda.time.DateTime;
-
 import com.google.common.base.MoreObjects;
 
 /**
@@ -41,9 +39,6 @@
     /** Consent value. */
     @Nullable private String value;
 
-    /** When consent expires. */
-    @Nullable private DateTime expiration;
-
     /** Whether consent is approved. */
     @Nullable private boolean approved;
 
@@ -54,15 +49,6 @@
      */

[... 305 lines stripped ...]