3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-03 08:50:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

pkg/storage/redis: add redis TLS support (#1163)

Browse source 
Fixes #1156
This commit is contained in:
Cuong Manh Le 2020-07-31 19:37:23 +07:00 • committed by GitHub
parent aab9ec413e
commit bc61206b78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 409 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

53
pkg/storage/redis/redis.go
View file

@ -3,9 +3,11 @@ package redis
import (
"context"
"crypto/tls"
"fmt"
"net"
"strconv"
"strings"
"time"
"github.com/golang/protobuf/proto"
@ -35,38 +37,44 @@ type DB struct {
lastVersionKey string
versionSet string
deletedSet string
tlsConfig *tls.Config
}
// New returns new DB instance.
func New(rawURL, recordType string, deletePermanentAfter int64) (*DB, error) {
func New(rawURL, recordType string, deletePermanentAfter int64, opts ...Option) (*DB, error) {
db := &DB{
pool: &redis.Pool{
Wait: true,
Dial: func() (redis.Conn, error) {
c, err := redis.DialURL(rawURL)
if err != nil {
return nil, fmt.Errorf(`redis.DialURL(): %w`, err)
}
return c, nil
},
TestOnBorrow: func(c redis.Conn, t time.Time) error {
if time.Since(t) < time.Minute {
return nil
}
_, err := c.Do("PING")
if err != nil {
return fmt.Errorf(`c.Do("PING"): %w`, err)
}
return nil
},
},
deletePermanentlyAfter: deletePermanentAfter,
recordType: recordType,
versionSet: recordType + "_version_set",
deletedSet: recordType + "_deleted_set",
lastVersionKey: recordType + "_last_version",
}
metrics.AddRedisMetrics(db.pool.Stats)
for _, o := range opts {
o(db)
}
db.pool = &redis.Pool{
Wait: true,
Dial: func() (redis.Conn, error) {
c, err := redis.DialURL(rawURL, redis.DialTLSConfig(db.tlsConfig))
if err != nil {
return nil, fmt.Errorf(`redis.DialURL(): %w`, err)
}
return c, nil
},
TestOnBorrow: func(c redis.Conn, t time.Time) error {
if time.Since(t) < time.Minute {
return nil
}
_, err := c.Do("PING")
if err != nil {
return fmt.Errorf(`c.Do("PING"): %w`, err)
}
return nil
},
}
return db, nil
}
@ -255,6 +263,9 @@ func (db *DB) doNotifyLoop(ctx context.Context, ch chan struct{}, psc *redis.Pub
if _, ok := v.(net.Error); ok {
return
}
if strings.HasPrefix(v.Error(), "redigo: connection closed") {
return
}
}
}
}