update config

pkg/dialer/forward/ssh/dialer.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"net"
+	"net/url"
 	"sync"
 	"time"
 
@@ -20,6 +21,7 @@ func init() {
 }
 
 type forwardDialer struct {
+	user         *url.Userinfo
 	sessions     map[string]*sshSession
 	sessionMutex sync.Mutex
 	logger       logger.Logger
@@ -33,6 +35,7 @@ func NewDialer(opts ...dialer.Option) dialer.Dialer {
 	}
 
 	return &forwardDialer{
+		user:     options.User,
 		sessions: make(map[string]*sshSession),
 		logger:   options.Logger,
 	}
@@ -161,9 +164,9 @@ func (d *forwardDialer) initSession(ctx context.Context, addr string, conn net.C
 		// Timeout:         timeout,
 		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
 	}
-	if d.md.user != nil {
-		config.User = d.md.user.Username()
-		if password, _ := d.md.user.Password(); password != "" {
+	if d.user != nil {
+		config.User = d.user.Username()
+		if password, _ := d.user.Password(); password != "" {
 			config.Auth = []ssh.AuthMethod{
 				ssh.Password(password),
 			}

pkg/dialer/forward/ssh/metadata.go

@@ -2,8 +2,6 @@ package ssh
 
 import (
 	"io/ioutil"
-	"net/url"
-	"strings"
 	"time"
 
 	mdata "github.com/go-gost/gost/pkg/metadata"
@@ -12,27 +10,16 @@ import (
 
 type metadata struct {
 	handshakeTimeout time.Duration
-	user             *url.Userinfo
 	signer           ssh.Signer
 }
 
 func (d *forwardDialer) parseMetadata(md mdata.Metadata) (err error) {
 	const (
 		handshakeTimeout = "handshakeTimeout"
-		user             = "user"
 		privateKeyFile   = "privateKeyFile"
 		passphrase       = "passphrase"
 	)
 
-	if v := mdata.GetString(md, user); v != "" {
-		ss := strings.SplitN(v, ":", 2)
-		if len(ss) == 1 {
-			d.md.user = url.User(ss[0])
-		} else {
-			d.md.user = url.UserPassword(ss[0], ss[1])
-		}
-	}
-
 	if key := mdata.GetString(md, privateKeyFile); key != "" {
 		data, err := ioutil.ReadFile(key)
 		if err != nil {

pkg/dialer/option.go

@@ -3,16 +3,24 @@ package dialer
 import (
 	"context"
 	"net"
+	"net/url"
 
 	"github.com/go-gost/gost/pkg/logger"
 )
 
 type Options struct {
+	User   *url.Userinfo
 	Logger logger.Logger
 }
 
 type Option func(opts *Options)
 
+func UserOption(user *url.Userinfo) Option {
+	return func(opts *Options) {
+		opts.User = user
+	}
+}
+
 func LoggerOption(logger logger.Logger) Option {
 	return func(opts *Options) {
 		opts.Logger = logger