From 2680086893a753b5f0940919edd386463451ed1f Mon Sep 17 00:00:00 2001
From: Arnaud Roques <plantuml@gmail.com>
Date: Tue, 14 May 2024 18:30:09 +0200
Subject: [PATCH] fix URL

---
 .../java/net/sourceforge/plantuml/servlet/OldProxyServlet.java | 2 +-
 .../java/net/sourceforge/plantuml/servlet/ProxyServlet.java    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/sourceforge/plantuml/servlet/OldProxyServlet.java b/src/main/java/net/sourceforge/plantuml/servlet/OldProxyServlet.java
index 1d37816..8802182 100644
--- 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
index 04766cf..261e531 100644
--- 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 class ProxyServlet extends HttpServlet {
         if (full == null) {
             return true;
         }
+        if (full.contains("@")) {
+            return true;
+        }
         if (full.startsWith("https://") == false && full.startsWith("http://") == false) {
             return true;
         }