[java-idp-oidc] branch main updated: JCOMOIDC-115 - Update Nimbus oauth2-oidc-sdk into 11.11
Henri Mikkonen
henri.mikkonen at iki.fi
Wed May 22 14:57:04 UTC 2024
This is an automated email from the git hooks/post-receive script.
hjmikkon 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=36b5963d54087859703aac82b93b1e4f5869a3ee
The following commit(s) were added to refs/heads/main by this push:
new 36b5963d JCOMOIDC-115 - Update Nimbus oauth2-oidc-sdk into 11.11
36b5963d is described below
commit 36b5963d54087859703aac82b93b1e4f5869a3ee
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Wed May 22 17:56:42 2024 +0300
JCOMOIDC-115 - Update Nimbus oauth2-oidc-sdk into 11.11
https://shibboleth.atlassian.net/browse/JCOMOIDC-115
Removed deprecation warnings
---
.../idp/plugin/oidc/op/messaging/JSONErrorResponse.java | 2 +-
.../idp/plugin/oidc/op/messaging/JSONSuccessResponse.java | 2 +-
.../plugin/oidc/op/messaging/JSONErrorResponseTest.java | 4 ++--
.../plugin/oidc/op/messaging/JSONSuccessResponseTest.java | 4 ++--
.../impl/OIDCClientRegistrationRequestDecoder.java | 6 +++---
.../idp/plugin/oidc/op/decoding/impl/RequestUtil.java | 4 ++--
.../idp/plugin/oidc/op/encoding/impl/ResponseUtil.java | 2 +-
.../impl/AttributeInOIDCRequestedClaimsMatcherTest.java | 2 +-
.../oidc/op/decoding/impl/OIDCTokenRequestDecoderTest.java | 14 ++++++++++----
.../plugin/oidc/op/profile/flow/ConfigurationFlowTest.java | 2 +-
.../idp/plugin/oidc/op/profile/flow/KeySetFlowTest.java | 2 +-
.../op/profile/impl/FormOutboundDiscoveryResponseTest.java | 4 ++--
12 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONErrorResponse.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONErrorResponse.java
index afa55a85..56bc3009 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONErrorResponse.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONErrorResponse.java
@@ -98,7 +98,7 @@ public class JSONErrorResponse implements ErrorResponse {
if (pragma != null) {
httpResponse.setPragma(pragma);
}
- httpResponse.setContent(getContent());
+ httpResponse.setBody(getContent());
return httpResponse;
}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONSuccessResponse.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONSuccessResponse.java
index 2cdfd317..200d0b22 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONSuccessResponse.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONSuccessResponse.java
@@ -89,7 +89,7 @@ public class JSONSuccessResponse implements SuccessResponse {
if (pragma != null) {
httpResponse.setPragma(pragma);
}
- httpResponse.setContent(content.toJSONString());
+ httpResponse.setBody(content.toJSONString());
return httpResponse;
}
}
diff --git a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONErrorResponseTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONErrorResponseTest.java
index d6ef5e52..3bfe4d61 100644
--- a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONErrorResponseTest.java
+++ b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONErrorResponseTest.java
@@ -46,7 +46,7 @@ public class JSONErrorResponseTest {
Assert.assertEquals("no-store", httpResponse.getCacheControl());
Assert.assertEquals("no-cache", httpResponse.getPragma());
JSONObject parsedContent =
- (JSONObject) new JSONParser(JSONParser.MODE_PERMISSIVE).parse(httpResponse.getContent());
+ (JSONObject) new JSONParser(JSONParser.MODE_PERMISSIVE).parse(httpResponse.getBody());
Assert.assertEquals("errorCode", parsedContent.get("error"));
Assert.assertEquals("errorDescription", parsedContent.get("error_description"));
}
@@ -60,7 +60,7 @@ public class JSONErrorResponseTest {
Assert.assertNull(httpResponse.getCacheControl());
Assert.assertNull(httpResponse.getPragma());
JSONObject parsedContent =
- (JSONObject) new JSONParser(JSONParser.MODE_PERMISSIVE).parse(httpResponse.getContent());
+ (JSONObject) new JSONParser(JSONParser.MODE_PERMISSIVE).parse(httpResponse.getBody());
Assert.assertEquals("errorCode", parsedContent.get("error"));
Assert.assertEquals("errorDescription", parsedContent.get("error_description"));
}
diff --git a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONSuccessResponseTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONSuccessResponseTest.java
index eeb0f12f..53803f6c 100644
--- a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONSuccessResponseTest.java
+++ b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONSuccessResponseTest.java
@@ -46,7 +46,7 @@ public class JSONSuccessResponseTest {
Assert.assertEquals("no-store", httpResponse.getCacheControl());
Assert.assertEquals("no-cache", httpResponse.getPragma());
JSONObject parsedContent =
- (JSONObject) new JSONParser(JSONParser.MODE_PERMISSIVE).parse(httpResponse.getContent());
+ (JSONObject) new JSONParser(JSONParser.MODE_PERMISSIVE).parse(httpResponse.getBody());
Assert.assertEquals(content.get("field1"), parsedContent.get("field1"));
Assert.assertEquals(content.get("field2"), parsedContent.get("field2"));
}
@@ -60,7 +60,7 @@ public class JSONSuccessResponseTest {
Assert.assertNull(httpResponse.getCacheControl());
Assert.assertNull(httpResponse.getPragma());
JSONObject parsedContent =
- (JSONObject) new JSONParser(JSONParser.MODE_PERMISSIVE).parse(httpResponse.getContent());
+ (JSONObject) new JSONParser(JSONParser.MODE_PERMISSIVE).parse(httpResponse.getBody());
Assert.assertEquals(content.get("field1"), parsedContent.get("field1"));
Assert.assertEquals(content.get("field2"), parsedContent.get("field2"));
}
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCClientRegistrationRequestDecoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCClientRegistrationRequestDecoder.java
index 283a2759..7f676f13 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCClientRegistrationRequestDecoder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCClientRegistrationRequestDecoder.java
@@ -76,16 +76,16 @@ public class OIDCClientRegistrationRequestDecoder extends BaseOAuth2RequestDecod
try {
final HTTPRequest httpRequest = JakartaServletUtils.createHTTPRequest(getHttpServletRequest());
getProtocolMessageLogger().trace("Inbound request {}", RequestUtil.toString(httpRequest, objectMapper));
- final JSONObject requestJson = httpRequest.getQueryAsJSONObject();
+ final JSONObject requestJson = httpRequest.getBodyAsJSONObject();
//TODO: Nimbus seems to be interpreting scope in different way as many RPs, currently the scope
//is removed in this phase, better solution TODO.
if (requestJson.containsKey("scope")) {
log.debug("Removed 'scope'");
requestJson.remove("scope");
- httpRequest.setQuery(requestJson.toJSONString());
+ httpRequest.setBody(requestJson.toJSONString());
}
- log.trace("JSON object: {}", httpRequest.getQueryAsJSONObject().toJSONString());
+ log.trace("JSON object: {}", httpRequest.getBody());
return OIDCClientRegistrationRequest.parse(httpRequest);
} catch (final IOException e) {
log.error("Could not create HTTP request from the request", e);
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/RequestUtil.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/RequestUtil.java
index 4a83b43b..afcf0cba 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/RequestUtil.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/RequestUtil.java
@@ -59,7 +59,7 @@ public final class RequestUtil {
ret += "\t" + entry.getKey() + ":" + entry.getValue() + nl;
}
}
- final Map<String, List<String>> parameters = httpReq.getQueryParameters();
+ final Map<String, List<String>> parameters = httpReq.getQueryStringParameters();
if (parameters != null) {
ret += "Parameters:" + nl;
for (final Entry<String, List<String>> entry : parameters.entrySet()) {
@@ -92,7 +92,7 @@ public final class RequestUtil {
ret += "\t" + entry.getKey() + ":" + entry.getValue() + nl;
}
}
- final Map<String, List<String>> parameters = httpReq.getQueryParameters();
+ final Map<String, List<String>> parameters = httpReq.getQueryStringParameters();
if (parameters != null) {
if (objectMapper != null && !parameters.isEmpty()) {
final String rawValue = parameters.keySet().iterator().next();
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 0aaabd17..6cf857e8 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/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcherTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcherTest.java
index b9476883..5795405c 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcherTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcherTest.java
@@ -75,7 +75,7 @@ public class AttributeInOIDCRequestedClaimsMatcherTest {
msgCtx.setMessage(new AuthenticationRequest(new URI("htts://example.org"), ResponseType.getDefault(), null,
new Scope("openid"), new ClientID(), new URI("htts://example.org"), new State(), new Nonce(), null,
null, null, null, 0, null, null, null, null, null, getClaimsRequest(idtoken, userinfo), null, null,
- null, null, null, null, userinfo, null));
+ null, null, null, null, null, userinfo, null));
respCtx.setRequestedClaims(getClaimsRequest(idtoken, userinfo));
setMappedClaims(respCtx, idtoken, userinfo);
}
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 78263905..28515748 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
@@ -178,16 +178,22 @@ public class OIDCTokenRequestDecoderTest {
}
protected void switchIntoCustomClientAssertion(@Nonnull final HTTPRequest httpRequest) {
- final Map<String,List<String>> params = httpRequest.getQueryParameters();
+ final Map<String, List<String>> params;
+ try {
+ params = httpRequest.getBodyAsFormParameters();
+ } catch (ParseException e) {
+ Assert.fail("Could not parse form parameters", e);
+ return;
+ }
if (params != null && !params.isEmpty() && params.get("client_assertion_type") != null) {
final List<String> assertionTypes = params.get("client_assertion_type");
- String query = httpRequest.getQuery();
+ String body = httpRequest.getBody();
for (final String assertionType : assertionTypes) {
if (assertionType.equals("urn:ietf:params:oauth:client-assertion-type:mock-custom")) {
- query = query.replace("client_assertion=", "custom_client_assertion=");
+ body = body.replace("client_assertion=", "custom_client_assertion=");
}
- httpRequest.setQuery(query);
+ httpRequest.setBody(body);
}
}
}
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/FormOutboundDiscoveryResponseTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundDiscoveryResponseTest.java
index ea4932bf..a452e2fa 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);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list