[java-idp-oidc] branch dev/JOIDC-7 updated: Move more UserInfo actions and tests.
Scott Cantor
cantor.2 at osu.edu
Mon Apr 25 19:10:05 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch dev/JOIDC-7
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=378e6be5b71bcce8649dc7a49cc91af40f3a3e55
The following commit(s) were added to refs/heads/dev/JOIDC-7 by this push:
new 378e6be5 Move more UserInfo actions and tests.
378e6be5 is described below
commit 378e6be5b71bcce8649dc7a49cc91af40f3a3e55
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Apr 25 15:10:02 2022 -0400
Move more UserInfo actions and tests.
---
.../idp/plugin/oidc/op/token/support/AccessTokenClaimsSet.java | 1 -
.../oidc/op/profile/impl/AbstractOIDCTokenResponseAction.java | 2 +-
.../profile/impl/BuildUserInfoErrorResponseFromEvent.java | 4 +++-
.../profile/impl/FormOutboundUserInfoResponseMessage.java | 3 ++-
.../impl/InitializeOutboundUserInfoResponseMessageContext.java | 4 +++-
.../net/shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml | 6 +++---
.../oidc/op/profile/impl/BaseOIDCResponseActionTest.java | 10 +++++-----
.../profile/impl/FormOutboundUserInfoResponseMessageTest.java | 3 ++-
.../{ => userinfo}/profile/impl/SignUserInfoResponseTest.java | 4 ++--
9 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSet.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSet.java
index 81347dbe..9c24d4c4 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSet.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSet.java
@@ -184,7 +184,6 @@ public final class AccessTokenClaimsSet extends TokenClaimsSet {
setPrincipal(existing.getPrincipal());
setSubject(existing.getClaimsSet().getSubject());
setACR(existing.getACR() == null ? null : new ACR(existing.getACR()));
- setNonce(existing.getNonce());
setNotBefore(existing.getNotBefore());
setAuthenticationTime(existing.getAuthenticationTime());
setAudience(existing.getAudience());
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCTokenResponseAction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCTokenResponseAction.java
index da1a579b..d66b8a9e 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCTokenResponseAction.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCTokenResponseAction.java
@@ -37,7 +37,7 @@ import net.shibboleth.oidc.metadata.context.OIDCMetadataContext;
* {@link ProfileRequestContext#getOutboundMessageContext()}. Extends base class that offers actions on
* {@link TokenRequest} found via {@link MessageContext#getMessage()}.
*/
-abstract class AbstractOIDCTokenResponseAction extends AbstractOIDCTokenRequestAction {
+public abstract class AbstractOIDCTokenResponseAction extends AbstractOIDCTokenRequestAction {
/** Class logger. */
@Nonnull private Logger log = LoggerFactory.getLogger(AbstractOIDCTokenResponseAction.class);
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildUserInfoErrorResponseFromEvent.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/BuildUserInfoErrorResponseFromEvent.java
similarity index 91%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildUserInfoErrorResponseFromEvent.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/BuildUserInfoErrorResponseFromEvent.java
index ac492442..f1e50494 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildUserInfoErrorResponseFromEvent.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/BuildUserInfoErrorResponseFromEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.oidc.op.profile.impl;
+package net.shibboleth.idp.plugin.oidc.op.userinfo.profile.impl;
import org.opensaml.profile.context.EventContext;
import org.opensaml.profile.context.ProfileRequestContext;
@@ -23,6 +23,8 @@ import org.opensaml.profile.context.ProfileRequestContext;
import com.nimbusds.oauth2.sdk.ErrorObject;
import com.nimbusds.openid.connect.sdk.UserInfoErrorResponse;
+import net.shibboleth.idp.plugin.oidc.op.profile.impl.AbstractBuildErrorResponseFromEvent;
+
/**
* This action reads an event from the configured {@link EventContext} lookup strategy, constructs an OIDC user info
* error response message and attaches it as the outbound message.
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundUserInfoResponseMessage.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/FormOutboundUserInfoResponseMessage.java
similarity index 94%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundUserInfoResponseMessage.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/FormOutboundUserInfoResponseMessage.java
index 541ea765..ceef2a1a 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundUserInfoResponseMessage.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/FormOutboundUserInfoResponseMessage.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.oidc.op.profile.impl;
+package net.shibboleth.idp.plugin.oidc.op.userinfo.profile.impl;
import javax.annotation.Nonnull;
@@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory;
import com.nimbusds.openid.connect.sdk.UserInfoSuccessResponse;
import net.shibboleth.idp.plugin.oidc.op.messaging.context.OIDCAuthenticationResponseContext;
+import net.shibboleth.idp.plugin.oidc.op.profile.impl.AbstractOIDCTokenResponseAction;
/**
* Action that forms outbound message based on response context. Formed message is set to
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeOutboundUserInfoResponseMessageContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/InitializeOutboundUserInfoResponseMessageContext.java
similarity index 88%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeOutboundUserInfoResponseMessageContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/InitializeOutboundUserInfoResponseMessageContext.java
index e625c01d..2af7a926 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeOutboundUserInfoResponseMessageContext.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/InitializeOutboundUserInfoResponseMessageContext.java
@@ -15,11 +15,13 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.oidc.op.profile.impl;
+package net.shibboleth.idp.plugin.oidc.op.userinfo.profile.impl;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.profile.context.ProfileRequestContext;
+import net.shibboleth.idp.plugin.oidc.op.profile.impl.AbstractInitializeOutboundResponseMessageContext;
+
/**
* Action that adds an outbound {@link MessageContext} and related OIDC contexts to the {@link ProfileRequestContext}
* not knowing the relying party yet.
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 69858d82..f7c36d64 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
@@ -23,7 +23,7 @@
</bean>
<bean id="InitializeOutboundMessageContext"
- class="net.shibboleth.idp.plugin.oidc.op.profile.impl.InitializeOutboundUserInfoResponseMessageContext"
+ class="net.shibboleth.idp.plugin.oidc.op.userinfo.profile.impl.InitializeOutboundUserInfoResponseMessageContext"
scope="prototype" />
<!-- Used for metadata lookup. -->
@@ -134,10 +134,10 @@
scope="prototype" />
<bean id="FormOutboundMessage"
- class="net.shibboleth.idp.plugin.oidc.op.profile.impl.FormOutboundUserInfoResponseMessage" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.userinfo.profile.impl.FormOutboundUserInfoResponseMessage" scope="prototype" />
<bean id="BuildErrorResponseFromEvent"
- class="net.shibboleth.idp.plugin.oidc.op.profile.impl.BuildUserInfoErrorResponseFromEvent" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.userinfo.profile.impl.BuildUserInfoErrorResponseFromEvent" scope="prototype"
p:httpServletResponse-ref="shibboleth.HttpServletResponse"
p:mappedErrors-ref="shibboleth.oidc.ErrorMappings">
<property name="eventContextLookupStrategy">
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BaseOIDCResponseActionTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BaseOIDCResponseActionTest.java
index 6eb852d5..f2e0ff6a 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BaseOIDCResponseActionTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BaseOIDCResponseActionTest.java
@@ -91,15 +91,15 @@ public abstract class BaseOIDCResponseActionTest extends OpenSAMLInitBaseTestCas
protected ProfileRequestContext profileRequestCtx;
- Credential credentialRSA;
+ protected Credential credentialRSA;
- Credential credentialEC256;
+ protected Credential credentialEC256;
- Credential credentialEC384;
+ protected Credential credentialEC384;
- Credential credentialEC521;
+ protected Credential credentialEC521;
- Credential credentialHMAC;
+ protected Credential credentialHMAC;
public BaseOIDCResponseActionTest() {
subject = "generatedSubject";
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundUserInfoResponseMessageTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/FormOutboundUserInfoResponseMessageTest.java
similarity index 96%
rename from idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundUserInfoResponseMessageTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/FormOutboundUserInfoResponseMessageTest.java
index 192ad118..bfe4d6a6 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundUserInfoResponseMessageTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/FormOutboundUserInfoResponseMessageTest.java
@@ -15,10 +15,11 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.oidc.op.profile.impl;
+package net.shibboleth.idp.plugin.oidc.op.userinfo.profile.impl;
import java.net.URISyntaxException;
+import net.shibboleth.idp.plugin.oidc.op.profile.impl.BaseOIDCResponseActionTest;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.opensaml.messaging.context.MessageContext;
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SignUserInfoResponseTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/SignUserInfoResponseTest.java
similarity index 98%
rename from idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SignUserInfoResponseTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/SignUserInfoResponseTest.java
index ce03b3ff..27e57542 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SignUserInfoResponseTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/SignUserInfoResponseTest.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.oidc.op.profile.impl;
+package net.shibboleth.idp.plugin.oidc.op.userinfo.profile.impl;
import java.net.URISyntaxException;
import java.security.interfaces.ECPublicKey;
import java.security.interfaces.RSAPublicKey;
-import net.shibboleth.idp.plugin.oidc.op.userinfo.profile.impl.SignUserInfoResponse;
+import net.shibboleth.idp.plugin.oidc.op.profile.impl.BaseOIDCResponseActionTest;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list