[#noissue] Generalized rule of rewriting into front

web/src/main/java/com/navercorp/pinpoint/web/servlet/RewriteForV2Filter.java

@@ -28,34 +28,19 @@
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.util.regex.Pattern;
 
 /**
  * @author Taejin Koo
  */
 public class RewriteForV2Filter implements Filter {
 
-    public static final String DEFAULT_INDEX = "/index.html";
-    private static final char PATH_DELIMITER = '/';
-    private static final String[] URI_PREFIXES_FOR_FRONT = {
-            "/auth",
-            "/browserNotSupported",
-            "/config",
-            "/error",
-            "/filteredMap",
-            "/inspector",
-            "/main",
-            "/realtime",
-            "/scatterFullScreenMode",
-            "/threadDump",
-            "/transactionDetail",
-            "/transactionList",
-            "/transactionView",
-            "/urlStatistic",
-            "/metric",
-    };
+    private static final Pattern API_PATTERN = Pattern.compile("(/v2|/v3)?/(.*\\.(js|css|png|ico)|assets/.+)|/api/.+");
+    private static final String LEGACY_FRONT_ENTRY_HTML = "/index.html";
+    private static final String V2_FRONT_ENTRY_HTML = "/v2/index.html";
+    private static final String V3_FRONT_ENTRY_HTML = "/v3/index.html";
 
     private final Logger logger = LogManager.getLogger(this.getClass());
-    private final boolean isDebugEnabled = logger.isDebugEnabled();
 
     private final boolean enabled;
 
@@ -79,43 +64,41 @@ public void doFilter(
             ServletResponse response,
             FilterChain chain
     ) throws IOException, ServletException {
-        if (this.shouldServeFrontApplication(request)) {
-            this.serveFrontApplication(request, response);
+        if (this.enabled && isRequestForFrontAppEntry(request)) {
+            this.serveFrontAppEntry((HttpServletRequest) request, response);
         } else {
             chain.doFilter(request, response);
         }
     }
 
-    private void serveFrontApplication(ServletRequest req, ServletResponse res) throws ServletException, IOException {
-        if (isDebugEnabled) {
-            logger.debug("requestUri: {} --(forward)--> {}", ((HttpServletRequest) req).getRequestURI(), DEFAULT_INDEX);
-        }
-        RequestDispatcher dispatcher = req.getRequestDispatcher(DEFAULT_INDEX);
-        dispatcher.forward(req, res);
-    }
+    private void serveFrontAppEntry(
+            HttpServletRequest request,
+            ServletResponse response
+    ) throws ServletException, IOException {
+        String uri = request.getRequestURI();
+        String entry = getFrontAppEntryHtml(uri);
+        logger.debug("requestUri: {} --(forward)--> {}", uri, entry);
 
-    private boolean shouldServeFrontApplication(ServletRequest req) {
-        return this.enabled && isURIForFront(getRequestURI(req));
+        RequestDispatcher dispatcher = request.getRequestDispatcher(entry);
+        dispatcher.forward(request, response);
     }
 
-    private static boolean isURIForFront(String uri) {
-        if (uri == null) {
+    private static boolean isRequestForFrontAppEntry(ServletRequest request) {
+        if (!(request instanceof HttpServletRequest)) {
             return false;
         }
-
-        for (String prefix : URI_PREFIXES_FOR_FRONT) {
-            if (uri.equals(prefix) || uri.startsWith(prefix + PATH_DELIMITER)) {
-                return true;
-            }
-        }
-        return false;
+        String uri = ((HttpServletRequest) request).getRequestURI();
+        return !API_PATTERN.matcher(uri).matches();
     }
 
-    private static String getRequestURI(ServletRequest req) {
-        if (req instanceof HttpServletRequest) {
-            return ((HttpServletRequest) req).getRequestURI();
+    private static String getFrontAppEntryHtml(String uri) {
+        if (uri.startsWith("/v2")) {
+            return V2_FRONT_ENTRY_HTML;
+        }
+        if (uri.startsWith("/v3")) {
+            return V3_FRONT_ENTRY_HTML;
         }
-        return null;
+        return LEGACY_FRONT_ENTRY_HTML;
     }
 
 }