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

Refactor a couple of imports into a shorter import statement

This commit is contained in:
VakarisZ 2021-10-04 14:26:30 +03:00
parent 3b5dd6ac3e
commit ddff2f0aa4
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
monkey/monkey_island/cc/server_utils/encryption/__init__.py
View File

@ -11,7 +11,11 @@ from monkey_island.cc.server_utils.encryption.encryptors.password_based_bytes_en
InvalidCredentialsError,
InvalidCiphertextError,
)
from .data_store_encryptor import initialize_datastore_encryptor, get_datastore_encryptor
from .data_store_encryptor import (
initialize_datastore_encryptor,
get_datastore_encryptor,
remove_old_datastore_key,
)
from .dict_encryption.dict_encryptor import (
SensitiveField,
encrypt_dict,

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

@ -3,8 +3,9 @@ from typing import Union
from Crypto import Random # noqa: DUO133 # nosec: B413
from monkey_island.cc.server_utils.encryption import IEncryptor, KeyBasedEncryptor
from monkey_island.cc.server_utils.encryption.encryptors.password_based_bytes_encryption import (
from monkey_island.cc.server_utils.encryption import (
IEncryptor,
KeyBasedEncryptor,
PasswordBasedBytesEncryptor,
)
from monkey_island.cc.server_utils.file_utils import open_new_securely_permissioned_file

2
monkey/monkey_island/cc/services/authentication.py
View File

@ -1,8 +1,8 @@
from monkey_island.cc.server_utils.encryption import (
get_datastore_encryptor,
initialize_datastore_encryptor,
remove_old_datastore_key,
)
from monkey_island.cc.server_utils.encryption.data_store_encryptor import remove_old_datastore_key
class AuthenticationService: