support redis acl

Signed-off-by: my036811 <miner.yang@broadcom.com>

Author: MinerYang

configuration/configuration.go

@@ -174,6 +174,9 @@ type Configuration struct {
 		// Password string to use when making a connection.
 		Password string `yaml:"password,omitempty"`
 
+		// Username string to use when making a connection.
+		Username string `yaml:"username,omitempty"`
+
 		// DB specifies the database to connect to on the redis instance.
 		DB int `yaml:"db,omitempty"`
 

registry/handlers/app.go

@@ -18,6 +18,7 @@ import (
 	"time"
 
 	"github.com/FZambia/sentinel"
+	"github.com/distribution/distribution/v3/configuration"
 	"github.com/distribution/reference"
 	"github.com/docker/distribution"
 	"github.com/docker/distribution/configuration"
@@ -582,8 +583,15 @@ func (app *App) configureRedis(configuration *configuration.Configuration) {
 			}
 
 			// authorize the connection
-			if configuration.Redis.Password != "" {
-				if _, err = conn.Do("AUTH", configuration.Redis.Password); err != nil {
+			username := configuration.Redis.Username
+			password := configuration.Redis.Password
+			if password != "" {
+				authArgs := make([]interface{}, 0, 2)
+				if username != "" {
+					authArgs = append(authArgs, username)
+				}
+				authArgs = append(authArgs, password)
+				if _, err = conn.Do("AUTH", authArgs...); err != nil {
 					defer conn.Close()
 					done(err)
 					return nil, err

registry/handlers/app_test.go

@@ -235,6 +235,31 @@ func TestNewAppWithRedisTLSSentinelCluster(t *testing.T) {
 	runAppWithConfig(t, config)
 }
 
+func TestNewAppWithRedisSentinelACL(t *testing.T) {
+	config := configuration.Configuration{
+		Storage: configuration.Storage{
+			"testdriver": nil,
+			"maintenance": configuration.Parameters{"uploadpurging": map[interface{}]interface{}{
+				"enabled": false,
+			}},
+		},
+		Auth: configuration.Auth{
+			// For now, we simply test that new auth results in a viable
+			// application.
+			"silly": {
+				"realm":   "realm-test",
+				"service": "service-test",
+			},
+		},
+	}
+	config.Redis.Addr = "192.168.0.11:30013,192.168.0.12:30014,192.168.0.12:30015"
+	config.Redis.DB = 0
+	config.Redis.SentinelMasterSet = "mymaster"
+	config.Redis.Username = "foo"
+	config.Redis.Password = "mypwd"
+	runAppWithConfig(t, config)
+}
+
 func runAppWithConfig(t *testing.T, config configuration.Configuration) {
 	ctx := context.Background()
 	// Mostly, with this test, given a sane configuration, we are simply