Skip to content
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

Jump to bottom

Obfuscate License Key in Agent Logs #362

Merged
merged 2 commits into from
Sep 1, 2021
Merged

Obfuscate License Key in Agent Logs #362

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ff8e85
obfuscate license key in agent logs
RichVanderwal Aug 18, 2021
e6ec68c
removed unnecessary code
RichVanderwal Aug 18, 2021
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
25 changes: 22 additions & 3 deletions v3/newrelic/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,12 @@ func collectorRequestInternal(url string, cmd rpmCmd, cs rpmControls) rpmRespons
// collectorRequest makes a request to New Relic.
func collectorRequest(cmd rpmCmd, cs rpmControls) rpmResponse {
url := rpmURL(cmd, cs)
urlWithoutLicense := removeLicenseFromURL(url)

if cs.Logger.DebugEnabled() {
cs.Logger.Debug("rpm request", map[string]interface{}{
"command": cmd.Name,
"url": url,
"url": urlWithoutLicense,
"payload": jsonString(cmd.Data),
})
}
Expand All @@ -215,14 +216,14 @@ func collectorRequest(cmd rpmCmd, cs rpmControls) rpmResponse {
if err := resp.Err; err != nil {
cs.Logger.Debug("rpm failure", map[string]interface{}{
"command": cmd.Name,
"url": url,
"url": urlWithoutLicense,
"response": string(resp.body), // Body might not be JSON on failure.
"error": err.Error(),
})
} else {
cs.Logger.Debug("rpm response", map[string]interface{}{
"command": cmd.Name,
"url": url,
"url": urlWithoutLicense,
"response": jsonString(resp.body),
})
}
Expand All @@ -231,6 +232,24 @@ func collectorRequest(cmd rpmCmd, cs rpmControls) rpmResponse {
return resp
}

func removeLicenseFromURL(u string) string {
rawURL, err := url.Parse(u)
if err != nil {
return ""
}

query := rawURL.Query()
licenseKey := query.Get("license_key")

// License key length has already been checked, but doing another
// conservative check here.
if n := len(licenseKey); n > 4 {
query.Set("license_key", string(licenseKey[0:2]+".."+licenseKey[n-2:]))
}
rawURL.RawQuery = query.Encode()
return rawURL.String()
}

type preconnectRequest struct {
SecurityPoliciesToken string `json:"security_policies_token,omitempty"`
HighSecurity bool `json:"high_security"`
Expand Down