[java-identity-provider] branch master updated: IDP-404 Fix some XML errors
Rod Widdowson
rdw at steadingsoftware.com
Tue Jul 30 11:03:16 EDT 2019
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=3acbbef10c931cd0afaace4762e864e8b2effd53
The following commit(s) were added to refs/heads/master by this push:
new 3acbbef IDP-404 Fix some XML errors
3acbbef is described below
commit 3acbbef10c931cd0afaace4762e864e8b2effd53
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jul 30 16:01:21 2019 +0100
IDP-404 Fix some XML errors
https://issues.shibboleth.net/jira/browse/IDP-404
---
.../filter/spring/matcher/AttributeValueMatcherParserTest.java | 5 ++++-
.../attribute/filter/matcher/attributeValueEmptyCaseSensitive.xml | 2 +-
.../resolver/spring/ad/resolver/subjectDerivedDependency.xml | 1 +
.../attribute/resolver/spring/dc/ResultCacheElementTimeToLive.xml | 2 +-
.../src/main/resources/system/flows/intercept/impersonate-beans.xml | 2 +-
idp-saml-api/src/test/resources/ACSUIInfo.xml | 3 ++-
6 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java
index 2ba5d44..f2959da 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java
@@ -22,6 +22,7 @@ import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
+import java.lang.IllegalArgumentException;
import java.util.Map;
import java.util.Set;
@@ -29,6 +30,7 @@ import org.springframework.beans.FatalBeanException;
import org.springframework.beans.factory.BeanCreationException;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import org.xml.sax.SAXParseException;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
@@ -157,7 +159,8 @@ public class AttributeValueMatcherParserTest extends BaseAttributeFilterParserTe
getMatcher("attributeValueEmptyCaseSensitive.xml");
fail("should have thrown an exception");
} catch (FatalBeanException e) {
- assertEquals(org.xml.sax.SAXParseException.class, rootCause(e));
+ final Class c = rootCause(e);
+ assertTrue((c == SAXParseException.class)|(c == IllegalArgumentException.class));
}
}
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueEmptyCaseSensitive.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueEmptyCaseSensitive.xml
index 2187e9e..9d2e20d 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueEmptyCaseSensitive.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueEmptyCaseSensitive.xml
@@ -3,5 +3,5 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
<PermitValueRule xsi:type="Value" value="jsmith" attributeID="uid"
- caseSensitive="" />
+ caseSensitive=" " />
</AttributeRule>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/subjectDerivedDependency.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/subjectDerivedDependency.xml
index ecc5b79..deb66cd 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/subjectDerivedDependency.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/subjectDerivedDependency.xml
@@ -4,6 +4,7 @@
xsi:type="SubjectDerivedAttribute" id="PD1" principalAttributeName="Whatever">
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.1" friendlyName="uid" />
+ <!-- The following line is here to throw a parsing error -->
<InputAttributeDefinition ref="32" />
</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ResultCacheElementTimeToLive.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ResultCacheElementTimeToLive.xml
index 2eb826f..3ac2944 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ResultCacheElementTimeToLive.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ResultCacheElementTimeToLive.xml
@@ -1,5 +1,5 @@
<DataConnector xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
id="myLDAP" xsi:type="LDAPDirectory">
- <ResultCache elementTimeToLive="PT1H" maximumCachedElements="1"/>
+ <ResultCache maximumCachedElements="1"/>
</DataConnector>
\ No newline at end of file
diff --git a/idp-conf/src/main/resources/system/flows/intercept/impersonate-beans.xml b/idp-conf/src/main/resources/system/flows/intercept/impersonate-beans.xml
index 85b0632..901d18a 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/impersonate-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/intercept/impersonate-beans.xml
@@ -58,7 +58,7 @@
<key>
<util:constant static-field="net.shibboleth.idp.profile.IdPAuditFields.IMPERSONATING_USERNAME"/>
</key>
- <bean parent="shibboleth.Functions.Compose"
+ <bean parent="shibboleth.Functions.Compose">
<constructor-arg name="g">
<bean class="net.shibboleth.idp.authn.context.navigate.SubjectContextImpersonatingPrincipalLookupFunction" />
</constructor-arg>
diff --git a/idp-saml-api/src/test/resources/ACSUIInfo.xml b/idp-saml-api/src/test/resources/ACSUIInfo.xml
index e03aa8b..e954828 100644
--- a/idp-saml-api/src/test/resources/ACSUIInfo.xml
+++ b/idp-saml-api/src/test/resources/ACSUIInfo.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<AttributeConsumingService xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+<AttributeConsumingService xmlns="urn:oasis:names:tc:SAML:2.0:metadata" index="1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd">
<ServiceName xml:lang="fr">Nom D'un Chien</ServiceName>
<ServiceName xml:lang="en">ServiceName</ServiceName>
<ServiceDescription xml:lang="de">ServiceDesc</ServiceDescription>
+ <RequestedAttribute Name="a"></RequestedAttribute>
</AttributeConsumingService>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list