Skip to content

Fix corrupted regex patterns in secret key detection #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
francose wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix corrupted regex patterns in secret key detection #63

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
998037c
Fix corrupted regex patterns in keys_extractor
francose May 10, 2026
14d9e5c
Use raw string for Slack Webhook pattern for consistency
francose May 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions xgitguard/common/data_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,22 +129,22 @@ def keys_extractor(code_content):
regexes = {
"AWS Tokens": "(?:A3T[A-Z0-9]|AKIA|AGPA|AIDA|AROA|AIPA|ANPA|ANVA|ASIA)[A-Z0-9]{16}",
"AWS Access Key ID": "[0-9a-zA-Z/+=]{40}",
"Google OAuth Secret": "[0-9a-zA-Zn\-_]{24}",
"Google OAuth Auth Code": "4/[0-9A-Za-zn\-_]+",
"Google OAuth Refresh Token": "1/[0-9A-Za-zn\-_]{43}|1/[0-9A-Za-zn\-_]{64}",
"Google OAuth Access Token": "ya29n.[0-9A-Za-zn\-_]+",
"Google API Key": "AIza[0-9A-Za-zn\-_]{35}",
"Google OAuth Secret": r"[0-9a-zA-Z\-_]{24}",
"Google OAuth Auth Code": r"4/[0-9A-Za-z\-_]+",
"Google OAuth Refresh Token": r"1/[0-9A-Za-z\-_]{43}|1/[0-9A-Za-z\-_]{64}",
"Google OAuth Access Token": r"ya29\.[0-9A-Za-z\-_]+",
"Google API Key": r"AIza[0-9A-Za-z\-_]{35}",
Comment on lines +132 to +136
Copy link
Copy Markdown
Author

@francose francose May 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Acknowledged — these patterns were completely non-functional before (corrupted quantifiers like f32g instead of {32}). This PR makes them syntactically correct. The remove_url_from_keys() stripping issue is pre-existing and orthogonal — will open a follow-up for that.

"RSA Private Key": "BEGIN RSA PRIVATE KEY",
"EC Private Key": "BEGIN EC PRIVATE KEY",
"PGP Private Key": "BEGIN PGP PRIVATE KEY BLOCK",
"General Private Key": "BEGIN PRIVATE KEY",
"Google YouTube OAuth ID Gmail, GCloud": "[0-9]+-[0-9A-Za-z_]f32gn.appsn.googleusercontentn.com",
"Amazon MWS": "access_tokenn$productionn$[0-9a-z]f16gn$[0-9a-f]f32g",
"PayPal": "amznn.mwsn.[0-9a-f]f8g-[0-9a-f]f4g-[0-9a-f]f4g-[0-9a-f]f4g-[0-9a-f]f12g",
"Google YouTube OAuth ID Gmail, GCloud": r"[0-9]+-[0-9A-Za-z_]{32}\.apps\.googleusercontent\.com",
"Amazon MWS": r"amzn\.mws\.[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}",
"PayPal Braintree": r"access_token\$production\$[0-9a-z]{16}\$[0-9a-f]{32}",
Comment on lines +141 to +143
Copy link
Copy Markdown
Author

@francose francose May 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above — corrected the regex syntax. The dot/underscore stripping by the sanitizer is a separate pre-existing issue. Also converted this to a raw string for consistency in the follow-up commit.

"Slack Token": "(xox[pbaor]-[0-9]{12}-[0-9]{12}-[0-9]{12}-[a-z0-9]{32})",
"AWS": "(?:.*awsSecretKey|.*aws_secret|.*api-key|.*aws_account_secret).*"
"(?=.*[A-Z])(?<![A-Za-z0-9/+=])[A-Za-z0-9/+=]{40}(?![A-Za-z0-9/+=])",
"Slack Webook": "T[a-zA-Z0-9_]{8}/B[a-zA-Z0-9_]{8}/[a-zA-Z0-9_]{24}",
"Slack Webhook": r"T[a-zA-Z0-9_]{8}/B[a-zA-Z0-9_]{8}/[a-zA-Z0-9_]{24}",
}

keys = []
Expand Down