[credentialprovider] avoid potential secret leaking while reading .dockercfg #94712
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
k8s-ci-robot
added
kind/design
|
/release-note-none |
k8s-ci-robot
added
release-note-none
k8s-ci-robot
added
the
lgtm
|
/milestone v1.20 |
deads2k
reviewed
Sep 11, 2020
pkg/credentialprovider/config.go
Outdated
| @@ -230,17 +233,15 @@ func ReadDockerConfigFileFromURL(url string, client *http.Client, header *http.H | |||
|
|
|||
| func readDockerConfigFileFromBytes(contents []byte) (cfg DockerConfig, err error) { | |||
| if err = json.Unmarshal(contents, &cfg); err != nil { | |||
| klog.Errorf("while trying to parse blob %q: %v", contents, err) | |||
| return nil, err | |||
| return nil, fmt.Errorf("while trying to parse blob: %v", err) | |||
There was a problem hiding this comment.
add a test to make sure this does what you want.
deads2k
reviewed
Sep 11, 2020
deads2k
reviewed
Sep 11, 2020
|
I think a test is in order. it's not obvious that an unmarshaller does what you want here. /lgtm cancel |
k8s-ci-robot
removed
the
lgtm
k8s-ci-robot
added
size/L
droslean
force-pushed
the
cred-leak
branch
3 times, most recently
from
fd880d7 to
cec73ff
Compare
|
/approve |
k8s-ci-robot
added
the
lgtm
liggitt
reviewed
Sep 12, 2020
liggitt
reviewed
Sep 12, 2020
liggitt
reviewed
Sep 12, 2020
k8s-ci-robot
removed
the
lgtm
There are a lot of scenarios where an invalid .dockercfg file will still contain secrets. This commit removes logging of the contents to avoid any potential leaking and manages the actual error by printing to the user the actual location of the invalid file. Signed-off-by: Nikolaos Moraitis <nmoraiti@redhat.com>
|
/lgtm |
k8s-ci-robot
added
sig/node
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dims, droslean, liggitt The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
|
/test pull-kubernetes-bazel-test |
|
#94547 flake |
This was referenced Oct 7, 2020
Merged
Merged
|
I opened cherry-picks given the potential sec impact. |
k8s-ci-robot
added a commit
that referenced
this pull request
Oct 8, 2020
…upstream-release-1.19 Automated cherry pick of #94712: avoid potential secret leaking while reading .dockercfg
k8s-ci-robot
added a commit
that referenced
this pull request
Oct 8, 2020
…upstream-release-1.17 Automated cherry pick of #94712: avoid potential secret leaking while reading .dockercfg
k8s-ci-robot
added a commit
that referenced
this pull request
Oct 8, 2020
…upstream-release-1.18 Automated cherry pick of #94712: avoid potential secret leaking while reading .dockercfg
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.
There are a lot of scenarios where an invalid .dockercfg file
will still contain secrets. This commit removes the logging of the
contents to avoid any potential leaking and manages the actual error
by printing to the user the actual location of the invalid file.
/kind design
Signed-off-by: Nikolaos Moraitis nmoraiti@redhat.com