experimenting with unix socket support using redis:// scheme

Author: corpix

redis/conn.go

@@ -324,10 +324,8 @@ func DialURL(rawurl string, options ...DialOption) (Conn, error) {
 }
 
 // DialURLContext connects to a Redis server at the given URL using the Redis
-// URI scheme. It supports:
-// redis - unencrypted tcp connection
-// rediss - TLS encrypted tcp connection
-// redis+socket - UNIX socket connection
+// URI scheme. URLs should follow the draft IANA specification for the
+// scheme (https://www.iana.org/assignments/uri-schemes/prov/redis).
 func DialURLContext(ctx context.Context, rawurl string, options ...DialOption) (Conn, error) {
 	u, err := url.Parse(rawurl)
 	if err != nil {
@@ -344,66 +342,68 @@ func DialURLContext(ctx context.Context, rawurl string, options ...DialOption) (
 	)
 	switch u.Scheme {
 	case "redis", "rediss":
-		// As per the IANA draft spec, the host defaults to localhost and
-		// the port defaults to 6379.
-		host, port, err := net.SplitHostPort(u.Host)
-		if err != nil {
-			// assume port is missing
-			host = u.Host
-			port = "6379"
-		}
-		if host == "" {
-			host = "localhost"
-		}
-		network = "tcp"
-		address = net.JoinHostPort(host, port)
-
-		if u.User != nil {
-			password, isSet := u.User.Password()
-			username := u.User.Username()
-			if isSet {
-				if username != "" {
-					// ACL
-					options = append(options, DialUsername(username), DialPassword(password))
-				} else {
-					// requirepass - user-info username:password with blank username
-					options = append(options, DialPassword(password))
-				}
-			} else if username != "" {
-				// requirepass - redis-cli compatibility which treats as single arg in user-info as a password
-				options = append(options, DialPassword(username))
-			}
-		}
-		match := pathDBRegexp.FindStringSubmatch(u.Path)
-		if len(match) == 2 {
-			if len(match[1]) > 0 {
-				db, err = strconv.Atoi(match[1])
+		if (u.Host == "" || u.Host == ".") && len(u.Path) > 0 && u.Path[0] == '/' {
+			network = "unix"
+
+			address = u.Path
+			dbParameter := u.Query().Get("db")
+			if dbParameter != "" {
+				db, err = strconv.Atoi(dbParameter)
 				if err != nil {
 					return nil, fmt.Errorf("invalid database: %s", u.Path[1:])
 				}
+				if db != 0 {
+					options = append(options, DialDatabase(db))
+				}
 			}
-			if db != 0 {
-				options = append(options, DialDatabase(db))
-			}
-		} else if u.Path != "" {
-			return nil, fmt.Errorf("invalid database: %s", u.Path[1:])
-		}
+		} else {
+			network = "tcp"
 
-		options = append(options, DialUseTLS(u.Scheme == "rediss"))
-	case "redis+socket":
-		network = "unix"
-		address = u.Path
-		dbParameter := u.Query().Get("db")
-		if dbParameter != "" {
-			db, err = strconv.Atoi(dbParameter)
+			// As per the IANA draft spec, the host defaults to localhost and
+			// the port defaults to 6379.
+			host, port, err := net.SplitHostPort(u.Host)
 			if err != nil {
-				return nil, fmt.Errorf("invalid database: %s", u.Path[1:])
+				// assume port is missing
+				host = u.Host
+				port = "6379"
+			}
+			if host == "" {
+				host = "localhost"
 			}
-			if db != 0 {
-				options = append(options, DialDatabase(db))
+			address = net.JoinHostPort(host, port)
+			if u.User != nil {
+				password, isSet := u.User.Password()
+				username := u.User.Username()
+				if isSet {
+					if username != "" {
+						// ACL
+						options = append(options, DialUsername(username), DialPassword(password))
+					} else {
+						// requirepass - user-info username:password with blank username
+						options = append(options, DialPassword(password))
+					}
+				} else if username != "" {
+					// requirepass - redis-cli compatibility which treats as single arg in user-info as a password
+					options = append(options, DialPassword(username))
+				}
+			}
+			match := pathDBRegexp.FindStringSubmatch(u.Path)
+			if len(match) == 2 {
+				if len(match[1]) > 0 {
+					db, err = strconv.Atoi(match[1])
+					if err != nil {
+						return nil, fmt.Errorf("invalid database: %s", u.Path[1:])
+					}
+				}
+				if db != 0 {
+					options = append(options, DialDatabase(db))
+				}
+			} else if u.Path != "" {
+				return nil, fmt.Errorf("invalid database: %s", u.Path[1:])
 			}
 		}
-		options = append(options, DialUseTLS(false))
+
+		options = append(options, DialUseTLS(u.Scheme == "rediss"))
 	default:
 		return nil, fmt.Errorf("invalid redis URL scheme: %s", u.Scheme)
 	}

redis/conn_test.go

@@ -24,6 +24,7 @@ import (
 	"math"
 	"net"
 	"os"
+	"path/filepath"
 	"reflect"
 	"strings"
 	"sync"
@@ -661,6 +662,8 @@ func TestDialURLHost(t *testing.T) {
 	}
 }
 
+var workingDirectory, _ = os.Getwd()
+
 var dialURLTests = []struct {
 	description string
 	url         string
@@ -680,8 +683,9 @@ var dialURLTests = []struct {
 	{"database 3", "redis://localhost/3", "+OK\r\n", "*2\r\n$6\r\nSELECT\r\n$1\r\n3\r\n"},
 	{"database 99", "redis://localhost/99", "+OK\r\n", "*2\r\n$6\r\nSELECT\r\n$2\r\n99\r\n"},
 	{"no database", "redis://localhost/", "+OK\r\n", ""},
-	{"database 99", "redis+socket://./server.sock?db=99", "+OK\r\n", "*2\r\n$6\r\nSELECT\r\n$2\r\n99\r\n"},
-	{"no database", "redis+socket://./server.sock", "+OK\r\n", ""},
+	{"absolute socket path", "redis://"+filepath.Join(workingDirectory, "server.sock"), "+OK\r\n", ""},
+	{"relative socket path", "redis://./server.sock", "+OK\r\n", ""},
+	{"socket path database 99", "redis://./server.sock?db=99", "+OK\r\n", "*2\r\n$6\r\nSELECT\r\n$2\r\n99\r\n"},
 }
 
 func TestDialURL(t *testing.T) {