vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix handling of secret key: We now generate it on app startup if it doesn't exist in the config (which it doesn't anymore in the base config.py).

Browse source
This commit is contained in:
Joseph Schorr 2015-01-05 12:31:02 -05:00
parent 1bf25f25c1
commit 40d2b1748f
6 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app.py
View file

@ -19,7 +19,7 @@ from util.exceptionlog import Sentry
from util.queuemetrics import QueueMetrics from util.queuemetrics import QueueMetrics
from util.names import urn_generator from util.names import urn_generator
from util.oauth import GoogleOAuthConfig, GithubOAuthConfig from util.oauth import GoogleOAuthConfig, GithubOAuthConfig
from util.configutil import import_yaml from util.configutil import import_yaml, generate_secret_key
from data.billing import Billing from data.billing import Billing
from data.buildlogs import BuildLogs from data.buildlogs import BuildLogs
from data.archivedlogs import LogArchive from data.archivedlogs import LogArchive
@ -139,5 +139,10 @@ database.configure(app.config)
model.config.app_config = app.config model.config.app_config = app.config
model.config.store = storage model.config.store = storage
# Generate a secret key if none was specified.
if app.config['SECRET_KEY'] is None:
logger.debug('Generating in-memory secret key')
app.config['SECRET_KEY'] = generate_secret_key()
def get_app_url(): def get_app_url():
return '%s://%s' % (app.config['PREFERRED_URL_SCHEME'], app.config['SERVER_HOSTNAME']) return '%s://%s' % (app.config['PREFERRED_URL_SCHEME'], app.config['SERVER_HOSTNAME'])

1
conf/gunicorn_local.py
View file

@ -5,3 +5,4 @@ timeout = 2000
daemon = False daemon = False
logconfig = 'conf/logging.conf' logconfig = 'conf/logging.conf'
pythonpath = '.' pythonpath = '.'
preload_app = True

1
config.py
View file

@ -36,7 +36,6 @@ def getFrontendVisibleConfig(config_dict):
class DefaultConfig(object): class DefaultConfig(object):
# Flask config # Flask config
SECRET_KEY = 'a36c9d7d-25a9-4d3f-a586-3d2f8dc40a83'
JSONIFY_PRETTYPRINT_REGULAR = False JSONIFY_PRETTYPRINT_REGULAR = False
SESSION_COOKIE_SECURE = False SESSION_COOKIE_SECURE = False

2
endpoints/api/suconfig.py
View file

@ -104,7 +104,7 @@ class SuperUserGetConfig(ApiResource):
config_object = request.get_json()['config'] config_object = request.get_json()['config']
# Add any enterprise defaults missing from the config. # Add any enterprise defaults missing from the config.
add_enterprise_config_defaults(config_object) add_enterprise_config_defaults(config_object, app.config['SECRET_KEY'])
# Write the configuration changes to the YAML file. # Write the configuration changes to the YAML file.
export_yaml(config_object, OVERRIDE_CONFIG_YAML_FILENAME) export_yaml(config_object, OVERRIDE_CONFIG_YAML_FILENAME)

1
test/testconfig.py
View file

@ -15,6 +15,7 @@ class FakeTransaction(object):
class TestConfig(DefaultConfig): class TestConfig(DefaultConfig):
TESTING = True TESTING = True
SECRET_KEY = 'a36c9d7d-25a9-4d3f-a586-3d2f8dc40a83'
DB_URI = os.environ.get('TEST_DATABASE_URI', 'sqlite:///:memory:') DB_URI = os.environ.get('TEST_DATABASE_URI', 'sqlite:///:memory:')
DB_CONNECTION_ARGS = { DB_CONNECTION_ARGS = {

4
util/configutil.py
View file

@ -36,7 +36,7 @@ def set_config_value(config_file, config_key, value):
export_yaml(config_obj, config_file) export_yaml(config_obj, config_file)
def add_enterprise_config_defaults(config_obj): def add_enterprise_config_defaults(config_obj, current_secret_key):
""" Adds/Sets the config defaults for enterprise registry config. """ """ Adds/Sets the config defaults for enterprise registry config. """
# These have to be false. # These have to be false.
config_obj['TESTING'] = False config_obj['TESTING'] = False
@ -52,7 +52,7 @@ def add_enterprise_config_defaults(config_obj):
# Default secret key. # Default secret key.
if not 'SECRET_KEY' in config_obj: if not 'SECRET_KEY' in config_obj:
config_obj['SECRET_KEY'] = generate_secret_key() config_obj['SECRET_KEY'] = current_secret_key
# Default storage configuration. # Default storage configuration.
if not 'DISTRIBUTED_STORAGE_CONFIG' in config_obj: if not 'DISTRIBUTED_STORAGE_CONFIG' in config_obj: