[java-shib-common COMMIT] in /branches/REL_1: doc/RELEASE-NOTES.txt src/main/java/edu/internet2/middleware/shibboleth...

[noreply at shibboleth.net]

Author: lajoie
Date: Thu Jun  7 17:35:21 2012
New Revision: 1024

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1024&view=rev
Log:
convert "conditional" crypto level to "always" for ECP as conditional makes no sense - SC-180

Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML2ECPProfileConfigurationFactoryBean.java

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/doc/RELEASE-NOTES.txt?rev=1024&r1=1023&r2=1024&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Thu Jun  7 17:35:21 2012
@@ -2,6 +2,7 @@
 =============================================
 [SC-176] - aacli utility doesn't set peer entity role metadata for requester
 [SC-177] - aacli utility generates extra linefeed in output
+[SC-180] - ignResponses/signAssertions="conditional" incorrect for ECP profile
 
 Changes in Release 1.3.5
 =============================================

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML2ECPProfileConfigurationFactoryBean.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML2ECPProfileConfigurationFactoryBean.java?rev=1024&r1=1023&r2=1024&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML2ECPProfileConfigurationFactoryBean.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML2ECPProfileConfigurationFactoryBean.java Thu Jun  7 17:35:21 2012
@@ -17,12 +17,50 @@
 
 package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
 
-import edu.internet2.middleware.shibboleth.common.config.relyingparty.saml.SAML2SSOProfileConfigurationFactoryBean;
+import edu.internet2.middleware.shibboleth.common.relyingparty.provider.CryptoOperationRequirementLevel;
 import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2.ECPConfiguration;
 
 /** Spring factory for ECP SAML 2 SSO profile configurations. */
 public class SAML2ECPProfileConfigurationFactoryBean extends SAML2SSOProfileConfigurationFactoryBean {
 
+    // We convert CryptoOperationRequirementLevel.conditional to CryptoOperationRequirementLevel.always because
+    // in front-channel ECP only always/never make sense
+
+    /** {@inheritDoc} */
+    public void setEncryptAssertions(CryptoOperationRequirementLevel encrypt) {
+        if (encrypt == CryptoOperationRequirementLevel.conditional) {
+            super.setEncryptAssertions(CryptoOperationRequirementLevel.always);
+        } else {
+            super.setEncryptAssertions(encrypt);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public void setEncryptNameIds(CryptoOperationRequirementLevel encrypt) {
+        if (encrypt == CryptoOperationRequirementLevel.conditional) {
+            super.setEncryptNameIds(CryptoOperationRequirementLevel.always);
+        } else {
+            super.setEncryptNameIds(encrypt);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public void setSignAssertions(CryptoOperationRequirementLevel sign) {
+        if (sign == CryptoOperationRequirementLevel.conditional) {
+            super.setSignAssertions(CryptoOperationRequirementLevel.always);
+        } else {
+            super.setSignAssertions(sign);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public void setSignResponses(CryptoOperationRequirementLevel sign) {
+        if (sign == CryptoOperationRequirementLevel.conditional) {
+            super.setSignResponses(CryptoOperationRequirementLevel.always);
+        } else {
+            super.setSignResponses(sign);
+        }
+    }
 
     /** {@inheritDoc} */
     public Class getObjectType() {