fix insecure manifest inspect with restrictive certs perms #1378
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
Codecov Report
@@ Coverage Diff @@
## master #1378 +/- ##
=========================================
- Coverage 54.88% 54.79% -0.1%
=========================================
Files 293 293
Lines 19428 19428
=========================================
- Hits 10663 10645 -18
- Misses 8089 8110 +21
+ Partials 676 673 -3 |
vdemeester
requested review from
vdemeester,
silvin-lubecki,
thaJeztah and
justincormack
thaJeztah
approved these changes
Sep 20, 2018
cli/registry/client/fetcher.go
Outdated
| serviceOpts := registry.ServiceOptions{} | ||
| if insecure { | ||
| logrus.Debugf("allowing insecure registry for: %s", reference.Domain(namedRef)) | ||
| serviceOpts.InsecureRegistries = []string{reference.Domain(namedRef)} |
There was a problem hiding this comment.
The name was a bit confusing, so checked if reference.Domain() returned the port-number as well, but looks like it does 😅 👍 https://github.com/docker/distribution/blob/6170ac53daed40ebbebc9fe5f482495d01f09f12/reference/reference_test.go#L51-L55
There was a problem hiding this comment.
yes it does. i double-checked that b/c i had the same concern. :) thanks @thaJeztah!
|
ping @justincormack @silvin-lubecki ptal |
cli/registry/client/fetcher.go
Outdated
| repoInfo, err := registry.ParseRepositoryInfo(namedRef) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| registryService, err := registry.NewService(registry.ServiceOptions{}) | ||
|
|
||
| serviceOpts := registry.ServiceOptions{} |
There was a problem hiding this comment.
nit: var serviceOpts registry.ServiceOptions
There was a problem hiding this comment.
fixed that and re-pushed
If, for some reason, the certs directory has permissions that are inaccessible by docker, we should still be able to fetch manifests using the `insecure` flag. Since the cli doesn't access the engine's list of insecure registries, the registry client should make a singleton list of the registry being queried with the `insecure` flag. Closes docker#1358 Signed-off-by: Christy Norman <christy@linux.vnet.ibm.com>
clnperez
force-pushed
the
manifest-inspect-insecure-fix
branch
from
7e84791
to
d57adbc
Compare
|
Thanks! |
lifubang
pushed a commit
to lifubang/cli
that referenced
this pull request
Oct 12, 2018
…e-fix fix insecure manifest inspect with restrictive certs perms Signed-off-by: Lifubang <lifubang@acmcoder.com>
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.
If, for some reason, the certs directory has permissions that are
inaccessible by docker, we should still be able to fetch manifests using
the
insecureflag.Since the cli doesn't access the engine's list of insecure registries,
the registry client should make a singleton list of the registry being queried with the
insecureflag.Closes #1358
Signed-off-by: Christy Norman christy@linux.vnet.ibm.com