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

island: Remove coupling between EnvironmentConfig and UserCreds

This commit is contained in:
Mike Salvatore 2021-05-04 15:17:36 -04:00
parent 5fa08f0447
commit 4b3b7af3d2
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,13 +38,12 @@ class EnvironmentConfig:
self._load_from_dict(data) self._load_from_dict(data)
def _load_from_dict(self, dict_data: Dict): def _load_from_dict(self, dict_data: Dict):
user_creds = UserCreds.get_from_server_config_dict(dict_data)
aws = dict_data["aws"] if "aws" in dict_data else None 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 data_dir = dict_data["data_dir"] if "data_dir" in dict_data else DEFAULT_DATA_DIR
self.server_config = dict_data["server_config"] self.server_config = dict_data["server_config"]
self.deployment = dict_data["deployment"] self.deployment = dict_data["deployment"]
self.user_creds = user_creds self.user_creds = _get_user_credentials_from_config(dict_data)
self.aws = aws self.aws = aws
self.data_dir = data_dir self.data_dir = data_dir
@ -75,3 +74,10 @@ class EnvironmentConfig:
def get_users(self) -> List[User]: def get_users(self) -> List[User]:
auth_user = self.user_creds.to_auth_user() auth_user = self.user_creds.to_auth_user()
return [auth_user] if auth_user else [] return [auth_user] if auth_user else []
def _get_user_credentials_from_config(dict_data: Dict):
username = dict_data.get("user", "")
password_hash = dict_data.get("password_hash", "")
return UserCreds(username, password_hash)

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

@ -44,15 +44,6 @@ class UserCreds:
).decode() ).decode()
return creds return creds
@staticmethod
def get_from_server_config_dict(data_dict: Dict) -> UserCreds:
creds = UserCreds()
if "user" in data_dict:
creds.username = data_dict["user"]
if "password_hash" in data_dict:
creds.password_hash = data_dict["password_hash"]
return creds
@staticmethod @staticmethod
def get_from_json(json_data: bytes) -> UserCreds: def get_from_json(json_data: bytes) -> UserCreds:
cred_dict = json.loads(json_data) cred_dict = json.loads(json_data)