Merge pull request #133 from jrsacks/master

PathMatchHandler will hand off control to the next handler when a request has an invalid URI
webbit · Aug 22, 2014 · c8ab58f · c8ab58f
2 parents 54f9f85 + a9fe59d
commit c8ab58f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/src/main/java/org/webbitserver/handler/PathMatchHandler.java b/src/main/java/org/webbitserver/handler/PathMatchHandler.java
@@ -23,11 +23,21 @@ public PathMatchHandler(String path, HttpHandler httpHandler) {
         this(Pattern.compile(path), httpHandler);
     }
 
+    public Boolean pathIsAMatch(HttpRequest request){
+        try {
+            String path = URI.create(request.uri()).getPath();
+            Matcher matcher = pathPattern.matcher(path);
+            if (matcher.matches()) {
+                return true;
+            }
+        } catch (IllegalArgumentException e) {
+        }
+        return false;
+    }
+
     @Override
     public void handleHttpRequest(HttpRequest request, HttpResponse response, HttpControl control) throws Exception {
-        String path = URI.create(request.uri()).getPath();
-        Matcher matcher = pathPattern.matcher(path);
-        if (matcher.matches()) {
+        if (pathIsAMatch(request)) {
             httpHandler.handleHttpRequest(request, response, control);
         } else {
             control.nextHandler();

diff --git a/src/test/java/org/webbitserver/handler/PathMatchHandlerTest.java b/src/test/java/org/webbitserver/handler/PathMatchHandlerTest.java
@@ -53,6 +53,21 @@ public void matchesRequestWithRegexpPath() throws Exception {
         verify(handler).handleHttpRequest(req, res, ctl);
     }
 
+    @Test
+    public void handsOffWhenIllegalURIPath() throws Exception {
+        HttpHandler handler = mock(HttpHandler.class);
+        PathMatchHandler pmh = new PathMatchHandler("/hello", handler);
+
+        HttpRequest req = new StubHttpRequest("//");
+        HttpResponse res = new StubHttpResponse();
+        HttpControl ctl = mock(HttpControl.class);
+
+        pmh.handleHttpRequest(req, res, ctl);
+
+        verifyZeroInteractions(handler);
+        verify(ctl).nextHandler();
+    }
+
     @Test
     public void handsOffWhenNoMatch() throws Exception {
         HttpHandler handler = mock(HttpHandler.class);