Fix #3140 — enforce trailing slash for directories in auto

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Aug 25, 2018 · d604423 · d604423
1 parent c3625df
commit d604423
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -20,6 +20,9 @@ Features
 Bugfixes
 --------
 
+* Enforce trailing slash for directories in ``nikola auto``
+  (Issue #3140)
+
 New in v8.0.0b3 (changes since Beta 2)
 ======================================
 

diff --git a/nikola/plugins/command/auto/__init__.py b/nikola/plugins/command/auto/__init__.py
@@ -38,7 +38,7 @@
     import aiohttp
     from aiohttp import web
     from aiohttp.web_urldispatcher import StaticResource
-    from aiohttp.web_exceptions import HTTPNotFound, HTTPForbidden
+    from aiohttp.web_exceptions import HTTPNotFound, HTTPForbidden, HTTPMovedPermanently
     from aiohttp.web_response import Response
     from aiohttp.web_fileresponse import FileResponse
 except ImportError:
@@ -432,7 +432,11 @@ def handle_file(self, request, filename, from_index=None):
             if filename.endswith('/') or not filename:
                 ret = yield from self.handle_file(request, filename + 'index.html', from_index=filename)
             else:
-                ret = yield from self.handle_file(request, filename + '/index.html', from_index=filename)
+                # Redirect and add trailing slash so relative links work (Issue #3140)
+                new_url = request.rel_url.path + '/'
+                if request.rel_url.query_string:
+                    new_url += '?' + request.rel_url.query_string
+                raise HTTPMovedPermanently(new_url)
         elif filepath.is_file():
             ct, encoding = mimetypes.guess_type(str(filepath))
             encoding = encoding or 'utf-8'