Merge pull request quarkusio#21936 from sberyozkin/defaul_token_cache…

…_not_injected Fix DefaultTokenIntrospectionUserInfoCache injection
geoand · Dec 6, 2021 · c3b3a46 · c3b3a46
2 parents 6c7e48e + 644eee9
commit c3b3a46
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java
@@ -25,6 +25,8 @@
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.oidc.SecurityEvent;
+import io.quarkus.oidc.TokenIntrospectionCache;
+import io.quarkus.oidc.UserInfoCache;
 import io.quarkus.oidc.runtime.DefaultTenantConfigResolver;
 import io.quarkus.oidc.runtime.DefaultTokenIntrospectionUserInfoCache;
 import io.quarkus.oidc.runtime.DefaultTokenStateManager;
@@ -95,7 +97,7 @@ public SyntheticBeanBuildItem addDefaultCacheBean(OidcConfig config,
             OidcRecorder recorder,
             CoreVertxBuildItem vertxBuildItem) {
         return SyntheticBeanBuildItem.configure(DefaultTokenIntrospectionUserInfoCache.class).unremovable()
-                .types(DefaultTokenIntrospectionUserInfoCache.class)
+                .types(DefaultTokenIntrospectionUserInfoCache.class, TokenIntrospectionCache.class, UserInfoCache.class)
                 .supplier(recorder.setupTokenCache(config, vertxBuildItem.getVertx()))
                 .scope(Singleton.class)
                 .setRuntimeInit()

diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcConfig.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcConfig.java
@@ -30,7 +30,9 @@ public class OidcConfig {
     public Map<String, OidcTenantConfig> namedTenants;
 
     /**
-     * Default TokenIntrospection and UserInfo Cache configuration which is used for all the tenants if it is enabled.
+     * Default TokenIntrospection and UserInfo Cache configuration which is used for all the tenants if it is enabled
+     * with the build-time 'quarkus.oidc.default-token-cache-enabled' property ('true' by default) and also activated,
+     * see its `max-size` property.
      */
     @ConfigItem
     public TokenCache tokenCache = new TokenCache();

diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowResource.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowResource.java
@@ -5,6 +5,7 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.QueryParam;
 
+import io.quarkus.oidc.runtime.DefaultTokenIntrospectionUserInfoCache;
 import io.quarkus.security.Authenticated;
 import io.quarkus.security.identity.SecurityIdentity;
 
@@ -14,10 +15,13 @@ public class CodeFlowResource {
     @Inject
     SecurityIdentity identity;
 
+    @Inject
+    DefaultTokenIntrospectionUserInfoCache tokenCache;
+
     @GET
     @Authenticated
     public String access() {
-        return identity.getPrincipal().getName();
+        return identity.getPrincipal().getName() + ", cache size: " + tokenCache.getCacheSize();
     }
 
     @GET

diff --git a/...on-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowUserInfoResource.java b/...on-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowUserInfoResource.java
@@ -5,6 +5,7 @@
 import javax.ws.rs.Path;
 
 import io.quarkus.oidc.UserInfo;
+import io.quarkus.oidc.runtime.DefaultTokenIntrospectionUserInfoCache;
 import io.quarkus.security.Authenticated;
 import io.quarkus.security.identity.SecurityIdentity;
 
@@ -18,8 +19,14 @@ public class CodeFlowUserInfoResource {
     @Inject
     SecurityIdentity identity;
 
+    @Inject
+    DefaultTokenIntrospectionUserInfoCache tokenCache;
+
     @GET
     public String access() {
-        return identity.getPrincipal().getName() + ":" + userInfo.getString("preferred_username");
+        int cacheSize = tokenCache.getCacheSize();
+        tokenCache.clearCache();
+        return identity.getPrincipal().getName() + ":" + userInfo.getString("preferred_username") + ", cache size: "
+                + cacheSize;
     }
 }
diff --git a/integration-tests/oidc-wiremock/src/main/resources/application.properties b/integration-tests/oidc-wiremock/src/main/resources/application.properties
@@ -31,11 +31,15 @@ quarkus.oidc.code-flow-user-info-only.client-id=quarkus-web-app
 quarkus.oidc.code-flow-user-info-only.credentials.secret=AyM1SysPpbyDfgZld3umj1qzKObwVMkoqQ-EstJQLr_T-1qS0gZH75aKtMN3Yj0iPS4hcgUuTwjAzZr1Z9CAow
 quarkus.oidc.code-flow-user-info-only.application-type=web-app
 
+quarkus.oidc.token-cache.max-size=1
+
 quarkus.oidc.bearer.auth-server-url=${keycloak.url}/realms/quarkus/
 quarkus.oidc.bearer.client-id=quarkus-app
 quarkus.oidc.bearer.credentials.secret=secret
 quarkus.oidc.bearer.authentication.scopes=profile,email,phone
 quarkus.oidc.bearer.token.audience=https://service.example.com
+quarkus.oidc.bearer.token.audience=https://service.example.com
+quarkus.oidc.bearer.allow-token-introspection-cache=false
 
 quarkus.oidc.bearer-no-introspection.auth-server-url=${keycloak.url}/realms/quarkus/
 quarkus.oidc.bearer-no-introspection.client-id=quarkus-app

diff --git a/...n-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java b/...n-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java
@@ -42,7 +42,7 @@ public void testCodeFlow() throws IOException {
 
             page = form.getInputByValue("login").click();
 
-            assertEquals("alice", page.getBody().asText());
+            assertEquals("alice, cache size: 0", page.getBody().asText());
             assertNotNull(getSessionCookie(webClient, "code-flow"));
 
             page = webClient.getPage("http://localhost:8081/code-flow/logout");
@@ -66,7 +66,8 @@ public void testCodeFlowUserInfo() throws IOException {
 
             page = form.getInputByValue("login").click();
 
-            assertEquals("alice:alice", page.getBody().asText());
+            assertEquals("alice:alice, cache size: 1", page.getBody().asText());
+
             assertNotNull(getSessionCookie(webClient, "code-flow-user-info-only"));
             webClient.getCookieManager().clearCookies();
         }