Skip to content

Add TRUST_X_FORWARDED_PROTO variable #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LEW21 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add TRUST_X_FORWARDED_PROTO variable #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bb458d
Added TRUST_X_FORWARDED_PROTO variable
LEW21 May 28, 2017
751001e
Changelog: Added TRUST_X_FORWARDED_PROTO variable
LEW21 May 28, 2017
cffabba
Add a test for TRUST_X_FORWARDED_PROTO.
LEW21 May 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Unreleased

* Dropped Python 3.2 support
* Added TRUST_X_FORWARDED_PROTO variable

## 1.3

Expand Down
5 changes: 5 additions & 0 deletions django12factor/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,11 @@ def factorise(custom_settings=None):

settings['ALLOWED_HOSTS'] = os.getenv('ALLOWED_HOSTS', '').split(',')

if getenv_bool('TRUST_X_FORWARDED_PROTO'):
settings['SECURE_PROXY_SSL_HEADER'] = ('HTTP_X_FORWARDED_PROTO', 'https')
else:
settings['SECURE_PROXY_SSL_HEADER'] = None

# For keys to different apis, etc.
if custom_settings is None:
custom_settings = []
Expand Down
9 changes: 9 additions & 0 deletions tests/test_d12f.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,3 +149,12 @@ def test_non_capitalised_database_ignored(self):
"Loaded %d databases instead of just 1 (default) - got %s "
"from environment %s" % (len(dbs), dbs.keys(), e)
)

def test_use_x_forwarded_proto(self):
with debugenv(TRUST_X_FORWARDED_PROTO="on"):
settings = d12f()
self.assertEquals(('HTTP_X_FORWARDED_PROTO', 'https'), settings['SECURE_PROXY_SSL_HEADER'])

with debugenv(TRUST_X_FORWARDED_PROTO="off"):
settings = d12f()
self.assertEquals(None, settings['SECURE_PROXY_SSL_HEADER'])