From 9fefee800cc094529f6904d2e35b2e08cfcdfc3b Mon Sep 17 00:00:00 2001 From: Francesco Siddi Date: Mon, 9 Nov 2015 17:41:54 +0100 Subject: [PATCH] Introducing scheme for url generation This requires a new SCHEME value in the config. Prevents browser warnings about insecure links when working with https. --- pillar/application/__init__.py | 3 ++- pillar/config.py.example | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pillar/application/__init__.py b/pillar/application/__init__.py index cb75091d..53c7e814 100644 --- a/pillar/application/__init__.py +++ b/pillar/application/__init__.py @@ -369,7 +369,8 @@ def generate_link(backend, file_path, project_id=None): blob = storage.Get(file_path) link = blob['signed_url'] elif backend == 'pillar': - link = url_for('file_storage.index', file_name=file_path, _external=True) + link = url_for('file_storage.index', file_name=file_path, _external=True, + _scheme=app.config['SCHEME']) elif backend == 'cdnsun': link = hash_file_path(file_path, None) else: diff --git a/pillar/config.py.example b/pillar/config.py.example index fa9a38f0..7e0dbad3 100644 --- a/pillar/config.py.example +++ b/pillar/config.py.example @@ -11,6 +11,7 @@ class Config(object): class Development(Config): + SCHEME = 'http' STORAGE_DIR = '{0}/application/static/storage'.format( os.path.join(os.path.dirname(__file__))) SHARED_DIR = '/storage/shared'