[java-idp-oidc] 02/02: JCOMOIDC-167 - Update Nimbus oauth2-oidc-sdk into the latest v11
Codeberg
noreply at shibboleth.net
Wed Jun 17 12:47:19 UTC 2026
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
https://codeberg.org/Shibboleth/java-idp-oidc/commit/7539a7a6a16302ce3f49967812bdbf22a2f5cdcc
commit 7539a7a6a16302ce3f49967812bdbf22a2f5cdcc
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Wed Jun 17 15:46:35 2026 +0300
JCOMOIDC-167 - Update Nimbus oauth2-oidc-sdk into the latest v11
https://shibboleth.atlassian.net/browse/JCOMOIDC-167
- HTTPResponse.getContent() -> .getBody()
- TokenRequest: switch into using non-deprecated constructors
- HTTPRequest.getQueryParameters() -> URLUtils.parseParameters(HTTPRequest.getBody())
---
.../op/encoding/impl/NimbusResponseEncoder.java | 4 +--
.../plugin/oidc/op/encoding/impl/ResponseUtil.java | 2 +-
.../decoding/impl/BaseOAuth2RequestDecoder.java | 4 +--
...ExtractClientAuthenticationFromRequestTest.java | 2 +-
.../op/authn/impl/JWTCredentialValidatorTest.java | 2 +-
.../decoding/impl/OIDCTokenRequestDecoderTest.java | 7 +++---
.../TokenRequestClientIDLookupFunctionTest.java | 2 +-
.../TokenRequestRedirectURILookupFunctionTest.java | 6 +++--
.../SetRequestObjectToResponseContextTest.java | 1 -
.../oauth2/profile/impl/ValidateAudienceTest.java | 16 ++++++------
.../op/oauth2/profile/impl/ValidateScopeTest.java | 2 +-
.../op/profile/flow/ConfigurationFlowTest.java | 2 +-
.../oidc/op/profile/flow/KeySetFlowTest.java | 2 +-
.../impl/AbstractOIDCTokenResponseActionTest.java | 2 +-
.../impl/FormOutboundDiscoveryResponseTest.java | 4 +--
.../oidc/op/profile/impl/ValidateGrantTest.java | 29 ++++++++++++++--------
.../op/profile/impl/ValidateGrantTypeTest.java | 4 +--
.../oidc/op/profile/impl/ValidatePKCETest.java | 15 ++++++-----
18 files changed, 59 insertions(+), 47 deletions(-)
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/NimbusResponseEncoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/NimbusResponseEncoder.java
index c9c5954c..4116a391 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/NimbusResponseEncoder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/NimbusResponseEncoder.java
@@ -216,12 +216,12 @@ public class NimbusResponseEncoder extends AbstractHttpServletResponseMessageEnc
if (redirect != null) {
log.debug("Sending redirect to {}", redirect);
response.sendRedirect(redirect);
- } else if (resp.getContent() != null) {
+ } else if (resp.getBody() != null) {
if (resp.getEntityContentType() != null) {
response.setContentType(resp.getEntityContentType().toString());
}
try (final PrintWriter out = response.getWriter()) {
- out.print(resp.getContent());
+ out.print(resp.getBody());
out.flush();
}
}
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/ResponseUtil.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/ResponseUtil.java
index 15e72f90..01e5dc13 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/ResponseUtil.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/ResponseUtil.java
@@ -103,7 +103,7 @@ public final class ResponseUtil {
ret += "\t" + entry.getKey() + ":" + entry.getValue().get(0) + nl;
}
}
- final String rawContent = httpResponse.getContent();
+ final String rawContent = httpResponse.getBody();
if (rawContent != null) {
if (objectMapper != null) {
try {
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/BaseOAuth2RequestDecoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/BaseOAuth2RequestDecoder.java
index 290a44da..26fa82c7 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/BaseOAuth2RequestDecoder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/BaseOAuth2RequestDecoder.java
@@ -141,9 +141,9 @@ public abstract class BaseOAuth2RequestDecoder<T extends Request> extends Abstra
* @param httpRequest The HTTP request object where the parameter values are prefixed
*/
protected void switchIntoCustomResource(@Nonnull final HTTPRequest httpRequest) {
- final String body = httpRequest.getQuery();
+ final String body = httpRequest.getBody();
if (body != null) {
- httpRequest.setQuery(transformResourceParameter(body));
+ httpRequest.setBody(transformResourceParameter(body));
}
}
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/ExtractClientAuthenticationFromRequestTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/ExtractClientAuthenticationFromRequestTest.java
index af727e90..3f0c7492 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/ExtractClientAuthenticationFromRequestTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/ExtractClientAuthenticationFromRequestTest.java
@@ -107,7 +107,7 @@ public class ExtractClientAuthenticationFromRequestTest {
final AuthorizationGrant authzGrant = new AuthorizationCodeGrant(new AuthorizationCode(), null);
rc = new RequestContextBuilder()
- .setInboundMessage(new TokenRequest(null, clientAuth, authzGrant))
+ .setInboundMessage(new TokenRequest(null, clientAuth, authzGrant, null))
.buildRequestContext();
prc = new WebflowRequestContextProfileRequestContextLookup().apply(rc);
prc.addSubcontext(new AuthenticationContext());
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/JWTCredentialValidatorTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/JWTCredentialValidatorTest.java
index 27d72da2..abe32f7f 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/JWTCredentialValidatorTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/JWTCredentialValidatorTest.java
@@ -182,7 +182,7 @@ public class JWTCredentialValidatorTest extends BaseAuthenticationContextTest {
prc.ensureSubcontext(RelyingPartyContext.class).setRelyingPartyId(clientId.getValue());
final AuthorizationGrant authzGrant = new AuthorizationCodeGrant(new AuthorizationCode(), null);
- completeSetup(new TokenRequest(null, clientAuth, authzGrant), method, sameSecret);
+ completeSetup(new TokenRequest(null, clientAuth, authzGrant, null), method, sameSecret);
}
protected ClaimsValidator constructClaimsValidator(final HttpServletRequest httpRequest,
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCTokenRequestDecoderTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCTokenRequestDecoderTest.java
index cd7605a9..d43c7472 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCTokenRequestDecoderTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCTokenRequestDecoderTest.java
@@ -34,6 +34,7 @@ import com.nimbusds.oauth2.sdk.TokenRequest;
import com.nimbusds.oauth2.sdk.http.HTTPRequest;
import com.nimbusds.oauth2.sdk.http.JakartaServletUtils;
import com.nimbusds.oauth2.sdk.http.HTTPRequest.Method;
+import com.nimbusds.oauth2.sdk.util.URLUtils;
import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.idp.plugin.oidc.op.messaging.context.navigate.DefaultRequestAudienceLookupFunction;
@@ -218,16 +219,16 @@ public class OIDCTokenRequestDecoderTest {
}
protected void switchIntoCustomClientAssertion(@Nonnull final HTTPRequest httpRequest) {
- final Map<String, List<String>> params = httpRequest.getQueryParameters();
+ final Map<String, List<String>> params = URLUtils.parseParameters(httpRequest.getBody());
if (params != null && !params.isEmpty() && params.get("client_assertion_type") != null) {
final List<String> assertionTypes = params.get("client_assertion_type");
- String body = httpRequest.getQuery();
+ String body = httpRequest.getBody();
for (final String assertionType : assertionTypes) {
if (assertionType.equals("urn:ietf:params:oauth:client-assertion-type:mock-custom")) {
body = body.replace("client_assertion=", "custom_client_assertion=");
}
- httpRequest.setQuery(body);
+ httpRequest.setBody(body);
}
}
}
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/navigate/TokenRequestClientIDLookupFunctionTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/navigate/TokenRequestClientIDLookupFunctionTest.java
index f62b068a..add4769c 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/navigate/TokenRequestClientIDLookupFunctionTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/navigate/TokenRequestClientIDLookupFunctionTest.java
@@ -39,7 +39,7 @@ public class TokenRequestClientIDLookupFunctionTest {
lookup = new TokenRequestClientIDLookupFunction();
ctx = new MessageContext();
TokenRequest req = new TokenRequest(new URI("http://example.com"), new ClientID("clientId"),
- new RefreshTokenGrant(new RefreshToken()));
+ new RefreshTokenGrant(new RefreshToken()), null);
ctx.setMessage(req);
}
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/navigate/TokenRequestRedirectURILookupFunctionTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/navigate/TokenRequestRedirectURILookupFunctionTest.java
index d66c6d95..8f2432bf 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/navigate/TokenRequestRedirectURILookupFunctionTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/navigate/TokenRequestRedirectURILookupFunctionTest.java
@@ -55,7 +55,8 @@ public class TokenRequestRedirectURILookupFunctionTest {
params.put("grant_type", Arrays.asList("authorization_code"));
params.put("code", Arrays.asList("xyz_code_abc"));
params.put("redirect_uri", Arrays.asList("http://example.com/redirect"));
- TokenRequest req = new TokenRequest(new URI("http://example.com"), new ClientID("clientId"),AuthorizationCodeGrant.parse(params));
+ TokenRequest req = new TokenRequest(new URI("http://example.com"), new ClientID("clientId"),
+ AuthorizationCodeGrant.parse(params), null);
prc.ensureInboundMessageContext().setMessage(req);
}
@@ -70,7 +71,8 @@ public class TokenRequestRedirectURILookupFunctionTest {
Map<String,List<String>> params = new HashMap<String,List<String>>();
params.put("grant_type", Arrays.asList("authorization_code"));
params.put("code", Arrays.asList("xyz_code_abc"));
- TokenRequest req = new TokenRequest(new URI("http://example.com"), new ClientID("clientId"),AuthorizationCodeGrant.parse(params));
+ TokenRequest req = new TokenRequest(new URI("http://example.com"), new ClientID("clientId"),
+ AuthorizationCodeGrant.parse(params), null);
prc.ensureInboundMessageContext().setMessage(req);
Assert.assertNull(lookup.apply(prc));
}
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/SetRequestObjectToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/SetRequestObjectToResponseContextTest.java
index 81c9f2fc..0231bc86 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/SetRequestObjectToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/SetRequestObjectToResponseContextTest.java
@@ -19,7 +19,6 @@ import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.oidc.profile.core.OidcEventIds;
import net.shibboleth.shared.httpclient.HttpClientBuilder;
import net.shibboleth.shared.httpclient.HttpClientSupport;
-import net.shibboleth.shared.testing.RepositorySupport;
import java.net.URI;
import java.net.URISyntaxException;
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/ValidateAudienceTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/ValidateAudienceTest.java
index cf077ca6..156387fe 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/ValidateAudienceTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/ValidateAudienceTest.java
@@ -80,9 +80,9 @@ public class ValidateAudienceTest extends BaseOIDCResponseActionTest {
final TokenRequest req = new TokenRequest(new URI("http://localhost"),
new ClientSecretBasic(new ClientID("s6BhdRkqt3"), new Secret("foo")),
new ClientCredentialsGrant(),
- null,
+ null, null,
List.of(new URI(DefaultRequestAudienceLookupFunction.CUSTOM_RESOURCE_PARAM_PREFIX + "https://sp3.example.org")),
- null
+ null, null
);
setTokenRequest(req);
@@ -103,11 +103,11 @@ public class ValidateAudienceTest extends BaseOIDCResponseActionTest {
final TokenRequest req = new TokenRequest(new URI("http://localhost"),
new ClientSecretBasic(new ClientID("s6BhdRkqt3"), new Secret("foo")),
new ClientCredentialsGrant(),
- null,
+ null, null,
List.of(new URI(DefaultRequestAudienceLookupFunction.CUSTOM_RESOURCE_PARAM_PREFIX +"https://sp.example.org"),
new URI(DefaultRequestAudienceLookupFunction.CUSTOM_RESOURCE_PARAM_PREFIX +"https://sp3.example.org"),
new URI(DefaultRequestAudienceLookupFunction.CUSTOM_RESOURCE_PARAM_PREFIX +"https://sp2.example.org")),
- null
+ null, null
);
setTokenRequest(req);
@@ -154,9 +154,9 @@ public class ValidateAudienceTest extends BaseOIDCResponseActionTest {
final TokenRequest req = new TokenRequest(new URI("http://localhost"),
new ClientSecretBasic(new ClientID("s6BhdRkqt3"), new Secret("foo")),
new AuthorizationCodeGrant(new AuthorizationCode("foo"), new URI("http://localhost")),
- null,
+ null, null,
List.of(new URI(DefaultRequestAudienceLookupFunction.CUSTOM_RESOURCE_PARAM_PREFIX + "https://sp3.example.org")),
- null);
+ null, null);
setTokenRequest(req);
final AuthorizeCodeClaimsSet claims = new AuthorizeCodeClaimsSet.Builder()
@@ -191,9 +191,9 @@ public class ValidateAudienceTest extends BaseOIDCResponseActionTest {
final TokenRequest req = new TokenRequest(new URI("http://localhost"),
new ClientSecretBasic(new ClientID("s6BhdRkqt3"), new Secret("foo")),
new AuthorizationCodeGrant(new AuthorizationCode("foo"), new URI("http://localhost")),
- null,
+ null, null,
List.of(new URI(DefaultRequestAudienceLookupFunction.CUSTOM_RESOURCE_PARAM_PREFIX + "https://sp3.example.org")),
- null);
+ null, null);
setTokenRequest(req);
final AuthorizeCodeClaimsSet claims = new AuthorizeCodeClaimsSet.Builder()
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/ValidateScopeTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/ValidateScopeTest.java
index e3b4a4bf..6d2c8ae0 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/ValidateScopeTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/ValidateScopeTest.java
@@ -276,7 +276,7 @@ public class ValidateScopeTest extends BaseOIDCResponseActionTest {
final TokenRequest req = new TokenRequest(new URI("http://localhost"),
new ClientSecretBasic(new ClientID("s6BhdRkqt3"), new Secret("foo")),
- new ClientCredentialsGrant());
+ new ClientCredentialsGrant(), null);
setTokenRequest(req);
final Event event = action.execute(requestCtx);
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/ConfigurationFlowTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/ConfigurationFlowTest.java
index 7cba0665..454c8769 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/ConfigurationFlowTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/ConfigurationFlowTest.java
@@ -60,7 +60,7 @@ public class ConfigurationFlowTest extends AbstractOidcFlowTest {
Assert.assertNull(originalMetadata.getUserInfoJWEAlgs());
Assert.assertNull(originalMetadata.getUserInfoJWEEncs());
Assert.assertNull(originalMetadata.getUserInfoJWSAlgs());
- final OIDCProviderMetadata metadata = OIDCProviderMetadata.parse(response.toHTTPResponse().getContent());
+ final OIDCProviderMetadata metadata = OIDCProviderMetadata.parse(response.toHTTPResponse().getBody());
Assert.assertEquals(metadata.getIssuer(), new Issuer("https://op.example.org"));;
// all but RSA-OAEP-384 as it's excluded in test relying-party.xml
final List<String> jweAlgs = Arrays.asList("RSA1_5", "RSA-OAEP", "RSA-OAEP-256", "RSA-OAEP-512",
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/KeySetFlowTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/KeySetFlowTest.java
index 8da234b9..b2c4ef20 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/KeySetFlowTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/KeySetFlowTest.java
@@ -53,7 +53,7 @@ public class KeySetFlowTest extends AbstractOidcFlowTest {
final FlowExecutionResult result = flowExecutor.launchExecution(FLOW_ID, null, externalContext);
final Response response = parseResponse(result);
Assert.assertTrue(response.indicatesSuccess());
- final JWKSet jwkSet = JWKSet.parse(response.toHTTPResponse().getContent());
+ final JWKSet jwkSet = JWKSet.parse(response.toHTTPResponse().getBody());
final List<JWK> keys = jwkSet.getKeys();
Assert.assertNotNull(keys);
Assert.assertEquals(keys.size(), 6);
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCTokenResponseActionTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCTokenResponseActionTest.java
index f9aae414..7464da12 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCTokenResponseActionTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCTokenResponseActionTest.java
@@ -58,7 +58,7 @@ public class AbstractOIDCTokenResponseActionTest {
final AuthorizationCode code = new AuthorizationCode("xyz...");
final URI callback = new URI("https://client.com/callback");
final AuthorizationGrant codeGrant = new AuthorizationCodeGrant(code, callback);
- final TokenRequest req = new TokenRequest(callback, new ClientID(), codeGrant);
+ final TokenRequest req = new TokenRequest(callback, new ClientID(), codeGrant, null);
requestCtx = new RequestContextBuilder().setInboundMessage(req).buildRequestContext();
final MessageContext msgCtx = new MessageContext();
prc = new WebflowRequestContextProfileRequestContextLookup().apply(requestCtx);
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundDiscoveryResponseTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundDiscoveryResponseTest.java
index 2d90b668..6d89b852 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundDiscoveryResponseTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundDiscoveryResponseTest.java
@@ -114,7 +114,7 @@ public class FormOutboundDiscoveryResponseTest {
(JSONSuccessResponse) profileRequestCtx.ensureOutboundMessageContext().getMessage();
assert resp != null;
Assert.assertTrue(resp.indicatesSuccess());
- final OIDCProviderMetadata metadata = OIDCProviderMetadata.parse(resp.toHTTPResponse().getContent());
+ final OIDCProviderMetadata metadata = OIDCProviderMetadata.parse(resp.toHTTPResponse().getBody());
assertFileContents(metadata);
Assert.assertNull(metadata.getCustomParameter(dynamicClaim));
}
@@ -129,7 +129,7 @@ public class FormOutboundDiscoveryResponseTest {
final JSONSuccessResponse resp =
(JSONSuccessResponse) profileRequestCtx.ensureOutboundMessageContext().getMessage();
assert resp != null;
- final OIDCProviderMetadata metadata = OIDCProviderMetadata.parse(resp.toHTTPResponse().getContent());
+ final OIDCProviderMetadata metadata = OIDCProviderMetadata.parse(resp.toHTTPResponse().getBody());
assertFileContents(metadata);
Assert.assertNotNull(metadata.getCustomParameter(dynamicClaim));
Assert.assertEquals(metadata.getCustomParameter(dynamicClaim), dynamicClaimValue);
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTest.java
index e78c7587..70b637f1 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTest.java
@@ -127,7 +127,8 @@ public class ValidateGrantTest extends BaseOIDCResponseActionTest {
action.setRefreshTokensEnabledPredicate(PredicateSupport.alwaysFalse());
}
action.initialize();
- final TokenRequest req = new TokenRequest(callback, new ClientID(clientId), new AuthorizationCodeGrant(new AuthorizationCode("obsolete"), callback));
+ final TokenRequest req = new TokenRequest(callback, new ClientID(clientId),
+ new AuthorizationCodeGrant(new AuthorizationCode("obsolete"), callback), null);
profileRequestCtx.ensureInboundMessageContext().setMessage(req);
profileRequestCtx.ensureOutboundMessageContext().ensureSubcontext(OIDCAuthenticationResponseContext.class).setAuthorizationGrantClaimsSet(acClaims);;
}
@@ -221,7 +222,8 @@ public class ValidateGrantTest extends BaseOIDCResponseActionTest {
@Test
public void testRefreshTokenSuccess() throws Exception {
init();
- final TokenRequest req = new TokenRequest(callback, new ClientID(clientId), new RefreshTokenGrant(new RefreshToken("obsolete")));
+ final TokenRequest req = new TokenRequest(callback, new ClientID(clientId),
+ new RefreshTokenGrant(new RefreshToken("obsolete")), null);
profileRequestCtx.ensureInboundMessageContext().setMessage(req);
profileRequestCtx.ensureOutboundMessageContext().ensureSubcontext(OIDCAuthenticationResponseContext.class).setAuthorizationGrantClaimsSet(rfClaims);;
ActionTestingSupport.assertProceedEvent(action.execute(requestCtx));
@@ -233,7 +235,8 @@ public class ValidateGrantTest extends BaseOIDCResponseActionTest {
@Test
public void testRefreshTokenChainExpired() throws Exception {
init(Instant.now().minus(Duration.ofHours(2)));
- final TokenRequest req = new TokenRequest(callback, new ClientID(clientId), new RefreshTokenGrant(new RefreshToken("obsolete")));
+ final TokenRequest req = new TokenRequest(callback, new ClientID(clientId),
+ new RefreshTokenGrant(new RefreshToken("obsolete")), null);
profileRequestCtx.ensureInboundMessageContext().setMessage(req);
profileRequestCtx.ensureOutboundMessageContext().ensureSubcontext(OIDCAuthenticationResponseContext.class).setAuthorizationGrantClaimsSet(rfClaims);;
ActionTestingSupport.assertEvent(action.execute(requestCtx), OidcEventIds.INVALID_GRANT);
@@ -242,7 +245,8 @@ public class ValidateGrantTest extends BaseOIDCResponseActionTest {
@Test
public void testRefreshTokenNotEnabled() throws Exception {
init(false);
- final TokenRequest req = new TokenRequest(callback, new ClientID(clientId), new RefreshTokenGrant(new RefreshToken("obsolete")));
+ final TokenRequest req = new TokenRequest(callback, new ClientID(clientId),
+ new RefreshTokenGrant(new RefreshToken("obsolete")), null);
profileRequestCtx.ensureInboundMessageContext().setMessage(req);
profileRequestCtx.ensureOutboundMessageContext().ensureSubcontext(OIDCAuthenticationResponseContext.class).setAuthorizationGrantClaimsSet(rfClaims);;
ActionTestingSupport.assertEvent(action.execute(requestCtx), OidcEventIds.INVALID_GRANT);
@@ -251,7 +255,8 @@ public class ValidateGrantTest extends BaseOIDCResponseActionTest {
@Test
public void testRefreshTokenReplayed() throws Exception {
init();
- final TokenRequest req = new TokenRequest(callback, new ClientID(clientId), new RefreshTokenGrant(new RefreshToken("obsolete")));
+ final TokenRequest req = new TokenRequest(callback, new ClientID(clientId),
+ new RefreshTokenGrant(new RefreshToken("obsolete")), null);
profileRequestCtx.ensureInboundMessageContext().setMessage(req);
profileRequestCtx.ensureOutboundMessageContext().ensureSubcontext(OIDCAuthenticationResponseContext.class).setAuthorizationGrantClaimsSet(rfClaims);;
ActionTestingSupport.assertProceedEvent(action.execute(requestCtx));
@@ -265,7 +270,8 @@ public class ValidateGrantTest extends BaseOIDCResponseActionTest {
final String rootJti = rfClaims.getRootTokenIdentifier();
assert rootJti != null;
Assert.assertTrue(revocationCache.revoke(RevocationCacheContexts.AUTHORIZATION_CODE, rootJti));
- final TokenRequest req = new TokenRequest(callback, new ClientID(clientId), new RefreshTokenGrant(new RefreshToken("obsolete")));
+ final TokenRequest req = new TokenRequest(callback, new ClientID(clientId),
+ new RefreshTokenGrant(new RefreshToken("obsolete")), null);
profileRequestCtx.ensureInboundMessageContext().setMessage(req);
profileRequestCtx.ensureOutboundMessageContext().ensureSubcontext(OIDCAuthenticationResponseContext.class).setAuthorizationGrantClaimsSet(rfClaims);;
ActionTestingSupport.assertEvent(action.execute(requestCtx), OidcEventIds.INVALID_GRANT);
@@ -278,7 +284,8 @@ public class ValidateGrantTest extends BaseOIDCResponseActionTest {
final String jti = rfClaims.getID();
assert jti != null;
Assert.assertTrue(revocationCache.revoke(RevocationCacheContexts.SINGLE_ACCESS_OR_REFRESH_TOKENS, jti));
- final TokenRequest req = new TokenRequest(callback, new ClientID(clientId), new RefreshTokenGrant(new RefreshToken("obsolete")));
+ final TokenRequest req = new TokenRequest(callback, new ClientID(clientId),
+ new RefreshTokenGrant(new RefreshToken("obsolete")), null);
profileRequestCtx.ensureInboundMessageContext().setMessage(req);
profileRequestCtx.ensureOutboundMessageContext().ensureSubcontext(OIDCAuthenticationResponseContext.class).setAuthorizationGrantClaimsSet(rfClaims);;
ActionTestingSupport.assertEvent(action.execute(requestCtx), OidcEventIds.INVALID_GRANT);
@@ -307,7 +314,7 @@ public class ValidateGrantTest extends BaseOIDCResponseActionTest {
Mockito.when(revocationCache.revoke(Mockito.anyString(), Mockito.anyString())).thenReturn(false);
init(true, revocationCache, prc -> null, Instant.now());
final TokenRequest req = new TokenRequest(callback, new ClientID(clientId),
- new RefreshTokenGrant(new RefreshToken("obsolete")));
+ new RefreshTokenGrant(new RefreshToken("obsolete")), null);
profileRequestCtx.ensureInboundMessageContext().setMessage(req);
profileRequestCtx.ensureOutboundMessageContext().ensureSubcontext(OIDCAuthenticationResponseContext.class)
.setAuthorizationGrantClaimsSet(rfClaims);
@@ -318,7 +325,7 @@ public class ValidateGrantTest extends BaseOIDCResponseActionTest {
public void testMixGrant() throws Exception {
init();
final TokenRequest req = new TokenRequest(callback, new ClientID(clientId),
- new RefreshTokenGrant(new RefreshToken(acClaims.serialize(getDataSealer()))));
+ new RefreshTokenGrant(new RefreshToken(acClaims.serialize(getDataSealer()))), null);
profileRequestCtx.ensureInboundMessageContext().setMessage(req);
ActionTestingSupport.assertEvent(action.execute(requestCtx), OidcEventIds.INVALID_GRANT);
}
@@ -339,7 +346,7 @@ public class ValidateGrantTest extends BaseOIDCResponseActionTest {
final Instant now = Instant.now();
rfClaims = new RefreshTokenClaimsSet.Builder(acClaims, now, now.minusMillis(10)).build();
final TokenRequest req = new TokenRequest(callback, new ClientID(clientId),
- new RefreshTokenGrant(new RefreshToken(rfClaims.serialize(getDataSealer()))));
+ new RefreshTokenGrant(new RefreshToken(rfClaims.serialize(getDataSealer()))), null);
profileRequestCtx.ensureInboundMessageContext().setMessage(req);
ActionTestingSupport.assertEvent(action.execute(requestCtx), OidcEventIds.INVALID_GRANT);
}
@@ -349,7 +356,7 @@ public class ValidateGrantTest extends BaseOIDCResponseActionTest {
init();
final TokenRequest req = new TokenRequest(callback,
new ClientSecretBasic(new ClientID(clientId), new Secret("foo")),
- new ClientCredentialsGrant());
+ new ClientCredentialsGrant(), null);
profileRequestCtx.ensureInboundMessageContext().setMessage(req);
profileRequestCtx.ensureOutboundMessageContext().ensureSubcontext(OIDCAuthenticationResponseContext.class)
.setAuthorizationGrantClaimsSet(null);
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTypeTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTypeTest.java
index 4a8fa9b1..afb82923 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTypeTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTypeTest.java
@@ -65,8 +65,8 @@ public class ValidateGrantTypeTest extends BaseOIDCResponseActionTest {
final OIDCClientInformation information =
new OIDCClientInformation(new ClientID("test"), null, metaData, null, null, null);
oidcCtx.setClientInformation(information);
- final TokenRequest req =
- new TokenRequest(new URI("https://notmatching.org"), new RefreshTokenGrant(new RefreshToken()));
+ final TokenRequest req = new TokenRequest(new URI("https://notmatching.org"),
+ new RefreshTokenGrant(new RefreshToken()), null);
setTokenRequest(req);
}
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidatePKCETest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidatePKCETest.java
index dfe5a8c1..414f9662 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidatePKCETest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidatePKCETest.java
@@ -59,7 +59,7 @@ public class ValidatePKCETest extends BaseOIDCResponseActionTest {
// to pass the code verifier value.
final TokenRequest req = new TokenRequest(new URI("https://client.com/callback"), new ClientID(clientId),
new AuthorizationCodeGrant(new AuthorizationCode("mockCode"), new URI("https://client.com/callback"),
- new CodeVerifier(codeVerifier)));
+ new CodeVerifier(codeVerifier)), null);
setTokenRequest(req);
@SuppressWarnings("null")
final AuthorizeCodeClaimsSet claims = new AuthorizeCodeClaimsSet.Builder()
@@ -98,7 +98,7 @@ public class ValidatePKCETest extends BaseOIDCResponseActionTest {
public void testWrongValue() throws URISyntaxException {
final TokenRequest req = new TokenRequest(new URI("https://client.com/callback"), new ClientID(clientId),
new AuthorizationCodeGrant(new AuthorizationCode("mockCode"), new URI("https://client.com/callback"),
- new CodeVerifier(codeVerifier + "someWrongValue")));
+ new CodeVerifier(codeVerifier + "someWrongValue")), null);
setTokenRequest(req);
final Event event = action.execute(requestCtx);
ActionTestingSupport.assertEvent(event, EventIds.MESSAGE_AUTHN_ERROR);
@@ -198,7 +198,8 @@ public class ValidatePKCETest extends BaseOIDCResponseActionTest {
@Test
public void testSuccessNoPKCE() throws URISyntaxException {
final TokenRequest req = new TokenRequest(new URI("https://client.com/callback"), new ClientID(clientId),
- new AuthorizationCodeGrant(new AuthorizationCode("mockCode"), new URI("https://client.com/callback")));
+ new AuthorizationCodeGrant(new AuthorizationCode("mockCode"),
+ new URI("https://client.com/callback")), null);
setTokenRequest(req);
@SuppressWarnings("null")
final AuthorizeCodeClaimsSet claims = new AuthorizeCodeClaimsSet.Builder()
@@ -228,7 +229,8 @@ public class ValidatePKCETest extends BaseOIDCResponseActionTest {
public void testFailureNoPKCE() throws URISyntaxException {
((DefaultOIDCAuthorizationConfiguration) rpCtx.ensureProfileConfig()).setForcePKCE(true);
final TokenRequest req = new TokenRequest(new URI("https://client.com/callback"), new ClientID(clientId),
- new AuthorizationCodeGrant(new AuthorizationCode("mockCode"), new URI("https://client.com/callback")));
+ new AuthorizationCodeGrant(new AuthorizationCode("mockCode"), new URI("https://client.com/callback")),
+ null);
setTokenRequest(req);
@SuppressWarnings("null")
final AuthorizeCodeClaimsSet claims = new AuthorizeCodeClaimsSet.Builder()
@@ -257,7 +259,8 @@ public class ValidatePKCETest extends BaseOIDCResponseActionTest {
@Test
public void testFailureTokenRequestMissingVerfier() throws URISyntaxException {
final TokenRequest req = new TokenRequest(new URI("https://client.com/callback"), new ClientID(clientId),
- new AuthorizationCodeGrant(new AuthorizationCode("mockCode"), new URI("https://client.com/callback")));
+ new AuthorizationCodeGrant(new AuthorizationCode("mockCode"), new URI("https://client.com/callback")),
+ null);
setTokenRequest(req);
final Event event = action.execute(requestCtx);
ActionTestingSupport.assertEvent(event, EventIds.INVALID_MESSAGE);
@@ -273,7 +276,7 @@ public class ValidatePKCETest extends BaseOIDCResponseActionTest {
public void testSuccessNoAuthzCode() throws URISyntaxException {
((DefaultOIDCAuthorizationConfiguration) rpCtx.ensureProfileConfig()).setForcePKCE(true);
final TokenRequest req = new TokenRequest(new URI("https://client.com/callback"), new ClientID(clientId),
- new RefreshTokenGrant(new RefreshToken()));
+ new RefreshTokenGrant(new RefreshToken()), null);
setTokenRequest(req);
@SuppressWarnings("null")
final RefreshTokenClaimsSet claims = new RefreshTokenClaimsSet.Builder(
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list