Skip to content

utils/rpc - strip password from url when logging #1056

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

Closed
areller wants to merge 12 commits into from
Closed

utils/rpc - strip password from url when logging #1056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ae8acf6
Merge pull request #956 from ava-labs/dev
StephenButtolph Nov 27, 2021
f0a3bbb
Merge pull request #967 from ava-labs/dev
StephenButtolph Dec 8, 2021
cc8dc30
Merge pull request #977 from ava-labs/dev
StephenButtolph Dec 21, 2021
e388a89
v1.7.4
StephenButtolph Jan 18, 2022
a13d640
Merge pull request #1006 from ava-labs/dev
StephenButtolph Feb 9, 2022
224c9fd
v1.7.6
StephenButtolph Mar 2, 2022
7840200
Merge pull request #1026 from ava-labs/dev
StephenButtolph Mar 10, 2022
061dc80
Merge pull request #1028 from ava-labs/dev
StephenButtolph Mar 18, 2022
4761693
Merge pull request #1039 from ava-labs/dev
StephenButtolph Mar 29, 2022
27b3076
Merge pull request #1051 from ava-labs/dev
StephenButtolph Apr 13, 2022
ae18c25
strip password from url when logging
areller Apr 23, 2022
b658b0d
use url.Redacted instead
areller Apr 24, 2022
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
6 changes: 4 additions & 2 deletions utils/rpc/requester.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,19 @@ func (requester jsonRPCRequester) SendJSONRPCRequest(
}

url := fmt.Sprintf("%s/%s%s", requester.uri, endpoint, queryParamsStr)
logSafeUrl := stripPassword(url)

req, err := http.NewRequestWithContext(ctx, "POST", url, bytes.NewBuffer(requestBodyBytes))
if err != nil {
return fmt.Errorf("problem while creating JSON RPC POST request to %s: %s", url, err)
return fmt.Errorf("problem while creating JSON RPC POST request to %s: %s", logSafeUrl, err)
}

req.Header = headers
req.Header.Set("Content-Type", "application/json")

resp, err := requester.client.Do(req)
if err != nil {
return fmt.Errorf("problem while making JSON RPC POST request to %s: %w", url, err)
return fmt.Errorf("problem while making JSON RPC POST request to %s: %w", logSafeUrl, err)
}
statusCode := resp.StatusCode

Expand Down
14 changes: 14 additions & 0 deletions utils/rpc/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package rpc

import (
"net/url"
)

func stripPassword(uri string) string {
u, err := url.Parse(uri)
if err != nil {
return uri
}

return u.Redacted()
}