paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-10 00:46:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moving ALLOWED_HOSTS to local_settings.

Browse Source 
(imported from commit b89c6983fd87ede42954dd84706f999ed0de740d)
This commit is contained in:
David Roe
2015-08-20 23:21:23 -07:00
committed by Tim Abbott
parent 80651c99cd
commit 59b94a901c
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zproject/local_settings.py
View File

@@ -94,6 +94,21 @@ SSO_APPEND_DOMAIN = None
AUTHENTICATION_BACKENDS = ('zproject.backends.EmailAuthBackend', AUTHENTICATION_BACKENDS = ('zproject.backends.EmailAuthBackend',
'zproject.backends.GoogleMobileOauth2Backend') 'zproject.backends.GoogleMobileOauth2Backend')
# ALLOWED_HOSTS is used by django to determine which addresses
# Zulip can serve. This is a security measure.
if TESTING_DEPLOYED:
# Allow any hosts for our test instances, to reduce 500 spam
ALLOWED_HOSTS = ['*']
else:
# Deployed on zulip.com
ALLOWED_HOSTS = ['localhost', '.humbughq.com', '54.214.48.144', '54.213.44.54',
'54.213.41.54', '54.213.44.58', '54.213.44.73',
'54.200.19.65', '54.201.95.104', '54.201.95.206',
'54.201.186.29', '54.200.111.22',
'54.245.120.64', '54.213.44.83', '.zulip.com', '.zulip.net',
'chat.dropboxer.net',
]
JWT_AUTH_KEYS = {} JWT_AUTH_KEYS = {}

8
zproject/local_settings_template.py
View File

@@ -43,6 +43,14 @@ DEFAULT_FROM_EMAIL = "Zulip <zulip@example.com>"
# Messages sent to this address should not be delivered anywhere. # Messages sent to this address should not be delivered anywhere.
NOREPLY_EMAIL_ADDRESS = "noreply@example.com" NOREPLY_EMAIL_ADDRESS = "noreply@example.com"
# A list of strings representing the host/domain names that this
# Django site can serve. You should reset it to be a list of
# domains/IP addresses for your site. This is a security measure to
# prevent an attacker from poisoning caches and triggering password
# reset emails with links to malicious hosts by submitting requests
# with a fake HTTP Host header.
ALLOWED_HOSTS = ['*']
### OPTIONAL SETTINGS ### OPTIONAL SETTINGS
# Controls whether session cookies expire when the browser closes # Controls whether session cookies expire when the browser closes

17
zproject/settings.py
View File

@@ -87,6 +87,7 @@ else:
# sample local_settings.py file, with a few exceptions. # sample local_settings.py file, with a few exceptions.
from local_settings_template import * from local_settings_template import *
EXTERNAL_HOST = 'localhost:9991' EXTERNAL_HOST = 'localhost:9991'
ALLOWED_HOSTS = ['localhost']
AUTHENTICATION_BACKENDS = ('zproject.backends.DevAuthBackend',) AUTHENTICATION_BACKENDS = ('zproject.backends.DevAuthBackend',)
# Add some of the below if you're testing other backends # Add some of the below if you're testing other backends
# AUTHENTICATION_BACKENDS = ('zproject.backends.EmailAuthBackend', # AUTHENTICATION_BACKENDS = ('zproject.backends.EmailAuthBackend',
@@ -344,22 +345,6 @@ if not DEPLOYED:
# can query using ./manage.py print_initial_password # can query using ./manage.py print_initial_password
INITIAL_PASSWORD_SALT = get_secret("initial_password_salt") INITIAL_PASSWORD_SALT = get_secret("initial_password_salt")
if TESTING_DEPLOYED or ENTERPRISE:
# XXX we should probably tighten this for ENTERPRISE
# Allow any hosts for our test instances, to reduce 500 spam
ALLOWED_HOSTS = ['*']
elif DEPLOYED:
# The IP addresses are for app.zulip.{com,net} and staging.zulip.{com,net}
ALLOWED_HOSTS = ['localhost', '.humbughq.com', '54.214.48.144', '54.213.44.54',
'54.213.41.54', '54.213.44.58', '54.213.44.73',
'54.200.19.65', '54.201.95.104', '54.201.95.206',
'54.201.186.29', "54.200.111.22",
'54.245.120.64', '54.213.44.83', '.zulip.com', '.zulip.net',
'chat.dropboxer.net',
]
else:
ALLOWED_HOSTS = ['localhost']
######################################################################## ########################################################################
# DEFAULT VALUES # DEFAULT VALUES
######################################################################## ########################################################################