Changeset - 6b1b3b8f2ebb
[Not reviewed]
0 1 0
Brett Smith (brett) - 6 years ago 2016-11-03 14:34:01
brett@sfconservancy.org
static: Encode paths as UTF-8 before translating to the filesystem.
1 file changed with 7 insertions and 1 deletions:
0 comments (0 inline, 0 general)
www/conservancy/static/views.py
Show inline comments
...
 
@@ -6,2 +6,3 @@ from conservancy.apps.fundgoal.models import FundraisingGoal as FundraisingGoal
 
STATIC_ROOT = '/home/www/website/www/conservancy/static/'
 
FILESYSTEM_ENCODING = 'utf-8'
 

	
...
 
@@ -38,5 +39,10 @@ def index(request, *args, **kwargs):
 
    path = request.path
 
    try:
 
        path_bytes = path.encode(FILESYSTEM_ENCODING)
 
    except UnicodeEncodeError:
 
        # If the path can't be expressed on the filesystem, it must not exist.
 
        return handler404(request)
 
    if path.endswith(u'/'):
 
        path += u'index.html'
 
    fullpath = os.path.join(STATIC_ROOT, path)
 
    fullpath = os.path.join(STATIC_ROOT, path_bytes)
 
    if not os.path.exists(fullpath):
0 comments (0 inline, 0 general)