[java-idp-oidc] branch master updated: Switched into InputAttributeDefinitions and InputDataSources.
Henri Mikkonen
henri.mikkonen at iki.fi
Fri Jan 17 07:20:53 EST 2020
This is an automated email from the git hooks/post-receive script.
hjmikkon pushed a commit to branch master
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=a57d3cd7480c8f3f6d16bfbc476d7f0f543815bd
The following commit(s) were added to refs/heads/master by this push:
new a57d3cd Switched into InputAttributeDefinitions and InputDataSources.
a57d3cd is described below
commit a57d3cd7480c8f3f6d16bfbc476d7f0f543815bd
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Jan 17 14:20:47 2020 +0200
Switched into InputAttributeDefinitions and InputDataSources.
---
.../resources/conf/attribute-resolver-oidc.xml | 106 ++++++++++-----------
1 file changed, 52 insertions(+), 54 deletions(-)
diff --git a/idp-oidc-extension-distribution/src/main/resources/conf/attribute-resolver-oidc.xml b/idp-oidc-extension-distribution/src/main/resources/conf/attribute-resolver-oidc.xml
index 00c3860..96d6323 100644
--- a/idp-oidc-extension-distribution/src/main/resources/conf/attribute-resolver-oidc.xml
+++ b/idp-oidc-extension-distribution/src/main/resources/conf/attribute-resolver-oidc.xml
@@ -27,8 +27,8 @@
Use activation conditions and filters to ensure the requirement is met if you have need for several different kind of formats for 'sub'.
- <AttributeDefinition id="subject-public" xsi:type="Simple" sourceAttributeID="uid" activationConditionRef="PublicRequired">
- <Dependency ref="uid" />
+ <AttributeDefinition id="subject-public" xsi:type="Simple" activationConditionRef="PublicRequired">
+ <InputAttributeDefinition ref="uid" />
<AttributeEncoder xsi:type="oidcext:OIDCString" name="sub" />
</AttributeDefinition>
@@ -42,9 +42,8 @@
<!-- The EPPN is the "standard" federated username in higher ed. For guidelines on the implementation of this attribute,
refer to the Shibboleth and eduPerson documentation. Above all, do not expose a value for this attribute without considering
the long term implications. This demonstrates use of OIDCScopedString encoder. -->
- <AttributeDefinition id="eduPersonPrincipalName" xsi:type="Scoped" scope="%{idp.scope}"
- sourceAttributeID="uid">
- <Dependency ref="uid" />
+ <AttributeDefinition id="eduPersonPrincipalName" xsi:type="Scoped" scope="%{idp.scope}">
+ <InputAttributeDefinition ref="uid" />
<AttributeEncoder xsi:type="SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonPrincipalName"
encodeType="false" />
<AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
@@ -52,7 +51,6 @@
<AttributeEncoder xsi:type="oidcext:OIDCScopedString" name="eppn" />
</AttributeDefinition>
-
<!-- The uid is the closest thing to a "standard" LDAP attribute representing a local username, but you should generally
*never* expose uid to federated services, as it is rarely globally unique. -->
<AttributeDefinition id="uid" xsi:type="PrincipalName">
@@ -69,7 +67,7 @@
Consider making the EPPN value the same as your official email addresses whenever possible. This demonstrates use of OIDCString
encoder. -->
<AttributeDefinition id="email" xsi:type="Template">
- <Dependency ref="uid" />
+ <InputAttributeDefinition ref="uid" />
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:mail" encodeType="false" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail"
encodeType="false" />
@@ -77,26 +75,25 @@
<Template><![CDATA[
${uid}@example.org
]]></Template>
- <SourceAttribute>uid</SourceAttribute>
</AttributeDefinition>
<!-- This demonstrates a claim that is placed always to id token -->
- <AttributeDefinition id="email_idtoken" xsi:type="Simple" sourceAttributeID="email">
- <Dependency ref="email" />
+ <AttributeDefinition id="email_idtoken" xsi:type="Simple">
+ <InputAttributeDefinition ref="email" />
<AttributeEncoder xsi:type="oidcext:OIDCString" placeToIDToken="true" denyUserinfo="true" name="email" />
</AttributeDefinition>
<!-- examples of claim splitting by defining two different name claim definitions -->
<!-- standard claim name fetched from static connector -->
- <AttributeDefinition id="name" xsi:type="Simple" sourceAttributeID="name">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="name" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="name"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" name="name" />
</AttributeDefinition>
<!-- This demonstrates a claim that is placed always to id token -->
- <AttributeDefinition id="name_idtoken" xsi:type="Simple" sourceAttributeID="name">
- <Dependency ref="name" />
+ <AttributeDefinition id="name_idtoken" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="name"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" placeToIDToken="true" denyUserinfo="true" name="name" />
</AttributeDefinition>
@@ -105,20 +102,21 @@
<!-- This demonstrates use of OIDCString as array encoder. -->
- <AttributeDefinition id="eduPersonAffiliation" xsi:type="Simple" sourceAttributeID="affiliation">
- <Dependency ref="staticAttributes" />
+
+ <AttributeDefinition id="eduPersonAffiliation" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="affiliation"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" asArray="true" name="affiliation" />
</AttributeDefinition>
<!-- This demonstrates use of OIDCString as int encoder. -->
- <AttributeDefinition id="age" xsi:type="Simple" sourceAttributeID="age">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="age" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="age"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" asInt="true" name="age" />
</AttributeDefinition>
<!-- This demonstrates complex claim constructed by forming JSON String and declaring it to be encoded as JSON Object -->
<AttributeDefinition id="address" xsi:type="ScriptedAttribute">
- <Dependency ref="staticAttributes" />
+ <InputDataConnector ref="staticAttributes" attributeNames="street_address locality region postal_code country"/>
<Script><![CDATA[address.addValue("{\"street_address\":\""+street_address.getValues().get(0) + "\","
+"\"locality\":\""+locality.getValues().get(0) + "\","
+"\"region\":\""+region.getValues().get(0) + "\","
@@ -129,88 +127,88 @@
<!-- rest of the claims needed to have full set of standard claims -->
- <AttributeDefinition id="phone_number" xsi:type="Simple" sourceAttributeID="phone_number">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="phone_number" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="phone_number"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" name="phone_number" />
</AttributeDefinition>
- <AttributeDefinition id="phone_number_verified" xsi:type="Simple" sourceAttributeID="phone_number_verified">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="phone_number_verified" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="phone_number_verified"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" asBoolean="true" name="phone_number_verified" />
</AttributeDefinition>
- <AttributeDefinition id="email_verified" xsi:type="Simple" sourceAttributeID="email_verified">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="email_verified" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="email_verified"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" asBoolean="true" name="email_verified" />
</AttributeDefinition>
- <AttributeDefinition id="family_name" xsi:type="Simple" sourceAttributeID="family_name">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="family_name" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="family_name"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" name="family_name" />
</AttributeDefinition>
- <AttributeDefinition id="given_name" xsi:type="Simple" sourceAttributeID="given_name">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="given_name" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="given_name"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" name="given_name" />
</AttributeDefinition>
- <AttributeDefinition id="middle_name" xsi:type="Simple" sourceAttributeID="middle_name">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="middle_name" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="middle_name"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" name="middle_name" />
</AttributeDefinition>
- <AttributeDefinition id="nickname" xsi:type="Simple" sourceAttributeID="nickname">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="nickname" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="nickname"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" name="nickname" />
</AttributeDefinition>
- <AttributeDefinition id="preferred_username" xsi:type="Simple" sourceAttributeID="preferred_username">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="preferred_username" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="preferred_username"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" name="preferred_username" />
</AttributeDefinition>
- <AttributeDefinition id="profile" xsi:type="Simple" sourceAttributeID="profile">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="profile" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="profile"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" name="profile" />
</AttributeDefinition>
- <AttributeDefinition id="website" xsi:type="Simple" sourceAttributeID="website">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="website" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="website"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" name="website" />
</AttributeDefinition>
- <AttributeDefinition id="picture" xsi:type="Simple" sourceAttributeID="picture">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="picture" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="picture"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" name="picture" />
</AttributeDefinition>
- <AttributeDefinition id="web_site" xsi:type="Simple" sourceAttributeID="web_site">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="web_site" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="web_site"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" name="web_site" />
</AttributeDefinition>
- <AttributeDefinition id="gender" xsi:type="Simple" sourceAttributeID="gender">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="gender" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="gender"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" name="gender" />
</AttributeDefinition>
- <AttributeDefinition id="birthdate" xsi:type="Simple" sourceAttributeID="birthdate">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="birthdate" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="birthdate"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" name="birthdate" />
</AttributeDefinition>
- <AttributeDefinition id="zoneinfo" xsi:type="Simple" sourceAttributeID="zoneinfo">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="zoneinfo" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="zoneinfo"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" name="zoneinfo" />
</AttributeDefinition>
- <AttributeDefinition id="locale" xsi:type="Simple" sourceAttributeID="locale">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="locale" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="locale"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" name="locale" />
</AttributeDefinition>
- <AttributeDefinition id="updated_at" xsi:type="Simple" sourceAttributeID="updated_at">
- <Dependency ref="staticAttributes" />
+ <AttributeDefinition id="updated_at" xsi:type="Simple">
+ <InputDataConnector ref="staticAttributes" attributeNames="updated_at"/>
<AttributeEncoder xsi:type="oidcext:OIDCString" asInt="true" name="updated_at" />
</AttributeDefinition>
@@ -304,4 +302,4 @@
<Value>US</Value>
</Attribute>
</DataConnector>
-</AttributeResolver>
\ No newline at end of file
+</AttributeResolver>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list