improve ss

pkg/connector/connector.go

@@ -0,0 +1,14 @@
+package connector
+
+import (
+	"context"
+	"net"
+
+	"github.com/go-gost/gost/pkg/metadata"
+)
+
+// Connector is responsible for connecting to the destination address.
+type Connector interface {
+	Init(metadata.Metadata) error
+	Connect(ctx context.Context, conn net.Conn, network, address string, opts ...ConnectOption) (net.Conn, error)
+}

pkg/connector/http/connector.go

@@ -0,0 +1,116 @@
+package http
+
+import (
+	"bufio"
+	"context"
+	"encoding/base64"
+	"fmt"
+	"net"
+	"net/http"
+	"net/http/httputil"
+	"net/url"
+	"strings"
+
+	"github.com/go-gost/gost/pkg/connector"
+	"github.com/go-gost/gost/pkg/logger"
+	md "github.com/go-gost/gost/pkg/metadata"
+	"github.com/go-gost/gost/pkg/registry"
+)
+
+func init() {
+	registry.RegiserConnector("http", NewConnector)
+}
+
+type httpConnector struct {
+	md     metadata
+	logger logger.Logger
+}
+
+func NewConnector(opts ...connector.Option) connector.Connector {
+	options := &connector.Options{}
+	for _, opt := range opts {
+		opt(options)
+	}
+
+	return &httpConnector{
+		logger: options.Logger,
+	}
+}
+
+func (c *httpConnector) Init(md md.Metadata) (err error) {
+	return c.parseMetadata(md)
+}
+
+func (c *httpConnector) Connect(ctx context.Context, conn net.Conn, network, address string, opts ...connector.ConnectOption) (net.Conn, error) {
+	req := &http.Request{
+		Method:     http.MethodConnect,
+		URL:        &url.URL{Host: address},
+		Host:       address,
+		ProtoMajor: 1,
+		ProtoMinor: 1,
+		Header:     make(http.Header),
+	}
+	if c.md.UserAgent != "" {
+		req.Header.Set("User-Agent", c.md.UserAgent)
+	}
+	req.Header.Set("Proxy-Connection", "keep-alive")
+
+	c.logger = c.logger.WithFields(map[string]interface{}{
+		"local":  conn.LocalAddr().String(),
+		"remote": conn.RemoteAddr().String(),
+		"target": address,
+	})
+	c.logger.Infof("connect: ", address)
+
+	if user := c.md.User; user != nil {
+		u := user.Username()
+		p, _ := user.Password()
+		req.Header.Set("Proxy-Authorization",
+			"Basic "+base64.StdEncoding.EncodeToString([]byte(u+":"+p)))
+	}
+
+	if c.logger.IsLevelEnabled(logger.DebugLevel) {
+		dump, _ := httputil.DumpRequest(req, false)
+		c.logger.Debug(string(dump))
+	}
+
+	req = req.WithContext(ctx)
+	if err := req.Write(conn); err != nil {
+		return nil, err
+	}
+
+	resp, err := http.ReadResponse(bufio.NewReader(conn), req)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	if c.logger.IsLevelEnabled(logger.DebugLevel) {
+		dump, _ := httputil.DumpResponse(resp, false)
+		c.logger.Debug(string(dump))
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("%s", resp.Status)
+	}
+
+	return conn, nil
+}
+
+func (c *httpConnector) parseMetadata(md md.Metadata) (err error) {
+	c.md.UserAgent, _ = md.Get(userAgent).(string)
+	if c.md.UserAgent == "" {
+		c.md.UserAgent = defaultUserAgent
+	}
+
+	if v := md.GetString(auth); v != "" {
+		ss := strings.SplitN(v, ":", 2)
+		if len(ss) == 1 {
+			c.md.User = url.User(ss[0])
+		} else {
+			c.md.User = url.UserPassword(ss[0], ss[1])
+		}
+	}
+
+	return
+}

pkg/connector/http/metadata.go

@@ -0,0 +1,17 @@
+package http
+
+import "net/url"
+
+const (
+	userAgent = "userAgent"
+	auth      = "auth"
+)
+
+const (
+	defaultUserAgent = "Chrome/78.0.3904.106"
+)
+
+type metadata struct {
+	UserAgent string
+	User      *url.Userinfo
+}

pkg/connector/option.go

@@ -0,0 +1,22 @@
+package connector
+
+import (
+	"github.com/go-gost/gost/pkg/logger"
+)
+
+type Options struct {
+	Logger logger.Logger
+}
+
+type Option func(opts *Options)
+
+func LoggerOption(logger logger.Logger) Option {
+	return func(opts *Options) {
+		opts.Logger = logger
+	}
+}
+
+type ConnectOptions struct {
+}
+
+type ConnectOption func(opts *ConnectOptions)

pkg/connector/ss/connector.go

@@ -0,0 +1,99 @@
+package ss
+
+import (
+	"context"
+	"net"
+	"time"
+
+	"github.com/go-gost/gosocks5"
+	"github.com/go-gost/gost/pkg/connector"
+	"github.com/go-gost/gost/pkg/internal/bufpool"
+	"github.com/go-gost/gost/pkg/internal/utils"
+	"github.com/go-gost/gost/pkg/logger"
+	md "github.com/go-gost/gost/pkg/metadata"
+	"github.com/go-gost/gost/pkg/registry"
+)
+
+func init() {
+	registry.RegiserConnector("ss", NewConnector)
+}
+
+type Connector struct {
+	md     metadata
+	logger logger.Logger
+}
+
+func NewConnector(opts ...connector.Option) connector.Connector {
+	options := &connector.Options{}
+	for _, opt := range opts {
+		opt(options)
+	}
+
+	return &Connector{
+		logger: options.Logger,
+	}
+}
+
+func (c *Connector) Init(md md.Metadata) (err error) {
+	return c.parseMetadata(md)
+}
+
+func (c *Connector) Connect(ctx context.Context, conn net.Conn, network, address string, opts ...connector.ConnectOption) (net.Conn, error) {
+	c.logger = c.logger.WithFields(map[string]interface{}{
+		"remote": conn.RemoteAddr().String(),
+		"local":  conn.LocalAddr().String(),
+		"target": address,
+	})
+	c.logger.Infof("connect: ", address)
+
+	socksAddr, err := gosocks5.NewAddr(address)
+	if err != nil {
+		c.logger.Error("parse addr: ", err)
+		return nil, err
+	}
+	rawaddr := bufpool.Get(512)
+	defer bufpool.Put(rawaddr)
+
+	n, err := socksAddr.Encode(rawaddr)
+	if err != nil {
+		c.logger.Error("encoding addr: ", err)
+		return nil, err
+	}
+
+	conn.SetDeadline(time.Now().Add(c.md.connectTimeout))
+	defer conn.SetDeadline(time.Time{})
+
+	if c.md.cipher != nil {
+		conn = c.md.cipher.StreamConn(conn)
+	}
+
+	var sc net.Conn
+	if c.md.noDelay {
+		sc = utils.ShadowConn(conn, nil)
+		// write the addr at once.
+		if _, err := sc.Write(rawaddr[:n]); err != nil {
+			return nil, err
+		}
+	} else {
+		// cache the header
+		sc = utils.ShadowConn(conn, rawaddr[:n])
+	}
+
+	return sc, nil
+}
+
+func (c *Connector) parseMetadata(md md.Metadata) (err error) {
+	c.md.cipher, err = utils.ShadowCipher(
+		md.GetString(method),
+		md.GetString(password),
+		md.GetString(key),
+	)
+	if err != nil {
+		return
+	}
+
+	c.md.connectTimeout = md.GetDuration(connectTimeout)
+	c.md.noDelay = md.GetBool(noDelay)
+
+	return
+}

pkg/connector/ss/metadata.go

@@ -0,0 +1,21 @@
+package ss
+
+import (
+	"time"
+
+	"github.com/shadowsocks/go-shadowsocks2/core"
+)
+
+const (
+	method         = "method"
+	password       = "password"
+	key            = "key"
+	connectTimeout = "timeout"
+	noDelay        = "noDelay"
+)
+
+type metadata struct {
+	cipher         core.Cipher
+	connectTimeout time.Duration
+	noDelay        bool
+}