Do not marshal secrets in URL's #328
Merged
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
config/http_config.go
Outdated
| } | ||
| return nil, nil | ||
| } | ||
|
|
||
| // MarshalYAML implements the yaml.Marshaler interface for URLs. |
There was a problem hiding this comment.
This comment doesn't describe this function.
config/http_config.go
Outdated
| @@ -110,11 +110,24 @@ func (u *URL) UnmarshalYAML(unmarshal func(interface{}) error) error { | |||
| // MarshalYAML implements the yaml.Marshaler interface for URLs. | |||
| func (u URL) MarshalYAML() (interface{}, error) { | |||
| if u.URL != nil { | |||
| return u.String(), nil | |||
| return u.Redact(), nil | |||
There was a problem hiding this comment.
Could we just use url.Redacted()?
There was a problem hiding this comment.
We can't as it is only supported from go 1.15 and +. But my intention was to use the same name, I will fix that.
There was a problem hiding this comment.
Go dropped support for 1.15 now that 1.17 is out. We could now require that.
SuperQ
approved these changes
Sep 28, 2021
|
I think we could update to require 1.15. |
|
That is a question for client_golang.
Le mar. 28 sept. 2021 à 07:38, Ben Kochie ***@***.***> a
écrit :
… I think we could update to require 1.15.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#328 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AACHHJWKFHOXITCWVI7CDCDUEFIHDANCNFSM5E2ZPVPA>
.
|
codesome
approved these changes
Sep 28, 2021
config/http_config.go
Outdated
Comment on lines
120
to
128
| if u.URL != nil { | ||
| ru := *u.URL | ||
| if _, ok := ru.User.Password(); ok { | ||
| // We can not use secretToken because it would be escaped. | ||
| ru.User = url.UserPassword(ru.User.Username(), "xxxxx") | ||
| } | ||
| return ru.String() | ||
| } | ||
| return "" |
There was a problem hiding this comment.
Look nicer, less indentation
Suggested change
| if u.URL != nil { | |
| ru := *u.URL | |
| if _, ok := ru.User.Password(); ok { | |
| // We can not use secretToken because it would be escaped. | |
| ru.User = url.UserPassword(ru.User.Username(), "xxxxx") | |
| } | |
| return ru.String() | |
| } | |
| return "" | |
| if u.URL == nil { | |
| return "" | |
| } | |
| ru := *u.URL | |
| if _, ok := ru.User.Password(); ok { | |
| // We can not use secretToken because it would be escaped. | |
| ru.User = url.UserPassword(ru.User.Username(), "xxxxx") | |
| } | |
| return ru.String() |
Signed-off-by: Julien Pivotto <[email protected]>
roidelapluie
force-pushed
the
no-marshal-http-secret
branch
from
a66304f to
b6d7542
Compare
SuperQ
approved these changes
Sep 28, 2021
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.
Signed-off-by: Julien Pivotto [email protected]