Add support for parsing redis:// and rediss:// URLs

This includes setting up a default dialer that handles the ssl
handshake.
This commit is contained in:
Edward Muller 2016-11-11 15:47:49 -08:00
parent 80cf5d1652
commit 019ff6eb38
2 changed files with 164 additions and 0 deletions

View File

@ -1,7 +1,12 @@
package redis package redis
import ( import (
"crypto/tls"
"errors"
"net" "net"
"net/url"
"strconv"
"strings"
"time" "time"
"gopkg.in/redis.v5/internal/pool" "gopkg.in/redis.v5/internal/pool"
@ -58,6 +63,9 @@ type Options struct {
// Enables read only queries on slave nodes. // Enables read only queries on slave nodes.
ReadOnly bool ReadOnly bool
// Config to use when connecting via TLS
TLSConfig *tls.Config
} }
func (opt *Options) init() { func (opt *Options) init() {
@ -92,6 +100,70 @@ func (opt *Options) init() {
} }
} }
// ParseURL parses a redis URL into options that can be used to connect to redis
func ParseURL(redisURL string) (*Options, error) {
o := &Options{Network: "tcp"}
u, err := url.Parse(redisURL)
if err != nil {
return nil, err
}
if u.Scheme != "redis" && u.Scheme != "rediss" {
return nil, errors.New("invalid redis URL scheme: " + u.Scheme)
}
if u.User != nil {
if p, ok := u.User.Password(); ok {
o.Password = p
}
}
if len(u.Query()) > 0 {
return nil, errors.New("no options supported")
}
h, p, err := net.SplitHostPort(u.Host)
if err != nil {
h = u.Host
}
if h == "" {
h = "localhost"
}
if p == "" {
p = "6379"
}
o.Addr = net.JoinHostPort(h, p)
f := strings.FieldsFunc(u.Path, func(r rune) bool {
return r == '/'
})
switch len(f) {
case 0:
o.DB = 0
case 1:
if o.DB, err = strconv.Atoi(f[0]); err != nil {
return nil, errors.New("Invalid redis database number: " + err.Error())
}
default:
return nil, errors.New("invalid redis URL path: " + u.Path)
}
if u.Scheme == "rediss" {
o.Dialer = func() (net.Conn, error) {
conn, err := net.DialTimeout(o.Network, o.Addr, o.DialTimeout)
if err != nil {
return nil, err
}
if o.TLSConfig == nil {
o.TLSConfig = &tls.Config{InsecureSkipVerify: true}
}
t := tls.Client(conn, o.TLSConfig)
return t, t.Handshake()
}
}
return o, nil
}
func newConnPool(opt *Options) *pool.ConnPool { func newConnPool(opt *Options) *pool.ConnPool {
return pool.NewConnPool( return pool.NewConnPool(
opt.Dialer, opt.Dialer,

92
options_test.go Normal file
View File

@ -0,0 +1,92 @@
package redis
import (
"errors"
"testing"
)
func TestParseURL(t *testing.T) {
cases := []struct {
u string
addr string
db int
dialer bool
err error
}{
{
"redis://localhost:123/1",
"localhost:123",
1, false, nil,
},
{
"redis://localhost:123",
"localhost:123",
0, false, nil,
},
{
"redis://localhost/1",
"localhost:6379",
1, false, nil,
},
{
"redis://12345",
"12345:6379",
0, false, nil,
},
{
"rediss://localhost:123",
"localhost:123",
0, true, nil,
},
{
"redis://localhost/?abc=123",
"",
0, false, errors.New("no options supported"),
},
{
"http://google.com",
"",
0, false, errors.New("invalid redis URL scheme: http"),
},
{
"redis://localhost/1/2/3/4",
"",
0, false, errors.New("invalid redis URL path: /1/2/3/4"),
},
{
"12345",
"",
0, false, errors.New("invalid redis URL scheme: "),
},
{
"redis://localhost/iamadatabase",
"",
0, false, errors.New("Invalid redis database number: strconv.ParseInt: parsing \"iamadatabase\": invalid syntax"),
},
}
for _, c := range cases {
t.Run(c.u, func(t *testing.T) {
o, err := ParseURL(c.u)
if c.err == nil && err != nil {
t.Fatalf("Expected err to be nil, but got: '%q'", err)
return
}
if c.err != nil && err != nil {
if c.err.Error() != err.Error() {
t.Fatalf("Expected err to be '%q', but got '%q'", c.err, err)
}
return
}
if o.Addr != c.addr {
t.Errorf("Expected Addr to be '%s', but got '%s'", c.addr, o.Addr)
}
if o.DB != c.db {
t.Errorf("Expecdted DB to be '%d', but got '%d'", c.db, o.DB)
}
if c.dialer && o.Dialer == nil {
t.Errorf("Expected a Dialer to be set, but isn't")
}
})
}
}