[java-idp-oidc] branch main updated: Some cleanup, clarifying claims delivery action in back-channel flows.
Scott Cantor
cantor.2 at osu.edu
Thu Dec 9 14:36:10 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=e8a392769140445da776d7d7335ece85e78476a6
The following commit(s) were added to refs/heads/main by this push:
new e8a39276 Some cleanup, clarifying claims delivery action in back-channel flows.
e8a39276 is described below
commit e8a392769140445da776d7d7335ece85e78476a6
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Dec 9 09:36:07 2021 -0500
Some cleanup, clarifying claims delivery action in back-channel flows.
---
.../oidc/op/profile/impl/SetConsentToResponseContext.java | 2 +-
.../net/shibboleth/idp/flows/oidc/token/token-beans.xml | 2 +-
.../net/shibboleth/idp/flows/oidc/token/token-flow.xml | 2 +-
.../shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml | 2 +-
.../net/shibboleth/idp/flows/oidc/userinfo/userinfo-flow.xml | 2 +-
.../idp/plugin/oidc/op/profile/impl/AddIDTokenShellTest.java | 12 +++++-------
6 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentToResponseContext.java
index 13782400..d951d573 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentToResponseContext.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentToResponseContext.java
@@ -123,7 +123,7 @@ public class SetConsentToResponseContext extends AbstractOIDCResponseAction {
}
if (!consentEnabledPredicate.test(profileRequestContext)) {
- log.debug("{} The attribute consent has not been enabled, nothing to do", getLogPrefix());
+ log.debug("{} Attribute consent has not been enabled, nothing to do", getLogPrefix());
return false;
}
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
index 34f4ca16..ba13987a 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
@@ -84,7 +84,7 @@
class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetAuthenticationTimeToResponseContext" scope="prototype"
p:authTimeLookupStrategy-ref="shibboleth.TokenRequestAuthTimeLookupFunction" />
- <bean id="SetTokenDeliveryAttributesToResponseContext"
+ <bean id="SetTokenDeliveryAttributesFromTokenToResponseContext"
class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetTokenDeliveryAttributesFromTokenToResponseContext" scope="prototype">
</bean>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-flow.xml
index 0202592a..39ac40b2 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-flow.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-flow.xml
@@ -38,7 +38,7 @@
<evaluate expression="SetRequestedClaimsToResponseContext" />
<evaluate expression="SetAuthenticationContextClassReferenceToResponseContext" />
<evaluate expression="SetAuthenticationTimeToResponseContext" />
- <evaluate expression="SetTokenDeliveryAttributesToResponseContext" />
+ <evaluate expression="SetTokenDeliveryAttributesFromTokenToResponseContext" />
<evaluate expression="SetConsentToResponseContext" />
<evaluate expression="ReduceValidatedScope" />
<evaluate expression="PopulateIDTokenSignatureSigningParameters" />
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml
index 86df0a69..758b42b2 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml
@@ -46,7 +46,7 @@
p:requestedClaimsLookupStrategy-ref="shibboleth.TokenRequestRequestedClaimsLookupFunction"
p:transcoderRegistry-ref="shibboleth.AttributeRegistryService" />
- <bean id="SetTokenDeliveryAttributesToResponseContext"
+ <bean id="SetTokenDeliveryAttributesFromTokenToResponseContext"
class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetTokenDeliveryAttributesFromTokenToResponseContext"
scope="prototype">
<property name="iDTokenDeliveryClaimsLookupStrategy">
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-flow.xml
index 81e0797c..829952cd 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-flow.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-flow.xml
@@ -32,7 +32,7 @@
<action-state id="OutboundContextsAndSecurityParameters">
<evaluate expression="ValidateScope" />
<evaluate expression="SetRequestedClaimsToResponseContext" />
- <evaluate expression="SetTokenDeliveryAttributesToResponseContext" />
+ <evaluate expression="SetTokenDeliveryAttributesFromTokenToResponseContext" />
<evaluate expression="SetConsentToResponseContext" />
<evaluate expression="PopulateUserInfoResponseSignatureSigningParameters" />
<evaluate expression="PopulateUserInfoResponseEncryptionParameters" />
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddIDTokenShellTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddIDTokenShellTest.java
index fd7e1ca5..041c7ae7 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddIDTokenShellTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddIDTokenShellTest.java
@@ -17,14 +17,12 @@
package net.shibboleth.idp.plugin.oidc.op.profile.impl;
-import net.shibboleth.idp.plugin.oidc.op.profile.impl.AddIDTokenShell;
-import net.shibboleth.idp.profile.context.navigate.ResponderIdLookupFunction;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.oidc.profile.config.navigate.AudienceRestrictionsLookupFunction;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.springframework.webflow.execution.Event;
import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import com.nimbusds.oauth2.sdk.id.Audience;
@@ -32,12 +30,13 @@ import com.nimbusds.oauth2.sdk.id.Audience;
/** {@link AddIDTokenShell} unit test. */
public class AddIDTokenShellTest extends BaseOIDCResponseActionTest {
+ /** Action to test. */
private AddIDTokenShell action;
- private void init() throws ComponentInitializationException {
+ /** Setup method. */
+ @BeforeMethod
+ public void setUp() throws ComponentInitializationException {
action = new AddIDTokenShell();
- action.setIssuerLookupStrategy(new ResponderIdLookupFunction());
- action.setAudienceRestrictionsLookupStrategy(new AudienceRestrictionsLookupFunction());
action.initialize();
}
@@ -48,7 +47,6 @@ public class AddIDTokenShellTest extends BaseOIDCResponseActionTest {
*/
@Test
public void testSuccess() throws ComponentInitializationException {
- init();
final Event event = action.execute(requestCtx);
ActionTestingSupport.assertProceedEvent(event);
Assert.assertTrue(respCtx.getIDToken().getAudience().contains(new Audience(request.getClientID())));
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list