HBASE-23663 Allow dot and hyphen in Profiler's URL (#1002)

Signed-off-by: Sean Busbey <busbey@apache.org> Signed-off-by: Viraj Jasani <vjasani@apache.org>
apache · Jan 9, 2020 · 54af279 · 54af279
1 parent fbf660c
commit 54af279
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileOutputServlet.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileOutputServlet.java
@@ -38,8 +38,8 @@ public class ProfileOutputServlet extends DefaultServlet {
   private static final long serialVersionUID = 1L;
   private static final Logger LOG = LoggerFactory.getLogger(ProfileOutputServlet.class);
   private static final int REFRESH_PERIOD = 2;
-  // Alphanumeric characters, plus percent (url-encoding), equals, and ampersand
-  private static final Pattern ALPHA_NUMERIC = Pattern.compile("[a-zA-Z0-9\\%\\=\\&]*");
+  // Alphanumeric characters, plus percent (url-encoding), equals, ampersand, dot and hyphen
+  private static final Pattern ALPHA_NUMERIC = Pattern.compile("[a-zA-Z0-9%=&.\\-]*");
 
   @Override
   protected void doGet(final HttpServletRequest req, final HttpServletResponse resp)

diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestProfileOutputServlet.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestProfileOutputServlet.java
@@ -37,7 +37,8 @@ public class TestProfileOutputServlet {
 
   @Test
   public void testSanitization() {
-    List<String> good = Arrays.asList("abcd", "key=value", "key1=value&key2=value2", "");
+    List<String> good = Arrays.asList("abcd", "key=value", "key1=value&key2=value2", "",
+        "host=host-1.example.com");
     for (String input : good) {
       assertEquals(input, ProfileOutputServlet.sanitize(input));
     }