add auther config

pkg/config/parsing/chain.go

@@ -1,8 +1,6 @@
 package parsing
 
 import (
-	"net/url"
-
 	"github.com/go-gost/gost/pkg/chain"
 	tls_util "github.com/go-gost/gost/pkg/common/util/tls"
 	"github.com/go-gost/gost/pkg/config"
@@ -39,15 +37,6 @@ func ParseChain(cfg *config.ChainConfig) (chain.Chainer, error) {
 				"kind": "connector",
 			})
 
-			var user *url.Userinfo
-			if auth := v.Connector.Auth; auth != nil && auth.Username != "" {
-				if auth.Password == "" {
-					user = url.User(auth.Username)
-				} else {
-					user = url.UserPassword(auth.Username, auth.Password)
-				}
-			}
-
 			tlsCfg := v.Connector.TLS
 			if tlsCfg == nil {
 				tlsCfg = &config.TLSConfig{}
@@ -61,7 +50,7 @@ func ParseChain(cfg *config.ChainConfig) (chain.Chainer, error) {
 			}
 
 			cr := registry.GetConnector(v.Connector.Type)(
-				connector.UserOption(user),
+				connector.AuthOption(parseAuth(v.Connector.Auth)),
 				connector.TLSConfigOption(tlsConfig),
 				connector.LoggerOption(connectorLogger),
 			)
@@ -78,15 +67,6 @@ func ParseChain(cfg *config.ChainConfig) (chain.Chainer, error) {
 				"kind": "dialer",
 			})
 
-			user = nil
-			if auth := v.Dialer.Auth; auth != nil && auth.Username != "" {
-				if auth.Password == "" {
-					user = url.User(auth.Username)
-				} else {
-					user = url.UserPassword(auth.Username, auth.Password)
-				}
-			}
-
 			tlsCfg = v.Dialer.TLS
 			if tlsCfg == nil {
 				tlsCfg = &config.TLSConfig{}
@@ -100,7 +80,7 @@ func ParseChain(cfg *config.ChainConfig) (chain.Chainer, error) {
 			}
 
 			d := registry.GetDialer(v.Dialer.Type)(
-				dialer.UserOption(user),
+				dialer.AuthOption(parseAuth(v.Dialer.Auth)),
 				dialer.TLSConfigOption(tlsConfig),
 				dialer.LoggerOption(dialerLogger),
 			)

pkg/config/parsing/parse.go

@@ -2,16 +2,59 @@ package parsing
 
 import (
 	"net"
+	"net/url"
 
+	"github.com/go-gost/gost/pkg/auth"
 	"github.com/go-gost/gost/pkg/bypass"
 	"github.com/go-gost/gost/pkg/chain"
 	"github.com/go-gost/gost/pkg/config"
 	hostspkg "github.com/go-gost/gost/pkg/hosts"
 	"github.com/go-gost/gost/pkg/logger"
+	"github.com/go-gost/gost/pkg/registry"
 	"github.com/go-gost/gost/pkg/resolver"
 	resolver_impl "github.com/go-gost/gost/pkg/resolver/impl"
 )
 
+func ParseAuther(cfg *config.AutherConfig) auth.Authenticator {
+	if cfg == nil {
+		return nil
+	}
+
+	m := make(map[string]string)
+
+	for _, user := range cfg.Auths {
+		if user.Username == "" {
+			continue
+		}
+		m[user.Username] = user.Password
+	}
+
+	if len(m) == 0 {
+		return nil
+	}
+	return auth.NewMapAuthenticator(m)
+}
+
+func autherFromAuth(au *config.AuthConfig) auth.Authenticator {
+	if au == nil || au.Username == "" {
+		return nil
+	}
+	return auth.NewMapAuthenticator(map[string]string{
+		au.Username: au.Password,
+	})
+}
+
+func parseAuth(cfg *config.AuthConfig) *url.Userinfo {
+	if cfg == nil || cfg.Username == "" {
+		return nil
+	}
+
+	if cfg.Password == "" {
+		return url.User(cfg.Username)
+	}
+	return url.UserPassword(cfg.Username, cfg.Password)
+}
+
 func parseSelector(cfg *config.SelectorConfig) chain.Selector {
 	if cfg == nil {
 		return nil
@@ -57,8 +100,8 @@ func ParseResolver(cfg *config.ResolverConfig) (resolver.Resolver, error) {
 	var nameservers []resolver_impl.NameServer
 	for _, server := range cfg.Nameservers {
 		nameservers = append(nameservers, resolver_impl.NameServer{
-			Addr: server.Addr,
-			// Chain:    chains[server.Chain],
+			Addr:     server.Addr,
+			Chain:    registry.Chain().Get(server.Chain),
 			TTL:      server.TTL,
 			Timeout:  server.Timeout,
 			ClientIP: net.ParseIP(server.ClientIP),

pkg/config/parsing/service.go

@@ -1,7 +1,6 @@
 package parsing
 
 import (
-	"net/url"
 	"strings"
 
 	"github.com/go-gost/gost/pkg/chain"
@@ -48,10 +47,16 @@ func ParseService(cfg *config.ServiceConfig) (*service.Service, error) {
 		return nil, err
 	}
 
+	auther := autherFromAuth(cfg.Listener.Auth)
+	if cfg.Listener.Auther != "" {
+		auther = registry.Auther().Get(cfg.Listener.Auther)
+	}
+
 	ln := registry.GetListener(cfg.Listener.Type)(
 		listener.AddrOption(cfg.Addr),
 		listener.ChainOption(registry.Chain().Get(cfg.Listener.Chain)),
-		listener.AuthsOption(parseAuths(cfg.Listener.Auths...)...),
+		listener.AutherOption(auther),
+		listener.AuthOption(parseAuth(cfg.Listener.Auth)),
 		listener.TLSConfigOption(tlsConfig),
 		listener.LoggerOption(listenerLogger),
 	)
@@ -79,8 +84,13 @@ func ParseService(cfg *config.ServiceConfig) (*service.Service, error) {
 		return nil, err
 	}
 
+	auther = autherFromAuth(cfg.Handler.Auth)
+	if cfg.Handler.Auther != "" {
+		auther = registry.Auther().Get(cfg.Handler.Auther)
+	}
 	h := registry.GetHandler(cfg.Handler.Type)(
-		handler.AuthsOption(parseAuths(cfg.Handler.Auths...)...),
+		handler.AutherOption(auther),
+		handler.AuthOption(parseAuth(cfg.Handler.Auth)),
 		handler.RetriesOption(cfg.Handler.Retries),
 		handler.ChainOption(registry.Chain().Get(cfg.Handler.Chain)),
 		handler.BypassOption(registry.Bypass().Get(cfg.Bypass)),
@@ -111,19 +121,6 @@ func ParseService(cfg *config.ServiceConfig) (*service.Service, error) {
 	return s, nil
 }
 
-func parseAuths(cfgs ...*config.AuthConfig) []*url.Userinfo {
-	var auths []*url.Userinfo
-
-	for _, cfg := range cfgs {
-		if cfg == nil || cfg.Username == "" {
-			continue
-		}
-		auths = append(auths, url.UserPassword(cfg.Username, cfg.Password))
-	}
-
-	return auths
-}
-
 func parseForwarder(cfg *config.ForwarderConfig) *chain.NodeGroup {
 	if cfg == nil || len(cfg.Targets) == 0 {
 		return nil