-
Notifications
You must be signed in to change notification settings - Fork 98
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Store auth in keyring and transfer it to nydusd via environment variable #512
Open
sctb512
wants to merge
9
commits into
containerd:main
Choose a base branch
from
sctb512:get-auth-from-keyring
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
cfe4c47
auth: introduce keyring module
sctb512 48d495c
auth: introduce cache module
sctb512 bba0915
auth: add test for keyring
sctb512 cbd8f16
auth: add test for cache
sctb512 32be15d
config: add enable_keyring entry for auth configuration
sctb512 299ef4d
daemon: store auth to keyring and send it to nydusd via env
sctb512 679e932
update go.mod to adapt auth cache/keyring module
sctb512 ce775ee
misc: add enable_keyring entry for auth configuration
sctb512 c317c16
keyring: for test
sctb512 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /* | ||
| * Copyright (c) 2023. Nydus Developers. All rights reserved. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package auth | ||
|
|
||
| import ( | ||
| "sync" | ||
|
|
||
| "github.com/containerd/containerd/log" | ||
| "github.com/containerd/nydus-snapshotter/pkg/utils/registry" | ||
| "github.com/golang/groupcache/lru" | ||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| type Cache struct { | ||
| lock sync.RWMutex | ||
| cache *lru.Cache | ||
| } | ||
|
|
||
| func NewCache() *Cache { | ||
| return &Cache{ | ||
| cache: lru.New(30), | ||
| } | ||
| } | ||
|
|
||
| func (c *Cache) UpdateAuth(imageHost, auth string) error { | ||
| log.L.Debugf("update auth for %s", imageHost) | ||
| key, err := AddKeyring(imageHost, auth) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| data, err := getData(key) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| c.lock.Lock() | ||
| defer c.lock.Unlock() | ||
| c.cache.Add(imageHost, data) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (c *Cache) GetAuth(imageHost string) (string, error) { | ||
| log.L.Debugf("get auth for %s", imageHost) | ||
| if auth, ok := c.cache.Get(imageHost); ok { | ||
| return auth.(string), nil | ||
| } | ||
|
|
||
| data, err := SearchKeyring(imageHost) | ||
| if err != nil { | ||
| return "", errors.Wrap(err, "search key error") | ||
|
|
||
| } | ||
|
|
||
| c.lock.Lock() | ||
| defer c.lock.Unlock() | ||
| c.cache.Add(imageHost, data) | ||
|
|
||
| return data, err | ||
| } | ||
|
|
||
| func (c *Cache) GetKeyChain(imageID string) (*PassKeyChain, error) { | ||
| image, err := registry.ParseImage(imageID) | ||
| if err != nil { | ||
| return nil, errors.Wrapf(err, "parse image %s", imageID) | ||
| } | ||
|
|
||
| cachedAuth, err := c.GetAuth(image.Host) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| keyChain, err := FromBase64(cachedAuth) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &keyChain, nil | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * Copyright (c) 2023. Nydus Developers. All rights reserved. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package auth | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestCache_UpdateAuth(t *testing.T) { | ||
| A := assert.New(t) | ||
|
|
||
| cache := NewCache() | ||
|
|
||
| testKey1 := "docker.io" | ||
| testValue := "dXNlcjpwYXNzd29yZAo=" | ||
| err := cache.UpdateAuth(testKey1, testValue) | ||
| A.NoError(err) | ||
|
|
||
| value, err := cache.GetAuth(testKey1) | ||
| A.NoError(err) | ||
| A.Equal(testValue, value) | ||
|
|
||
| keyChain, err := cache.GetKeyChain(testKey1) | ||
| A.NoError(err) | ||
| A.Equal(keyChain.ToBase64(), value) | ||
|
|
||
| value, err = cache.GetAuth("invalidKey") | ||
| A.ErrorContains(err, "required key not available") | ||
| A.Equal(value, "") | ||
|
|
||
| testInvalidAuthValue := "invalidAuthValue" | ||
| err = cache.UpdateAuth(testKey1, testInvalidAuthValue) | ||
| A.NoError(err) | ||
|
|
||
| keyChain, err = cache.GetKeyChain(testKey1) | ||
| A.ErrorContains(err, "invalid registry auth token") | ||
| A.Nil(keyChain) | ||
| } |
Oops, something went wrong.
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 was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the error type should be transparent for the caller