Merge branch 'master' into ndyakov/CAE-1088-resp3-notification-handlers

Author: ndyakov

sentinel.go

@@ -17,6 +17,7 @@ import (
 	"github.com/redis/go-redis/v9/internal/pool"
 	"github.com/redis/go-redis/v9/internal/rand"
 	"github.com/redis/go-redis/v9/push"
+	"github.com/redis/go-redis/v9/internal/util"
 )
 
 //------------------------------------------------------------------------------
@@ -274,6 +275,7 @@ func (opt *FailoverOptions) clusterOptions() *ClusterOptions {
 //     URL attributes (scheme, host, userinfo, resp.), query parameters using these
 //     names will be treated as unknown parameters
 //   - unknown parameter names will result in an error
+//   - use "skip_verify=true" to ignore TLS certificate validation
 //
 // Example:
 //
@@ -381,6 +383,10 @@ func setupFailoverConnParams(u *url.URL, o *FailoverOptions) (*FailoverOptions,
 		o.SentinelAddrs = append(o.SentinelAddrs, net.JoinHostPort(h, p))
 	}
 
+	if o.TLSConfig != nil && q.has("skip_verify") {
+		o.TLSConfig.InsecureSkipVerify = q.bool("skip_verify")
+	}
+
 	// any parameters left?
 	if r := q.remaining(); len(r) > 0 {
 		return nil, fmt.Errorf("redis: unexpected option: %s", strings.Join(r, ", "))
@@ -806,7 +812,20 @@ func (c *sentinelFailover) MasterAddr(ctx context.Context) (string, error) {
 	for err := range errCh {
 		errs = append(errs, err)
 	}
-	return "", fmt.Errorf("redis: all sentinels specified in configuration are unreachable: %w", errors.Join(errs...))
+	return "", fmt.Errorf("redis: all sentinels specified in configuration are unreachable: %s", joinErrors(errs))
+}
+
+func joinErrors(errs []error) string {
+	if len(errs) == 1 {
+		return errs[0].Error()
+	}
+
+	b := []byte(errs[0].Error())
+	for _, err := range errs[1:] {
+		b = append(b, '\n')
+		b = append(b, err.Error()...)
+	}
+	return util.BytesToString(b)
 }
 
 func (c *sentinelFailover) replicaAddrs(ctx context.Context, useDisconnected bool) ([]string, error) {

sentinel_test.go

@@ -431,6 +431,14 @@ func TestParseFailoverURL(t *testing.T) {
 					ServerName: "localhost",
 				}},
 		},
+		{
+			url: "rediss://localhost:6379/5?master_name=test&skip_verify=true",
+			o: &redis.FailoverOptions{SentinelAddrs: []string{"localhost:6379"}, MasterName: "test", DB: 5,
+				TLSConfig: &tls.Config{
+					ServerName:         "localhost",
+					InsecureSkipVerify: true,
+				}},
+		},
 		{
 			url: "redis://localhost:6379/5?master_name=test&db=2",
 			o:   &redis.FailoverOptions{SentinelAddrs: []string{"localhost:6379"}, MasterName: "test", DB: 2},