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

[noreply at shibboleth.net]

Author: scantor
Date: Tue May 27 17:54:01 2014
New Revision: 5977

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5977&view=rev
Log:
Splitting off credentials config, working on decryption.

Added:
    trunk/idp-conf/src/main/resources/conf/credentials.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/logback.xml
    trunk/idp-conf/src/main/resources/conf/relying-party-native.xml

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=5977&r1=5976&r2=5977&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Tue May 27 17:54:01 2014
@@ -16,10 +16,10 @@
 # at a second keypair, restart, 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-encrypt.key
-idp.encryption.cert = ${idp.home}/creds/idp-encrypt.crt
-idp.encryption.key.2 = ${idp.home}/creds/idp-encrypt.key
-idp.encryption.cert.2 = ${idp.home}/creds/idp-encrypt.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
 
 # Configures the primary server-side storage plugin
 idp.storage.StorageService = org.opensaml.storage.impl.MemoryStorageService

Modified: trunk/idp-conf/src/main/resources/conf/logback.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/logback.xml?rev=5977&r1=5976&r2=5977&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/logback.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/logback.xml Tue May 27 17:54:01 2014
@@ -18,6 +18,8 @@
     <logger name="org.ldaptive" level="INFO" />
     
     <logger name="org.opensaml" level="WARN" />
+    
+    <logger name="org.opensaml.profile.action.impl" level="DEBUG" />
    
     <logger name="org.opensaml.saml.common.binding" level="DEBUG" />
 

Modified: trunk/idp-conf/src/main/resources/conf/relying-party-native.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/relying-party-native.xml?rev=5977&r1=5976&r2=5977&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/relying-party-native.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/relying-party-native.xml Tue May 27 17:54:01 2014
@@ -27,32 +27,14 @@
         
     <!-- Your IdP's default name, set via property file. -->
     <bean id="entityID" class="java.lang.String" c:_0="${idp.entity.id}" />
-    
-    <!-- Your IdP's default signing key, set via property file. -->
-    <bean id="signingCredential" class="org.opensaml.security.x509.BasicX509Credential"
-            p:entityId-ref="entityID">
-        <constructor-arg name="privateKey">
-            <bean class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean">
-                <property name="privateKeyFile">
-                    <bean class="java.io.File" c:_0="${idp.home}/creds/idp.key" />
-                </property>
-            </bean>
-        </constructor-arg>
-        <constructor-arg name="entityCertificate">
-            <bean class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
-                <property name="certificateFile">
-                    <bean class="java.io.File" c:_0="${idp.home}/creds/idp.crt" />
-                </property>
-            </bean>
-        </constructor-arg>
-    </bean>
 
     <!-- Security Configuration Defaults -->
 
     <bean id="DefaultSecurityConfiguration" class="net.shibboleth.idp.profile.config.SecurityConfiguration">
+    
         <property name="signatureSigningConfiguration">
             <bean class="org.opensaml.xmlsec.impl.BasicSignatureSigningConfiguration"
-                    p:signingCredentials-ref="signingCredential">
+                    p:signingCredentials-ref="defaultSigningCredential">
                 <property name="signatureAlgorithms">
                     <util:list>
                         <util:constant static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256" />
@@ -66,6 +48,12 @@
                 </property>
             </bean>
         </property>
+        
+        <property name="decryptionConfiguration">
+            <bean class="org.opensaml.xmlsec.impl.BasicDecryptionConfiguration"
+                p:KEKKeyInfoCredentialResolver-ref="defaultEncryptionCredentials" />
+        </property>
+        
         <property name="encryptionConfiguration">

[... 11 lines stripped ...]