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

Split `get_from_dict()` into 2 functions as per usage

This commit is contained in:
Shreya 2021-05-03 23:28:55 +05:30
parent d2083149dd
commit 02f3b15c64
2 changed files with 12 additions and 3 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) 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_dict(dict_data) user_creds = UserCreds.get_from_dict_server_config(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

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

@ -28,7 +28,7 @@ class UserCreds:
return User(1, self.username, self.password_hash) return User(1, self.username, self.password_hash)
@staticmethod @staticmethod
def get_from_dict(data_dict: Dict) -> UserCreds: def get_from_dict_new_registration(data_dict: Dict) -> UserCreds:
creds = UserCreds() creds = UserCreds()
if "user" in data_dict: if "user" in data_dict:
creds.username = data_dict["user"] creds.username = data_dict["user"]
@ -38,7 +38,16 @@ class UserCreds:
).decode() ).decode()
return creds return creds
@staticmethod
def get_from_dict_server_config(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)
return UserCreds.get_from_dict(cred_dict) return UserCreds.get_from_dict_new_registration(cred_dict)