Fix redirect loop when index file serving disabled

fixes #18

Author: jjmerino

HISTORY.md

@@ -1,3 +1,8 @@
+unreleased
+==========
+
+  * Fix redirect loop when index file serving disabled
+
 1.6.3 / 2014-09-24
 ==================
 

index.js

@@ -62,8 +62,9 @@ exports = module.exports = function serveStatic(root, options) {
     var opts = merge({}, options)
     var originalUrl = parseurl.original(req)
     var path = parseurl(req).pathname
+    var hasTrailingSlash = originalUrl.pathname[originalUrl.pathname.length - 1] === '/'
 
-    if (path === '/' && originalUrl.pathname[originalUrl.pathname.length - 1] !== '/') {
+    if (path === '/' && !hasTrailingSlash) {
       // make sure redirect occurs at mount
       path = ''
     }
@@ -74,6 +75,10 @@ exports = module.exports = function serveStatic(root, options) {
     if (redirect) {
       // redirect relative to originalUrl
       stream.on('directory', function redirect() {
+        if (hasTrailingSlash) {
+          return next()
+        }
+
         originalUrl.pathname += '/'
 
         var target = url.format(originalUrl)

test/test.js

@@ -559,6 +559,43 @@ describe('serveStatic()', function(){
       });
     });
   });
+
+  describe('when index file serving disabled', function(){
+    var server;
+    before(function () {
+      server = createServer(fixtures, {'index': false}, function (req) {
+        // mimic express/connect mount
+        req.originalUrl = req.url;
+        req.url = '/' + req.url.split('/').slice(2).join('/');
+      });
+    });
+
+    it('should next() on directory', function (done) {
+      request(server)
+      .get('/static/users/')
+      .expect(404, 'sorry!', done);
+    });
+
+    it('should redirect to trailing slash', function (done) {
+      request(server)
+      .get('/static/users')
+      .expect('Location', '/static/users/')
+      .expect(303, done);
+    });
+
+    it('should next() on mount point', function (done) {
+      request(server)
+      .get('/static/')
+      .expect(404, 'sorry!', done);
+    });
+
+    it('should redirect to trailing slash mount point', function (done) {
+      request(server)
+      .get('/static')
+      .expect('Location', '/static/')
+      .expect(303, done);
+    });
+  });
 });
 
 function createServer(dir, opts, fn) {