From 88649d7d000beda969bc46a8d6949a54a9d691ea Mon Sep 17 00:00:00 2001 From: Farah Juma Date: Tue, 26 Jul 2022 18:05:33 -0400 Subject: [PATCH] [ELY-2362] Small fixes for bearer-only support --- .../wildfly/security/http/oidc/RequestAuthenticator.java | 4 ++-- .../org/wildfly/security/http/oidc/ServerRequest.java | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/http/oidc/src/main/java/org/wildfly/security/http/oidc/RequestAuthenticator.java b/http/oidc/src/main/java/org/wildfly/security/http/oidc/RequestAuthenticator.java index 438f83b6be1..81c2c9b784f 100644 --- a/http/oidc/src/main/java/org/wildfly/security/http/oidc/RequestAuthenticator.java +++ b/http/oidc/src/main/java/org/wildfly/security/http/oidc/RequestAuthenticator.java @@ -152,7 +152,7 @@ private AuthOutcome doAuthenticate() { log.debug("NOT_ATTEMPTED: bearer only"); return AuthOutcome.NOT_ATTEMPTED; } - if (isAutodetectedBearerOnly(facade.getRequest())) { + if (isAutodetectedBearerOnly()) { challenge = bearer.getChallenge(); log.debug("NOT_ATTEMPTED: Treating as bearer only"); return AuthOutcome.NOT_ATTEMPTED; @@ -214,7 +214,7 @@ protected void completeAuthentication(BearerTokenRequestAuthenticator bearer) { log.debugv("User ''{0}'' invoking ''{1}'' on client ''{2}''", principal.getName(), facade.getRequest().getURI(), deployment.getResourceName()); } - protected boolean isAutodetectedBearerOnly(OidcHttpFacade.Request request) { + protected boolean isAutodetectedBearerOnly() { if (! deployment.isAutodetectBearerOnly()) return false; String headerValue = facade.getRequest().getHeader(X_REQUESTED_WITH); diff --git a/http/oidc/src/main/java/org/wildfly/security/http/oidc/ServerRequest.java b/http/oidc/src/main/java/org/wildfly/security/http/oidc/ServerRequest.java index d938cec0a29..a39554f901c 100644 --- a/http/oidc/src/main/java/org/wildfly/security/http/oidc/ServerRequest.java +++ b/http/oidc/src/main/java/org/wildfly/security/http/oidc/ServerRequest.java @@ -269,14 +269,8 @@ public static AccessAndIDTokenResponse getBearerToken(OidcClientConfiguration oi if (entity == null) { throw log.noMessageEntity(); } - InputStream is = entity.getContent(); - try { + try (InputStream is = entity.getContent()) { tokenResponse = JsonSerialization.readValue(is, AccessAndIDTokenResponse.class); - } finally { - try { - is.close(); - } catch (java.io.IOException ignored) { - } } return tokenResponse; }