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

Island: Fix minor things in MongoCredentialsRepository and credentials 

endpoint
This commit is contained in:
Ilija Lazoroski 2022-07-18 13:35:40 +02:00
parent 0cee5ac00d
commit 55f95891e1
2 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
monkey/monkey_island/cc/repository/mongo_credentials_repository.py
View File

@ -15,19 +15,13 @@ class MongoCredentialsRepository(ICredentialsRepository):
def __init__(self, mongo: MongoClient, repository_encryptor: ILockableEncryptor): def __init__(self, mongo: MongoClient, repository_encryptor: ILockableEncryptor):
self._database = mongo.monkeyisland self._database = mongo.monkeyisland
self._repository_encryptor = repository_encryptor
def get_configured_credentials(self) -> Sequence[Credentials]: def get_configured_credentials(self) -> Sequence[Credentials]:
return MongoCredentialsRepository._get_credentials_from_collection( return self._get_credentials_from_collection(self._database.configured_credentials)
self._database.configured_credentials
)
def get_stolen_credentials(self) -> Sequence[Credentials]: def get_stolen_credentials(self) -> Sequence[Credentials]:
return MongoCredentialsRepository._get_credentials_from_collection( return self._get_credentials_from_collection(self._database.stolen_credentials)
self._database.stolen_credentials
)
def get_all_credentials(self) -> Sequence[Credentials]: def get_all_credentials(self) -> Sequence[Credentials]:
configured_credentials = self.get_configured_credentials() configured_credentials = self.get_configured_credentials()
@ -37,26 +31,16 @@ class MongoCredentialsRepository(ICredentialsRepository):
def save_configured_credentials(self, credentials: Sequence[Credentials]): def save_configured_credentials(self, credentials: Sequence[Credentials]):
# TODO: Fix deduplication of Credentials in mongo # TODO: Fix deduplication of Credentials in mongo
MongoCredentialsRepository._save_credentials_to_collection( self._save_credentials_to_collection(credentials, self._database.configured_credentials)
credentials, self._database.configured_credentials
)
def save_stolen_credentials(self, credentials: Sequence[Credentials]): def save_stolen_credentials(self, credentials: Sequence[Credentials]):
MongoCredentialsRepository._save_credentials_to_collection( self._save_credentials_to_collection(credentials, self._database.stolen_credentials)
credentials, self._database.stolen_credentials
)
def remove_configured_credentials(self): def remove_configured_credentials(self):
MongoCredentialsRepository._remove_credentials_fom_collection( self._remove_credentials_fom_collection(self._database.configured_credentials)
self._database.configured_credentials
)
def remove_stolen_credentials(self): def remove_stolen_credentials(self):
MongoCredentialsRepository._remove_credentials_fom_collection( self._remove_credentials_fom_collection(self._database.stolen_credentials)
self._database.stolen_credentials
)
def remove_all_credentials(self): def remove_all_credentials(self):
self.remove_configured_credentials() self.remove_configured_credentials()

2
monkey/monkey_island/cc/resources/propagation_credentials.py
View File

@ -29,7 +29,7 @@ class PropagationCredentials(AbstractResource):
return propagation_credentials, HTTPStatus.OK return propagation_credentials, HTTPStatus.OK
def post(self, collection=None): def post(self, collection=None):
credentials = [Credentials.from_mapping(c) for c in request.json] credentials = [Credentials.from_json(c) for c in request.json]
if collection == _configured_collection: if collection == _configured_collection:
self._credentials_repository.save_configured_credentials(credentials) self._credentials_repository.save_configured_credentials(credentials)