[java-identity-provider] branch master updated: Move DataSealer into dedicated file and add property resolvers.

[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=3e3198a04c0f92e5fa5f9ffa28aeaf9353e233fd

The following commit(s) were added to refs/heads/master by this push:
       new  3e3198a04 Move DataSealer into dedicated file and add property resolvers.
3e3198a04 is described below

commit 3e3198a04c0f92e5fa5f9ffa28aeaf9353e233fd
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Aug 3 19:37:03 2020 -0400

    Move DataSealer into dedicated file and add property resolvers.
---
 .../net/shibboleth/idp/conf/global-system.xml      | 19 +-----------
 .../net/shibboleth/idp/conf/http-client.xml        |  4 +++
 .../resources/net/shibboleth/idp/conf/sealer.xml   | 36 ++++++++++++++++++++++
 3 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
index c4311b51c..49f2bb3e5 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
@@ -68,6 +68,7 @@
     <import resource="http-client.xml" />
     <import resource="soap-client.xml" />
     <import resource="saml-utilities.xml" />
+    <import resource="sealer.xml" />
 
     <bean id="systemPrereqs" class="org.springframework.beans.factory.config.MethodInvokingBean"
             p:targetObject-ref="systemProperties" p:targetMethod="putAll">
@@ -218,24 +219,6 @@
         p:cookiePath="%{idp.cookie.path:}"
         p:maxAge="%{idp.cookie.maxAge:31536000}" />
 
-    <bean id="shibboleth.DataSealerKeyStrategy" lazy-init="true"
-            class="net.shibboleth.utilities.java.support.security.impl.BasicKeystoreKeyStrategy"
-        p:keystoreType="%{idp.sealer.storeType:JCEKS}"
-        p:keystoreResource="%{idp.sealer.storeResource:}"
-        p:keyVersionResource="%{idp.sealer.versionResource:}"
-        p:keyAlias="%{idp.sealer.aliasBase:secret}"
-        p:keystorePassword="%{idp.sealer.storePassword:}"
-        p:keyPassword="%{idp.sealer.keyPassword:}"
-        p:updateInterval="%{idp.sealer.updateInterval:PT15M}" />
-
-    <bean id="shibboleth.DataSealer" 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')) }" />
-
-    <!-- This is a convenience for compatibility with the examples for configuring this in V2. -->
-    <alias name="shibboleth.DataSealer" alias="shibboleth.TransientIDDataSealer"/>
-
     <bean id="shibboleth.StorageService" lazy-init="true"
         class="%{idp.storage.StorageService:org.opensaml.storage.impl.MemoryStorageService}"
         p:cleanupInterval="%{idp.storage.cleanupInterval:PT10M}" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/http-client.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/http-client.xml
index 06a030279..669bb6c80 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/http-client.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/http-client.xml
@@ -12,6 +12,10 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
+    <bean id="shibboleth.PropertySourcesPlaceholderConfigurer"
+        class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
+        p:placeholderPrefix="%{" p:placeholderSuffix="}" />
+
     <!-- These are parent beans for custom HTTP clients and resources. -->
         
     <bean id="shibboleth.HttpClientFactory" abstract="true"
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
new file mode 100644
index 000000000..07b84cade
--- /dev/null
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/sealer.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:c="http://www.springframework.org/schema/c"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+       default-init-method="initialize"
+       default-destroy-method="destroy">
+
+    <bean id="shibboleth.PropertySourcesPlaceholderConfigurer"
+        class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
+        p:placeholderPrefix="%{" p:placeholderSuffix="}" />
+
+    <!-- Isolated for potential reusability. -->
+
+    <bean id="shibboleth.DataSealerKeyStrategy" lazy-init="true"
+            class="net.shibboleth.utilities.java.support.security.impl.BasicKeystoreKeyStrategy"
+        p:keystoreType="%{idp.sealer.storeType:JCEKS}"
+        p:keystoreResource="%{idp.sealer.storeResource:}"
+        p:keyVersionResource="%{idp.sealer.versionResource:}"
+        p:keyAlias="%{idp.sealer.aliasBase:secret}"
+        p:keystorePassword="%{idp.sealer.storePassword:}"
+        p:keyPassword="%{idp.sealer.keyPassword:}"
+        p:updateInterval="%{idp.sealer.updateInterval:PT15M}" />
+
+    <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')) }" />
+
+ </beans>

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