update config

pkg/listener/option.go

@@ -1,12 +1,14 @@
 package listener
 
 import (
+	"github.com/go-gost/gost/pkg/auth"
 	"github.com/go-gost/gost/pkg/logger"
 )
 
 type Options struct {
-	Addr   string
-	Logger logger.Logger
+	Addr          string
+	Authenticator auth.Authenticator
+	Logger        logger.Logger
 }
 
 type Option func(opts *Options)
@@ -17,6 +19,12 @@ func AddrOption(addr string) Option {
 	}
 }
 
+func AuthenticatorOption(auth auth.Authenticator) Option {
+	return func(opts *Options) {
+		opts.Authenticator = auth
+	}
+}
+
 func LoggerOption(logger logger.Logger) Option {
 	return func(opts *Options) {
 		opts.Logger = logger

pkg/listener/ssh/listener.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net"
 
+	"github.com/go-gost/gost/pkg/auth"
 	ssh_util "github.com/go-gost/gost/pkg/internal/util/ssh"
 	"github.com/go-gost/gost/pkg/listener"
 	"github.com/go-gost/gost/pkg/logger"
@@ -19,11 +20,12 @@ func init() {
 type sshListener struct {
 	addr string
 	net.Listener
-	config  *ssh.ServerConfig
-	cqueue  chan net.Conn
-	errChan chan error
-	logger  logger.Logger
-	md      metadata
+	config        *ssh.ServerConfig
+	authenticator auth.Authenticator
+	cqueue        chan net.Conn
+	errChan       chan error
+	logger        logger.Logger
+	md            metadata
 }
 
 func NewListener(opts ...listener.Option) listener.Listener {
@@ -50,13 +52,13 @@ func (l *sshListener) Init(md md.Metadata) (err error) {
 	l.Listener = ln
 
 	config := &ssh.ServerConfig{
-		PasswordCallback:  ssh_util.PasswordCallback(l.md.authenticator),
+		PasswordCallback:  ssh_util.PasswordCallback(l.authenticator),
 		PublicKeyCallback: ssh_util.PublicKeyCallback(l.md.authorizedKeys),
 	}
 
 	config.AddHostKey(l.md.signer)
 
-	if l.md.authenticator == nil && len(l.md.authorizedKeys) == 0 {
+	if l.authenticator == nil && len(l.md.authorizedKeys) == 0 {
 		config.NoClientAuth = true
 	}
 

pkg/listener/ssh/metadata.go

@@ -2,9 +2,7 @@ package ssh
 
 import (
 	"io/ioutil"
-	"strings"
 
-	"github.com/go-gost/gost/pkg/auth"
 	tls_util "github.com/go-gost/gost/pkg/common/util/tls"
 	ssh_util "github.com/go-gost/gost/pkg/internal/util/ssh"
 	mdata "github.com/go-gost/gost/pkg/metadata"
@@ -16,7 +14,6 @@ const (
 )
 
 type metadata struct {
-	authenticator  auth.Authenticator
 	signer         ssh.Signer
 	authorizedKeys map[string]bool
 	backlog        int
@@ -24,26 +21,12 @@ type metadata struct {
 
 func (l *sshListener) parseMetadata(md mdata.Metadata) (err error) {
 	const (
-		users          = "users"
 		authorizedKeys = "authorizedKeys"
 		privateKeyFile = "privateKeyFile"
 		passphrase     = "passphrase"
 		backlog        = "backlog"
 	)
 
-	if auths := mdata.GetStrings(md, users); len(auths) > 0 {
-		authenticator := auth.NewLocalAuthenticator(nil)
-		for _, auth := range auths {
-			ss := strings.SplitN(auth, ":", 2)
-			if len(ss) == 1 {
-				authenticator.Add(ss[0], "")
-			} else {
-				authenticator.Add(ss[0], ss[1])
-			}
-		}
-		l.md.authenticator = authenticator
-	}
-
 	if key := mdata.GetString(md, privateKeyFile); key != "" {
 		data, err := ioutil.ReadFile(key)
 		if err != nil {