engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

encryption: allow to pass in alternative key for encryption values

Browse source
This commit is contained in:
Marcin Kuzminski 2016-06-24 13:29:27 +02:00
parent 2600624410
commit 858cf0db77
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rhodecode/lib/utils2.py
View file

@ -343,7 +343,9 @@ def engine_from_config(configuration, prefix='sqlalchemy.', **kwargs):
def get_encryption_key(config):
return config['beaker.session.secret']
secret = config.get('rhodecode.encrypted_values.secret')
default = config['beaker.session.secret']
return secret or default
def age(prevdate, now=None, show_short_version=False, show_suffix=True,