Merge pull request #373 from kevinxmorales/kevinxmorales/add-tls-options

Add servername and min tls version to tls config

url.go

@@ -25,7 +25,9 @@ func ParseURL(str string) (opt ClientOption, err error) {
 		}
 		opt.InitAddress = []string{strings.TrimSpace(u.Path)}
 	case "rediss":
-		opt.TLSConfig = &tls.Config{}
+		opt.TLSConfig = &tls.Config{
+			MinVersion: tls.VersionTLS12,
+		}
 	case "redis":
 	default:
 		return opt, fmt.Errorf("redis: invalid URL scheme: %s", u.Scheme)
@@ -42,6 +44,9 @@ func ParseURL(str string) (opt ClientOption, err error) {
 			port = "6379"
 		}
 		opt.InitAddress = []string{net.JoinHostPort(host, port)}
+		if opt.TLSConfig != nil {
+			opt.TLSConfig.ServerName = host
+		}
 	}
 	if u.User != nil {
 		opt.Username = u.User.Username()

url_test.go

@@ -57,6 +57,9 @@ func TestParseURL(t *testing.T) {
 	if opt, err := ParseURL("redis://?master_set=0"); opt.Sentinel.MasterSet != "0" {
 		t.Fatalf("unexpected %v %v", opt, err)
 	}
+	if opt, err := ParseURL("rediss://myhost:6379"); err != nil || opt.TLSConfig.ServerName != "myhost" {
+		t.Fatalf("unexpected %v %v", opt, err)
+	}
 }
 
 func TestMustParseURL(t *testing.T) {