# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2016-06-23 11:48:11
# Node ID c66c7ec2dbede8132de5e57154862350de01ae02
# Parent  3c0e100a5fc63c413d158515fbda4cbea6480e50

encryption: use common method to fetch encryption key for encrypted fields.

diff --git a/rhodecode/config/utils.py b/rhodecode/config/utils.py
--- a/rhodecode/config/utils.py
+++ b/rhodecode/config/utils.py
@@ -68,9 +68,9 @@ def configure_vcs(config):
 
 
 def initialize_database(config):
-    from rhodecode.lib.utils2 import engine_from_config
+    from rhodecode.lib.utils2 import engine_from_config, get_encryption_key
     engine = engine_from_config(config, 'sqlalchemy.db1.')
-    init_model(engine, encryption_key=config['beaker.session.secret'])
+    init_model(engine, encryption_key=get_encryption_key(config))
 
 
 def initialize_test_environment(settings, test_env=None):
diff --git a/rhodecode/lib/utils2.py b/rhodecode/lib/utils2.py
--- a/rhodecode/lib/utils2.py
+++ b/rhodecode/lib/utils2.py
@@ -342,6 +342,10 @@ def engine_from_config(configuration, pr
     return engine
 
 
+def get_encryption_key(config):
+    return config['beaker.session.secret']
+
+
 def age(prevdate, now=None, show_short_version=False, show_suffix=True,
         short_format=False):
     """
diff --git a/rhodecode/model/__init__.py b/rhodecode/model/__init__.py
--- a/rhodecode/model/__init__.py
+++ b/rhodecode/model/__init__.py
@@ -46,7 +46,7 @@ from pylons import config
 from pyramid.threadlocal import get_current_registry
 
 from rhodecode.model import meta, db
-from rhodecode.lib.utils2 import obfuscate_url_pw
+from rhodecode.lib.utils2 import obfuscate_url_pw, get_encryption_key
 
 log = logging.getLogger(__name__)
 
@@ -66,8 +66,8 @@ def init_model(engine, encryption_key=No
 
 
 def init_model_encryption(migration_models):
-    migration_models.ENCRYPTION_KEY = config['beaker.session.secret']
-    db.ENCRYPTION_KEY = config['beaker.session.secret']
+    migration_models.ENCRYPTION_KEY = get_encryption_key(config)
+    db.ENCRYPTION_KEY = get_encryption_key(config)
 
 
 class BaseModel(object):