go-gost/gost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add socks5 udp relay

Browse Source
This commit is contained in:
ginuerzh
2021-11-07 23:39:35 +08:00
parent e8f040cbdf
commit 16f34d3e94
39 changed files with 728 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/connector/connector.go
View File

@ -12,3 +12,7 @@ type Connector interface {
Init(metadata.Metadata) error
Connect(ctx context.Context, conn net.Conn, network, address string, opts ...ConnectOption) (net.Conn, error)
}
type Handshaker interface {
Handshake(ctx context.Context, conn net.Conn) (net.Conn, error)
}

7
pkg/connector/http/connector.go
View File

@ -10,6 +10,7 @@ import (
"net/http/httputil"
"net/url"
"strings"
"time"
"github.com/go-gost/gost/pkg/connector"
"github.com/go-gost/gost/pkg/logger"
@ -74,6 +75,11 @@ func (c *httpConnector) Connect(ctx context.Context, conn net.Conn, network, add
c.logger.Debug(string(dump))
}
if c.md.connectTimeout > 0 {
conn.SetDeadline(time.Now().Add(c.md.connectTimeout))
defer conn.SetDeadline(time.Time{})
}
req = req.WithContext(ctx)
if err := req.Write(conn); err != nil {
return nil, err
@ -98,6 +104,7 @@ func (c *httpConnector) Connect(ctx context.Context, conn net.Conn, network, add
}
func (c *httpConnector) parseMetadata(md md.Metadata) (err error) {
c.md.connectTimeout = md.GetDuration(connectTimeout)
c.md.UserAgent, _ = md.Get(userAgent).(string)
if c.md.UserAgent == "" {
c.md.UserAgent = defaultUserAgent

15
pkg/connector/http/metadata.go
View File

@ -1,10 +1,14 @@
package http
import "net/url"
import (
"net/url"
"time"
)
const (
userAgent = "userAgent"
auth = "auth"
connectTimeout = "timeout"
userAgent = "userAgent"
auth = "auth"
)
const (
@ -12,6 +16,7 @@ const (
)
type metadata struct {
UserAgent string
User *url.Userinfo
connectTimeout time.Duration
UserAgent string
User *url.Userinfo
}

2
pkg/connector/socks/v4/connector.go
View File

@ -79,8 +79,8 @@ func (c *socks4Connector) Connect(ctx context.Context, conn net.Conn, network, a
if c.md.connectTimeout > 0 {
conn.SetDeadline(time.Now().Add(c.md.connectTimeout))
defer conn.SetDeadline(time.Time{})
}
defer conn.SetDeadline(time.Time{})
req := gosocks4.NewRequest(gosocks4.CmdConnect, addr, nil)
if err := req.Write(conn); err != nil {

128
pkg/connector/socks/v5/connector.go
View File

@ -2,27 +2,30 @@ package v5
import (
"context"
"fmt"
"crypto/tls"
"errors"
"net"
"net/url"
"strconv"
"strings"
"time"
"github.com/go-gost/gosocks4"
"github.com/go-gost/gosocks5"
"github.com/go-gost/gost/pkg/connector"
"github.com/go-gost/gost/pkg/internal/utils/socks"
"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("socks4", NewConnector)
registry.RegiserConnector("socks4a", NewConnector)
registry.RegiserConnector("socks5", NewConnector)
registry.RegiserConnector("socks", NewConnector)
}
type socks4Connector struct {
md metadata
logger logger.Logger
type socks5Connector struct {
selector gosocks5.Selector
logger logger.Logger
md metadata
}
func NewConnector(opts ...connector.Option) connector.Connector {
@ -31,64 +34,85 @@ func NewConnector(opts ...connector.Option) connector.Connector {
opt(options)
}
return &socks4Connector{
return &socks5Connector{
logger: options.Logger,
}
}
func (c *socks4Connector) Init(md md.Metadata) (err error) {
return c.parseMetadata(md)
func (c *socks5Connector) Init(md md.Metadata) (err error) {
if err = c.parseMetadata(md); err != nil {
return
}
selector := &clientSelector{
methods: []uint8{
gosocks5.MethodNoAuth,
gosocks5.MethodUserPass,
},
logger: c.logger,
User: c.md.User,
TLSConfig: c.md.tlsConfig,
}
if !c.md.noTLS {
selector.methods = append(selector.methods, socks.MethodTLS)
if selector.TLSConfig == nil {
selector.TLSConfig = &tls.Config{
InsecureSkipVerify: true,
}
}
}
c.selector = selector
return
}
func (c *socks4Connector) Connect(ctx context.Context, conn net.Conn, network, address string, opts ...connector.ConnectOption) (net.Conn, error) {
func (c *socks5Connector) Handshake(ctx context.Context, conn net.Conn) (net.Conn, error) {
c.logger = c.logger.WithFields(map[string]interface{}{
"remote": conn.RemoteAddr().String(),
"local": conn.LocalAddr().String(),
})
if c.md.connectTimeout > 0 {
conn.SetDeadline(time.Now().Add(c.md.connectTimeout))
defer conn.SetDeadline(time.Time{})
}
cc := gosocks5.ClientConn(conn, c.selector)
if err := cc.Handleshake(); err != nil {
return nil, err
}
return cc, nil
}
func (c *socks5Connector) Connect(ctx context.Context, conn net.Conn, network, address string, opts ...connector.ConnectOption) (net.Conn, error) {
c.logger = c.logger.WithFields(map[string]interface{}{
"target": address,
})
c.logger.Infof("connect: ", address)
c.logger.Info("connect: ", address)
var addr *gosocks4.Addr
if c.md.disable4a {
taddr, err := net.ResolveTCPAddr("tcp4", address)
if err != nil {
c.logger.Error("resolve: ", err)
return nil, err
}
if len(taddr.IP) == 0 {
taddr.IP = net.IPv4zero
}
addr = &gosocks4.Addr{
Type: gosocks4.AddrIPv4,
Host: taddr.IP.String(),
Port: uint16(taddr.Port),
}
} else {
host, port, err := net.SplitHostPort(address)
if err != nil {
return nil, err
}
p, _ := strconv.Atoi(port)
addr = &gosocks4.Addr{
Type: gosocks4.AddrDomain,
Host: host,
Port: uint16(p),
}
addr, err := gosocks5.NewAddr(address)
if err != nil {
c.logger.Error(err)
return nil, err
}
conn.SetDeadline(time.Now().Add(c.md.connectTimeout))
defer conn.SetDeadline(time.Time{})
req := gosocks4.NewRequest(gosocks4.CmdConnect, addr, nil)
if c.md.connectTimeout > 0 {
conn.SetDeadline(time.Now().Add(c.md.connectTimeout))
defer conn.SetDeadline(time.Time{})
}
req := gosocks5.NewRequest(gosocks5.CmdConnect, addr)
if err := req.Write(conn); err != nil {
c.logger.Error(err)
return nil, err
}
if c.logger.IsLevelEnabled(logger.DebugLevel) {
c.logger.Debug(req)
}
reply, err := gosocks4.ReadReply(conn)
reply, err := gosocks5.ReadReply(conn)
if err != nil {
c.logger.Error(err)
return nil, err
@ -98,19 +122,25 @@ func (c *socks4Connector) Connect(ctx context.Context, conn net.Conn, network, a
c.logger.Debug(reply)
}
if reply.Code != gosocks4.Granted {
return nil, fmt.Errorf("error: %d", reply.Code)
if reply.Rep != gosocks5.Succeeded {
return nil, errors.New("service unavailable")
}
return conn, nil
}
func (c *socks4Connector) parseMetadata(md md.Metadata) (err error) {
func (c *socks5Connector) parseMetadata(md md.Metadata) (err error) {
if v := md.GetString(auth); v != "" {
c.md.User = url.User(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])
}
}
c.md.connectTimeout = md.GetDuration(connectTimeout)
c.md.disable4a = md.GetBool(disable4a)
c.md.noTLS = md.GetBool(noTLS)
return
}

6
pkg/connector/socks/v5/metadata.go
View File

@ -1,6 +1,7 @@
package v5
import (
"crypto/tls"
"net/url"
"time"
)
@ -8,11 +9,12 @@ import (
const (
connectTimeout = "timeout"
auth = "auth"
disable4a = "disable4a"
noTLS = "notls"
)
type metadata struct {
connectTimeout time.Duration
User *url.Userinfo
disable4a bool
tlsConfig *tls.Config
noTLS bool
}

81
pkg/connector/socks/v5/selector.go Normal file
View File

@ -0,0 +1,81 @@
package v5
import (
"crypto/tls"
"net"
"net/url"
"github.com/go-gost/gosocks5"
"github.com/go-gost/gost/pkg/internal/utils/socks"
"github.com/go-gost/gost/pkg/logger"
)
type clientSelector struct {
methods []uint8
User *url.Userinfo
TLSConfig *tls.Config
logger logger.Logger
}
func (s *clientSelector) Methods() []uint8 {
if s.logger.IsLevelEnabled(logger.DebugLevel) {
s.logger.Debug("methods: ", s.methods)
}
return s.methods
}
func (s *clientSelector) AddMethod(methods ...uint8) {
s.methods = append(s.methods, methods...)
}
func (s *clientSelector) Select(methods ...uint8) (method uint8) {
return
}
func (s *clientSelector) OnSelected(method uint8, conn net.Conn) (net.Conn, error) {
if s.logger.IsLevelEnabled(logger.DebugLevel) {
s.logger.Debug("method selected: ", method)
}
switch method {
case socks.MethodTLS:
conn = tls.Client(conn, s.TLSConfig)
case gosocks5.MethodUserPass, socks.MethodTLSAuth:
if method == socks.MethodTLSAuth {
conn = tls.Client(conn, s.TLSConfig)
}
var username, password string
if s.User != nil {
username = s.User.Username()
password, _ = s.User.Password()
}
req := gosocks5.NewUserPassRequest(gosocks5.UserPassVer, username, password)
if err := req.Write(conn); err != nil {
s.logger.Error(err)
return nil, err
}
if s.logger.IsLevelEnabled(logger.DebugLevel) {
s.logger.Debug(req)
}
resp, err := gosocks5.ReadUserPassResponse(conn)
if err != nil {
s.logger.Error(err)
return nil, err
}
if s.logger.IsLevelEnabled(logger.DebugLevel) {
s.logger.Debug(resp)
}
if resp.Status != gosocks5.Succeeded {
return nil, gosocks5.ErrAuthFailure
}
case gosocks5.MethodNoAcceptable:
return nil, gosocks5.ErrBadMethod
}
return conn, nil
}

8
pkg/connector/ss/connector.go
View File

@ -8,7 +8,7 @@ import (
"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/internal/utils/ss"
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
"github.com/go-gost/gost/pkg/registry"
@ -71,21 +71,21 @@ func (c *ssConnector) Connect(ctx context.Context, conn net.Conn, network, addre
var sc net.Conn
if c.md.noDelay {
sc = utils.ShadowConn(conn, nil)
sc = ss.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])
sc = ss.ShadowConn(conn, rawaddr[:n])
}
return sc, nil
}
func (c *ssConnector) parseMetadata(md md.Metadata) (err error) {
c.md.cipher, err = utils.ShadowCipher(
c.md.cipher, err = ss.ShadowCipher(
md.GetString(method),
md.GetString(password),
md.GetString(key),