[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/conf: global-beans.xml idp.properties session-m...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Oct 30 12:55:05 2013
New Revision: 4910

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4910&view=rev
Log:
Sync with testbed.

Modified:
    trunk/idp-conf/src/main/resources/conf/global-beans.xml
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/session-manager.xml

Modified: trunk/idp-conf/src/main/resources/conf/global-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global-beans.xml?rev=4910&r1=4909&r2=4910&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global-beans.xml Wed Oct 30 12:55:05 2013
@@ -108,7 +108,19 @@
     <bean id="shibboleth.CookieManager" class="net.shibboleth.utilities.java.support.net.CookieManager"
         p:httpServletRequest-ref="shibboleth.HttpServletRequest" p:httpServletResponse-ref="shibboleth.HttpServletResponse" />
         
+    <bean id="shibboleth.DataSealer" class="net.shibboleth.utilities.java.support.security.DataSealer"
+        p:keystoreType="${idp.sealer.storeType}"
+        p:keystorePath="${idp.home}/${idp.sealer.storePath}"
+        p:keystorePassword="${idp.sealer.storePassword}"
+        p:cipherKeyAlias="${idp.sealer.alias}"
+        p:cipherKeyPassword="${idp.sealer.keyPassword}" />
+    
     <bean id="shibboleth.StorageService" class="${idp.storage.StorageService}" p:cleanupInterval="${idp.storage.cleanupInterval}" />
+
+    <bean id="shibboleth.ClientStorageService" class="${idp.storage.ClientStorageService}"
+        p:httpServletRequest-ref="shibboleth.HttpServletRequest" p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+        p:cookieManager-ref="shibboleth.CookieManager"
+        p:dataSealer-ref="shibboleth.DataSealer" />
 
     <bean id="shibboleth.ReplayCache" class="org.opensaml.storage.ReplayCache" depends-on="shibboleth.LogbackLogging"
         p:storage-ref="shibboleth.StorageService" p:strict="true" />

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=4910&r1=4909&r2=4910&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Wed Oct 30 12:55:05 2013
@@ -6,12 +6,25 @@
 # Xerces, use org.apache.xerces.util.SecurityManager
 idp.xml.securityManager = org.apache.xerces.util.SecurityManager
 
+# Settings for internal AES encryption key
+idp.sealer.storeType = JCEKS
+idp.sealer.storePath = creds/sealer.jks
+idp.sealer.storePassword = password
+idp.sealer.alias = idpSecretKey
+idp.sealer.keyPassword = password
+
 # Configures the primary server-side storage plugin
 idp.storage.StorageService = org.opensaml.storage.impl.MemoryStorageService
 idp.storage.cleanupInterval = PT10M
 
+# Configures the primary client-side storage plugin
+idp.storage.ClientStorageService = org.opensaml.storage.impl.ServletRequestScopedStorageService
+
 # Set to false to disable the IdP session layer
 idp.session.enabled = true
+
+# Set to "shibboleth.StorageService" for server-side storage
+idp.session.StorageService = shibboleth.ClientStorageService
 
 # Size of session IDs
 idp.session.idSize = 32

Modified: trunk/idp-conf/src/main/resources/conf/session-manager.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/session-manager.xml?rev=4910&r1=4909&r2=4910&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/session-manager.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/session-manager.xml Wed Oct 30 12:55:05 2013
@@ -19,7 +19,7 @@
             p:httpServletRequest-ref="shibboleth.HttpServletRequest" p:httpServletResponse-ref="shibboleth.HttpServletResponse"
             p:authenticationFlowDescriptors="#{@'shibboleth.AvailableAuthenticationFlows'.?[id matches 'AuthenticationFlow/(${idp.authn.flows})']}"
             p:cookieManager-ref="shibboleth.CookieManager"
-            p:storageService-ref="shibboleth.StorageService"
+            p:storageService-ref="${idp.session.StorageService}"
             p:consistentAddress="${idp.session.consistentAddress}"
             p:sessionTimeout="${idp.session.timeout}"
             p:sessionSlop="${idp.session.slop}"