[java-identity-provider] branch main updated: IDP-1726 - Conditional DataSealer injection failing in Spring configs

[Scott Cantor]

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

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

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

The following commit(s) were added to refs/heads/main by this push:
       new  627e8ab85 IDP-1726 - Conditional DataSealer injection failing in Spring configs
627e8ab85 is described below

commit 627e8ab85bd5028719b52573e656afd594ad95c0
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Dec 15 12:23:14 2020 -0500

    IDP-1726 - Conditional DataSealer injection failing in Spring configs
    
    https://issues.shibboleth.net/jira/browse/IDP-1726
---
 .../src/main/resources/net/shibboleth/idp/conf/authn-system.xml         | 2 +-
 idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/sealer.xml     | 2 +-
 .../net/shibboleth/idp/flows/logout/logout-propagation-beans.xml        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/authn-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/authn-system.xml
index 375d0f81b..9291a611b 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/authn-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/authn-system.xml
@@ -328,7 +328,7 @@
         <constructor-arg name="serializer">
             <bean class="net.shibboleth.idp.authn.principal.SealedPrincipalSerializer"
                 c:claz="net.shibboleth.idp.authn.principal.PasswordPrincipal" c:name="PW"
-                p:dataSealer="#{(systemProperties.contains('idp.sealer.storeResource') or systemProperties.contains('idp.sealer.keyStrategy')) ? getObject('shibboleth.DataSealer') : null}" />
+                p:dataSealer="#{(environment.containsProperty('idp.sealer.storeResource') or environment.containsProperty('idp.sealer.keyStrategy')) ? getObject('shibboleth.DataSealer') : null}" />
         </constructor-arg>
     </bean>
 
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/sealer.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/sealer.xml
index 07b84cade..65eb225b1 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/sealer.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/sealer.xml
@@ -31,6 +31,6 @@
     <bean id="shibboleth.DataSealer" name="shibboleth.TransientIDDataSealer" lazy-init="true"
         class="net.shibboleth.utilities.java.support.security.DataSealer"
         p:keyStrategy-ref="#{ '%{idp.sealer.keyStrategy:shibboleth.DataSealerKeyStrategy}'.trim() }"
-        p:lockedAtStartup="#{!systemProperties.contains('idp.sealer.keyStrategy') and (!systemProperties.contains('idp.sealer.storePassword') or !systemProperties.contains('idp.sealer.keyPassword')) }" />
+        p:lockedAtStartup="#{!environment.containsProperty('idp.sealer.keyStrategy') and (!environment.containsProperty('idp.sealer.storePassword') or !environment.containsProperty('idp.sealer.keyPassword')) }" />
 
  </beans>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-propagation-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-propagation-beans.xml
index c9814ebea..3f7998d51 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-propagation-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/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="#{(systemProperties.contains('idp.sealer.storeResource') or systemProperties.contains('idp.sealer.keyStrategy')) ? getObject('shibboleth.DataSealer') : null}" />
+        p:dataSealer="#{(environment.containsProperty('idp.sealer.storeResource') or environment.containsProperty('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.