[java-identity-provider] branch master updated: IDP-1218 - Different storage key bases for consent flows

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=3bc2b14fa3b73016312966c0acbaea14677f1c81

The following commit(s) were added to refs/heads/master by this push:
       new  3bc2b14   IDP-1218 - Different storage key bases for consent flows
3bc2b14 is described below

commit 3bc2b14fa3b73016312966c0acbaea14677f1c81
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Sep 6 16:59:48 2018 -0400

    IDP-1218 - Different storage key bases for consent flows
    
    https://issues.shibboleth.net/jira/browse/IDP-1218
---
 idp-conf/src/main/resources/conf/idp.properties                     | 6 ++++--
 idp-conf/src/main/resources/system/conf/global-system.xml           | 2 ++
 .../resources/system/flows/intercept/attribute-release-beans.xml    | 4 ++--
 .../main/resources/system/flows/intercept/terms-of-use-beans.xml    | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/idp-conf/src/main/resources/conf/idp.properties b/idp-conf/src/main/resources/conf/idp.properties
index 2cd2c47..3768496 100644
--- a/idp-conf/src/main/resources/conf/idp.properties
+++ b/idp-conf/src/main/resources/conf/idp.properties
@@ -138,8 +138,10 @@ idp.authn.flows = Password
 
 # Set to "shibboleth.consent.AttributeConsentStorageKey" to use an attribute
 # to key user consent storage records (and set the attribute name)
-#idp.consent.userStorageKey = shibboleth.consent.PrincipalConsentStorageKey
-#idp.consent.userStorageKeyAttribute = uid
+#idp.consent.attribute-release.userStorageKey = shibboleth.consent.PrincipalConsentStorageKey
+#idp.consent.attribute-release.userStorageKeyAttribute = uid
+#idp.consent.terms-of-use.userStorageKey = shibboleth.consent.PrincipalConsentStorageKey
+#idp.consent.terms-of-use.userStorageKeyAttribute = uid
 
 # Flags controlling how built-in attribute consent feature operates 
 #idp.consent.allowDoNotRemember = true
diff --git a/idp-conf/src/main/resources/system/conf/global-system.xml b/idp-conf/src/main/resources/system/conf/global-system.xml
index e55a519..0ddcf33 100644
--- a/idp-conf/src/main/resources/system/conf/global-system.xml
+++ b/idp-conf/src/main/resources/system/conf/global-system.xml
@@ -80,6 +80,8 @@
                 <entry key="idp.nameid.saml1.legacyGenerator">
                     <null/>
                 </entry>
+                <entry key="idp.consent.userStorageKey" value="idp.consent.attribute-release.userStorageKey" />
+                <entry key="idp.consent.userStorageKeyAttribute" value="idp.consent.attribute-release.userStorageKeyAttribute" />
             </map>
         </property>
         <property name="deadProperties">
diff --git a/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml b/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
index 2a6edac..a3c7de5 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
@@ -46,9 +46,9 @@
         
     <bean id="shibboleth.consent.AttributeConsentStorageKey"
         class="net.shibboleth.idp.consent.logic.impl.AttributeValueLookupFunction"
-        c:userAttributeId="%{idp.consent.userStorageKeyAttribute:uid}" />
+        c:userAttributeId="%{idp.consent.attribute-release.userStorageKeyAttribute:%{idp.consent.userStorageKeyAttribute:uid}}" />
         
-    <alias name="%{idp.consent.userStorageKey:shibboleth.consent.PrincipalConsentStorageKey}"
+    <alias name="%{idp.consent.attribute-release.userStorageKey:%{idp.consent.userStorageKey:shibboleth.consent.PrincipalConsentStorageKey}}"
         alias="shibboleth.consent.UserStorageKey" />
 
     <!--
diff --git a/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml b/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml
index 520083a..986d4d0 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml
@@ -33,9 +33,9 @@
         
     <bean id="shibboleth.consent.AttributeConsentStorageKey"
         class="net.shibboleth.idp.consent.logic.impl.AttributeValueLookupFunction"
-        c:userAttributeId="%{idp.consent.userStorageKeyAttribute:uid}" />
+        c:userAttributeId="%{idp.consent.terms-of-use.userStorageKeyAttribute:%{idp.consent.userStorageKeyAttribute:uid}}" />
         
-    <alias name="%{idp.consent.userStorageKey:shibboleth.consent.PrincipalConsentStorageKey}"
+    <alias name="%{idp.consent.terms-of-use.userStorageKey:%{idp.consent.userStorageKey:shibboleth.consent.PrincipalConsentStorageKey}}"
         alias="shibboleth.consent.UserStorageKey" />
 
     <!--

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.