add file and redis loader

config/config.go

@@ -74,11 +74,11 @@ type TLSConfig struct {
 }
 
 type AutherConfig struct {
-	Name string `json:"name"`
-	// inline, file, redis, etc.
-	Type  string        `yaml:",omitempty" json:"type,omitempty"`
-	Auths []*AuthConfig `yaml:",omitempty" json:"auths"`
-	// File string        `yaml:",omitempty" json:"file"`
+	Name   string        `json:"name"`
+	Auths  []*AuthConfig `yaml:",omitempty" json:"auths"`
+	Reload time.Duration `yaml:",omitempty" json:"reload,omitempty"`
+	File   *FileLoader   `yaml:",omitempty" json:"file,omitempty"`
+	Redis  *RedisLoader  `yaml:",omitempty" json:"redis,omitempty"`
 }
 
 type AuthConfig struct {
@@ -93,19 +93,32 @@ type SelectorConfig struct {
 }
 
 type AdmissionConfig struct {
-	Name string `json:"name"`
-	// inline, file, etc.
-	Type     string   `yaml:",omitempty" json:"type,omitempty"`
-	Reverse  bool     `yaml:",omitempty" json:"reverse,omitempty"`
-	Matchers []string `json:"matchers"`
+	Name     string        `json:"name"`
+	Reverse  bool          `yaml:",omitempty" json:"reverse,omitempty"`
+	Matchers []string      `json:"matchers"`
+	Reload   time.Duration `yaml:",omitempty" json:"reload,omitempty"`
+	File     *FileLoader   `yaml:",omitempty" json:"file,omitempty"`
+	Redis    *RedisLoader  `yaml:",omitempty" json:"redis,omitempty"`
 }
 
 type BypassConfig struct {
-	Name string `json:"name"`
-	// inline, file, etc.
-	Type     string   `yaml:",omitempty" json:"type,omitempty"`
-	Reverse  bool     `yaml:",omitempty" json:"reverse,omitempty"`
-	Matchers []string `json:"matchers"`
+	Name     string        `json:"name"`
+	Reverse  bool          `yaml:",omitempty" json:"reverse,omitempty"`
+	Matchers []string      `json:"matchers"`
+	Reload   time.Duration `yaml:",omitempty" json:"reload,omitempty"`
+	File     *FileLoader   `yaml:",omitempty" json:"file,omitempty"`
+	Redis    *RedisLoader  `yaml:",omitempty" json:"redis,omitempty"`
+}
+
+type FileLoader struct {
+	Path string `json:"path"`
+}
+
+type RedisLoader struct {
+	Addr     string `yaml:",omitempty" json:"addr,omitempty"`
+	DB       int    `yaml:",omitempty" json:"db,omitempty"`
+	Password string `yaml:",omitempty" json:"password,omitempty"`
+	Key      string `yaml:",omitempty" json:"key,omitempty"`
 }
 
 type NameserverConfig struct {

config/parsing/parse.go

@@ -16,6 +16,7 @@ import (
 	bypass_impl "github.com/go-gost/x/bypass"
 	"github.com/go-gost/x/config"
 	hosts_impl "github.com/go-gost/x/hosts"
+	"github.com/go-gost/x/internal/loader"
 	"github.com/go-gost/x/registry"
 	resolver_impl "github.com/go-gost/x/resolver"
 )
@@ -34,19 +35,39 @@ func ParseAuther(cfg *config.AutherConfig) auth.Authenticator {
 		m[user.Username] = user.Password
 	}
 
-	if len(m) == 0 {
-		return nil
+	opts := []auth_impl.Option{
+		auth_impl.AuthsPeriodOption(m),
+		auth_impl.ReloadPeriodOption(cfg.Reload),
+		auth_impl.LoggerOption(logger.Default().WithFields(map[string]any{
+			"kind":   "auther",
+			"auther": cfg.Name,
+		})),
 	}
-	return auth_impl.NewAuthenticator(m)
+	if cfg.File != nil && cfg.File.Path != "" {
+		opts = append(opts, auth_impl.FileLoaderOption(loader.FileLoader(cfg.File.Path)))
+	}
+	if cfg.Redis != nil && cfg.Redis.Addr != "" {
+		opts = append(opts, auth_impl.RedisLoaderOption(loader.RedisHashLoader(
+			cfg.Redis.Addr,
+			loader.DBRedisLoaderOption(cfg.Redis.DB),
+			loader.PasswordRedisLoaderOption(cfg.Redis.Password),
+			loader.KeyRedisLoaderOption(cfg.Redis.Key),
+		)))
+	}
+
+	return auth_impl.NewAuthenticator(opts...)
 }
 
 func ParseAutherFromAuth(au *config.AuthConfig) auth.Authenticator {
 	if au == nil || au.Username == "" {
 		return nil
 	}
-	return auth_impl.NewAuthenticator(map[string]string{
-		au.Username: au.Password,
-	})
+	return auth_impl.NewAuthenticator(
+		auth_impl.AuthsPeriodOption(
+			map[string]string{
+				au.Username: au.Password,
+			},
+		))
 }
 
 func parseAuth(cfg *config.AuthConfig) *url.Userinfo {
@@ -88,28 +109,55 @@ func ParseAdmission(cfg *config.AdmissionConfig) admission.Admission {
 	if cfg == nil {
 		return nil
 	}
-	return admission_impl.NewAdmission(
-		cfg.Reverse,
-		cfg.Matchers,
+	opts := []admission_impl.Option{
+		admission_impl.MatchersOption(cfg.Matchers),
+		admission_impl.ReverseOption(cfg.Reverse),
+		admission_impl.ReloadPeriodOption(cfg.Reload),
 		admission_impl.LoggerOption(logger.Default().WithFields(map[string]any{
 			"kind":      "admission",
 			"admission": cfg.Name,
 		})),
-	)
+	}
+	if cfg.File != nil && cfg.File.Path != "" {
+		opts = append(opts, admission_impl.FileLoaderOption(loader.FileLoader(cfg.File.Path)))
+	}
+	if cfg.Redis != nil && cfg.Redis.Addr != "" {
+		opts = append(opts, admission_impl.RedisLoaderOption(loader.RedisSetLoader(
+			cfg.Redis.Addr,
+			loader.DBRedisLoaderOption(cfg.Redis.DB),
+			loader.PasswordRedisLoaderOption(cfg.Redis.Password),
+			loader.KeyRedisLoaderOption(cfg.Redis.Key),
+		)))
+	}
+	return admission_impl.NewAdmission(opts...)
 }
 
 func ParseBypass(cfg *config.BypassConfig) bypass.Bypass {
 	if cfg == nil {
 		return nil
 	}
-	return bypass_impl.NewBypass(
-		cfg.Reverse,
-		cfg.Matchers,
+
+	opts := []bypass_impl.Option{
+		bypass_impl.MatchersOption(cfg.Matchers),
+		bypass_impl.ReverseOption(cfg.Reverse),
+		bypass_impl.ReloadPeriodOption(cfg.Reload),
 		bypass_impl.LoggerOption(logger.Default().WithFields(map[string]any{
 			"kind":   "bypass",
 			"bypass": cfg.Name,
 		})),
-	)
+	}
+	if cfg.File != nil && cfg.File.Path != "" {
+		opts = append(opts, bypass_impl.FileLoaderOption(loader.FileLoader(cfg.File.Path)))
+	}
+	if cfg.Redis != nil && cfg.Redis.Addr != "" {
+		opts = append(opts, bypass_impl.RedisLoaderOption(loader.RedisSetLoader(
+			cfg.Redis.Addr,
+			loader.DBRedisLoaderOption(cfg.Redis.DB),
+			loader.PasswordRedisLoaderOption(cfg.Redis.Password),
+			loader.KeyRedisLoaderOption(cfg.Redis.Key),
+		)))
+	}
+	return bypass_impl.NewBypass(opts...)
 }
 
 func ParseResolver(cfg *config.ResolverConfig) (resolver.Resolver, error) {