[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src: main/java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Apr  1 10:59:27 2014
New Revision: 5675

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5675&view=rev
Log:
Wire in encryption flag.

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAML2ProfileConfigurationParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2SSOValues.xml

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAML2ProfileConfigurationParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAML2ProfileConfigurationParser.java?rev=5675&r1=5674&r2=5675&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAML2ProfileConfigurationParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAML2ProfileConfigurationParser.java Tue Apr  1 10:59:27 2014
@@ -63,6 +63,10 @@
     @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
         super.doParse(element, parserContext, builder);
 
+        if (element.hasAttributeNS(null, "encryptionOptional")) {
+            builder.addPropertyValue("encryptionOptional", element.getAttributeNS(null, "encryptionOptional"));
+        }
+        
         builder.addPropertyValue("encryptAssertionsPredicate",
                 predicateForEncryption(element.getAttributeNS(null, "encryptAssertions"), "conditional"));
         builder.addPropertyValue("encryptNameIDsPredicate",

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java?rev=5675&r1=5674&r2=5675&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java Tue Apr  1 10:59:27 2014
@@ -64,6 +64,7 @@
 
         assertConditionalPredicate(profile.getEncryptAssertionsPredicate());
         assertFalsePredicate(profile.getEncryptNameIDsPredicate());
+        Assert.assertTrue(profile.isEncryptionOptional());
 
         Assert.assertEquals(profile.getProxyCount(), 0);
         Assert.assertTrue(profile.getProxyAudiences().isEmpty());

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2SSOValues.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2SSOValues.xml?rev=5675&r1=5674&r2=5675&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2SSOValues.xml (original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2SSOValues.xml Tue Apr  1 10:59:27 2014
@@ -6,7 +6,7 @@
                         nameIDFormatPrecedence="one two" defaultAuthenticationMethod="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport">
 	<rp:ProfileConfiguration xsi:type="saml:SAML2SSOProfile"
 		localityAddress="ignore" localityDNSName="ignore" includeAttributeStatement="false" securityPolicyRef="ignore" 
-		maximumSPSessionLifetime="1"
+		maximumSPSessionLifetime="1" encryptionOptional="true"
 		skipEndpointValidationWhenSigned="true" outboundArtifactType="76543">
 	</rp:ProfileConfiguration>