[java-identity-provider] branch master updated: Adjust conditional use of DataSealer based on additional properties.

[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=5b26e14caf8b4b2c91633958e8eb01081ff3583c

The following commit(s) were added to refs/heads/master by this push:
       new  5b26e14   Adjust conditional use of DataSealer based on additional properties.
5b26e14 is described below

commit 5b26e14caf8b4b2c91633958e8eb01081ff3583c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jun 25 14:30:18 2019 -0400

    Adjust conditional use of DataSealer based on additional properties.
---
 idp-conf/src/main/resources/system/conf/general-authn-system.xml        | 2 +-
 .../src/main/resources/system/flows/logout/logout-propagation-beans.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/idp-conf/src/main/resources/system/conf/general-authn-system.xml b/idp-conf/src/main/resources/system/conf/general-authn-system.xml
index 73ee553..9de5dae 100644
--- a/idp-conf/src/main/resources/system/conf/general-authn-system.xml
+++ b/idp-conf/src/main/resources/system/conf/general-authn-system.xml
@@ -48,7 +48,7 @@
                 <bean class="net.shibboleth.idp.authn.duo.impl.DuoPrincipalSerializer" />
                 <bean class="net.shibboleth.idp.authn.principal.impl.IdPAttributePrincipalSerializer" />
                 <bean class="net.shibboleth.idp.authn.principal.impl.PasswordPrincipalSerializer"
-                    p:dataSealer="#{'%{idp.sealer.storeResource:}'.trim().length() > 0 ? getObject('shibboleth.DataSealer') : null}" />
+                    p:dataSealer="#{(systemProperties.contains('idp.sealer.storeResource') or systemProperties.contains('idp.sealer.keyStrategy')) ? getObject('shibboleth.DataSealer') : null}" />
                 <bean class="net.shibboleth.idp.authn.principal.impl.ProxyAuthenticationPrincipalSerializer" />                    
             </list>
         </property>
diff --git a/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml b/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml
index 3c4bbff..e1bba67 100644
--- a/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml
@@ -34,7 +34,7 @@
     <bean id="PopulateLogoutPropagationContext"
         class="net.shibboleth.idp.session.impl.PopulateLogoutPropagationContext" scope="prototype"
         p:SPSessionSerializerRegistry="#{getObject('shibboleth.SPSessionSerializerRegistry') ?: getObject('shibboleth.DefaultSPSessionSerializerRegistry')}"
-        p:dataSealer="#{'%{idp.sealer.storeResource:}'.trim().length() > 0 ? getObject('shibboleth.DataSealer') : null}" />
+        p:dataSealer="#{(systemProperties.contains('idp.sealer.storeResource') or systemProperties.contains('idp.sealer.keyStrategy')) ? getObject('shibboleth.DataSealer') : null}" />
 
     <bean id="PopulateUserAgentContext"
           class="net.shibboleth.idp.profile.impl.PopulateUserAgentContext" scope="prototype"

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