p17860254
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Island: Rename internal DataStoreEncryptor methods

This commit is contained in:
Mike Salvatore 2021-10-07 14:45:00 -04:00
parent 1a0a07d550
commit 97c3ed3b97
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
monkey/monkey_island/cc/server_utils/encryption/data_store_encryptor.py
View File

@ -25,18 +25,18 @@ class DataStoreEncryptor(IEncryptor):
def _initialize_key_based_encryptor(self):
if os.path.exists(self._key_file):
return self._load_existing_key()
return self._load_key()
return self._create_new_key()
return self._create_key()
def _load_existing_key(self) -> KeyBasedEncryptor:
def _load_key(self) -> KeyBasedEncryptor:
with open(self._key_file, "rb") as f:
encrypted_key = f.read()
plaintext_key = self._password_based_encryptor.decrypt(encrypted_key)
return KeyBasedEncryptor(plaintext_key)
def _create_new_key(self) -> KeyBasedEncryptor:
def _create_key(self) -> KeyBasedEncryptor:
plaintext_key = Random.new().read(DataStoreEncryptor._KEY_LENGTH_BYTES)
encrypted_key = self._password_based_encryptor.encrypt(plaintext_key)