[java-identity-provider] 02/02: Remove more deprecated structures from tests
Rod Widdowson
rdw at steadingsoftware.com
Thu Nov 22 11:36:37 EST 2018
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=abb6396340833c478ef94d8b8d2edaa36c831583
commit abb6396340833c478ef94d8b8d2edaa36c831583
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Nov 22 16:33:26 2018 +0000
Remove more deprecated structures from tests
- sourceAttributeId=
- Dependency
- Principal Connectors.
But only for the top level namespace. Deprecated namespaces are still full tested
---
.../resolver/spring/AttributeResolverTest.java | 14 --
.../dc/ComputedIDDataConnectorParserTest.java | 1 -
.../idp/attribute/resolver/filter/resolver.xml | 4 +-
.../ad/resolver/simpleAttributePopulated.xml | 2 +-
.../attribute-resolver-selective-navigate.xml | 61 ++---
.../spring/attribute-resolver-selective.xml | 50 ++--
.../resolver/spring/attribute-resolver.xml | 253 ++++++---------------
.../spring/dc/resolver/computedNoSource1.xml | 2 +-
.../spring/dc/resolver/computedProperty.xml | 5 +-
.../attribute/resolver/spring/mappedTemplate.xml | 60 +++--
.../impl/attribute/mapping/attributesMapper.xml | 47 ++--
11 files changed, 170 insertions(+), 329 deletions(-)
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
index 4b56df1..068d9eb 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
@@ -281,20 +281,6 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
ctx.setRequesterId("REQ");
ctx.setResponderId("RES");
- try {
- serviceableComponent = attributeResolverService.getServiceableComponent();
-
- final AttributeResolver resolver = serviceableComponent.getComponent();
- final LegacyPrincipalDecoder decoder = (LegacyPrincipalDecoder) resolver;
- Assert.assertTrue(decoder.hasValidConnectors());
- Assert.assertEquals(decoder.canonicalize(ctx), "MyHovercraftIsFullOfEels");
-
- } finally {
- if (null != serviceableComponent) {
- serviceableComponent.unpinComponent();
- }
- }
-
}
@Test public void mappedTemplate() throws Exception {
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java
index 99e5326..51870e2 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java
@@ -92,7 +92,6 @@ public class ComputedIDDataConnectorParserTest extends BaseAttributeDefinitionPa
@Test public void resolverNoSourceDependency() {
final ComputedIDDataConnector connector = getDataConnector("resolver/computedNoSource1.xml", ComputedIDDataConnector.class);
Assert.assertEquals(connector.getId(), "computed");
- Assert.assertEquals(connector.getSourceAttributeId(), "theSourceRemainsTheSame");
Assert.assertEquals(connector.getGeneratedAttributeId(), "jenny");
Assert.assertEquals(connector.getSalt(), "abcdefghijklmnopqrst ".getBytes());
Assert.assertEquals(connector.getSourceAttributeInformation(), "theSourceRemainsTheSame");
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/resolver.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/resolver.xml
index 577facd..cadecf7 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/resolver.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/resolver.xml
@@ -10,8 +10,8 @@
</Attribute>
</DataConnector>
- <AttributeDefinition id="dn1" xsi:type="Simple" sourceAttributeID="dn1">
- <Dependency ref="staticAttributes"/>
+ <AttributeDefinition id="dn1" xsi:type="Simple" >
+ <InputDataConnector ref="staticAttributes" attributeNames="dn1"></InputDataConnector>
<AttributeEncoder xsi:type="SAML2String"
name="urn:mace:dir:attribute-def:displayName" nameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
friendlyName="dn1" />
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributePopulated.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributePopulated.xml
index dc20a41..b6c8c6e 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributePopulated.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributePopulated.xml
@@ -2,7 +2,7 @@
xmlns="urn:mace:shibboleth:2.0:resolver"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
dependencyOnly="1"
- xsi:type="Simple" id="simplePopulated" sourceAttributeID="flibble"
+ xsi:type="Simple" id="simplePopulated"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<InputAttributeDefinition ref="dep2"/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective-navigate.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective-navigate.xml
index 7e32b52..911c4ea 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective-navigate.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective-navigate.xml
@@ -1,49 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- This file is an EXAMPLE configuration file. While the configuration
- presented in this example file is functional, it isn't very interesting.
- However, there are lots of example attributes, encoders, and a couple example
- data connectors. Not all attribute definitions, data connectors, or principal
- connectors are demonstrated. Deployers should refer to the Shibboleth 2 documentation
- for a complete list of components and their options. -->
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+<AttributeResolver 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">
<!-- ========================================== -->
<!-- Attribute Definitions -->
<!-- ========================================== -->
- <resolver:AttributeDefinition xsi:type="Simple"
- xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="EPA1"
- sourceAttributeID="staticEpA" activationConditionRef="peter"
+ <AttributeDefinition xsi:type="Simple"
+ id="EPA1"
+ activationConditionRef="peter"
profileContextStrategyRef="findProfileCtx">
- <resolver:Dependency ref="staticAttributes" />
- </resolver:AttributeDefinition>
+ <InputDataConnector ref="staticAttributes" attributeNames="staticEpA"/>
+ </AttributeDefinition>
- <resolver:AttributeDefinition xsi:type="Simple"
- xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="EPE"
- sourceAttributeID="eduPersonEntitlement" activationConditionRef="principal"
+ <AttributeDefinition xsi:type="Simple"
+ id="EPE"
+ activationConditionRef="principal"
profileContextStrategyRef="findProfileCtx">
- <resolver:Dependency ref="staticAttributes" />
- </resolver:AttributeDefinition>
+ <InputDataConnector ref="staticAttributes" attributeNames="eduPersonEntitlement"/>
+ </AttributeDefinition>
- <resolver:DataConnector id="staticAttributes"
- xsi:type="dc:Static">
- <dc:Attribute id="staticEpA">
- <dc:Value>member</dc:Value>
- </dc:Attribute>
- <dc:Attribute id="eduPersonEntitlement">
- <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
- <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
- </dc:Attribute>
- </resolver:DataConnector>
+ <DataConnector id="staticAttributes"
+ xsi:type="Static">
+ <Attribute id="staticEpA">
+ <Value>member</Value>
+ </Attribute>
+ <Attribute id="eduPersonEntitlement">
+ <Value>urn:example.org:entitlement:entitlement1</Value>
+ <Value>urn:mace:dir:entitlement:common-lib-terms</Value>
+ </Attribute>
+ </DataConnector>
-</resolver:AttributeResolver>
+</AttributeResolver>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective.xml
index 3caeaf1..e8cb4d5 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective.xml
@@ -1,42 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- This file is an EXAMPLE configuration file. While the configuration
- presented in this example file is functional, it isn't very interesting.
- However, there are lots of example attributes, encoders, and a couple example
- data connectors. Not all attribute definitions, data connectors, or principal
- connectors are demonstrated. Deployers should refer to the Shibboleth 2 documentation
- for a complete list of components and their options. -->
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:sec="urn:mace:shibboleth:2.0:security"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+<AttributeResolver 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">
<!-- ========================================== -->
<!-- Attribute Definitions -->
<!-- ========================================== -->
- <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="EPA1" sourceAttributeID="staticEpA" activationConditionRef="peter">
- <resolver:Dependency ref="staticAttributes" />
- </resolver:AttributeDefinition>
+ <AttributeDefinition xsi:type="Simple" id="EPA1" activationConditionRef="peter">
+ <InputDataConnector ref="staticAttributes" attributeNames="staticEpA" />
+ </AttributeDefinition>
- <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="EPE" sourceAttributeID="eduPersonEntitlement" activationConditionRef="principal">
- <resolver:Dependency ref="staticAttributes" />
- </resolver:AttributeDefinition>
+ <AttributeDefinition xsi:type="Simple" id="EPE" activationConditionRef="principal">
+ <InputDataConnector ref="staticAttributes" attributeNames="eduPersonEntitlement"/>
+ </AttributeDefinition>
- <resolver:DataConnector id="staticAttributes" xsi:type="dc:Static">
- <dc:Attribute id="staticEpA">
- <dc:Value>member</dc:Value>
- </dc:Attribute>
- <dc:Attribute id="eduPersonEntitlement">
- <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
- <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
- </dc:Attribute>
- </resolver:DataConnector>
+ <DataConnector id="staticAttributes" xsi:type="Static">
+ <Attribute id="staticEpA">
+ <Value>member</Value>
+ </Attribute>
+ <Attribute id="eduPersonEntitlement">
+ <Value>urn:example.org:entitlement:entitlement1</Value>
+ <Value>urn:mace:dir:entitlement:common-lib-terms</Value>
+ </Attribute>
+ </DataConnector>
-</resolver:AttributeResolver>
+</AttributeResolver>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml
index 5e47072..439ad98 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml
@@ -1,170 +1,152 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- This file is an EXAMPLE configuration file. While the configuration
- presented in this example file is functional, it isn't very interesting.
- However, there are lots of example attributes, encoders, and a couple example
- data connectors. Not all attribute definitions, data connectors, or principal
- connectors are demonstrated. Deployers should refer to the Shibboleth 2 documentation
- for a complete list of components and their options. -->
-<AttributeResolver xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd">
+<AttributeResolver 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">
<!-- ========================================== -->
<!-- Attribute Definitions -->
<!-- ========================================== -->
- <AttributeDefinition xsi:type="Simple" id="eduPersonAffiliation" sourceAttributeID="staticEpA">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition xsi:type="Simple" id="eduPersonAffiliation" >
+ <InputDataConnector ref="staticAttributes" attributeNames="staticEpA"/>
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="simpleEPE" sourceAttributeID="eduPersonEntitlement" dependencyOnly="true">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition xsi:type="Simple" id="simpleEPE" dependencyOnly="true">
+ <InputDataConnector ref="staticAttributes" attributeNames="eduPersonEntitlement"/>
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="simpleEPE" sourceAttributeID="eduPersonEntitlement" dependencyOnly="true">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition xsi:type="Simple" id="simpleEPE" dependencyOnly="true">
+ <InputDataConnector ref="staticAttributes" attributeNames="eduPersonEntitlement"/>
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="broken" sourceAttributeID="staticEpA">
- <Dependency ref="simpleEPE" />
- <Dependency ref="eduPersonAffiliation" />
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition xsi:type="Simple" id="broken" >
+ <InputAttributeDefinition ref="simpleEPE" />
+ <InputAttributeDefinition ref="eduPersonAffiliation" />
+ <InputDataConnector ref="staticAttributes" attributeNames="staticEpA"/>
</AttributeDefinition>
<AttributeDefinition xsi:type="Simple" id="broken2">
- <Dependency ref="simpleEPE" />
- <Dependency ref="eduPersonAffiliation" />
- </AttributeDefinition>
-<!--
- <DataConnector id="staticAttributes" xsi:type="Static">
- <Attribute id="staticEpA">
- <Value>member</Value>
- </Attribute>
- <Attribute id="eduPersonEntitlement">
- <Value>urn:example.org:entitlement:entitlement1</Value>
- <Value>urn:mace:dir:entitlement:common-lib-terms</Value>
- </Attribute>
- </DataConnector>
--->
+ <InputAttributeDefinition ref="simpleEPE" />
+ <InputAttributeDefinition ref="eduPersonAffiliation" />
+ </AttributeDefinition>
+
<!-- Schema: Core schema attributes-->
- <AttributeDefinition xsi:type="Simple" id="uid" sourceAttributeID="uid">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="uid">
+ <InputDataConnector ref="myLDAP" attributeNames="uid"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:uid" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.1" friendlyName="uid" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="email" sourceAttributeID="mail">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="email" >
+ <InputDataConnector ref="myLDAP" attributeNames="mail"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:mail" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="homePhone" sourceAttributeID="homephone">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="homePhone">
+ <InputDataConnector ref="myLDAP" attributeNames="homephone"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:homePhone" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.20" friendlyName="homePhone" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="homePostalAddress" sourceAttributeID="homePostalAddress">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="homePostalAddress">
+ <InputDataConnector ref="myLDAP" attributeNames="homePostalAddress"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:homePostalAddress" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.39" friendlyName="homePostalAddress" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="mobileNumber" sourceAttributeID="MOBILE">
- <Dependency ref="myDB" />
+ <AttributeDefinition xsi:type="Simple" id="mobileNumber">
+ <InputDataConnector ref="myDB" attributeNames="MOBILE"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:mobile" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.41" friendlyName="mobile" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="pagerNumber" sourceAttributeID="PAGER">
- <Dependency ref="myDB" />
+ <AttributeDefinition xsi:type="Simple" id="pagerNumber">
+ <InputDataConnector ref="myDB" attributeNames="PAGER"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:pager" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.42" friendlyName="pager" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="commonName" sourceAttributeID="cn">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="commonName">
+ <InputDataConnector ref="myLDAP" attributeNames="cn"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:cn" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.3" friendlyName="cn" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="surname" sourceAttributeID="sn">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="surname">
+ <InputDataConnector ref="myLDAP" attributeNames="sn"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:sn" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.4" friendlyName="sn" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="locality" sourceAttributeID="l">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="locality">
+ <InputDataConnector ref="myLDAP" attributeNames="l"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:l" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.7" friendlyName="l" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="stateProvince" sourceAttributeID="st">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="stateProvince">
+ <InputDataConnector ref="myLDAP" attributeNames="st"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:st" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.8" friendlyName="st" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="street" sourceAttributeID="STREET">
- <Dependency ref="myDB" />
+ <AttributeDefinition xsi:type="Simple" id="street">
+ <InputDataConnector ref="myDB" attributeNames="STREET"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:street" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.9" friendlyName="street" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="organizationName" sourceAttributeID="o">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="organizationName">
+ <InputDataConnector ref="myLDAP" attributeNames="o"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:o" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.10" friendlyName="o" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="organizationalUnit" sourceAttributeID="ou">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="organizationalUnit">
+ <InputDataConnector ref="myLDAP" attributeNames="ou"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:ou" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.11" friendlyName="ou" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="title" sourceAttributeID="TITLE">
- <Dependency ref="myDB" />
+ <AttributeDefinition xsi:type="Simple" id="title" >
+ <InputDataConnector ref="myDB" attributeNames="TITLE"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:title" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.12" friendlyName="title" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="postalAddress" sourceAttributeID="postalAddress">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="postalAddress">
+ <InputDataConnector ref="myLDAP" attributeNames="postalAddress"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:postalAddress" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.16" friendlyName="postalAddress" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="postalCode" sourceAttributeID="postalCode">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="postalCode">
+ <InputDataConnector ref="myLDAP" attributeNames="postalCode"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:postalCode" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.17" friendlyName="postalCode" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="postOfficeBox" sourceAttributeID="postOfficeBox">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="postOfficeBox">
+ <InputDataConnector ref="myLDAP" attributeNames="postOfficeBox"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:postOfficeBox" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.18" friendlyName="postOfficeBox" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="telephoneNumber" sourceAttributeID="phone">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="telephoneNumber">
+ <InputDataConnector ref="myLDAP" attributeNames="phone"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:telephoneNumber" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.20" friendlyName="telephoneNumber" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="givenName" sourceAttributeID="givenName">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="givenName">
+ <InputDataConnector ref="myLDAP" attributeNames="givenName"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:givenName" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.42" friendlyName="givenName" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="initials" sourceAttributeID="initials">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="initials">
+ <InputDataConnector ref="myLDAP" attributeNames="initials"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:initials" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.43" friendlyName="initials" />
</AttributeDefinition>
@@ -172,122 +154,50 @@
<!-- Schema: inetOrgPerson attributes-->
- <AttributeDefinition xsi:type="Simple" id="departmentNumber" sourceAttributeID="DEPARTMENTNUMBER">
- <Dependency ref="myDB" />
+ <AttributeDefinition xsi:type="Simple" id="departmentNumber">
+ <InputDataConnector ref="myDB" attributeNames="DEPARTMENTNUMBER"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:departmentNumber" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.16.840.1.113730.3.1.2" friendlyName="departmentNumber" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="displayName" sourceAttributeID="displayName">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="displayName">
+ <InputDataConnector ref="myLDAP" attributeNames="displayName"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:displayName" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.16.840.1.113730.3.1.241" friendlyName="displayName" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="employeeNumber" sourceAttributeID="employeeNumber">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="employeeNumber">
+ <InputDataConnector ref="myLDAP" attributeNames="employeeNumber"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:employeeNumber" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.16.840.1.113730.3.1.3" friendlyName="employeeNumber" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="employeeType" sourceAttributeID="employeeType">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="employeeType">
+ <InputDataConnector ref="myLDAP" attributeNames="employeeType"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:employeeType" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.16.840.1.113730.3.1.4" friendlyName="employeeType" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="jpegPhoto" sourceAttributeID="jpegPhoto">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="jpegPhoto">
+ <InputDataConnector ref="myLDAP" attributeNames="jpegPhoto"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:jpegPhoto" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.60" friendlyName="jpegPhoto" />
</AttributeDefinition>
- <AttributeDefinition xsi:type="Simple" id="preferredLanguage" sourceAttributeID="preferredLanguage">
- <Dependency ref="myLDAP" />
+ <AttributeDefinition xsi:type="Simple" id="preferredLanguage">
+ <InputDataConnector ref="myLDAP" attributeNames="preferredLanguage"/>
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:preferredLanguage" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.16.840.1.113730.3.1.39" friendlyName="preferredLanguage" />
</AttributeDefinition>
- <!-- Schema: eduPerson attributes -->
- <!--
- <AttributeDefinition xsi:type="Simple" id="eduPersonAffiliation" sourceAttributeID="eduPersonAffiliation">
- <Dependency ref="myLDAP" />
- <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAffiliation" />
- <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" friendlyName="eduPersonAffiliation" />
- </AttributeDefinition>
-
- <AttributeDefinition xsi:type="Simple" id="eduPersonEntitlement" sourceAttributeID="eduPersonEntitlement">
- <Dependency ref="myLDAP" />
- <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonEntitlement" />
- <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" friendlyName="eduPersonEntitlement" />
- </AttributeDefinition>
-
- <AttributeDefinition xsi:type="Simple" id="eduPersonNickname" sourceAttributeID="eduPersonNickname">
- <Dependency ref="myLDAP" />
- <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonNickname" />
- <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" friendlyName="eduPersonNickname" />
- </AttributeDefinition>
-
- <AttributeDefinition xsi:type="Simple" id="eduPersonOrgDN" sourceAttributeID="eduPersonOrgDN">
- <Dependency ref="myLDAP" />
- <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonOrgDN" />
- <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" friendlyName="eduPersonOrgDN" />
- </AttributeDefinition>
-
- <AttributeDefinition xsi:type="Simple" id="eduPersonOrgUnitDN" sourceAttributeID="eduPersonOrgUnitDN">
- <Dependency ref="myLDAP" />
- <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonOrgUnitDN" />
- <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" friendlyName="eduPersonOrgUnitDN" />
- </AttributeDefinition>
-
- <AttributeDefinition xsi:type="Simple" id="eduPersonPrimaryAffiliation" sourceAttributeID="eduPersonPrimaryAffiliation">
- <Dependency ref="myLDAP" />
- <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation" />
- <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" friendlyName="eduPersonPrimaryAffiliation" />
- </AttributeDefinition>
-
- <AttributeDefinition xsi:type="Simple" id="eduPersonPrimaryOrgUnitDN" sourceAttributeID="eduPersonPrimaryOrgUnitDN">
- <Dependency ref="myLDAP" />
- <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN" />
- <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" friendlyName="eduPersonPrimaryOrgUnitDN" />
- </AttributeDefinition>
-
- <AttributeDefinition xsi:type="Scoped" id="eduPersonPrincipalName" scope="$IDP_SCOPE$" sourceAttributeID="uid">
- <Dependency ref="myLDAP" />
- <AttributeEncoder xsi:type="SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonPrincipalName" />
- <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" friendlyName="eduPersonPrincipalName" />
- </AttributeDefinition>
-
- <AttributeDefinition xsi:type="Scoped" id="eduPersonScopedAffiliation" scope="$IDP_SCOPE$" sourceAttributeID="eduPersonAffiliation">
- <Dependency ref="myLDAP" />
- <AttributeEncoder xsi:type="SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" />
- <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" friendlyName="eduPersonScopedAffiliation" />
- </AttributeDefinition>
-
- <AttributeDefinition xsi:type="Simple" id="eduPersonAssurance" sourceAttributeID="eduPersonAssurance">
- <Dependency ref="myLDAP" />
- <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
- <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="eduPersonAssurance" />
- </AttributeDefinition>
- -->
-
<AttributeDefinition xsi:type="SAML2NameID" id="eduPersonTargetedID"
- nameIdFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" sourceAttributeID="computedID">
- <Dependency ref="computedID" />
+ nameIdFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent">
+ <InputDataConnector ref="computedID" attributeNames="computedID"/>
<AttributeEncoder xsi:type="SAML1XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" />
<AttributeEncoder xsi:type="SAML2XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" friendlyName="eduPersonTargetedID" />
</AttributeDefinition>
- <!-- Do NOT use the version of eduPersonTargetedID defined below unless you understand
- why it was deprecated and know that this reason does not apply to you. -->
- <!--
- <AttributeDefinition xsi:type="Scoped" id="eduPersonTargetedID.old" scope="$IDP_SCOPE$" sourceAttributeID="computedID">
- <Dependency ref="computedID" />
- <AttributeEncoder xsi:type="SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonTargetedID" />
- </AttributeDefinition>
- -->
-
<!-- Name Identifier related attributes -->
<AttributeDefinition id="transientId" xsi:type="TransientId">
@@ -299,19 +209,6 @@
<!-- Data Connectors -->
<!-- ========================================== -->
- <!-- Example Static Connector -->
- <!--
- <DataConnector id="staticAttributes" xsi:type="Static">
- <Attribute id="eduPersonAffiliation">
- <Value>member</Value>
- </Attribute>
- <Attribute id="eduPersonEntitlement">
- <Value>urn:example.org:entitlement:entitlement1</Value>
- <Value>urn:mace:dir:entitlement:common-lib-terms</Value>
- </Attribute>
- </DataConnector>
- -->
-
<!-- Example Relational Database Connector -->
<DataConnector id="myDB" xsi:type="RelationalDatabase">
@@ -343,16 +240,10 @@
<!-- Computed targeted ID connector -->
<DataConnector xsi:type="ComputedId"
- id="computedID" generatedAttributeID="computedID" sourceAttributeID="uid"
+ id="computedID" generatedAttributeID="computedID"
salt="your random string here">
- <Dependency ref="myLDAP" />
+ <InputDataConnector ref="myLDAP" attributeNames="uid"/>
</DataConnector>
- <!-- ========================================== -->
- <!-- Principal Connectors -->
- <!-- ========================================== -->
-
- <PrincipalConnector xsi:type="pc:Transient" id="shibTransient" nameIDFormat="https://www.exmaple.org/bogus/name/id"/>
- <PrincipalConnector xsi:type="pc:Direct" id="shibDirect" nameIDFormat="urn:mace:shibboleth:1.0:nameIdentifier"/>
</AttributeResolver>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computedNoSource1.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computedNoSource1.xml
index 985b391..9fe09b5 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computedNoSource1.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computedNoSource1.xml
@@ -2,9 +2,9 @@
<DataConnector id="computed"
xsi:type="ComputedId" xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- sourceAttributeID="theSourceRemainsTheSame"
generatedAttributeID="jenny"
salt="abcdefghijklmnopqrst "
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<FailoverDataConnector ref="2123"/>
+ <InputAttributeDefinition ref="theSourceRemainsTheSame"/>
</DataConnector>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computedProperty.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computedProperty.xml
index c401dd5..8cec127 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computedProperty.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computedProperty.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<DataConnector id="computed" xsi:type="ComputedId" xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- sourceAttributeID="theSourceRemainsTheSame"
generatedAttributeID="jenny"
salt="%{the.ComputedIDDataConnector.salt}"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"/>
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
+ <InputAttributeDefinition ref="theSourceRemainsTheSame"/>
+</DataConnector>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mappedTemplate.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mappedTemplate.xml
index 447b50d..c2280c2 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mappedTemplate.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mappedTemplate.xml
@@ -1,58 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+<AttributeResolver 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">
<!-- ========================================== -->
<!-- Attribute Definitions -->
<!-- ========================================== -->
- <resolver:AttributeDefinition xsi:type="Mapped" xmlns="urn:mace:shibboleth:2.0:resolver:ad"
- id="mapped1" sourceAttributeID="attr1" dependencyOnly="true">
- <resolver:Dependency ref="static" />
+ <AttributeDefinition xsi:type="Mapped"
+ id="mapped1" dependencyOnly="true">
+ <InputDataConnector ref="static" attributeNames="attr1"/>
<DefaultValue>undefined</DefaultValue>
<ValueMap>
<ReturnValue>$1</ReturnValue>
<SourceValue>(.+)</SourceValue>
</ValueMap>
- </resolver:AttributeDefinition>
+ </AttributeDefinition>
- <resolver:AttributeDefinition xsi:type="Mapped" xmlns="urn:mace:shibboleth:2.0:resolver:ad"
- id="mapped2" sourceAttributeID="attr2" dependencyOnly="true">
- <resolver:Dependency ref="static" />
+ <AttributeDefinition xsi:type="Mapped"
+ id="mapped2" sourceAttributeID="attr1" dependencyOnly="true">
+ <InputDataConnector ref="static" attributeNames="attr2"/>
<DefaultValue>undefined</DefaultValue>
<ValueMap>
<ReturnValue>$1</ReturnValue>
<SourceValue>(.+)</SourceValue>
</ValueMap>
- </resolver:AttributeDefinition>
+ </AttributeDefinition>
- <resolver:AttributeDefinition xsi:type="Template" xmlns="urn:mace:shibboleth:2.0:resolver:ad"
+ <AttributeDefinition xsi:type="Template"
id="testing">
- <resolver:Dependency ref="mapped1" />
- <resolver:Dependency ref="mapped2" />
+ <InputAttributeDefinition ref="mapped1" />
+ <InputAttributeDefinition ref="mapped2" />
<Template>
<![CDATA[${mapped1}:${mapped2}]]>
</Template>
- <SourceAttribute>mapped1</SourceAttribute>
- <SourceAttribute>mapped2</SourceAttribute>
- </resolver:AttributeDefinition>
+ </AttributeDefinition>
- <resolver:DataConnector id="static" xsi:type="dc:Static">
- <dc:Attribute id="attr1">
- <dc:Value>a1v1</dc:Value>
- <dc:Value>a1v2</dc:Value>
- </dc:Attribute>
- <dc:Attribute id="attr2">
- <dc:Value>A2V1</dc:Value>
- <dc:Value>A2V2</dc:Value>
- </dc:Attribute>
- </resolver:DataConnector>
+ <DataConnector id="static" xsi:type="Static">
+ <Attribute id="attr1">
+ <Value>a1v1</Value>
+ <Value>a1v2</Value>
+ </Attribute>
+ <Attribute id="attr2">
+ <Value>A2V1</Value>
+ <Value>A2V2</Value>
+ </Attribute>
+ </DataConnector>
-</resolver:AttributeResolver>
+</AttributeResolver>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/mapping/attributesMapper.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/mapping/attributesMapper.xml
index 83775c7..a079a3d 100644
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/mapping/attributesMapper.xml
+++ b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/mapping/attributesMapper.xml
@@ -5,37 +5,36 @@
<!-- This is what we are trying to reverse map (note bi-directional aliasing, just to confuse things. And me.
- <resolver:AttributeDefinition xsi:type="ad:Simple" id="eduPersonAssurance" sourceAttributeID="eduPersonAssurance">
- <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="eduPersonAssurance" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2String" nameFormat="http://example.org/Format" name="http://example.org/name/for/Attribute" friendlyName="otherSAMLName" />
- </resolver:AttributeDefinition>
+ <AttributeDefinition xsi:type="ad:Simple" id="eduPersonAssurance" >
+ <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
+ <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="eduPersonAssurance" />
+ <AttributeEncoder xsi:type="SAML2String" nameFormat="http://example.org/Format" name="http://example.org/name/for/Attribute" friendlyName="otherSAMLName" />
+ </AttributeDefinition>
- <resolver:AttributeDefinition xsi:type="ad:Simple" id="otherPersonAssurance" sourceAttributeID="otherPersonAssurance">
- <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="eduPersonAssurance" />
- </resolver:AttributeDefinition>
+ <AttributeDefinition xsi:type="ad:Simple" id="otherPersonAssurance" >
+ <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
+ <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="eduPersonAssurance" />
+ </AttributeDefinition>
- <resolver:AttributeDefinition xsi:type="ad:Scoped" id="eduPersonScopedAffiliation" scope="example.org"
- sourceAttributeID="eduPersonAffiliation">
- <resolver:AttributeEncoder xsi:type="enc:SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" friendlyName="eduPersonScopedAffiliation"
+ <AttributeDefinition xsi:type="ad:Scoped" id="eduPersonScopedAffiliation" scope="example.org" >
+ <AttributeEncoder xsi:type="SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" />
+ <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" friendlyName="eduPersonScopedAffiliation"
scopeDelimiter='#'/>
- </resolver:AttributeDefinition>
+ </AttributeDefinition>
- <resolver:AttributeDefinition xsi:type="ad:SAML2NameID" id="eduPersonTargetedID"
- nameIdFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" sourceAttributeID="computedID">
- <resolver:AttributeEncoder xsi:type="enc:SAML1XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" friendlyName="eduPersonTargetedID" />
- </resolver:AttributeDefinition>
+ <AttributeDefinition xsi:type="ad:SAML2NameID" id="eduPersonTargetedID"
+ nameIdFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent">
+ <AttributeEncoder xsi:type="SAML1XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" />
+ <AttributeEncoder xsi:type="SAML2XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" friendlyName="eduPersonTargetedID" />
+ </AttributeDefinition>
But note that this is unmappable (no source name)
- <resolver:AttributeDefinition id="transientId" xsi:type="ad:TransientId">
- <resolver:AttributeEncoder xsi:type="enc:SAML1StringNameIdentifier" nameFormat="urn:mace:shibboleth:1.0:nameIdentifier"/>
- <resolver:AttributeEncoder xsi:type="enc:SAML2StringNameID" nameFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:transient"/>
- </resolver:AttributeDefinition>
+ <AttributeDefinition id="transientId" xsi:type="ad:TransientId">
+ <AttributeEncoder xsi:type="SAML1StringNameIdentifier" nameFormat="urn:mace:shibboleth:1.0:nameIdentifier"/>
+ <AttributeEncoder xsi:type="SAML2StringNameID" nameFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:transient"/>
+ </AttributeDefinition>
-->
@@ -105,4 +104,4 @@
</list>
</property>
</bean>
-</beans>
\ No newline at end of file
+</beans>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list