Skip to content

fix: Expand sanitizeURL secrets redactions #4126

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

Merged
gmlewis merged 7 commits into from
Apr 3, 2026
+14 −3
Merged

fix: Expand sanitizeURL secrets redactions #4126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3aa7e66
fix: set GetBody in NewRequest and expand sanitizeURL redaction
YooLCD Apr 2, 2026
dca6c57
fix: expand sanitizeURL to redact access_token and token
YooLCD Apr 2, 2026
f66bd9e
fix: set GetBody in NewRequest
YooLCD Apr 2, 2026
4779ec1
fix: drop GetBody change, keep only sanitizeURL fix
YooLCD Apr 2, 2026
6b21e7c
fix: simplify sanitizeURL loop
YooLCD Apr 3, 2026
97b3c05
fix: move sensitiveParams before sanitizeURL comment
YooLCD Apr 3, 2026
3b41c36
fix: use var redacted bool in sanitizeURL
YooLCD Apr 3, 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
14 changes: 11 additions & 3 deletions github/github.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1382,15 +1382,23 @@ func (r *RedirectionError) Is(target error) bool {
r.Location != nil && v.Location != nil && r.Location.String() == v.Location.String()) // or they are both not nil and marshaled identically
}

// sanitizeURL redacts the client_secret parameter from the URL which may be
var sensitiveParams = []string{"client_secret", "access_token", "token"}

// sanitizeURL redacts sensitive parameters from the URL which may be
// exposed to the user.
func sanitizeURL(uri *url.URL) *url.URL {
if uri == nil {
return nil
}
params := uri.Query()
if len(params.Get("client_secret")) > 0 {
params.Set("client_secret", "REDACTED")
var redacted bool
for _, p := range sensitiveParams {
if len(params.Get(p)) > 0 {
params.Set(p, "REDACTED")
redacted = true
}
}
if redacted {
uri.RawQuery = params.Encode()
}
return uri
Expand Down
3 changes: 3 additions & 0 deletions github/github_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2174,6 +2174,9 @@ func TestSanitizeURL(t *testing.T) {
{"/?a=b", "/?a=b"},
{"/?a=b&client_secret=secret", "/?a=b&client_secret=REDACTED"},
{"/?a=b&client_id=id&client_secret=secret", "/?a=b&client_id=id&client_secret=REDACTED"},
{"/?a=b&access_token=secret", "/?a=b&access_token=REDACTED"},
{"/?a=b&token=secret", "/?a=b&token=REDACTED"},
{"/?client_secret=s&access_token=t&token=u", "/?access_token=REDACTED&client_secret=REDACTED&token=REDACTED"},
}

for _, tt := range tests {
Expand Down
Loading