Agent: Change logic for generating random password

monkey/infection_monkey/post_breach/actions/communicate_as_backdoor_user.py

@@ -41,7 +41,7 @@ class CommunicateAsBackdoorUser(PBA):
     def run(self):
         username = CommunicateAsBackdoorUser.get_random_new_user_name()
         try:
-            password = get_random_password()
+            password = get_random_password(14)
             with create_auto_new_user(username, password) as new_user:
                 http_request_commandline = (
                     CommunicateAsBackdoorUser.get_commandline_for_http_request(

monkey/infection_monkey/utils/random_password_generator.py

@@ -1,8 +1,10 @@
 import secrets
+import string
 
-SECRET_BYTE_LENGTH = 32
+SECRET_LENGTH = 32
 
 
-def get_random_password(length: int = SECRET_BYTE_LENGTH) -> str:
-    password = secrets.token_urlsafe(length)
+def get_random_password(length: int = SECRET_LENGTH) -> str:
+    alphabet = string.ascii_letters + string.digits + string.punctuation
+    password = "".join(secrets.choice(alphabet) for i in range(length))
     return password

monkey/tests/unit_tests/infection_monkey/utils/test_random_password_generator.py

@@ -2,12 +2,17 @@ from infection_monkey.utils.random_password_generator import get_random_password
 
 
 def test_get_random_password__length():
-    password_byte_length = len(get_random_password().encode())
+    password_length = len(get_random_password())
     # 32 is the recommended secure byte length for secrets
-    assert password_byte_length >= 32
+    assert password_length == 32
+
+
+def test_get_random_password__custom_length():
+    password_length = len(get_random_password(14))
+    assert password_length == 14
 
 
 def test_get_random_password__randomness():
     random_password1 = get_random_password()
     random_password2 = get_random_password()
-    assert not random_password1 == random_password2
+    assert random_password1 != random_password2