fix URL

plantuml · May 14, 2024 · 2680086 · 2680086
1 parent eafc9c4
commit 2680086
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/net/sourceforge/plantuml/servlet/OldProxyServlet.java b/src/main/java/net/sourceforge/plantuml/servlet/OldProxyServlet.java
@@ -51,7 +51,7 @@ public class OldProxyServlet extends HttpServlet {
     /**
      * Proxy request URI regex pattern.
      */
-    private static final Pattern PROXY_PATTERN = Pattern.compile("/\\w+/proxy/((\\d+)/)?((\\w+)/)?(https?://.*)");
+    private static final Pattern PROXY_PATTERN = Pattern.compile("/\\w+/proxy/((\\d+)/)?((\\w+)/)?(https?://[^@]*)");
 
     @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {

diff --git a/src/main/java/net/sourceforge/plantuml/servlet/ProxyServlet.java b/src/main/java/net/sourceforge/plantuml/servlet/ProxyServlet.java
@@ -52,6 +52,9 @@ public static boolean forbiddenURL(String full) {
         if (full == null) {
             return true;
         }
+        if (full.contains("@")) {
+            return true;
+        }
         if (full.startsWith("https://") == false && full.startsWith("http://") == false) {
             return true;
         }