Merge pull request #38779 from sberyozkin/oidc_endpoint_annotation_issue

Fix OidcEndpoint annotation processing
quarkusio · Feb 14, 2024 · 1b597a8 · 1b597a8
2 parents 6182f88 + 7c74b90
commit 1b597a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...ons/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java b/...ons/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java
@@ -30,6 +30,7 @@
 
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.ClientProxy;
 import io.quarkus.credentials.CredentialsProvider;
 import io.quarkus.credentials.runtime.CredentialsProviderFinder;
 import io.quarkus.oidc.common.OidcEndpoint;
@@ -496,7 +497,7 @@ public static Map<OidcEndpoint.Type, List<OidcRequestFilter>> getOidcRequestFilt
             Map<OidcEndpoint.Type, List<OidcRequestFilter>> map = new HashMap<>();
             for (OidcRequestFilter filter : container.listAll(OidcRequestFilter.class).stream().map(handle -> handle.get())
                     .collect(Collectors.toList())) {
-                OidcEndpoint endpoint = filter.getClass().getAnnotation(OidcEndpoint.class);
+                OidcEndpoint endpoint = ClientProxy.unwrap(filter).getClass().getAnnotation(OidcEndpoint.class);
                 OidcEndpoint.Type type = endpoint != null ? endpoint.value() : OidcEndpoint.Type.ALL;
                 map.computeIfAbsent(type, k -> new ArrayList<OidcRequestFilter>()).add(filter);
             }

diff --git a/...ts/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OidcDiscoveryRequestCustomizer.java b/...ts/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OidcDiscoveryRequestCustomizer.java
@@ -3,6 +3,7 @@
 import jakarta.enterprise.context.ApplicationScoped;
 
 import io.quarkus.arc.Unremovable;
+import io.quarkus.oidc.OIDCException;
 import io.quarkus.oidc.common.OidcEndpoint;
 import io.quarkus.oidc.common.OidcEndpoint.Type;
 import io.quarkus.oidc.common.OidcRequestContextProperties;
@@ -17,6 +18,9 @@ public class OidcDiscoveryRequestCustomizer implements OidcRequestFilter {
 
     @Override
     public void filter(HttpRequest<Buffer> request, Buffer buffer, OidcRequestContextProperties contextProps) {
+        if (!request.uri().endsWith(".well-known/openid-configuration")) {
+            throw new OIDCException("Filter is applied to the wrong endpoint: " + request.uri());
+        }
         request.putHeader("Discovery", "OK");
     }
 }