[java-identity-provider] 03/04: IDP-1434 Add tests for encodeType
Rod Widdowson
rdw at steadingsoftware.com
Sun May 5 10:48:19 EDT 2019
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch feature/IDP-1434
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=ae55c59df0b7323be3fc23fc0b85be5e890c39c9
commit ae55c59df0b7323be3fc23fc0b85be5e890c39c9
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun May 5 13:17:00 2019 +0100
IDP-1434 Add tests for encodeType
---
.../resolver/spring/BaseAttributeDefinitionParserTest.java | 8 ++++++++
.../spring/enc/SAML1Base64AttributeEncoderParserTest.java | 2 ++
.../spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java | 2 ++
.../spring/enc/SAML1StringAttributeEncoderParserTest.java | 2 ++
.../spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java | 2 ++
.../spring/enc/SAML2Base64AttributeEncoderParserTest.java | 2 ++
.../spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java | 2 ++
.../spring/enc/SAML2StringAttributeEncoderParserTest.java | 2 ++
.../spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java | 2 ++
.../idp/attribute/resolver/spring/enc/resolver/saml1Base64.xml | 1 +
.../idp/attribute/resolver/spring/enc/resolver/saml1Scoped.xml | 1 +
.../idp/attribute/resolver/spring/enc/resolver/saml1String.xml | 1 +
.../idp/attribute/resolver/spring/enc/resolver/saml1XmlObject.xml | 1 +
.../idp/attribute/resolver/spring/enc/resolver/saml2Base64.xml | 1 +
.../idp/attribute/resolver/spring/enc/resolver/saml2Scoped.xml | 1 +
.../idp/attribute/resolver/spring/enc/resolver/saml2String.xml | 3 ++-
.../idp/attribute/resolver/spring/enc/resolver/saml2XmlObject.xml | 3 ++-
17 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java
index 60f7064..d808bcb 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java
@@ -17,7 +17,9 @@
package net.shibboleth.idp.attribute.resolver.spring;
+import static net.shibboleth.idp.saml.attribute.transcoding.AbstractSAMLAttributeTranscoder.PROP_ENCODE_TYPE;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
import java.util.Arrays;
import java.util.Collection;
@@ -234,4 +236,10 @@ public abstract class BaseAttributeDefinitionParserTest extends OpenSAMLInitBase
return (AttributeResolverImpl) strategy.apply(appCtx);
}
+ static public void checkEncodeType(final Map<String,Object> rule, boolean expectedValue) {
+ final Object encodeType = rule.getOrDefault(PROP_ENCODE_TYPE, Boolean.TRUE);
+ assertTrue(encodeType instanceof Boolean);
+ assertTrue(encodeType.equals(expectedValue));
+ }
+
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java
index 1f6d522..73564bc 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java
@@ -53,6 +53,7 @@ public class SAML1Base64AttributeEncoderParserTest extends BaseAttributeDefiniti
assertEquals(rule.get(AbstractSAML1AttributeTranscoder.PROP_NAME), "SAML1_BASE64_ATTRIBUTE_NAME");
assertEquals(rule.get(AbstractSAML1AttributeTranscoder.PROP_NAMESPACE), "SAML1_BASE64_ATTRIBUTE_NAME_SPACE");
assertEquals(value, ((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ checkEncodeType(rule, false);
}
@@ -67,6 +68,7 @@ public class SAML1Base64AttributeEncoderParserTest extends BaseAttributeDefiniti
assertEquals(rule.get(AbstractSAML1AttributeTranscoder.PROP_NAME), "Base64_ATTRIBUTE");
assertNull(rule.get(AbstractSAML1AttributeTranscoder.PROP_NAMESPACE));
assertFalse(((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ checkEncodeType(rule, true);
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java
index bc16590..3fce643 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java
@@ -56,6 +56,7 @@ public class SAML1ScopedStringAttributeEncoderParserTest extends BaseAttributeDe
assertEquals(rule.get(SAML1ScopedStringAttributeTranscoder.PROP_SCOPE_ATTR_NAME), "saml1ScopeAttrib");
assertEquals(rule.get(SAML1ScopedStringAttributeTranscoder.PROP_SCOPE_DELIMITER), "#@#");
assertEquals(value, ((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ checkEncodeType(rule, false);
}
@@ -73,6 +74,7 @@ public class SAML1ScopedStringAttributeEncoderParserTest extends BaseAttributeDe
assertNull(rule.get(SAML1ScopedStringAttributeTranscoder.PROP_SCOPE_ATTR_NAME));
assertNull(rule.get(SAML1ScopedStringAttributeTranscoder.PROP_SCOPE_DELIMITER));
assertFalse(((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ checkEncodeType(rule, true);
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java
index 334ac11..7cdf9b8 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java
@@ -52,6 +52,7 @@ public class SAML1StringAttributeEncoderParserTest extends BaseAttributeDefiniti
assertEquals(rule.get(AbstractSAML1AttributeTranscoder.PROP_NAME), "SAML1_STRING_ATTRIBUTE_NAME");
assertEquals(rule.get(AbstractSAML1AttributeTranscoder.PROP_NAMESPACE), "SAML1_STRING_ATTRIBUTE_NAME_SPACE");
assertEquals(value, ((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ checkEncodeType(rule, true);
}
@@ -66,6 +67,7 @@ public class SAML1StringAttributeEncoderParserTest extends BaseAttributeDefiniti
assertEquals(rule.get(AbstractSAML1AttributeTranscoder.PROP_NAME), "ATTRIBUTE");
assertNull(rule.get(AbstractSAML1AttributeTranscoder.PROP_NAMESPACE));
assertFalse(((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ checkEncodeType(rule, true);
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java
index bb99754..92a8ccc 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java
@@ -53,6 +53,7 @@ public class SAML1XMLObjectAttributeEncoderParserTest extends BaseAttributeDefin
assertEquals(rule.get(AbstractSAML1AttributeTranscoder.PROP_NAME), "SAML1_XMLObject_ATTRIBUTE_NAME");
assertEquals(rule.get(AbstractSAML1AttributeTranscoder.PROP_NAMESPACE), "SAML1_XMLObject_ATTRIBUTE_NAME_SPACE");
assertEquals(value, ((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ checkEncodeType(rule, true);
}
@Test public void defaultCase() {
@@ -66,6 +67,7 @@ public class SAML1XMLObjectAttributeEncoderParserTest extends BaseAttributeDefin
assertEquals(rule.get(AbstractSAML1AttributeTranscoder.PROP_NAME), "XMLObject_ATTRIBUTE");
assertNull(rule.get(AbstractSAML1AttributeTranscoder.PROP_NAMESPACE));
assertFalse(((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ checkEncodeType(rule, true);
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java
index 550b1e4..caec10a 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java
@@ -54,6 +54,7 @@ public class SAML2Base64AttributeEncoderParserTest extends BaseAttributeDefiniti
assertEquals(rule.get(AbstractSAML2AttributeTranscoder.PROP_NAME_FORMAT), "Saml2Base64_ATTRIBUTE_NAME_FORMAT");
assertEquals(rule.get(AbstractSAML2AttributeTranscoder.PROP_FRIENDLY_NAME), "Saml2Base64_ATTRIBUTE_FRIENDLY_NAME");
assertEquals(value, ((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ checkEncodeType(rule, true);
}
@Test public void defaultCase() {
@@ -68,6 +69,7 @@ public class SAML2Base64AttributeEncoderParserTest extends BaseAttributeDefiniti
assertNull(rule.get(AbstractSAML2AttributeTranscoder.PROP_NAME_FORMAT));
assertNull(rule.get(AbstractSAML2AttributeTranscoder.PROP_FRIENDLY_NAME));
assertFalse(((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ checkEncodeType(rule, true);
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java
index fd305cc..e1c56a0 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java
@@ -57,6 +57,7 @@ public class SAML2ScopedStringAttributeEncoderParserTest extends BaseAttributeDe
assertEquals(rule.get(SAML2ScopedStringAttributeTranscoder.PROP_SCOPE_ATTR_NAME), "scopeAttrib");
assertEquals(rule.get(SAML2ScopedStringAttributeTranscoder.PROP_SCOPE_DELIMITER), "###");
assertEquals(value, ((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ checkEncodeType(rule, false);
}
@Test public void defaultCase() {
@@ -74,6 +75,7 @@ public class SAML2ScopedStringAttributeEncoderParserTest extends BaseAttributeDe
assertNull(rule.get(SAML2ScopedStringAttributeTranscoder.PROP_SCOPE_ATTR_NAME));
assertNull(rule.get(SAML2ScopedStringAttributeTranscoder.PROP_SCOPE_DELIMITER));
assertFalse(((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ checkEncodeType(rule, true);
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java
index c193e58..5b567de 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java
@@ -54,6 +54,7 @@ public class SAML2StringAttributeEncoderParserTest extends BaseAttributeDefiniti
assertEquals(rule.get(AbstractSAML2AttributeTranscoder.PROP_NAME_FORMAT), "Saml2String_ATTRIBUTE_NAME_FORMAT");
assertEquals(rule.get(AbstractSAML2AttributeTranscoder.PROP_FRIENDLY_NAME), "Saml2String_ATTRIBUTE_FRIENDLY_NAME");
assertEquals(value, ((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ checkEncodeType(rule, false);
}
@Test public void defaultCase() {
@@ -68,6 +69,7 @@ public class SAML2StringAttributeEncoderParserTest extends BaseAttributeDefiniti
assertNull(rule.get(AbstractSAML2AttributeTranscoder.PROP_NAME_FORMAT));
assertNull(rule.get(AbstractSAML2AttributeTranscoder.PROP_FRIENDLY_NAME));
assertFalse(((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ checkEncodeType(rule, true);
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java
index 7ba989e..44d3bce 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java
@@ -53,6 +53,7 @@ public class SAML2XMLObjectAttributeEncoderParserTest extends BaseAttributeDefin
assertEquals(rule.get(AbstractSAML2AttributeTranscoder.PROP_NAME_FORMAT), "Saml2XmlObject_ATTRIBUTE_NAME_FORMAT");
assertEquals(rule.get(AbstractSAML2AttributeTranscoder.PROP_FRIENDLY_NAME), "Saml2XmlObject_ATTRIBUTE_FRIENDLY_NAME");
assertEquals(value, ((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ checkEncodeType(rule, true);
}
@Test public void defaultCase() {
@@ -67,6 +68,7 @@ public class SAML2XMLObjectAttributeEncoderParserTest extends BaseAttributeDefin
assertNull(rule.get(AbstractSAML2AttributeTranscoder.PROP_NAME_FORMAT));
assertNull(rule.get(AbstractSAML2AttributeTranscoder.PROP_FRIENDLY_NAME));
assertFalse(((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ checkEncodeType(rule, true);
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Base64.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Base64.xml
index 7f89751..550d989 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Base64.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Base64.xml
@@ -4,6 +4,7 @@
xmlns="urn:mace:shibboleth:2.0:resolver"
name="SAML1_BASE64_ATTRIBUTE_NAME"
namespace="SAML1_BASE64_ATTRIBUTE_NAME_SPACE"
+ encodeType="false"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<ActivationConditionScript>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Scoped.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Scoped.xml
index 3676c8e..d76d6be 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Scoped.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Scoped.xml
@@ -7,6 +7,7 @@
scopeType="attribute"
scopeAttribute="saml1ScopeAttrib"
scopeDelimiter="#@#"
+ encodeType="false"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<ActivationConditionScript>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1String.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1String.xml
index fe7d20b..40e84c0 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1String.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1String.xml
@@ -4,6 +4,7 @@
xmlns="urn:mace:shibboleth:2.0:resolver"
name="SAML1_STRING_ATTRIBUTE_NAME"
namespace="SAML1_STRING_ATTRIBUTE_NAME_SPACE"
+ encodeType="true"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<ActivationConditionScript>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1XmlObject.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1XmlObject.xml
index c5ef31f..9482374 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1XmlObject.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1XmlObject.xml
@@ -4,6 +4,7 @@
xmlns="urn:mace:shibboleth:2.0:resolver"
name="SAML1_XMLObject_ATTRIBUTE_NAME"
namespace="SAML1_XMLObject_ATTRIBUTE_NAME_SPACE"
+ encodeType="true"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<ActivationConditionScript>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Base64.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Base64.xml
index dc067dd..46cc6e7 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Base64.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Base64.xml
@@ -5,6 +5,7 @@
name="Saml2Base64_ATTRIBUTE_NAME"
nameFormat="Saml2Base64_ATTRIBUTE_NAME_FORMAT"
friendlyName="Saml2Base64_ATTRIBUTE_FRIENDLY_NAME"
+ encodeType="true"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<ActivationConditionScript>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Scoped.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Scoped.xml
index e5899bf..0b66ea8 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Scoped.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Scoped.xml
@@ -8,6 +8,7 @@
scopeType="attribute"
scopeAttribute="scopeAttrib"
scopeDelimiter="###"
+ encodeType="false"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<ActivationConditionScript>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2String.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2String.xml
index a4007b5..df910c1 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2String.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2String.xml
@@ -4,7 +4,8 @@
xmlns="urn:mace:shibboleth:2.0:resolver"
name="Saml2String_ATTRIBUTE_NAME"
nameFormat="Saml2String_ATTRIBUTE_NAME_FORMAT"
- friendlyName="Saml2String_ATTRIBUTE_FRIENDLY_NAME"
+ friendlyName="Saml2String_ATTRIBUTE_FRIENDLY_NAME"
+ encodeType="false"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<ActivationConditionScript>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2XmlObject.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2XmlObject.xml
index 626247a..cfab5c1 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2XmlObject.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2XmlObject.xml
@@ -4,7 +4,8 @@
xmlns="urn:mace:shibboleth:2.0:resolver"
name="Saml2XmlObject_ATTRIBUTE_NAME"
nameFormat="Saml2XmlObject_ATTRIBUTE_NAME_FORMAT"
- friendlyName="Saml2XmlObject_ATTRIBUTE_FRIENDLY_NAME"
+ friendlyName="Saml2XmlObject_ATTRIBUTE_FRIENDLY_NAME"
+ encodeType="true"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<ActivationConditionScript>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list