From fc2454061f43a18c414d92ea0d6deb7f80879f84 Mon Sep 17 00:00:00 2001 From: Andreas Dinauer Date: Sun, 24 May 2026 15:19:49 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20Allow=20non=20authenticated=20re?= =?UTF-8?q?quests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proxy/header/strategy/OidcStrategy.java | 27 ++++++++++++------- src/main/resources/application.properties | 2 +- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/main/java/dev/dinauer/oidcproxy/proxy/header/strategy/OidcStrategy.java b/src/main/java/dev/dinauer/oidcproxy/proxy/header/strategy/OidcStrategy.java index b610d0c..f77a1a1 100644 --- a/src/main/java/dev/dinauer/oidcproxy/proxy/header/strategy/OidcStrategy.java +++ b/src/main/java/dev/dinauer/oidcproxy/proxy/header/strategy/OidcStrategy.java @@ -8,11 +8,15 @@ import io.vertx.core.http.Cookie; import io.vertx.core.http.HttpServerRequest; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.WebApplicationException; import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.lang3.Strings; import java.util.List; import java.util.Map; +import java.util.Optional; +import java.util.Set; @ApplicationScoped public class OidcStrategy @@ -24,24 +28,27 @@ public class OidcStrategy public List> filter(HttpServerRequest request, List> input) throws TokenNotFoundException, SessionNotFoundException { - if (!hasAuthHeader(input)) + Optional tokenOptional = getAccessToken(request); + if (!hasAuthHeader(input) && tokenOptional.isPresent()) { - input.add(Map.entry(AUTH_HEADER, String.format("Bearer %s", getAccessToken(request)))); + input.add(Map.entry(AUTH_HEADER, String.format("Bearer %s", tokenOptional.get()))); } return input; } - private String getAccessToken(HttpServerRequest request) throws TokenNotFoundException, SessionNotFoundException + private Optional getAccessToken(HttpServerRequest request) throws TokenNotFoundException { - for (Cookie cookie : request.cookies()) + Set sessions = request.cookies("session"); + if (sessions.size() == 1) { - if ("session".equals(cookie.getName())) - { - String session = cookie.getValue(); - return sessionCache.get(session); - } + String session = sessions.iterator().next().getValue(); + return Optional.of(sessionCache.get(session)); } - throw new SessionNotFoundException(); + if (sessions.isEmpty()) + { + return Optional.empty(); + } + throw new BadRequestException(); } private boolean hasAuthHeader(List> input) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4ae077a..95f9908 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,7 +1,6 @@ oidc.proxy.client.auth-url=http://localhost:8089/api/realms/maven/protocol/openid-connect/token oidc.proxy.client.id=backend oidc.proxy.client.secret=backend -oidc.proxy.client.redirect=http://localhost:3000 %test,dev.oidc.proxy.routes.config.location=/home/andreas/Documents/dev/oidc-proxy/src/main/resources/routes.yaml %prod.oidc.proxy.routes.config.location=/var/lib/oidc-proxy/routes.yaml @@ -12,6 +11,7 @@ oidc.proxy.client.redirect=http://localhost:3000 %dev,test.oidc.proxy.crypto.secret=test +%dev,test.oidc.proxy.client.redirect=http://localhost:3000 %dev,test.oidc.proxy.logout.redirect.url=http://localhost:3000 %dev,test.quarkus.flyway.clean-at-start=true