[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/credentials.xml conf/idp.properties conf/...

[noreply at shibboleth.net]

Author: scantor
Date: Wed May 28 23:31:03 2014
New Revision: 5994

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5994&view=rev
Log:
Support decryption in legacy config.

Modified:
    trunk/idp-conf/src/main/resources/conf/credentials.xml
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/services-user.xml
    trunk/idp-conf/src/main/resources/system/conf/profile-defaults.xml

Modified: trunk/idp-conf/src/main/resources/conf/credentials.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/credentials.xml?rev=5994&r1=5993&r2=5994&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/credentials.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/credentials.xml Wed May 28 23:31:03 2014
@@ -65,6 +65,11 @@
             </constructor-arg>
         </bean>
 
+        <!--
+        For key rollover, uncomment and point to your original keypair, and use the one above
+        to point to your new keypair. Once metadata has propagated, comment this one out again.
+        -->
+        <!--
         <bean class="org.opensaml.security.x509.BasicX509Credential" p:entityId-ref="entityID">
             <constructor-arg name="privateKey">
                 <bean class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean">
@@ -81,6 +86,7 @@
                 </bean>
             </constructor-arg>
         </bean>
+        -->
     </util:list>
 
     <bean id="defaultKeyEncryptionCredentialResolver" class="org.opensaml.xmlsec.keyinfo.impl.ChainingKeyInfoCredentialResolver">

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=5994&r1=5993&r2=5994&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Wed May 28 23:31:03 2014
@@ -12,14 +12,14 @@
 idp.sealer.keyPassword = password
 
 # Settings for public/private signing and encryption key(s)
-# During decryption key rollover, point the ".2" properties
-# at a second keypair, restart, then publish it in your metadata.
+# During decryption key rollover, point the ".2" properties at a second
+# keypair, uncomment in credentials.xml, then publish it in your metadata.
 idp.signing.key = ${idp.home}/creds/idp-signing.key
 idp.signing.cert = ${idp.home}/creds/idp-signing.crt
 idp.encryption.key = ${idp.home}/creds/idp-encryption.key
 idp.encryption.cert = ${idp.home}/creds/idp-encryption.crt
-idp.encryption.key.2 = ${idp.home}/creds/idp-encryption.key
-idp.encryption.cert.2 = ${idp.home}/creds/idp-encryption.crt
+#idp.encryption.key.2 = ${idp.home}/creds/idp-encryption-old.key
+#idp.encryption.cert.2 = ${idp.home}/creds/idp-encryption-old.crt
 
 # Configures the primary server-side storage plugin
 idp.storage.StorageService = org.opensaml.storage.impl.MemoryStorageService

Modified: trunk/idp-conf/src/main/resources/conf/services-user.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/services-user.xml?rev=5994&r1=5993&r2=5994&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/services-user.xml Wed May 28 23:31:03 2014
@@ -74,17 +74,17 @@
         <value>file:///${idp.home}/conf/property-placeholder.xml</value>
     </util:list>
 
-    <!--
     <util:list id="shibboleth.RelyingPartyResolverResources">
         <value>file:///${idp.home}/conf/relying-party.xml</value>
         <value>file:///${idp.home}/system/conf/profile-defaults.xml</value>
         <value>file:///${idp.home}/conf/property-placeholder.xml</value>
     </util:list>
-    -->
+    <!--
     <util:list id="shibboleth.RelyingPartyResolverResources">
         <value>file:///${idp.home}/conf/relying-party-native.xml</value>
         <value>file:///${idp.home}/conf/credentials.xml</value>
     </util:list>
+    -->
 
     <util:list id ="shibboleth.NameIdentifierGenerationResources">
         <value>file:///${idp.home}/conf/saml-nameid-gen.xml</value>

Modified: trunk/idp-conf/src/main/resources/system/conf/profile-defaults.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/profile-defaults.xml?rev=5994&r1=5993&r2=5994&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/profile-defaults.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/profile-defaults.xml Wed May 28 23:31:03 2014
@@ -66,5 +66,17 @@
         c:_0="1111" />
     <bean id="shibboleth.SAML1.BrowserSSO.InboundFlowId" class="java.lang.String"
         c:_0="security-policy/shibboleth-sso" />
+

[... 14 lines stripped ...]