go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve file and redis loader

Browse Source
This commit is contained in:
ginuerzh 2022-04-21 23:24:52 +08:00
parent dca2a79c54
commit 5f3e4177a1
9 changed files with 227 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
admission/admission.go
View File

@ -164,6 +164,17 @@ func (p *admission) reload(ctx context.Context) error {
func (p *admission) load(ctx context.Context) (patterns []string, err error) {
if p.options.fileLoader != nil {
if lister, ok := p.options.fileLoader.(loader.Lister); ok {
list, er := lister.List(ctx)
if er != nil {
p.options.logger.Warnf("file loader: %v", er)
}
for _, s := range list {
if line := p.parseLine(s); line != "" {
patterns = append(patterns, line)
}
}
} else {
r, er := p.options.fileLoader.Load(ctx)
if er != nil {
p.options.logger.Warnf("file loader: %v", er)
@ -172,7 +183,15 @@ func (p *admission) load(ctx context.Context) (patterns []string, err error) {
patterns = append(patterns, v...)
}
}
}
if p.options.redisLoader != nil {
if lister, ok := p.options.redisLoader.(loader.Lister); ok {
list, er := lister.List(ctx)
if er != nil {
p.options.logger.Warnf("redis loader: %v", er)
}
patterns = append(patterns, list...)
} else {
r, er := p.options.redisLoader.Load(ctx)
if er != nil {
p.options.logger.Warnf("redis loader: %v", er)
@ -181,6 +200,7 @@ func (p *admission) load(ctx context.Context) (patterns []string, err error) {
patterns = append(patterns, v...)
}
}
}
return
}
@ -192,12 +212,7 @@ func (p *admission) parsePatterns(r io.Reader) (patterns []string, err error) {
scanner := bufio.NewScanner(r)
for scanner.Scan() {
line := scanner.Text()
if n := strings.IndexByte(line, '#'); n >= 0 {
line = line[:n]
}
line = strings.TrimSpace(line)
if line != "" {
if line := p.parseLine(scanner.Text()); line != "" {
patterns = append(patterns, line)
}
}
@ -206,6 +221,13 @@ func (p *admission) parsePatterns(r io.Reader) (patterns []string, err error) {
return
}
func (p *admission) parseLine(s string) string {
if n := strings.IndexByte(s, '#'); n >= 0 {
s = s[:n]
}
return strings.TrimSpace(s)
}
func (p *admission) matched(addr string) bool {
p.mu.RLock()
defer p.mu.RUnlock()

20
auth/auth.go
View File

@ -143,17 +143,32 @@ func (p *authenticator) load(ctx context.Context) (m map[string]string, err erro
m = make(map[string]string)
if p.options.fileLoader != nil {
if mapper, ok := p.options.fileLoader.(loader.Mapper); ok {
auths, er := mapper.Map(ctx)
if er != nil {
p.options.logger.Warnf("file loader: %v", er)
}
m = auths
} else {
r, er := p.options.fileLoader.Load(ctx)
if er != nil {
p.options.logger.Warnf("file loader: %v", er)
}
if auths, _ := p.parseAuths(r); auths != nil {
for k, v := range auths {
m[k] = v
m = auths
}
}
}
if p.options.redisLoader != nil {
if mapper, ok := p.options.fileLoader.(loader.Mapper); ok {
auths, er := mapper.Map(ctx)
if er != nil {
p.options.logger.Warnf("file loader: %v", er)
}
for k, v := range auths {
m[k] = v
}
} else {
r, er := p.options.redisLoader.Load(ctx)
if er != nil {
p.options.logger.Warnf("redis loader: %v", er)
@ -164,6 +179,7 @@ func (p *authenticator) load(ctx context.Context) (m map[string]string, err erro
}
}
}
}
return
}

34
bypass/bypass.go
View File

@ -159,6 +159,17 @@ func (bp *bypass) reload(ctx context.Context) error {
func (bp *bypass) load(ctx context.Context) (patterns []string, err error) {
if bp.options.fileLoader != nil {
if lister, ok := bp.options.fileLoader.(loader.Lister); ok {
list, er := lister.List(ctx)
if er != nil {
bp.options.logger.Warnf("file loader: %v", er)
}
for _, s := range list {
if line := bp.parseLine(s); line != "" {
patterns = append(patterns, line)
}
}
} else {
r, er := bp.options.fileLoader.Load(ctx)
if er != nil {
bp.options.logger.Warnf("file loader: %v", er)
@ -167,7 +178,15 @@ func (bp *bypass) load(ctx context.Context) (patterns []string, err error) {
patterns = append(patterns, v...)
}
}
}
if bp.options.redisLoader != nil {
if lister, ok := bp.options.redisLoader.(loader.Lister); ok {
list, er := lister.List(ctx)
if er != nil {
bp.options.logger.Warnf("redis loader: %v", er)
}
patterns = append(patterns, list...)
} else {
r, er := bp.options.redisLoader.Load(ctx)
if er != nil {
bp.options.logger.Warnf("redis loader: %v", er)
@ -176,6 +195,7 @@ func (bp *bypass) load(ctx context.Context) (patterns []string, err error) {
patterns = append(patterns, v...)
}
}
}
return
}
@ -187,12 +207,7 @@ func (bp *bypass) parsePatterns(r io.Reader) (patterns []string, err error) {
scanner := bufio.NewScanner(r)
for scanner.Scan() {
line := scanner.Text()
if n := strings.IndexByte(line, '#'); n >= 0 {
line = line[:n]
}
line = strings.TrimSpace(line)
if line != "" {
if line := bp.parseLine(scanner.Text()); line != "" {
patterns = append(patterns, line)
}
}
@ -221,6 +236,13 @@ func (bp *bypass) Contains(addr string) bool {
return b
}
func (bp *bypass) parseLine(s string) string {
if n := strings.IndexByte(s, '#'); n >= 0 {
s = s[:n]
}
return strings.TrimSpace(s)
}
func (bp *bypass) matched(addr string) bool {
bp.mu.RLock()
defer bp.mu.RUnlock()

4
config/parsing/tls.go
View File

@ -38,9 +38,9 @@ func BuildDefaultTLSConfig(cfg *config.TLSConfig) {
tlsConfig = &tls.Config{
Certificates: []tls.Certificate{cert},
}
log.Warn("load TLS certificate files failed, use random generated certificate")
log.Warn("load global TLS certificate files failed, use random generated certificate")
} else {
log.Info("load TLS certificate files OK")
log.Info("load global TLS certificate files OK")
}
defaultTLSConfig = tlsConfig
}

2
go.sum
View File

@ -121,8 +121,6 @@ github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gost/core v0.0.0-20220411145302-03988fee0b9a h1:GYdVcUmEoFVzkPNDavMsDnGA6AM+jgORE4n3/tIiKqI=
github.com/go-gost/core v0.0.0-20220411145302-03988fee0b9a/go.mod h1:bHVbCS9da6XtKNYMkMUVcck5UqDDUkyC37erVfs4GXQ=
github.com/go-gost/core v0.0.0-20220413143512-acee88323487 h1:boiBuK2m2jImLYkOlvey8bIrEl7TKM5ZbU+wNmX5oyg=
github.com/go-gost/core v0.0.0-20220413143512-acee88323487/go.mod h1:bHVbCS9da6XtKNYMkMUVcck5UqDDUkyC37erVfs4GXQ=
github.com/go-gost/gosocks4 v0.0.1 h1:+k1sec8HlELuQV7rWftIkmy8UijzUt2I6t+iMPlGB2s=

36
hosts/hosts.go
View File

@ -218,14 +218,33 @@ func (h *Hosts) reload(ctx context.Context) (err error) {
func (h *Hosts) load(ctx context.Context) (mappings []Mapping, err error) {
if h.options.fileLoader != nil {
if lister, ok := h.options.fileLoader.(loader.Lister); ok {
list, er := lister.List(ctx)
if er != nil {
h.options.logger.Warnf("file loader: %v", er)
}
for _, s := range list {
mappings = append(mappings, h.parseLine(s)...)
}
} else {
r, er := h.options.fileLoader.Load(ctx)
if er != nil {
h.options.logger.Warnf("file loader: %v", er)
}
mappings, _ = h.parseMapping(r)
}
}
if h.options.redisLoader != nil {
if lister, ok := h.options.redisLoader.(loader.Lister); ok {
list, er := lister.List(ctx)
if er != nil {
h.options.logger.Warnf("redis loader: %v", er)
}
for _, s := range list {
mappings = append(mappings, h.parseLine(s)...)
}
} else {
r, er := h.options.redisLoader.Load(ctx)
if er != nil {
h.options.logger.Warnf("redis loader: %v", er)
@ -234,6 +253,7 @@ func (h *Hosts) load(ctx context.Context) (mappings []Mapping, err error) {
mappings = append(mappings, m...)
}
}
}
return
}
@ -245,7 +265,14 @@ func (h *Hosts) parseMapping(r io.Reader) (mappings []Mapping, err error) {
scanner := bufio.NewScanner(r)
for scanner.Scan() {
line := strings.Replace(scanner.Text(), "\t", " ", -1)
mappings = append(mappings, h.parseLine(scanner.Text())...)
}
err = scanner.Err()
return
}
func (h *Hosts) parseLine(s string) (mappings []Mapping) {
line := strings.Replace(s, "\t", " ", -1)
line = strings.TrimSpace(line)
if n := strings.IndexByte(line, '#'); n >= 0 {
line = line[:n]
@ -257,12 +284,12 @@ func (h *Hosts) parseMapping(r io.Reader) (mappings []Mapping, err error) {
}
}
if len(sp) < 2 {
continue // invalid lines are ignored
return // invalid lines are ignored
}
ip := net.ParseIP(sp[0])
if ip == nil {
continue // invalid IP addresses are ignored
return // invalid IP addresses are ignored
}
for _, v := range sp[1:] {
@ -271,9 +298,6 @@ func (h *Hosts) parseMapping(r io.Reader) (mappings []Mapping, err error) {
IP: ip,
})
}
}
err = scanner.Err()
return
}

18
internal/loader/file.go
View File

@ -1,6 +1,7 @@
package loader
import (
"bufio"
"bytes"
"context"
"io"
@ -26,6 +27,23 @@ func (l *fileLoader) Load(ctx context.Context) (io.Reader, error) {
return bytes.NewReader(data), nil
}
// List implements Lister interface{}
func (l *fileLoader) List(ctx context.Context) (list []string, err error) {
f, err := os.Open(l.filename)
if err != nil {
return
}
defer f.Close()
scanner := bufio.NewScanner(f)
for scanner.Scan() {
list = append(list, scanner.Text())
}
err = scanner.Err()
return
}
func (l *fileLoader) Close() error {
return nil
}

8
internal/loader/loader.go
View File

@ -9,3 +9,11 @@ type Loader interface {
Load(context.Context) (io.Reader, error)
Close() error
}
type Lister interface {
List(ctx context.Context) ([]string, error)
}
type Mapper interface {
Map(ctx context.Context) (map[string]string, error)
}

35
internal/loader/redis.go
View File

@ -68,13 +68,18 @@ func RedisSetLoader(addr string, opts ...RedisLoaderOption) Loader {
}
func (p *redisSetLoader) Load(ctx context.Context) (io.Reader, error) {
v, err := p.client.SMembers(ctx, p.key).Result()
v, err := p.List(ctx)
if err != nil {
return nil, err
}
return bytes.NewReader([]byte(strings.Join(v, "\n"))), nil
}
// List implements Lister interface{}
func (p *redisSetLoader) List(ctx context.Context) ([]string, error) {
return p.client.SMembers(ctx, p.key).Result()
}
func (p *redisSetLoader) Close() error {
return p.client.Close()
}
@ -107,13 +112,18 @@ func RedisListLoader(addr string, opts ...RedisLoaderOption) Loader {
}
func (p *redisListLoader) Load(ctx context.Context) (io.Reader, error) {
v, err := p.client.LRange(ctx, p.key, 0, -1).Result()
v, err := p.List(ctx)
if err != nil {
return nil, err
}
return bytes.NewReader([]byte(strings.Join(v, "\n"))), nil
}
// List implements Lister interface{}
func (p *redisListLoader) List(ctx context.Context) ([]string, error) {
return p.client.LRange(ctx, p.key, 0, -1).Result()
}
func (p *redisListLoader) Close() error {
return p.client.Close()
}
@ -146,7 +156,7 @@ func RedisHashLoader(addr string, opts ...RedisLoaderOption) Loader {
}
func (p *redisHashLoader) Load(ctx context.Context) (io.Reader, error) {
m, err := p.client.HGetAll(ctx, p.key).Result()
m, err := p.Map(ctx)
if err != nil {
return nil, err
}
@ -158,6 +168,25 @@ func (p *redisHashLoader) Load(ctx context.Context) (io.Reader, error) {
return bytes.NewBufferString(b.String()), nil
}
// List implements Lister interface{}
func (p *redisHashLoader) List(ctx context.Context) (list []string, err error) {
m, err := p.Map(ctx)
if err != nil {
return
}
for k, v := range m {
list = append(list, fmt.Sprintf("%s %s", k, v))
}
return
}
// Map implements Mapper interface{}
func (p *redisHashLoader) Map(ctx context.Context) (map[string]string, error) {
return p.client.HGetAll(ctx, p.key).Result()
}
func (p *redisHashLoader) Close() error {
return p.client.Close()
}