[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/idp.properties idp-conf/src/main/resource...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Aug 27 23:13:34 2015
New Revision: 7709

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7709&view=rev
Log:
IDP-594 - Add split record maximums for consent record management

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml
    trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/ConsentFlowDescriptor.java
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/storage/impl/AbstractConsentIndexedStorageAction.java
    trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/storage/impl/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=7709&r1=7708&r2=7709&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties	(original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties	Thu Aug 27 23:13:34 2015
@@ -132,9 +132,10 @@
 
 # Whether attribute values and terms of use text are compared
 #idp.consent.compareValues = false
-# Maximum number of consent storage records
-# Set to -1 for unlimited server-side storage
+# Maximum number of consent records for space-limited storage (e.g. cookies)
 #idp.consent.maxStoredRecords = 10
+# Maximum number of consent records for larger/server-side storage (0 = no limit)
+#idp.consent.expandedMaxStoredRecords = 0
 
 # Time in milliseconds to expire consent storage records.
 #idp.consent.storageRecordLifetime = P1Y

Modified: trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml?rev=7709&r1=7708&r2=7709&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml	Thu Aug 27 23:13:34 2015
@@ -14,11 +14,11 @@
 
     <!--
     Intercept flows are used at various injection points to modify processing. This is the master list
-    of flows available, but flows are enabled by specifying them in various profile configuration beans
-    via relying-party.xml 
+    of flows available that provide interesting features to deployers, but flows are actually enabled by
+    specifying them in various profile configuration beans via relying-party.xml 
     
     This list of flows is merged with a built-in set defined in a system configuration file, and may be
-    empty, but should not be removed.
+    empty, but should not be removed. You must add your own custom flows to this list if you create any.
     -->
     
     <bean id="shibboleth.AvailableInterceptFlows" parent="shibboleth.DefaultInterceptFlows" lazy-init="true">

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=7709&r1=7708&r2=7709&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	Thu Aug 27 23:13:34 2015
@@ -43,6 +43,8 @@
             p:compareValues="%{idp.consent.compareValues:false}"
             p:lifetime="%{idp.consent.storageRecordLifetime:P1Y}"
             p:maximumNumberOfStoredRecords="%{idp.consent.maxStoredRecords:10}"
+            p:expandedNumberOfStoredRecords="%{idp.consent.expandedMaxStoredRecords:0}"
+            p:expandedStorageThreshold="%{idp.consent.expandedStorageThreshold:1048576}"
             p:nonBrowserSupported="false">
         <property name="activationCondition">
             <bean parent="shibboleth.Conditions.OR">
@@ -65,6 +67,8 @@
         p:compareValues="%{idp.consent.compareValues:false}"
         p:lifetime="%{idp.consent.storageRecordLifetime:P1Y}"
         p:maximumNumberOfStoredRecords="%{idp.consent.maxStoredRecords:10}"
+        p:expandedNumberOfStoredRecords="%{idp.consent.expandedMaxStoredRecords:0}"
+        p:expandedStorageThreshold="%{idp.consent.expandedStorageThreshold:1048576}"
         p:nonBrowserSupported="false" />
 
     <!-- Function to lookup consent-specific audit context as a child of the consent context. -->

Modified: trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/ConsentFlowDescriptor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/ConsentFlowDescriptor.java?rev=7709&r1=7708&r2=7709&view=diff

[... 194 lines stripped ...]