CXF-9161: Some of the OIDCFlowTest fail with timeout (JPA only) when HttpClient instance is shared (#3109)

Signed-off-by: Andriy Redko <drreta@gmail.com>

Author: reta

rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java

@@ -295,29 +295,30 @@ public static ClientAccessToken getAccessToken(WebClient accessTokenService,
             // in this case the AccessToken service is expected to find a mapping between
             // the authenticated credentials and the client registration id
         }
-        Response response = accessTokenService.form(form);
-        final Map<String, String> map;
-        try {
-            map = response.getMediaType() == null
-                    || response.getMediaType().isCompatible(MediaType.APPLICATION_JSON_TYPE)
-                            ? new OAuthJSONProvider().readJSONResponse((InputStream) response.getEntity())
-                            : Collections.emptyMap();
-        } catch (Exception ex) {
-            throw new ResponseProcessingException(response, ex);
-        }
-        if (200 == response.getStatus()) {
-            ClientAccessToken token = fromMapToClientToken(map, defaultTokenType);
-            if (token == null) {
-                throw new OAuthServiceException(OAuthConstants.SERVER_ERROR);
+        try (Response response = accessTokenService.form(form)) {
+            final Map<String, String> map;
+            try {
+                map = response.getMediaType() == null
+                        || response.getMediaType().isCompatible(MediaType.APPLICATION_JSON_TYPE)
+                                ? new OAuthJSONProvider().readJSONResponse((InputStream) response.getEntity())
+                                : Collections.emptyMap();
+            } catch (Exception ex) {
+                throw new ResponseProcessingException(response, ex);
             }
-            return token;
-        } else if (response.getStatus() >= 400 && map.containsKey(OAuthConstants.ERROR_KEY)) {
-            OAuthError error = new OAuthError(map.get(OAuthConstants.ERROR_KEY),
-                                              map.get(OAuthConstants.ERROR_DESCRIPTION_KEY));
-            error.setErrorUri(map.get(OAuthConstants.ERROR_URI_KEY));
-            throw new OAuthServiceException(error);
+            if (200 == response.getStatus()) {
+                ClientAccessToken token = fromMapToClientToken(map, defaultTokenType);
+                if (token == null) {
+                    throw new OAuthServiceException(OAuthConstants.SERVER_ERROR);
+                }
+                return token;
+            } else if (response.getStatus() >= 400 && map.containsKey(OAuthConstants.ERROR_KEY)) {
+                OAuthError error = new OAuthError(map.get(OAuthConstants.ERROR_KEY),
+                                                  map.get(OAuthConstants.ERROR_DESCRIPTION_KEY));
+                error.setErrorUri(map.get(OAuthConstants.ERROR_URI_KEY));
+                throw new OAuthServiceException(error);
+            }
+            throw new OAuthServiceException(OAuthConstants.SERVER_ERROR);
         }
-        throw new OAuthServiceException(OAuthConstants.SERVER_ERROR);
     }
 
     public static ClientAccessToken fromMapToClientToken(Map<String, String> map) {

rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java

@@ -218,12 +218,17 @@ public static void setStateClaimsProperty(OAuthRedirectionState state,
     }
 
     public static OidcProviderMetadata getOidcProviderMetadata(String issuerURL) {
-        Response response = WebClient.create(issuerURL).path("/.well-known/openid-configuration")
-            .accept(MediaType.APPLICATION_JSON).get();
-        if (Status.OK.getStatusCode() != response.getStatus()) {
-            throw ExceptionUtils.toWebApplicationException(response);
+        try (WebClient webClient = WebClient.create(issuerURL)) {
+            try (Response response = webClient.path("/.well-known/openid-configuration")
+                    .accept(MediaType.APPLICATION_JSON).get()) {
+                if (Status.OK.getStatusCode() != response.getStatus()) {
+                    throw ExceptionUtils.toWebApplicationException(response);
+                }
+
+                return new OidcProviderMetadata(new JsonMapObjectReaderWriter()
+                        .fromJson(response.readEntity(String.class)));
+            }
         }
-        return new OidcProviderMetadata(new JsonMapObjectReaderWriter().fromJson(response.readEntity(String.class)));
     }
 
 }

systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java

@@ -162,18 +162,15 @@ public static String getLocation(WebClient client, OAuthAuthorizationData authzD
         form.param("response_type", authzData.getResponseType());
         form.param("oauthDecision", "allow");
 
-        Response response = client.post(form);
-        String location;
-        try {
-            location = response.getHeaderString("Location");
-        } finally {
-            response.close();
-        }
-        if (state != null) {
-            Assert.assertTrue(location.contains("state=" + state));
-        }
+        try (Response response = client.post(form)) {
+            String location  = response.getHeaderString("Location");
+
+            if (state != null) {
+                Assert.assertTrue(location.contains("state=" + state));
+            }
 
-        return location;
+            return location;
+        }
     }
 
     public static ClientAccessToken getAccessTokenWithAuthorizationCode(WebClient client, String code) {