Do local URI verification, while attempting to defuse SSRF #879
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dustin-decker
force-pushed
the
uri-detector-local
branch
from
087f8dc
to
75ab1f1
Compare
dustin-decker
commented
Oct 29, 2022
pkg/detectors/mongodb/mongodb.go
Outdated
| @@ -21,7 +21,7 @@ var _ detectors.Detector = (*Scanner)(nil) | |||
|
|
|||
| var ( | |||
| // Make sure that your group is surrounded in boundary characters such as below to reduce false positives. | |||
| keyPat = regexp.MustCompile(`\b(mongodb(\+srv)?://(?:[^:]+:(?:[^@]+)?@)?(?:[^/]+|/.+.sock?,?)+(?:/([^/."*<>:|?]*))?\?(?:(.+=?=\S+)&?)+)\b`) | |||
| keyPat = regexp.MustCompile(`\b(mongodb(\+srv)?://[-.%\w{}]{1,50}:([-.%\S]{3,50})@[-.%\w\/:]+)\b`) | |||
There was a problem hiding this comment.
The previous regex was a bit too inclusive and exclusive, sometimes grabbing html nearby and sometimes missing things that were picked up by this pattern, which is a modified version of the URI pattern but only for the mongodb scheme.
dustin-decker
force-pushed
the
uri-detector-local
branch
from
4b25b51
to
e6de528
Compare
ahrav
approved these changes
Nov 1, 2022
| return results, nil | ||
| } | ||
|
|
||
| func verifyFTP(ctx context.Context, u *url.URL) bool { |
There was a problem hiding this comment.
nit: We can remove ctx as an arg since it doesn't look to be used.
| return results, nil | ||
| } | ||
|
|
||
| func verifyRedis(ctx context.Context, u *url.URL) bool { |
There was a problem hiding this comment.
nit: we can remove ctx as an arg here if unused.
| keyPat = regexp.MustCompile(`\b[a-zA-Z]{1,10}:?\/\/[-.%\w{}]{1,50}:([-.%\S]{3,50})@[-.%\w\/:]+\b`) | ||
| keyPat = regexp.MustCompile(`\b(?:http(?:s)?:)?\/\/[\S]{3,50}:([\S]{3,50})@[-.%\w\/:]+\b`) | ||
|
|
||
| client = common.SaneHttpClient() | ||
| ) | ||
|
|
||
| type proxyRes struct { |
There was a problem hiding this comment.
nit: I know you didn't touch this, but looks like we no longer use this struct. We can probably remove?
| return false | ||
| } | ||
|
|
||
| time.Sleep(time.Millisecond * 10) |
mac2000
pushed a commit
to mac2000/trufflehog
that referenced
this pull request
Nov 16, 2022
…curity#879) * simplify monogo pattern * do URI verification locally, while attempting to defuse SSRF * test SSRF defuse * simplify err check logic per linter recommendation * split up detectors * address comments * remove unused var
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously we used the SSRF proxy to mitigate SSRF concerns of potential malicious payloads. However this meant that URI credentials were sent up to the proxy, and verification only worked if the resource was externally accessible.
This change performs verification locally to the scanner, after attempting to defuse http and https payloads. It does so with the following 3 modifications to the detected URI:
Additionally it verifies using a GET request.
So if there is a blind SSRF payload on a state-changing GET endpoint with no filepath, it could still fire, but otherwise it should be defused.
The SSRF proxy also previously verified redis and ftp, and these have been split up into new detectors.