Merge pull request #62 from davidpett/handle-malformed-uri

handle malformed URI error
tildeio · Oct 25, 2015 · 2a5a26c · 2a5a26c
2 parents 379d612 + ed41239
commit 2a5a26c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/lib/route-recognizer.js b/lib/route-recognizer.js
@@ -317,7 +317,11 @@ function addSegment(currentState, segment) {
 function decodeQueryParamPart(part) {
   // http://www.w3.org/TR/html401/interact/forms.html#h-17.13.4.1
   part = part.replace(/\+/gm, '%20');
-  return decodeURIComponent(part);
+  var result;
+  try {
+    result = decodeURIComponent(part);
+  } catch(error) {result = '';}
+  return result;
 }
 
 // The main interface

diff --git a/tests/recognizer-tests.js b/tests/recognizer-tests.js
@@ -141,6 +141,15 @@ test("Multiple routes recognize", function() {
   resultsMatch(router.recognize("/bar/1"), [{ handler: handler2, params: { baz: "1" }, isDynamic: true }]);
 });
 
+test("ignore the URI malformed error", function() {
+  var handler1 = { handler: 1 };
+  var router = new RouteRecognizer();
+
+  router.add([{ path: "/foo", handler: handler1 }]);
+
+  deepEqual(router.recognize("/foo?a=1%").queryParams, {a: ""});
+});
+
 test("Multiple routes with overlapping query params recognize", function() {
   var handler1 = { handler: 1 };
   var handler2 = { handler: 2 };

diff --git a/tests/router-tests.js b/tests/router-tests.js
@@ -157,7 +157,7 @@ test("supports star routes", function() {
 
 test("star route does not swallow trailing `/`", function() {
   var r;
-  
+
   router.map(function(match) {
     match("/").to("posts");
     match("/*everything").to("glob");
@@ -173,7 +173,7 @@ test("support star route before other segment", function() {
   });
 
   ["folder1/folder2/folder3//the-extra-stuff/", "folder1/folder2/folder3//the-extra-stuff"].forEach(function(r) {
-    matchesRoute("/" + r, [{ handler: "glob", params: {everything: "folder1/folder2/folder3/", extra: "the-extra-stuff"}, isDynamic: true}]);  
+    matchesRoute("/" + r, [{ handler: "glob", params: {everything: "folder1/folder2/folder3/", extra: "the-extra-stuff"}, isDynamic: true}]);
   });
 });
 
@@ -258,4 +258,3 @@ test("supports add-route callback", function() {
   matchesRoute("/posts/new", [{ handler: "newPost", params: {}, isDynamic: false }]);
   ok(called, "The add-route callback was called.");
 });
-