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

Agent: Handle new fingerprinters config format in IPScanner

This commit is contained in:
Mike Salvatore 2022-02-07 12:55:57 -05:00
parent a989e5543a
commit 46487be05d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
monkey/infection_monkey/master/ip_scanner.py
View File

@ -95,8 +95,8 @@ class IPScanner:
fingerprint_data = {} fingerprint_data = {}
for f in interruptable_iter(fingerprinters, stop): for f in interruptable_iter(fingerprinters, stop):
fingerprint_data[f] = self._puppet.fingerprint( fingerprint_data[f["name"]] = self._puppet.fingerprint(
f, ip, ping_scan_data, port_scan_data, {} f["name"], ip, ping_scan_data, port_scan_data, f["options"]
) )
return fingerprint_data return fingerprint_data

7
monkey/tests/unit_tests/infection_monkey/master/test_ip_scanner.py
View File

@ -30,7 +30,12 @@ def scan_config():
"icmp": { "icmp": {
"timeout_ms": 1000, "timeout_ms": 1000,
}, },
"fingerprinters": {"HTTPFinger", "SMBFinger", "SSHFinger"}, "fingerprinters": [
{"name": "HTTPFinger", "options": {}},
{"name": "SMBFinger", "options": {}},
{"name": "SSHFinger", "options": {}},
]
} }