Improve tenant context rewrite regex patterns

wso2-extensions · Oct 29, 2023 · 956761e · 956761e
1 parent 49f0f05
commit 956761e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...ite.valve/src/main/java/org/wso2/carbon/identity/context/rewrite/bean/RewriteContext.java b/...ite.valve/src/main/java/org/wso2/carbon/identity/context/rewrite/bean/RewriteContext.java
@@ -29,11 +29,16 @@ public class RewriteContext {
 
     private Pattern baseContextPattern;
 
+    private static final String CONSOLE_CONTEXT = "/console/";
+
     public RewriteContext(boolean isWebApp, String context) {
 
         this.isWebApp = isWebApp;
         this.context = context;
-        this.tenantContextPattern = Pattern.compile("^/t/([^/]+(?:/o)?)" + context);
+        this.tenantContextPattern = this.isWebApp ? CONSOLE_CONTEXT.equals(context)
+                ? Pattern.compile("^/t/([^/]+)(/o|/o/([^/]+))?" + context)
+                : Pattern.compile("^/t/([^/]+)(/o)?" + context)
+                : Pattern.compile("^/t/([^/]+)" + context);
         this.baseContextPattern = Pattern.compile("^" + context);
     }