xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-01-24 00:23:53 +00:00
Code Issues Projects Releases Wiki Activity

Never generate new key on crypt read

Browse Source 
An autogenerated key on read can never be useful.  Instead, let it fail
and assume a repair action is coming.
This commit is contained in:
Jarrod Johnson 2018-07-12 15:55:05 -04:00
parent 0f3014957b
commit 61dd71778f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
confluent_server/confluent/config/configmanager.py
View File

@ -267,14 +267,14 @@ def _do_add_watcher(watcher, added, configmanager):
logException()
def init_masterkey(password=None):
def init_masterkey(password=None, autogen=True):
global _masterkey
global _masterintegritykey
cfgn = get_global('master_privacy_key')
if cfgn:
_masterkey = _get_protected_key(cfgn, password, 'master_privacy_key')
else:
elif autogen:
_masterkey = os.urandom(32)
set_global('master_privacy_key', _format_key(
_masterkey,
@ -283,7 +283,7 @@ def init_masterkey(password=None):
if cfgn:
_masterintegritykey = _get_protected_key(cfgn, password,
'master_integrity_key')
else:
elif autogen:
_masterintegritykey = os.urandom(64)
set_global('master_integrity_key', _format_key(
_masterintegritykey,
@ -301,7 +301,7 @@ def decrypt_value(cryptvalue,
iv, cipherdata, hmac = cryptvalue
if key is None and integritykey is None:
if _masterkey is None or _masterintegritykey is None:
init_masterkey()
init_masterkey(autogen=False)
key = _masterkey
integritykey = _masterintegritykey
check_hmac = HMAC.new(integritykey, cipherdata, SHA256).digest()