Handle multiple slashes between URL segements

livedata · Aug 25, 2012 · c6d76fb · c6d76fb
1 parent f1fd030
commit c6d76fb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/lib/app.js b/lib/app.js
@@ -387,7 +387,8 @@ var App = function () {
     // Handle the requests
     // ==================
     geddy.server.addListener('request', function (req, resp) {
-      var reqObj
+      var reqUrl
+        , reqObj
         , params
         , urlParams
         , method
@@ -411,6 +412,11 @@ var App = function () {
         , accessTime = (new Date()).getTime()
         , inFlighId;
 
+      // Sanitize URL; reduce multiple slashes to single slash
+      // TODO: Handle trailing slashes correctly, whatever
+      // 'correctly' means
+      reqUrl = req.url.replace(/\/{2,}/g, '/');
+
       // Buffered request-obj -- buffer the request data,
       // and pass this proxy object to the controller
       reqObj = new Request(req);
@@ -427,7 +433,7 @@ var App = function () {
       };
 
       if (router) {
-        urlParams = url.parse(req.url, true).query;
+        urlParams = url.parse(reqUrl, true).query;
 
         if (req.method.toUpperCase() == 'POST') {
           // POSTs may be overridden by the _method param
@@ -476,7 +482,7 @@ var App = function () {
             '- ' +
             '- ' +
             '[' + new Date(entry.accessTime) + '] ' +
-            '"' + entry.method + ' ' + req.url + ' ' +
+            '"' + entry.method + ' ' + reqUrl + ' ' +
               req.httpVersion + '" ' +
             stat + ' ' +
             (resp._length || '-') + ' ' +
@@ -495,7 +501,7 @@ var App = function () {
           }
         });
 
-        params = router.first(req, method);
+        params = router.first(reqUrl, method);
       }
 
       if (params) {
@@ -619,7 +625,7 @@ var App = function () {
       // Either static or 404
       else {
         // Get the path to the file
-        staticPath = geddy.config.staticFilePath + '/' + req.url;
+        staticPath = geddy.config.staticFilePath + reqUrl;
         // Ignore querystring
         staticPath = staticPath.split('?')[0];
         // Decode path (e.g. %20)
@@ -630,7 +636,7 @@ var App = function () {
           staticResp.sendFile(staticPath);
         }
         else {
-          err = new errors.NotFoundError(req.url + ' not found.');
+          err = new errors.NotFoundError(reqUrl + ' not found.');
           errResp = new response.Response(resp);
           errResp.send(err.message, err.statusCode,
               {'Content-Type': 'text/html'});

diff --git a/lib/routers/regexp_router.js b/lib/routers/regexp_router.js
@@ -126,11 +126,11 @@ var Router = function () {
    *
    * if there's no match, this will return false
    */
-  this.first = function (req, method) {
+  this.first = function (url, method) {
     var routes = this.routes
       , route
       , ret = false
-      , path = req.url
+      , path = url
       , notAllowed = false
       , allowed = []
       , err;