github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1250 from awesomenix/fixemptyauth

Browse Source 
fix: support empty auth config for anonymous registry
This commit is contained in:
Lantao Liu 2019-08-29 14:40:09 -07:00 committed by GitHub
commit 567cd57f5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/server/image_pull.go
View File

@ -187,7 +187,8 @@ func ParseAuth(auth *runtime.AuthConfig, host string) (string, string, error) {
return user, strings.Trim(passwd, "\x00"), nil return user, strings.Trim(passwd, "\x00"), nil
} }
// TODO(random-liu): Support RegistryToken. // TODO(random-liu): Support RegistryToken.
return "", "", errors.New("invalid auth config") // An empty auth config is valid for anonymous registry
return "", "", nil
} }
// createImageReference creates image reference inside containerd image store. // createImageReference creates image reference inside containerd image store.

4
pkg/server/image_pull_test.go
View File

@ -42,9 +42,9 @@ func TestParseAuth(t *testing.T) {
expectErr bool expectErr bool
}{ }{
"should not return error if auth config is nil": {}, "should not return error if auth config is nil": {},
"should return error if no supported auth is provided": { "should not return error if empty auth is provided for access to anonymous registry": {
auth: &runtime.AuthConfig{}, auth: &runtime.AuthConfig{},
expectErr: true, expectErr: false,
}, },
"should support identity token": { "should support identity token": {
auth: &runtime.AuthConfig{IdentityToken: "abcd"}, auth: &runtime.AuthConfig{IdentityToken: "abcd"},