Author: tzeller
Date: Wed Dec 17 00:14:09 2014
New Revision: 7127
URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7127&view=rev
Log:
Additional consent properties. Allow unlimited number of storage records via property.
Modified:
trunk/idp-conf/src/main/resources/conf/idp.properties
trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml
trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ConsentFlowDescriptor.java
trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/AbstractConsentIndexedStorageAction.java
trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/ConsentFlowDescriptorTest.java
trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/storage/CreateResultTest.java
Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=7127&r1=7126&r2=7127&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Wed Dec 17 00:14:09 2014
@@ -127,6 +127,14 @@
#idp.consent.allowGlobal = true
idp.consent.allowPerAttribute = true
+# Whether attribute values and terms of use text are compared
+#idp.consent.compareValues = false
+# Lifetime of consent storage records
+#idp.consent.lifetime = P1Y
+# Maximum number of consent storage records
+# Set to -1 for unlimited server-side storage
+#idp.consent.maxStoredRecords = 5
+
# Whether to lookup metadata, etc. for every SP involved in a logout
# for use by user interface logic; adds overhead so off by default.
#idp.logout.elaboration = false
@@ -161,4 +169,4 @@
#idp.httpclient.filecaching.connectionTimeout = -1
#idp.httpclient.filecaching.maxCacheEntries = 100
#idp.httpclient.filecaching.maxCacheEntrySize = 10485760
-idp.httpclient.filecaching.cacheDirectory = %{idp.home}/tmp/httpClientCache
+idp.httpclient.filecaching.cacheDirectory = %{idp.home}/tmp/httpClientCache
Modified: trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml?rev=7127&r1=7126&r2=7127&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml Wed Dec 17 00:14:09 2014
@@ -39,8 +39,9 @@
p:doNotRememberConsentAllowed="%{idp.consent.allowDoNotRemember:true}"
p:globalConsentAllowed="%{idp.consent.allowGlobal:true}"
p:perAttributeConsentEnabled="%{idp.consent.allowPerAttribute:false}"
- p:compareValues="true"
- p:lifetime="P1Y"
+ p:compareValues="%{idp.consent.compareValues:false}"
+ p:lifetime="%{idp.consent.lifetime:P1Y}"
+ p:maximumNumberOfStoredRecords="%{idp.consent.maxStoredRecords:5}"
p:nonBrowserSupported="false">
<property name="activationCondition">
<bean parent="shibboleth.Conditions.OR">
@@ -60,8 +61,9 @@
<bean id="shibboleth.consent.TermsOfUseFlow" abstract="true"
class="net.shibboleth.idp.consent.flow.ConsentFlowDescriptor"
p:storageService-ref="%{idp.consent.StorageService:shibboleth.ClientPersistentStorageService}"
- p:compareValues="true"
- p:lifetime="P1Y"
+ p:compareValues="%{idp.consent.compareValues:false}"
+ p:lifetime="%{idp.consent.lifetime:P1Y}"
+ p:maximumNumberOfStoredRecords="%{idp.consent.maxStoredRecords:5}"
p:nonBrowserSupported="false" />
<!-- Function to lookup consent-specific audit context as a child of the consent context. -->
Modified: trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ConsentFlowDescriptor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ConsentFlowDescriptor.java?rev=7127&r1=7126&r2=7127&view=diff
==============================================================================
--- trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ConsentFlowDescriptor.java (original)
+++ trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ConsentFlowDescriptor.java Wed Dec 17 00:14:09 2014
@@ -23,10 +23,8 @@
import net.shibboleth.idp.profile.interceptor.ProfileInterceptorFlowDescriptor;
import net.shibboleth.utilities.java.support.annotation.Duration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonNegative;
-import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
[... 205 lines stripped ...]