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

Refactored cyphertext to ciphertext for consistency

This commit is contained in:
VakarisZ 2021-06-11 11:43:15 +03:00
parent 5cf002d81a
commit 3450b80a82
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
monkey/monkey_island/cc/services/utils/config_encryption.py
View File

@ -27,9 +27,9 @@ def encrypt_config(config: Dict, password: str) -> str:
return ciphertext_b64.decode() return ciphertext_b64.decode()
def decrypt_config(cyphertext: str, password: str) -> Dict: def decrypt_config(ciphertext: str, password: str) -> Dict:
cyphertext = base64.b64decode(cyphertext) ciphertext = base64.b64decode(ciphertext)
ciphertext_config_stream = io.BytesIO(cyphertext) ciphertext_config_stream = io.BytesIO(ciphertext)
dec_plaintext_config_stream = io.BytesIO() dec_plaintext_config_stream = io.BytesIO()
len_ciphertext_config_stream = len(ciphertext_config_stream.getvalue()) len_ciphertext_config_stream = len(ciphertext_config_stream.getvalue())

6
monkey/tests/unit_tests/monkey_island/cc/resources/test_configuration_import.py
View File

@ -1,8 +1,8 @@
import json import json
import pytest import pytest
from tests.unit_tests.monkey_island.cc.services.utils.cyphertexts_for_encryption_test import ( from tests.unit_tests.monkey_island.cc.services.utils.ciphertexts_for_encryption_test import (
MALFORMED_CYPHER_TEXT_CORRUPTED, MALFORMED_CIPHER_TEXT_CORRUPTED,
) )
from tests.unit_tests.monkey_island.cc.services.utils.test_config_encryption import PASSWORD from tests.unit_tests.monkey_island.cc.services.utils.test_config_encryption import PASSWORD
@ -23,7 +23,7 @@ def test_is_config_encrypted__ciphertext(monkey_config):
def test_is_config_encrypted__corrupt_ciphertext(): def test_is_config_encrypted__corrupt_ciphertext():
with pytest.raises(InvalidConfigurationError): with pytest.raises(InvalidConfigurationError):
assert ConfigurationImport.is_config_encrypted(MALFORMED_CYPHER_TEXT_CORRUPTED) assert ConfigurationImport.is_config_encrypted(MALFORMED_CIPHER_TEXT_CORRUPTED)
def test_is_config_encrypted__unknown_format(): def test_is_config_encrypted__unknown_format():

2
monkey/tests/unit_tests/monkey_island/cc/services/utils/cyphertexts_for_encryption_test.py → monkey/tests/unit_tests/monkey_island/cc/services/utils/ciphertexts_for_encryption_test.py
View File

@ -1,4 +1,4 @@
MALFORMED_CYPHER_TEXT_CORRUPTED = ( MALFORMED_CIPHER_TEXT_CORRUPTED = (
"QUVTAgAAGM0NKEYTESTURfQlkAcHlBZXNDcnlwdCA2LjAuMACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" "QUVTAgAAGM0NKEYTESTURfQlkAcHlBZXNDcnlwdCA2LjAuMACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEWlHUF5GTDFdrlGaUbFqGOBHE" "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEWlHUF5GTDFdrlGaUbFqGOBHE"

6
monkey/tests/unit_tests/monkey_island/cc/services/utils/test_config_encryption.py
View File

@ -1,6 +1,6 @@
import pytest import pytest
from tests.unit_tests.monkey_island.cc.services.utils.cyphertexts_for_encryption_test import ( from tests.unit_tests.monkey_island.cc.services.utils.ciphertexts_for_encryption_test import (
MALFORMED_CYPHER_TEXT_CORRUPTED, MALFORMED_CIPHER_TEXT_CORRUPTED,
) )
from monkey_island.cc.services.utils.config_encryption import ( from monkey_island.cc.services.utils.config_encryption import (
@ -28,7 +28,7 @@ def test_encrypt_decrypt_config__wrong_password(monkey_config):
def test_encrypt_decrypt_config__malformed_corrupted(): def test_encrypt_decrypt_config__malformed_corrupted():
with pytest.raises(ValueError): with pytest.raises(ValueError):
decrypt_config(MALFORMED_CYPHER_TEXT_CORRUPTED, PASSWORD) decrypt_config(MALFORMED_CIPHER_TEXT_CORRUPTED, PASSWORD)
def test_encrypt_decrypt_config__decrypt_no_password(monkey_config): def test_encrypt_decrypt_config__decrypt_no_password(monkey_config):