Skip to content
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

feat(registry): contrib/registry/zookeeper add digest acl support #1964

Merged
merged 2 commits into from
Apr 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 22 additions & 1 deletion contrib/registry/zookeeper/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ type options struct {
ctx context.Context
rootPath string
timeout time.Duration
user string
password string
}

// WithContext with registry context.
Expand All @@ -42,6 +44,14 @@ func WithTimeout(timeout time.Duration) Option {
return func(o *options) { o.timeout = timeout }
}

// WithDigestACL with registry password.
func WithDigestACL(user string, password string) Option {
return func(o *options) {
o.user = user
o.password = password
}
}

// Registry is consul registry
type Registry struct {
opts *options
Expand All @@ -63,6 +73,12 @@ func New(zkServers []string, opts ...Option) (*Registry, error) {
if err != nil {
return nil, err
}
if len(options.user) > 0 && len(options.password) > 0 {
err = conn.AddAuth("digest", []byte(options.user+":"+options.password))
if err != nil {
return nil, err
}
}
return &Registry{
opts: options,
conn: conn,
Expand Down Expand Up @@ -182,7 +198,12 @@ func (r *Registry) ensureName(path string, data []byte, flags int32) error {
return err
}
if !exists {
_, err := r.conn.Create(path, data, flags, zk.WorldACL(zk.PermAll))
var err error
if len(r.opts.user) > 0 && len(r.opts.password) > 0 {
_, err = r.conn.Create(path, data, flags, zk.DigestACL(zk.PermAll, r.opts.user, r.opts.password))
} else {
_, err = r.conn.Create(path, data, flags, zk.WorldACL(zk.PermAll))
}
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion contrib/registry/zookeeper/register_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func TestRegistry(t *testing.T) {
Endpoints: []string{"http://127.0.0.1:1111"},
}

r, _ := New([]string{"127.0.0.1:2181"})
r, _ := New([]string{"127.0.0.1:2181"}, WithDigestACL("username", "password"))

w, err := r.Watch(ctx, s.Name)
if err != nil {
Expand Down