nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-04-29 10:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

web_framework: Don't create Django secret key when listing depends

Browse Source 
This allows --list-dependencies to run without having to write to disk.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2020-06-24 18:08:07 -07:00 committed by James Valleroy
parent 28fe8c8c3e
commit e5177289dc
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plinth/web_framework.py
View File

@ -20,7 +20,7 @@ from . import cfg, glib, log, module_loader, settings
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
def init(): def init(read_only=False):
"""Setup Django configuration in the absence of .settings file""" """Setup Django configuration in the absence of .settings file"""
if cfg.secure_proxy_ssl_header: if cfg.secure_proxy_ssl_header:
settings.SECURE_PROXY_SSL_HEADER = (cfg.secure_proxy_ssl_header, settings.SECURE_PROXY_SSL_HEADER = (cfg.secure_proxy_ssl_header,
@ -36,7 +36,7 @@ def init():
settings.LANGUAGES = get_languages() settings.LANGUAGES = get_languages()
settings.LOGGING = log.get_configuration() settings.LOGGING = log.get_configuration()
settings.MESSAGE_TAGS = {message_constants.ERROR: 'danger'} settings.MESSAGE_TAGS = {message_constants.ERROR: 'danger'}
settings.SECRET_KEY = _get_secret_key() settings.SECRET_KEY = _get_secret_key(read_only)
settings.SESSION_FILE_PATH = os.path.join(cfg.data_dir, 'sessions') settings.SESSION_FILE_PATH = os.path.join(cfg.data_dir, 'sessions')
settings.STATIC_URL = '/'.join([cfg.server_dir, settings.STATIC_URL = '/'.join([cfg.server_dir,
'static/']).replace('//', '/') 'static/']).replace('//', '/')
@ -65,7 +65,7 @@ def post_init():
glib.schedule(24 * 3600, _cleanup_expired_sessions, in_thread=True) glib.schedule(24 * 3600, _cleanup_expired_sessions, in_thread=True)
def _get_secret_key(): def _get_secret_key(read_only=False):
"""Retrieve or create a new Django secret key.""" """Retrieve or create a new Django secret key."""
secret_key_file = pathlib.Path(cfg.data_dir) / 'django-secret.key' secret_key_file = pathlib.Path(cfg.data_dir) / 'django-secret.key'
if secret_key_file.exists(): if secret_key_file.exists():
@ -73,6 +73,9 @@ def _get_secret_key():
if len(secret_key) >= 128: if len(secret_key) >= 128:
return secret_key return secret_key
if read_only:
return ''
secret_key = _generate_secret_key() secret_key = _generate_secret_key()
# File should be created with permission 0o700 # File should be created with permission 0o700
old_umask = os.umask(0o077) old_umask = os.umask(0o077)