[java-idp-oidc] branch main updated: IDP-1652 - Support easier integration into configuration by plugins
Scott Cantor
cantor.2 at osu.edu
Mon Sep 21 18:45:24 UTC 2020
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=bbae025249444563c09982b7dc061c650ac65f74
The following commit(s) were added to refs/heads/main by this push:
new bbae0252 IDP-1652 - Support easier integration into configuration by plugins
bbae0252 is described below
commit bbae025249444563c09982b7dc061c650ac65f74
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 21 14:45:22 2020 -0400
IDP-1652 - Support easier integration into configuration by plugins
https://issues.shibboleth.net/jira/browse/IDP-1652
Auto-wire AttributeRegistry naming functions.
---
.../resources/META-INF/net.shibboleth.idp/postconfig.xml | 12 ++++--------
.../transcoding/impl/OIDCByteAttributeTranscoderTest.java | 6 ++++--
.../impl/OIDCScopedStringAttributeTranscoderTest.java | 6 ++++--
.../transcoding/impl/OIDCStringAttributeTranscoderTest.java | 6 ++++--
.../oidc/profile/impl/AddAttributesToClaimsSetTest.java | 6 ++++--
.../SetTokenDeliveryAttributesToResponseContextTest.java | 6 ++++--
.../logic/AttributeResolutionSubjectLookupFunctionTest.java | 9 ++++++---
7 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index 62f8a865..51c96e9b 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -22,14 +22,10 @@
<bean id="OIDCScopedStringTranscoder"
class="org.geant.idpextension.oidc.attribute.transcoding.impl.OIDCScopedStringAttributeTranscoder" />
- <bean id="OIDCExtendedNamingRegistry" parent="shibboleth.DefaultNamingRegistry">
- <property name="sourceMap">
- <map merge="true">
- <entry key="#{T(net.minidev.json.JSONObject)}">
- <bean class="org.geant.idpextension.oidc.attribute.transcoding.AbstractOIDCAttributeTranscoder.NamingFunction" />
- </entry>
- </map>
- </property>
+ <bean parent="shibboleth.RegistryNamingFunction" c:claz="net.minidev.json.JSONObject">
+ <constructor-arg name="function">
+ <bean class="org.geant.idpextension.oidc.attribute.transcoding.AbstractOIDCAttributeTranscoder.NamingFunction" />
+ </constructor-arg>
</bean>
</beans>
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCByteAttributeTranscoderTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCByteAttributeTranscoderTest.java
index 4e28976d..7d4692bf 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCByteAttributeTranscoderTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCByteAttributeTranscoderTest.java
@@ -43,6 +43,7 @@ import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
+import net.shibboleth.idp.attribute.transcoding.BasicNamingFunction;
import net.shibboleth.idp.attribute.transcoding.TranscoderSupport;
import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
import net.shibboleth.idp.attribute.transcoding.impl.AttributeTranscoderRegistryImpl;
@@ -63,8 +64,9 @@ public class OIDCByteAttributeTranscoderTest {
final OIDCByteAttributeTranscoder transcoder = new OIDCByteAttributeTranscoder();
transcoder.initialize();
- registry.setNamingRegistry(Collections.singletonMap(transcoder.getEncodedType(),
- new AbstractOIDCAttributeTranscoder.NamingFunction()));
+ registry.setNamingRegistry(Collections.singletonList(
+ new BasicNamingFunction<>(transcoder.getEncodedType(),
+ new AbstractOIDCAttributeTranscoder.NamingFunction())));
ruleset = new HashMap<>();
ruleset.put(AttributeTranscoderRegistry.PROP_ID, ATTR_ID);
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCScopedStringAttributeTranscoderTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCScopedStringAttributeTranscoderTest.java
index 3a460098..12467561 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCScopedStringAttributeTranscoderTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCScopedStringAttributeTranscoderTest.java
@@ -32,6 +32,7 @@ import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.ScopedStringAttributeValue;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
+import net.shibboleth.idp.attribute.transcoding.BasicNamingFunction;
import net.shibboleth.idp.attribute.transcoding.TranscoderSupport;
import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
import net.shibboleth.idp.attribute.transcoding.impl.AttributeTranscoderRegistryImpl;
@@ -65,8 +66,9 @@ public class OIDCScopedStringAttributeTranscoderTest {
final OIDCScopedStringAttributeTranscoder transcoder = new OIDCScopedStringAttributeTranscoder();
transcoder.initialize();
- registry.setNamingRegistry(Collections.singletonMap(transcoder.getEncodedType(),
- new AbstractOIDCAttributeTranscoder.NamingFunction()));
+ registry.setNamingRegistry(Collections.singletonList(
+ new BasicNamingFunction<>(transcoder.getEncodedType(),
+ new AbstractOIDCAttributeTranscoder.NamingFunction())));
ruleset = new HashMap<>();
ruleset.put(AttributeTranscoderRegistry.PROP_ID, ATTR_ID);
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCStringAttributeTranscoderTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCStringAttributeTranscoderTest.java
index 42113cc7..9e071823 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCStringAttributeTranscoderTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCStringAttributeTranscoderTest.java
@@ -41,6 +41,7 @@ import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
+import net.shibboleth.idp.attribute.transcoding.BasicNamingFunction;
import net.shibboleth.idp.attribute.transcoding.TranscoderSupport;
import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
import net.shibboleth.idp.attribute.transcoding.impl.AttributeTranscoderRegistryImpl;
@@ -64,8 +65,9 @@ public class OIDCStringAttributeTranscoderTest {
final OIDCStringAttributeTranscoder transcoder = new OIDCStringAttributeTranscoder();
transcoder.initialize();
- registry.setNamingRegistry(Collections.singletonMap(transcoder.getEncodedType(),
- new AbstractOIDCAttributeTranscoder.NamingFunction()));
+ registry.setNamingRegistry(Collections.singletonList(
+ new BasicNamingFunction<>(transcoder.getEncodedType(),
+ new AbstractOIDCAttributeTranscoder.NamingFunction())));
ruleset = new HashMap<>();
ruleset.put(AttributeTranscoderRegistry.PROP_ID, ATTR_ID);
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAttributesToClaimsSetTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAttributesToClaimsSetTest.java
index 0d450774..f49314fc 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAttributesToClaimsSetTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAttributesToClaimsSetTest.java
@@ -30,6 +30,7 @@ import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.context.AttributeContext;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
+import net.shibboleth.idp.attribute.transcoding.BasicNamingFunction;
import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
import net.shibboleth.idp.attribute.transcoding.impl.AttributeTranscoderRegistryImpl;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
@@ -91,8 +92,9 @@ public class AddAttributesToClaimsSetTest extends BaseOIDCResponseActionTest {
rule4.put(OIDCAttributeTranscoder.PROP_NAME, "test4");
rule4.put(OIDCAttributeTranscoder.PROP_FORCE_ID_TOKEN, true);
- registry.setNamingRegistry(Collections.singletonMap(
- transcoder.getEncodedType(), new AbstractOIDCAttributeTranscoder.NamingFunction()));
+ registry.setNamingRegistry(Collections.singletonList(
+ new BasicNamingFunction<>(transcoder.getEncodedType(),
+ new AbstractOIDCAttributeTranscoder.NamingFunction())));
registry.setTranscoderRegistry(List.of(
new TranscodingRule(rule1),
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesToResponseContextTest.java
index faed2338..4c79c3a5 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesToResponseContextTest.java
@@ -29,6 +29,7 @@ import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.context.AttributeContext;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
+import net.shibboleth.idp.attribute.transcoding.BasicNamingFunction;
import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
import net.shibboleth.idp.attribute.transcoding.impl.AttributeTranscoderRegistryImpl;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
@@ -83,8 +84,9 @@ public class SetTokenDeliveryAttributesToResponseContextTest extends BaseOIDCRes
rule3.put(OIDCAttributeTranscoder.PROP_FORCE_ID_TOKEN, true);
rule3.put(OIDCAttributeTranscoder.PROP_IN_TOKEN, true);
- registry.setNamingRegistry(Collections.singletonMap(
- transcoder.getEncodedType(), new AbstractOIDCAttributeTranscoder.NamingFunction()));
+ registry.setNamingRegistry(Collections.singletonList(
+ new BasicNamingFunction<>(transcoder.getEncodedType(),
+ new AbstractOIDCAttributeTranscoder.NamingFunction())));
registry.setTranscoderRegistry(List.of(
new TranscodingRule(rule1),
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/logic/AttributeResolutionSubjectLookupFunctionTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/logic/AttributeResolutionSubjectLookupFunctionTest.java
index b2c9eda7..64c5a1be 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/logic/AttributeResolutionSubjectLookupFunctionTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/logic/AttributeResolutionSubjectLookupFunctionTest.java
@@ -28,6 +28,7 @@ import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.context.AttributeContext;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
+import net.shibboleth.idp.attribute.transcoding.BasicNamingFunction;
import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
import net.shibboleth.idp.attribute.transcoding.impl.AttributeTranscoderRegistryImpl;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
@@ -99,9 +100,11 @@ public class AttributeResolutionSubjectLookupFunctionTest extends OpenSAMLInitBa
rule4.put(AttributeTranscoderRegistry.PROP_TRANSCODER, samlTranscoder);
rule4.put(SAML2AttributeTranscoder.PROP_NAME, "sub");
- registry.setNamingRegistry(Map.of(
- transcoder.getEncodedType(), new AbstractOIDCAttributeTranscoder.NamingFunction(),
- samlTranscoder.getEncodedType(), new AbstractSAML2AttributeTranscoder.NamingFunction()));
+ registry.setNamingRegistry(List.of(
+ new BasicNamingFunction<>(transcoder.getEncodedType(),
+ new AbstractOIDCAttributeTranscoder.NamingFunction()),
+ new BasicNamingFunction<>(samlTranscoder.getEncodedType(),
+ new AbstractSAML2AttributeTranscoder.NamingFunction())));
// any attribute
final IdPAttribute attribute1 = new IdPAttribute("test1");
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list