Skip to content

Commit

Permalink
Merge pull request #1382 from thaJeztah/18.09_manifest-inspect-insecu…
Browse files Browse the repository at this point in the history
…re-fix

[18.09] backport fix insecure manifest inspect with restrictive certs perms
  • Loading branch information
thaJeztah authored Sep 21, 2018
2 parents 78c42cf + f9d666b commit e79e591
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions cli/registry/client/fetcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ func continueOnError(err error) bool {
}

func (c *client) iterateEndpoints(ctx context.Context, namedRef reference.Named, each func(context.Context, distribution.Repository, reference.Named) (bool, error)) error {
endpoints, err := allEndpoints(namedRef)
endpoints, err := allEndpoints(namedRef, c.insecureRegistry)
if err != nil {
return err
}
Expand Down Expand Up @@ -262,12 +262,18 @@ func (c *client) iterateEndpoints(ctx context.Context, namedRef reference.Named,
}

// allEndpoints returns a list of endpoints ordered by priority (v2, https, v1).
func allEndpoints(namedRef reference.Named) ([]registry.APIEndpoint, error) {
func allEndpoints(namedRef reference.Named, insecure bool) ([]registry.APIEndpoint, error) {
repoInfo, err := registry.ParseRepositoryInfo(namedRef)
if err != nil {
return nil, err
}
registryService, err := registry.NewService(registry.ServiceOptions{})

var serviceOpts registry.ServiceOptions
if insecure {
logrus.Debugf("allowing insecure registry for: %s", reference.Domain(namedRef))
serviceOpts.InsecureRegistries = []string{reference.Domain(namedRef)}
}
registryService, err := registry.NewService(serviceOpts)
if err != nil {
return []registry.APIEndpoint{}, err
}
Expand Down

0 comments on commit e79e591

Please sign in to comment.