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

monkey: Rename `get_from...()` methods in UserCreds to be more readable

This commit is contained in:
Mike Salvatore 2021-05-04 14:43:11 -04:00
parent f28cd5305c
commit 1be07a4828
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monkey/monkey_island/cc/environment/environment_config.py
View File

@ -38,7 +38,7 @@ class EnvironmentConfig:
self._load_from_dict(data)
def _load_from_dict(self, dict_data: Dict):
user_creds = UserCreds.get_from_dict_server_config(dict_data)
user_creds = UserCreds.get_from_server_config_dict(dict_data)
aws = dict_data["aws"] if "aws" in dict_data else None
data_dir = dict_data["data_dir"] if "data_dir" in dict_data else DEFAULT_DATA_DIR

6
monkey/monkey_island/cc/environment/user_creds.py
View File

@ -28,7 +28,7 @@ class UserCreds:
return User(1, self.username, self.password_hash)
@staticmethod
def get_from_dict_new_registration(data_dict: Dict) -> UserCreds:
def get_from_new_registration_dict(data_dict: Dict) -> UserCreds:
creds = UserCreds()
if "user" in data_dict:
creds.username = data_dict["user"]
@ -39,7 +39,7 @@ class UserCreds:
return creds
@staticmethod
def get_from_dict_server_config(data_dict: Dict) -> UserCreds:
def get_from_server_config_dict(data_dict: Dict) -> UserCreds:
creds = UserCreds()
if "user" in data_dict:
creds.username = data_dict["user"]
@ -50,4 +50,4 @@ class UserCreds:
@staticmethod
def get_from_json(json_data: bytes) -> UserCreds:
cred_dict = json.loads(json_data)
return UserCreds.get_from_dict_new_registration(cred_dict)
return UserCreds.get_from_new_registration_dict(cred_dict)