Fix 976. Get serial key after database is inited
Change-Id: Ic6692c5eabdb3ff7d8b1a7fc6501321dc69ea43a
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
diff --git a/osm_common/dbbase.py b/osm_common/dbbase.py
index 95250c1..7428ed9 100644
--- a/osm_common/dbbase.py
+++ b/osm_common/dbbase.py
@@ -212,6 +212,13 @@
self.secret_key = None
self.secret_key = self._join_secret_key(new_secret_key)
+ def get_secret_key(self):
+ """
+ Get the database secret key in case it is not done when "connect" is called. It can happens when database is
+ empty after an initial install. It should skip if secret is already obtained.
+ """
+ pass
+
def encrypt(self, value, schema_version=None, salt=None):
"""
Encrypt a value
@@ -221,6 +228,7 @@
:param salt: optional salt to be used. Must be str
:return: Encrypted content of value
"""
+ self.get_secret_key()
if not self.secret_key or not schema_version or schema_version == '1.0':
return value
else:
@@ -240,6 +248,7 @@
:param salt: optional salt to be used
:return: Plain content of value
"""
+ self.get_secret_key()
if not self.secret_key or not schema_version or schema_version == '1.0':
return value
else:
@@ -257,6 +266,7 @@
def encrypt_decrypt_fields(self, item, action, fields=None, flags=re.I, schema_version=None, salt=None):
if not fields:
return
+ self.get_secret_key()
actions = ['encrypt', 'decrypt']
if action.lower() not in actions:
raise DbException("Unknown action ({}): Must be one of {}".format(action, actions),