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

Agent: Use distinct fields for SSH Keypair

This commit is contained in:
Ilija Lazoroski 2022-02-16 18:37:16 +01:00
parent 5f8e3e3d8e
commit 897bc11d7b
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
monkey/infection_monkey/credential_collectors/credential_components/ssh_keypair.py
View File

@ -6,4 +6,5 @@ from infection_monkey.i_puppet import CredentialType, ICredentialComponent
@dataclass(frozen=True) @dataclass(frozen=True)
class SSHKeypair(ICredentialComponent): class SSHKeypair(ICredentialComponent):
credential_type: CredentialType = field(default=CredentialType.SSH_KEYPAIR, init=False) credential_type: CredentialType = field(default=CredentialType.SSH_KEYPAIR, init=False)
content: dict private_key: str
public_key: str

6
monkey/infection_monkey/credential_collectors/ssh_collector/ssh_credential_collector.py
View File

@ -41,7 +41,11 @@ class SSHCredentialCollector(ICredentialCollector):
ssh_keypair[key] = info[key] ssh_keypair[key] = info[key]
if len(ssh_keypair): if len(ssh_keypair):
secrets.append(SSHKeypair(ssh_keypair)) secrets.append(
SSHKeypair(
ssh_keypair.get("private_key", ""), ssh_keypair.get("public_key", "")
)
)
if identities != [] or secrets != []: if identities != [] or secrets != []:
ssh_credentials.append(Credentials(identities, secrets)) ssh_credentials.append(Credentials(identities, secrets))

6
monkey/tests/unit_tests/infection_monkey/credential_collectors/linux_credentials_collector/test_ssh_credentials_collector.py
View File

@ -52,10 +52,8 @@ def test_ssh_info_result_parsing(monkeypatch, patch_telemetry_messenger):
username2 = Username("mcus") username2 = Username("mcus")
username3 = Username("guest") username3 = Username("guest")
ssh_keypair1 = SSHKeypair( ssh_keypair1 = SSHKeypair("ExtremelyGoodPrivateKey", "SomePublicKeyUbuntu")
{"public_key": "SomePublicKeyUbuntu", "private_key": "ExtremelyGoodPrivateKey"} ssh_keypair2 = SSHKeypair("", "AnotherPublicKey")
)
ssh_keypair2 = SSHKeypair({"public_key": "AnotherPublicKey"})
expected = [ expected = [
Credentials(identities=[username], secrets=[ssh_keypair1]), Credentials(identities=[username], secrets=[ssh_keypair1]),