Update fingerprinters to use updated fingerprintdata #2988

cakekoa · 2023-02-20T03:47:24Z

What does this PR do?

Fixes part of #2136

Add any further explanations here.

PR Checklist

Have you added an explanation of what your changes do and why you'd like to include them?
Is the TravisCI build passing?
Was the CHANGELOG.md updated to reflect the changes?
Was the documentation framework updated to reflect the changes?
Have you checked that you haven't introduced any duplicate code?

Testing Checklist

Added relevant unit tests?
Have you successfully tested your changes locally? Elaborate:

Tested by {Running the Monkey locally with relevant config/running Island/...}
If applicable, add screenshots or log transcripts of the feature working

monkey/infection_monkey/network_scanning/http_fingerprinter.py

shreyamalviya

Approved pending the changes to the MSSQL UTs as discussed on Slack

monkey/infection_monkey/network_scanning/mssql_fingerprinter.py

monkey/infection_monkey/network_scanning/smb_fingerprinter.py

monkey/infection_monkey/network_scanning/mssql_fingerprinter.py

monkey/infection_monkey/network_scanning/smb_fingerprinter.py

monkey/infection_monkey/network_scanning/mssql_fingerprinter.py

monkey/infection_monkey/network_scanning/http_fingerprinter.py

monkey/infection_monkey/network_scanning/mssql_fingerprinter.py

VakarisZ

Some questions/suggestions

Issue #2136 PR #2988

ilija-lazoroski force-pushed the 2136-redefine-fingerprinterdata branch from 0494b0c to 7e06152 Compare February 20, 2023 08:22

shreyamalviya force-pushed the 2136-update-fingerprinters branch from d3ef224 to d1a2957 Compare February 20, 2023 08:35

ilija-lazoroski force-pushed the 2136-redefine-fingerprinterdata branch from d6b5e48 to 250c676 Compare February 20, 2023 09:51

ilija-lazoroski force-pushed the 2136-update-fingerprinters branch from d1a2957 to e87f074 Compare February 20, 2023 09:55

ilija-lazoroski changed the title ~~Agent: Update fingerprinters to use updated fingerprintdata~~ Update fingerprinters to use updated fingerprintdata Feb 20, 2023

ilija-lazoroski marked this pull request as ready for review February 20, 2023 11:11

Base automatically changed from 2136-redefine-fingerprinterdata to 2136-refactor-scanning February 20, 2023 12:10

shreyamalviya reviewed Feb 20, 2023

View reviewed changes

monkey/infection_monkey/network_scanning/http_fingerprinter.py Outdated Show resolved Hide resolved

shreyamalviya approved these changes Feb 20, 2023

View reviewed changes

mssalvatore reviewed Feb 20, 2023

View reviewed changes

monkey/infection_monkey/network_scanning/mssql_fingerprinter.py Outdated Show resolved Hide resolved

mssalvatore reviewed Feb 20, 2023

View reviewed changes

monkey/infection_monkey/network_scanning/smb_fingerprinter.py Outdated Show resolved Hide resolved

shreyamalviya requested changes Feb 20, 2023

View reviewed changes

monkey/infection_monkey/network_scanning/mssql_fingerprinter.py Outdated Show resolved Hide resolved

VakarisZ reviewed Feb 20, 2023

View reviewed changes

monkey/infection_monkey/network_scanning/mssql_fingerprinter.py Outdated Show resolved Hide resolved

VakarisZ reviewed Feb 20, 2023

View reviewed changes

monkey/infection_monkey/network_scanning/mssql_fingerprinter.py Outdated Show resolved Hide resolved

VakarisZ reviewed Feb 20, 2023

View reviewed changes

monkey/infection_monkey/network_scanning/mssql_fingerprinter.py Outdated Show resolved Hide resolved

ilija-lazoroski force-pushed the 2136-update-fingerprinters branch 2 times, most recently from 6957364 to 4af5662 Compare February 20, 2023 13:51

VakarisZ reviewed Feb 20, 2023

View reviewed changes

monkey/infection_monkey/network_scanning/smb_fingerprinter.py Show resolved Hide resolved

monkey/infection_monkey/network_scanning/mssql_fingerprinter.py Outdated Show resolved Hide resolved

VakarisZ reviewed Feb 20, 2023

View reviewed changes

monkey/infection_monkey/network_scanning/mssql_fingerprinter.py Outdated Show resolved Hide resolved

VakarisZ reviewed Feb 20, 2023

View reviewed changes

monkey/infection_monkey/network_scanning/mssql_fingerprinter.py Outdated Show resolved Hide resolved

ilija-lazoroski force-pushed the 2136-update-fingerprinters branch from c6c94d0 to 98babeb Compare February 20, 2023 14:49

cakekoa and others added 7 commits February 20, 2023 15:58

Agent: Update fingerprinters to use updated fingerprintdata

3103c1b

UT: Fix MSSQLFingerprinter tests

85f38fb

UT: Fix HTTPFinger tests

df1dd0c

UT: Fix SSHFingerprint tests

ae14a88

Agent: Use correct discovered service in MSSQL

a0e741c

Agent: Define SMB_PORT as NetworkPort

a23796d

Agent: Use request.structure.CaseInsensitiveDict in HTTPFinger

58a1b74

ilija-lazoroski force-pushed the 2136-update-fingerprinters branch from 98babeb to 58a1b74 Compare February 20, 2023 14:58

ilija-lazoroski self-requested a review February 21, 2023 08:28

ilija-lazoroski requested review from mssalvatore, VakarisZ and shreyamalviya February 21, 2023 08:28

VakarisZ reviewed Feb 21, 2023

View reviewed changes

monkey/infection_monkey/network_scanning/http_fingerprinter.py Outdated Show resolved Hide resolved

VakarisZ reviewed Feb 21, 2023

View reviewed changes

monkey/infection_monkey/network_scanning/mssql_fingerprinter.py Outdated Show resolved Hide resolved

VakarisZ reviewed Feb 21, 2023

View reviewed changes

monkey/infection_monkey/network_scanning/mssql_fingerprinter.py Outdated Show resolved Hide resolved

VakarisZ reviewed Feb 21, 2023

View reviewed changes

monkey/infection_monkey/network_scanning/mssql_fingerprinter.py Outdated Show resolved Hide resolved

VakarisZ reviewed Feb 21, 2023

View reviewed changes

monkey/infection_monkey/network_scanning/mssql_fingerprinter.py Outdated Show resolved Hide resolved

VakarisZ reviewed Feb 21, 2023

View reviewed changes

monkey/infection_monkey/network_scanning/mssql_fingerprinter.py Outdated Show resolved Hide resolved

VakarisZ reviewed Feb 21, 2023

View reviewed changes

monkey/infection_monkey/network_scanning/mssql_fingerprinter.py Outdated Show resolved Hide resolved

VakarisZ requested changes Feb 21, 2023

View reviewed changes

Agent: Refactor MSSQLFinger a bit

9b47a96

ilija-lazoroski force-pushed the 2136-update-fingerprinters branch from 30fbb1e to 9b47a96 Compare February 21, 2023 11:57

ilija-lazoroski and others added 6 commits February 21, 2023 13:04

Agent: Short up condition in HTTPFinger

48b98b1

Common: Add MSSQL_BROWSER to NetworkService

3d29d57

Agent: Make DiscoveredService hashable

ea42fcd

Agent: Add MSSQL_BROWSER to discovered services in MSSQLFinger

2e12c6c

Agent: Change DiscoveredService.services -> DiscoveredService.service

7c35e7c

UT: Change DiscoveredService.services -> DiscoveredService.service

e2171e5

VakarisZ approved these changes Feb 21, 2023

View reviewed changes

Agent: Add Unknown UDP server after recieveing data in MSSQLFinger

b98b7c8

mssalvatore approved these changes Feb 21, 2023

View reviewed changes

mssalvatore merged commit 8fa3613 into 2136-refactor-scanning Feb 21, 2023

mssalvatore deleted the 2136-update-fingerprinters branch February 21, 2023 15:48

mssalvatore added a commit that referenced this pull request Feb 22, 2023

Merge branch '2136-update-fingerprinters' into 2136-refactor-scanning

e462703

Issue #2136 PR #2988

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update fingerprinters to use updated fingerprintdata #2988

Update fingerprinters to use updated fingerprintdata #2988

Uh oh!

cakekoa commented Feb 20, 2023 •

edited by ilija-lazoroski

Loading

Uh oh!

Uh oh!

shreyamalviya left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

VakarisZ left a comment

Uh oh!

Uh oh!

Update fingerprinters to use updated fingerprintdata #2988

Update fingerprinters to use updated fingerprintdata #2988

Uh oh!

Conversation

cakekoa commented Feb 20, 2023 • edited by ilija-lazoroski Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

PR Checklist

Testing Checklist

Uh oh!

Uh oh!

shreyamalviya left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

VakarisZ left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cakekoa commented Feb 20, 2023 •

edited by ilija-lazoroski

Loading