[java-idp-oidc] branch main updated: Adjust test files, and update example extension namespace prefix.
Scott Cantor
cantor.2 at osu.edu
Tue Feb 16 17:31:07 UTC 2021
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=85e11a7ce3ad776b84f1528c397bd5add55937d3
The following commit(s) were added to refs/heads/main by this push:
new 85e11a7c Adjust test files, and update example extension namespace prefix.
85e11a7c is described below
commit 85e11a7ce3ad776b84f1528c397bd5add55937d3
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 16 12:31:05 2021 -0500
Adjust test files, and update example extension namespace prefix.
---
.../plugin/oidc/op/conf/oidc-attribute-filter.xml | 21 +++++++++++----------
.../plugin/oidc/op/conf/oidc-attribute-resolver.xml | 13 +++++++------
.../src/test/resources/conf/attribute-filter.xml | 8 ++++----
.../src/test/resources/conf/attribute-resolver.xml | 8 ++++----
.../attribute/filter/matcher/requestedClaims.xml | 7 +++----
5 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc-attribute-filter.xml b/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc-attribute-filter.xml
index 0ab54eb5..e1c7e4ae 100644
--- a/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc-attribute-filter.xml
+++ b/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc-attribute-filter.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<AttributeFilterPolicyGroup id="ShibbolethFilterPolicy" xmlns="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:oidcext="urn:mace:shibboleth:2.0:afp:oidc"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:oidc="urn:mace:shibboleth:2.0:afp:oidc"
xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
urn:mace:shibboleth:2.0:afp:oidc http://shibboleth.net/schema/oidc/shibboleth-afp-oidc.xsd">
@@ -12,7 +13,7 @@
-->
<AttributeFilterPolicy id="OPENID_SCOPE">
- <PolicyRequirementRule xsi:type="oidcext:OIDCScope" value="openid" />
+ <PolicyRequirementRule xsi:type="oidc:OIDCScope" value="openid" />
<!-- May adjust to taste depending on strategy used to produce sub claim. -->
<AttributeRule attributeID="subject">
<PermitValueRule xsi:type="ANY" />
@@ -30,7 +31,7 @@
The requester needs to have that as a registered scope.
-->
<AttributeFilterPolicy id="OPENID_SCOPE_EMAIL">
- <PolicyRequirementRule xsi:type="oidcext:OIDCScope" value="email" />
+ <PolicyRequirementRule xsi:type="oidc:OIDCScope" value="email" />
<AttributeRule attributeID="mail">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
@@ -44,7 +45,7 @@
The requester needs to have that as a registered scope.
-->
<AttributeFilterPolicy id="OPENID_SCOPE_ADDRESS">
- <PolicyRequirementRule xsi:type="oidcext:OIDCScope" value="address" />
+ <PolicyRequirementRule xsi:type="oidc:OIDCScope" value="address" />
<AttributeRule attributeID="address">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
@@ -55,7 +56,7 @@
The requester needs to have that as a registered scope.
-->
<AttributeFilterPolicy id="OPENID_SCOPE_PHONE">
- <PolicyRequirementRule xsi:type="oidcext:OIDCScope" value="phone" />
+ <PolicyRequirementRule xsi:type="oidc:OIDCScope" value="phone" />
<AttributeRule attributeID="telephoneNumber">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
@@ -69,7 +70,7 @@
The requester needs to have that as a registered scope.
-->
<AttributeFilterPolicy id="OPENID_SCOPE_PROFILE">
- <PolicyRequirementRule xsi:type="oidcext:OIDCScope" value="profile" />
+ <PolicyRequirementRule xsi:type="oidc:OIDCScope" value="profile" />
<AttributeRule attributeID="displayName">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
@@ -121,19 +122,19 @@
<PolicyRequirementRule xsi:type="ANY" />
<!-- Release picture if asked. -->
<AttributeRule attributeID="picture">
- <PermitValueRule xsi:type="oidcext:AttributeInOIDCRequestedClaims" />
+ <PermitValueRule xsi:type="oidc:AttributeInOIDCRequestedClaims" />
</AttributeRule>
<!-- Release email in ID token if specifically asked for in ID token. -->
<AttributeRule attributeID="mail">
- <PermitValueRule xsi:type="oidcext:AttributeInOIDCRequestedClaims" matchOnlyIDToken="true" />
+ <PermitValueRule xsi:type="oidc:AttributeInOIDCRequestedClaims" matchOnlyIDToken="true" />
</AttributeRule>
<!-- Release phone_number in UserInfo token if specifically asked for in UserInfo token. -->
<AttributeRule attributeID="telephoneNumber">
- <PermitValueRule xsi:type="oidcext:AttributeInOIDCRequestedClaims" matchOnlyUserInfo="true" />
+ <PermitValueRule xsi:type="oidc:AttributeInOIDCRequestedClaims" matchOnlyUserInfo="true" />
</AttributeRule>
<!-- Release name if specifically asked for in UserInfo token and flagged as essential. -->
<AttributeRule attributeID="displayName">
- <PermitValueRule xsi:type="oidcext:AttributeInOIDCRequestedClaims" matchOnlyUserInfo="true"
+ <PermitValueRule xsi:type="oidc:AttributeInOIDCRequestedClaims" matchOnlyUserInfo="true"
onlyIfEssential="true" />
</AttributeRule>
</AttributeFilterPolicy>
diff --git a/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc-attribute-resolver.xml b/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc-attribute-resolver.xml
index a5ebd80e..bab9f96a 100644
--- a/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc-attribute-resolver.xml
+++ b/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc-attribute-resolver.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<AttributeResolver xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:oidcext="urn:mace:shibboleth:2.0:resolver:oidc"
+<AttributeResolver xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:oidc="urn:mace:shibboleth:2.0:resolver:oidc"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
urn:mace:shibboleth:2.0:resolver:oidc http://shibboleth.net/schema/oidc/shibboleth-attribute-encoder-oidc.xsd">
@@ -28,13 +29,13 @@
<AttributeDefinition id="subject-public" xsi:type="Scoped" scope="%{idp.scope}"
activationConditionRef="shibboleth.oidc.Conditions.PublicRequired">
<InputAttributeDefinition ref="uid" />
- <AttributeEncoder xsi:type="oidcext:OIDCScopedString" name="sub" />
+ <AttributeEncoder xsi:type="oidc:OIDCScopedString" name="sub" />
</AttributeDefinition>
<AttributeDefinition id="subject-pairwise" xsi:type="Scoped" scope="%{idp.scope}"
activationConditionRef="shibboleth.oidc.Conditions.PairwiseRequired">
<InputDataConnector ref="computedSubjectId" attributeNames="subjectId"/>
- <AttributeEncoder xsi:type="oidcext:OIDCScopedString" name="sub" />
+ <AttributeEncoder xsi:type="oidc:OIDCScopedString" name="sub" />
</AttributeDefinition>
<!--
@@ -48,7 +49,7 @@
<AttributeDefinition id="subject" xsi:type="Scoped" scope="%{idp.scope}"
activationConditionRef="shibboleth.oidc.Conditions.SubjectRequired">
<InputDataConnector ref="computedSubjectId" attributeNames="subjectId"/>
- <AttributeEncoder xsi:type="oidcext:OIDCScopedString" name="sub" />
+ <AttributeEncoder xsi:type="oidc:OIDCScopedString" name="sub" />
</AttributeDefinition>
-->
@@ -60,7 +61,7 @@
-->
<AttributeDefinition id="eduPersonPrincipalName" xsi:type="Scoped" scope="%{idp.scope}">
<InputAttributeDefinition ref="uid" />
- <AttributeEncoder xsi:type="oidcext:OIDCScopedString" name="eppn" />
+ <AttributeEncoder xsi:type="oidc:OIDCScopedString" name="eppn" />
</AttributeDefinition>
<!--
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/attribute-filter.xml b/idp-oidc-extension-impl/src/test/resources/conf/attribute-filter.xml
index 910f46a4..e6c69f53 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/attribute-filter.xml
+++ b/idp-oidc-extension-impl/src/test/resources/conf/attribute-filter.xml
@@ -12,7 +12,7 @@
<AttributeFilterPolicyGroup id="ShibbolethFilterPolicy"
xmlns="urn:mace:shibboleth:2.0:afp"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:oidcext="urn:mace:shibboleth:2.0:afp:oidc"
+ xmlns:oidc="urn:mace:shibboleth:2.0:afp:oidc"
xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
urn:mace:shibboleth:2.0:afp:oidc http://shibboleth.net/schema/oidc/shibboleth-afp-oidc.xsd">
@@ -97,21 +97,21 @@
</AttributeFilterPolicy>
<AttributeFilterPolicy id="OPENID_SCOPE">
- <PolicyRequirementRule xsi:type="oidcext:OIDCScope" value="openid" />
+ <PolicyRequirementRule xsi:type="oidc:OIDCScope" value="openid" />
<AttributeRule attributeID="subject">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
</AttributeFilterPolicy>
<AttributeFilterPolicy id="OPENID_SCOPE_EMAIL">
- <PolicyRequirementRule xsi:type="oidcext:OIDCScope" value="email" />
+ <PolicyRequirementRule xsi:type="oidc:OIDCScope" value="email" />
<AttributeRule attributeID="mail">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
</AttributeFilterPolicy>
<AttributeFilterPolicy id="OPENID_SCOPE_PROFILE">
- <PolicyRequirementRule xsi:type="oidcext:OIDCScope" value="profile" />
+ <PolicyRequirementRule xsi:type="oidc:OIDCScope" value="profile" />
<AttributeRule attributeID="name">
<PermitValueRule xsi:type="ANY" />
</AttributeRule>
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/attribute-resolver.xml b/idp-oidc-extension-impl/src/test/resources/conf/attribute-resolver.xml
index 2c9f22c4..197a3f27 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/attribute-resolver.xml
+++ b/idp-oidc-extension-impl/src/test/resources/conf/attribute-resolver.xml
@@ -16,7 +16,7 @@
<AttributeResolver
xmlns="urn:mace:shibboleth:2.0:resolver"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:oidcext="urn:mace:shibboleth:2.0:resolver:oidc"
+ xmlns:oidc="urn:mace:shibboleth:2.0:resolver:oidc"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
urn:mace:shibboleth:2.0:resolver:oidc http://shibboleth.net/schema/oidc/shibboleth-attribute-encoder-oidc.xsd">
@@ -36,7 +36,7 @@
<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" friendlyName="eduPersonPrincipalName" encodeType="false" />
- <AttributeEncoder xsi:type="oidcext:OIDCScopedString" name="eppn" />
+ <AttributeEncoder xsi:type="oidc:OIDCScopedString" name="eppn" />
</AttributeDefinition>
<!--
@@ -58,7 +58,7 @@
<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" />
- <AttributeEncoder xsi:type="oidcext:OIDCString" name="email" />
+ <AttributeEncoder xsi:type="oidc:OIDCString" name="email" />
<Template>
<![CDATA[
${uid}@example.org
@@ -80,7 +80,7 @@
This example attribute (the data connector actually ) will generate public or pairwise 'sub' depending on client registration data. -->
<AttributeDefinition id="subject" xsi:type="Simple" activationConditionRef="shibboleth.oidc.Conditions.SubjectRequired">
<InputDataConnector ref="computedSubjectId" attributeNames="subjectId"/>
- <AttributeEncoder xsi:type="oidcext:OIDCString" name="sub" />
+ <AttributeEncoder xsi:type="oidc:OIDCString" name="sub" />
</AttributeDefinition>
diff --git a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/attribute/filter/matcher/requestedClaims.xml b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/attribute/filter/matcher/requestedClaims.xml
index 3ed7a775..98b1c57b 100644
--- a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/attribute/filter/matcher/requestedClaims.xml
+++ b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/attribute/filter/matcher/requestedClaims.xml
@@ -1,9 +1,8 @@
<AttributeRule attributeID="test"
xmlns="urn:mace:shibboleth:2.0:afp"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:oidcext="urn:mace:shibboleth:2.0:afp:oidc"
+ xmlns:oidc="urn:mace:shibboleth:2.0:afp:oidc"
xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd
- urn:mace:shibboleth:2.0:afp:oidc classpath:/schema/idp-oidc-extension-afp.xsd">
- <PermitValueRule xsi:type="oidcext:AttributeInOIDCRequestedClaims" onlyIfEssential="true" matchIfRequestedClaimsSilent="true" matchOnlyUserInfo="true" matchOnlyIDToken="false" />
+ urn:mace:shibboleth:2.0:afp:oidc http://shibboleth.net/schema/oidc/shibboleth-afp-oidc.xsd">
+ <PermitValueRule xsi:type="oidc:AttributeInOIDCRequestedClaims" onlyIfEssential="true" matchIfRequestedClaimsSilent="true" matchOnlyUserInfo="true" matchOnlyIDToken="false" />
</AttributeRule>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list