p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Island: Explicitly handle path/string conversion in DataStoreEncryptor

This commit is contained in:
Mike Salvatore 2021-10-12 07:28:36 -04:00
parent 356b3475cd
commit 8519edbbd2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ class DataStoreEncryptor(IEncryptor):
plaintext_key = Random.new().read(DataStoreEncryptor._KEY_LENGTH_BYTES) plaintext_key = Random.new().read(DataStoreEncryptor._KEY_LENGTH_BYTES)
encrypted_key = self._password_based_encryptor.encrypt(plaintext_key) encrypted_key = self._password_based_encryptor.encrypt(plaintext_key)
with open_new_securely_permissioned_file(self._key_file, "wb") as f: with open_new_securely_permissioned_file(str(self._key_file), "wb") as f:
f.write(encrypted_key) f.write(encrypted_key)
return KeyBasedEncryptor(plaintext_key) return KeyBasedEncryptor(plaintext_key)
@ -52,8 +52,8 @@ class DataStoreEncryptor(IEncryptor):
return self._key_based_encryptor.decrypt(ciphertext) return self._key_based_encryptor.decrypt(ciphertext)
def reset_datastore_encryptor(key_file_dir: str, secret: str, key_file_name: str = _KEY_FILE_NAME): def reset_datastore_encryptor(key_file_dir: Path, secret: str, key_file_name: str = _KEY_FILE_NAME):
key_file = Path(key_file_dir) / key_file_name key_file = key_file_dir / key_file_name
if key_file.is_file(): if key_file.is_file():
key_file.unlink() key_file.unlink()
@ -61,8 +61,10 @@ def reset_datastore_encryptor(key_file_dir: str, secret: str, key_file_name: str
_initialize_datastore_encryptor(key_file, secret) _initialize_datastore_encryptor(key_file, secret)
def unlock_datastore_encryptor(key_file_dir: str, secret: str, key_file_name: str = _KEY_FILE_NAME): def unlock_datastore_encryptor(
key_file = Path(key_file_dir) / key_file_name key_file_dir: Path, secret: str, key_file_name: str = _KEY_FILE_NAME
):
key_file = key_file_dir / key_file_name
_initialize_datastore_encryptor(key_file, secret) _initialize_datastore_encryptor(key_file, secret)