fix(proxy): Beans with special characters not working in proxy url

fix #2505
hawtio · Aug 23, 2018 · 0339e07 · 0339e07
1 parent 650a015
commit 0339e07
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/hawtio-system/src/main/java/io/hawt/web/proxy/ProxyDetails.java b/hawtio-system/src/main/java/io/hawt/web/proxy/ProxyDetails.java
@@ -78,7 +78,7 @@ public ProxyDetails(HttpServletRequest httpServletRequest) {
     }
 
     public ProxyDetails(String pathInfo) {
-        hostAndPort = pathInfo;
+        hostAndPort = pathInfo.replace(" ", "%20");
 
         if (hostAndPort == null) {
             return;

diff --git a/hawtio-system/src/main/java/io/hawt/web/proxy/ProxyServlet.java b/hawtio-system/src/main/java/io/hawt/web/proxy/ProxyServlet.java
@@ -201,7 +201,7 @@ protected void service(HttpServletRequest servletRequest, HttpServletResponse se
         try {
             targetUriObj = new URI(proxyRequestUri);
         } catch (URISyntaxException e) {
-            LOG.debug("URL '{}' is not valid: {}", proxyRequestUri, e.getMessage());
+            LOG.error("URL '{}' is not valid: {}", proxyRequestUri, e.getMessage());
             servletResponse.setStatus(HttpServletResponse.SC_NOT_FOUND);
             return;
         }

diff --git a/hawtio-system/src/test/java/io/hawt/web/proxy/ProxyDetailsTest.java b/hawtio-system/src/test/java/io/hawt/web/proxy/ProxyDetailsTest.java
@@ -73,6 +73,7 @@ public void testPathInfoWithPort() throws Exception {
         when(mockReq.getPathInfo()).thenReturn("/localhost/90/jolokia/");
 
         ProxyDetails details = new ProxyDetails(mockReq);
+
         assertEquals("getUserName()", null, details.getUserName());
         assertEquals("getPassword()", null, details.getPassword());
         assertEquals("getHost()", "localhost", details.getHost());
@@ -83,6 +84,16 @@ public void testPathInfoWithPort() throws Exception {
         assertEquals("getFullProxyUrl()", "http://localhost:90/jolokia/", details.getFullProxyUrl());
     }
 
+    @Test
+    public void testPathInfoWithWhitespace() throws Exception {
+        HttpServletRequest mockReq = mock(HttpServletRequest.class);
+        when(mockReq.getPathInfo()).thenReturn("/http/localhost/10001/jolokia/read/java.lang:type=MemoryManager,name=Metaspace Manager/Name");
+
+        ProxyDetails details = new ProxyDetails(mockReq);
+
+        assertEquals("getFullProxyUrl()", "http://localhost:10001/jolokia/read/java.lang:type=MemoryManager,name=Metaspace%20Manager/Name", details.getFullProxyUrl());
+    }
+
     @Test
     public void testDefaultPort() throws Exception {
         HttpServletRequest mockReq = mock(HttpServletRequest.class);

diff --git a/hawtio-war/pom.xml b/hawtio-war/pom.xml
@@ -205,6 +205,9 @@
               <script>${project.basedir}/etc/security.cli</script>
             </scripts>
           </beforeDeployment>
+          <javaOpts>
+            <javaOpt>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8787</javaOpt>
+          </javaOpts>
         </configuration>
       </plugin>