handle path prefix in paths

allegro · Nov 26, 2024 · 377c505 · 377c505
1 parent b239154
commit 377c505
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/...gro/tech/servicemesh/envoycontrol/snapshot/resource/listeners/filters/JwtFilterFactory.kt b/...gro/tech/servicemesh/envoycontrol/snapshot/resource/listeners/filters/JwtFilterFactory.kt
@@ -132,17 +132,20 @@ class JwtFilterFactory(
         methods: Set<String>,
         providers: MutableSet<String>
     ): RequirementRule {
-        val pathMatching = RouteMatch.newBuilder().setPathMatchPolicy(
-            TypedExtensionConfig.newBuilder()
-                .setName("envoy.path.match.uri_template.uri_template_matcher")
-                .setTypedConfig(
-                    Any.pack(
-                        UriTemplateMatchConfig.newBuilder()
-                            .setPathTemplate(pathGlobPattern)
-                            .build()
-                    )
-                ).build()
-        )
+
+        val pathMatching =
+            if (pathGlobPattern.matches(Regex("^[^*]*[^*/]\\*$"))) RouteMatch.newBuilder().setPrefix(pathGlobPattern)
+            else RouteMatch.newBuilder().setPathMatchPolicy(
+                TypedExtensionConfig.newBuilder()
+                    .setName("envoy.path.match.uri_template.uri_template_matcher")
+                    .setTypedConfig(
+                        Any.pack(
+                            UriTemplateMatchConfig.newBuilder()
+                                .setPathTemplate(pathGlobPattern)
+                                .build()
+                        )
+                    ).build()
+            )
         if (methods.isNotEmpty()) {
             pathMatching.addHeaders(createHeaderMatcherBuilder(methods))
         }