p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Island: Remove _is_credentials_set_up() from Environment

This commit is contained in:
Mike Salvatore 2021-10-07 15:34:19 -04:00
parent caa62c6272
commit 6bdba71b69
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
monkey/monkey_island/cc/environment/__init__.py
View File

@ -50,13 +50,7 @@ class Environment(object, metaclass=ABCMeta):
return True return True
def _is_registered(self) -> bool: def _is_registered(self) -> bool:
return self._is_credentials_set_up() return self._config and self._config.user_creds
def _is_credentials_set_up(self) -> bool:
if self._config and self._config.user_creds:
return True
else:
return False
@property @property
def testing(self): def testing(self):

6
monkey/tests/unit_tests/monkey_island/cc/environment/test_environment.py
View File

@ -93,12 +93,6 @@ class TestEnvironment(TestCase):
self._test_bool_env_method("_is_registered", env, NO_CREDENTIALS, False) self._test_bool_env_method("_is_registered", env, NO_CREDENTIALS, False)
self._test_bool_env_method("_is_registered", env, PARTIAL_CREDENTIALS, False) self._test_bool_env_method("_is_registered", env, PARTIAL_CREDENTIALS, False)
def test_is_credentials_set_up(self):
env = TestEnvironment.EnvironmentCredentialsRequired()
self._test_bool_env_method("_is_credentials_set_up", env, NO_CREDENTIALS, False)
self._test_bool_env_method("_is_credentials_set_up", env, WITH_CREDENTIALS, True)
self._test_bool_env_method("_is_credentials_set_up", env, PARTIAL_CREDENTIALS, False)
def _test_bool_env_method( def _test_bool_env_method(
self, method_name: str, env: Environment, config: Dict, expected_result: bool self, method_name: str, env: Environment, config: Dict, expected_result: bool
): ):