Changeset - 54894a53fa6d
[Not reviewed]
0 1 0
Brett Smith (brett) - 5 years ago 2016-11-02 20:46:53
brett@sfconservancy.org
static: Encode paths as UTF-8 before translating to the filesystem.
1 file changed with 6 insertions and 1 deletions:
0 comments (0 inline, 0 general)
www/conservancy/static/views.py
Show inline comments
...
 
@@ -4,6 +4,7 @@ from django.template import RequestContext, loader
 
from conservancy.apps.fundgoal.models import FundraisingGoal as FundraisingGoal
 

	
 
STATIC_ROOT = '/home/www/website/www/conservancy/static/'
 
FILESYSTEM_ENCODING = 'utf-8'
 

	
 
def handler(request, errorcode):
 
    path = os.path.join('error', errorcode, 'index.html')
...
 
@@ -36,9 +37,13 @@ def fundgoal_lookup(fundraiser_sought):
 
def index(request, *args, **kwargs):
 
    # return HttpResponse("Hello, static world: " + request.get_full_path())
 
    path = request.path
 
    try:
 
        path_bytes = path.encode(FILESYSTEM_ENCODING)
 
    except UnicodeEncodeError:
 
        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):
 
        # return HttpResponse("Sorry that's a 404: " + path)
 
        return handler404(request)
0 comments (0 inline, 0 general)