archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Fix for hash_file_path when not starting with forward slash

Browse Source
This commit is contained in:
Francesco Siddi
2015-09-10 20:46:18 +02:00
parent f9203c5193
commit 6382d1dbf5
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pillar/application/utils.py
View File

@@ -3,6 +3,8 @@ from hashlib import md5
from application import app from application import app
def hash_file_path(file_path, expiry_timestamp=None): def hash_file_path(file_path, expiry_timestamp=None):
if not file_path.startswith('/'):
file_path = '/' + file_path;
service_domain = app.config['CDN_SERVICE_DOMAIN'] service_domain = app.config['CDN_SERVICE_DOMAIN']
domain_subfolder = app.config['CDN_CONTENT_SUBFOLDER'] domain_subfolder = app.config['CDN_CONTENT_SUBFOLDER']
asset_url = app.config['CDN_SERVICE_DOMAIN_PROTOCOL'] + \ asset_url = app.config['CDN_SERVICE_DOMAIN_PROTOCOL'] + \
@@ -14,9 +16,6 @@ def hash_file_path(file_path, expiry_timestamp=None):
if app.config['CDN_USE_URL_SIGNING']: if app.config['CDN_USE_URL_SIGNING']:
url_signing_key = app.config['CDN_URL_SIGNING_KEY'] url_signing_key = app.config['CDN_URL_SIGNING_KEY']
if not file_path.startswith('/'):
file_path = '/' + file_path;
hash_string = domain_subfolder + file_path + url_signing_key; hash_string = domain_subfolder + file_path + url_signing_key;
if not expiry_timestamp: if not expiry_timestamp: