Expand RabbitMQ validator to check loose credentials expressions. #788
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
yongyan-gh
requested review from
cfaucon,
HulonJenkins,
michaelcfanning and
suvamM
as code owners
HulonJenkins
previously approved these changes
Jul 17, 2023
| @@ -18,12 +18,19 @@ protected override IEnumerable<ValidationResult> IsValidStaticHelper(IDictionary | |||
| { | |||
| if (!groups.TryGetNonEmptyValue("id", out FlexMatch id) || | |||
| !groups.TryGetNonEmptyValue("host", out FlexMatch host) || | |||
| !groups.TryGetNonEmptyValue("secret", out FlexMatch secret) || | |||
| !groups.TryGetNonEmptyValue("resource", out FlexMatch resource)) | |||
| !groups.TryGetNonEmptyValue("secret", out FlexMatch secret)) | |||
There was a problem hiding this comment.
We shouldn't need this if statement check for id, host, and secret now that these are required in the regex. Can just be string id = groups["id"].value for all 3 #Resolved
| @@ -48,5 +48,24 @@ public static bool LikelyPowershellVariable(string input) | |||
|
|
|||
| return true; | |||
| } | |||
|
|
|||
| public static bool PasswordIsInCommonVariableContext(string secret) | |||
There was a problem hiding this comment.
Yes, the function I copied from your previous implementation. The other projects has a reference to Security can use it.
yongyan-gh
commented
Jul 17, 2023
| @@ -129,9 +129,14 @@ | |||
| $SEC101/038.PostgreSqlCredentialsAdoSecret=(?i)(?:password|pwd)\s*=\s*(?P<secret>[^,;"'<\s]{8,128})(?:[,;"'<\s]|$) | |||
| $SEC101/038.PostgreSqlCredentialsAdoResource=(?i)(?:database|db|dbname)\s*=\s*(?P<resource>[^,;"'=|&\]\[><\s]+)(?:[,;"'=|&\]\[><\s]|$) | |||
|
|
|||
| $SEC101/041.RabbitMqCredentials=(?i)amqps?:\/\/(?P<id>[^:"]+):(?P<secret>[^@\s]+)@(?P<host>[\w_\-\:]+)\/(?P<resource>[\w]+)(?:[^0-9a-z]|$) | |||
| $SEC101/041.RabbitMqCredentials=(?i)amqps?:\/\/(?P<id>[^:"]+):(?P<secret>[^@\s]+)@(?P<host>[\w_-]+)(?::?(?P<port>[0-9]{4,5}))?\/(?P<resource>[\w]+)?(?:[^0-9a-z]|$) | |||
There was a problem hiding this comment.
The change here is to add capture group for "port" explicitly and make the "resource" group optional
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.
Changes
SEC101/041.RabbitMqCredentialsvalidator to check for loose credentials. e.g.