[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties system/conf/relying-party-...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jun 23 10:09:31 2014
New Revision: 6154

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6154&view=rev
Log:
Add a property to make encryption optional.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/conf/relying-party-system.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=6154&r1=6153&r2=6154&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Mon Jun 23 10:09:31 2014
@@ -28,6 +28,10 @@
 
 # To default to SHA-1, set to shibboleth.SigningConfiguration.SHA1
 #idp.signing.config = shibboleth.SigningConfiguration.SHA256
+
+# If true, encryption will happen whenever a key to use can be located, but
+# failure to encrypt won't result in request failure.
+#idp.encryption.optional = false
 
 # Configures the primary server-side storage plugin
 #idp.storage.StorageService = org.opensaml.storage.impl.MemoryStorageService

Modified: trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml?rev=6154&r1=6153&r2=6154&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml Mon Jun 23 10:09:31 2014
@@ -58,19 +58,23 @@
     <bean id="SAML2.SSO"
         class="net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration"
         p:artifactConfiguration-ref="shibboleth.DefaultArtifactConfiguration"
-        p:inboundSubflowId="security-policy/saml2-sso" />
+        p:inboundSubflowId="security-policy/saml2-sso"
+        p:encryptionOptional="${idp.encryption.optional:false}" />
 
     <bean id="SAML2.ECP"
         class="net.shibboleth.idp.saml.saml2.profile.config.ECPProfileConfiguration"
-        p:inboundSubflowId="security-policy/saml2-sso" />
+        p:inboundSubflowId="security-policy/saml2-sso"
+        p:encryptionOptional="${idp.encryption.optional:false}" />
 
     <bean id="SAML2.AttributeQuery"
         class="net.shibboleth.idp.saml.saml2.profile.config.AttributeQueryProfileConfiguration"
-        p:inboundSubflowId="security-policy/soap" />
+        p:inboundSubflowId="security-policy/soap"
+        p:encryptionOptional="${idp.encryption.optional:false}" />
 
     <bean id="SAML2.ArtifactResolution"
         class="net.shibboleth.idp.saml.saml2.profile.config.ArtifactResolutionProfileConfiguration"
-        p:inboundSubflowId="security-policy/soap" />
+        p:inboundSubflowId="security-policy/soap"
+        p:encryptionOptional="${idp.encryption.optional:false}" />
     
     <bean id="Liberty.SSOS"
         class="net.shibboleth.idp.saml.idwsf.profile.config.SSOSProfileConfiguration" />