From 1813ccfda7c2557a34bde26dcb27f01890226d21 Mon Sep 17 00:00:00 2001 From: David Kral Date: Tue, 5 Mar 2024 13:54:17 +0100 Subject: [PATCH] minor adjustments Signed-off-by: David Kral --- .../helidon/microprofile/security/SecurityFilterCommon.java | 1 + .../security/providers/oidc/TenantAuthenticationHandler.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/microprofile/security/src/main/java/io/helidon/microprofile/security/SecurityFilterCommon.java b/microprofile/security/src/main/java/io/helidon/microprofile/security/SecurityFilterCommon.java index b4142c14ef6..a2b7578b5b8 100644 --- a/microprofile/security/src/main/java/io/helidon/microprofile/security/SecurityFilterCommon.java +++ b/microprofile/security/src/main/java/io/helidon/microprofile/security/SecurityFilterCommon.java @@ -100,6 +100,7 @@ protected void doFilter(ContainerRequestContext request, SecurityContext securit allHeaders.put(Security.HEADER_ORIG_URI, List.of(origRequest)); SecurityEnvironment.Builder envBuilder = SecurityEnvironment.builder(security.serverTime()) + .transport(requestUri.getScheme()) .path(filterContext.getResourcePath()) .targetUri(filterContext.getTargetUri()) .method(filterContext.getMethod()) diff --git a/security/providers/oidc/src/main/java/io/helidon/security/providers/oidc/TenantAuthenticationHandler.java b/security/providers/oidc/src/main/java/io/helidon/security/providers/oidc/TenantAuthenticationHandler.java index 3b3b04c69f6..3b9761d15f0 100644 --- a/security/providers/oidc/src/main/java/io/helidon/security/providers/oidc/TenantAuthenticationHandler.java +++ b/security/providers/oidc/src/main/java/io/helidon/security/providers/oidc/TenantAuthenticationHandler.java @@ -415,8 +415,8 @@ private String redirectUri(SecurityEnvironment env) { for (Map.Entry> entry : env.headers().entrySet()) { if (entry.getKey().equalsIgnoreCase("host") && !entry.getValue().isEmpty()) { String firstHost = entry.getValue().getFirst(); - return oidcConfig.redirectUriWithHost(oidcConfig.forceHttpsRedirects() ? "https" : env.transport() - + "://" + firstHost); + String schema = oidcConfig.forceHttpsRedirects() ? "https" : env.transport(); + return oidcConfig.redirectUriWithHost(schema + "://" + firstHost); } }