backport pre matching filter fix

Signed-off-by: tvallin <[email protected]>
helidon-io · Sep 27, 2023 · afebe02 · afebe02
1 parent 9fc0c93
commit afebe02
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/...le/security/src/main/java/io/helidon/microprofile/security/SecurityPreMatchingFilter.java b/...le/security/src/main/java/io/helidon/microprofile/security/SecurityPreMatchingFilter.java
@@ -66,12 +66,19 @@ public void filter(ContainerRequestContext request) {
         SecurityTracing tracing = SecurityTracing.get();
 
         // create a new security context
-        SecurityContext securityContext = security()
-                .contextBuilder(Integer.toString(CONTEXT_COUNTER.incrementAndGet(), Character.MAX_RADIX))
-                .tracingSpan(tracing.findParent().orElse(null))
-                .build();
-
-        Contexts.context().ifPresent(ctx -> ctx.register(securityContext));
+        SecurityContext securityContext = Contexts.context()
+                .flatMap(context -> context.get(SecurityContext.class))
+                .orElse(null);
+
+        if (securityContext == null) {
+            // create a new security context
+            securityContext = security()
+                    .contextBuilder(Integer.toString(CONTEXT_COUNTER.incrementAndGet(), Character.MAX_RADIX))
+                    .tracingSpan(tracing.findParent().orElse(null))
+                    .build();
+            SecurityContext finalSecurityContext = securityContext;
+            Contexts.context().ifPresent(ctx -> ctx.register(finalSecurityContext));
+        }
 
         injectionManager.<Ref<SecurityContext>>getInstance((new GenericType<Ref<SecurityContext>>() { }).getType())
                 .set(securityContext);

diff --git a/tests/integration/security/gh2297/src/main/resources/application.yaml b/tests/integration/security/gh2297/src/main/resources/application.yaml
@@ -33,6 +33,4 @@ security:
         abac:
           roles-allowed:
             user:
-              - admin
-metrics:
-  permit-all: true
+              - admin