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

fix log usage

Browse Source
This commit is contained in:
ginuerzh
2022-01-26 16:45:57 +08:00
parent 04dfc8c4c3
commit 713586729b
16 changed files with 183 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,6 @@ import (
"github.com/go-gost/gosocks4"
"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"
)
@ -22,20 +21,20 @@ func init() {
}
type socks4Connector struct {
user *url.Userinfo
md metadata
logger logger.Logger
user *url.Userinfo
md metadata
options connector.Options
}
func NewConnector(opts ...connector.Option) connector.Connector {
options := &connector.Options{}
options := connector.Options{}
for _, opt := range opts {
opt(options)
opt(&options)
}
return &socks4Connector{
user: options.User,
logger: options.Logger,
user: options.User,
options: options,
}
}
@ -44,24 +43,24 @@ func (c *socks4Connector) Init(md md.Metadata) (err error) {
}
func (c *socks4Connector) Connect(ctx context.Context, conn net.Conn, network, address string, opts ...connector.ConnectOption) (net.Conn, error) {
c.logger = c.logger.WithFields(map[string]interface{}{
log := c.options.Logger.WithFields(map[string]interface{}{
"remote": conn.RemoteAddr().String(),
"local": conn.LocalAddr().String(),
"network": network,
"address": address,
})
c.logger.Infof("connect %s/%s", address, network)
log.Infof("connect %s/%s", address, network)
switch network {
case "tcp", "tcp4", "tcp6":
if _, ok := conn.(net.PacketConn); ok {
err := fmt.Errorf("tcp over udp is unsupported")
c.logger.Error(err)
log.Error(err)
return nil, err
}
default:
err := fmt.Errorf("network %s is unsupported", network)
c.logger.Error(err)
log.Error(err)
return nil, err
}
@ -70,7 +69,7 @@ func (c *socks4Connector) Connect(ctx context.Context, conn net.Conn, network, a
if c.md.disable4a {
taddr, err := net.ResolveTCPAddr("tcp4", address)
if err != nil {
c.logger.Error("resolve: ", err)
log.Error("resolve: ", err)
return nil, err
}
if len(taddr.IP) == 0 {
@ -105,21 +104,21 @@ func (c *socks4Connector) Connect(ctx context.Context, conn net.Conn, network, a
}
req := gosocks4.NewRequest(gosocks4.CmdConnect, addr, userid)
if err := req.Write(conn); err != nil {
c.logger.Error(err)
log.Error(err)
return nil, err
}
c.logger.Debug(req)
log.Debug(req)
reply, err := gosocks4.ReadReply(conn)
if err != nil {
c.logger.Error(err)
log.Error(err)
return nil, err
}
c.logger.Debug(reply)
log.Debug(reply)
if reply.Code != gosocks4.Granted {
err = errors.New("host unreachable")
c.logger.Error(err)
log.Error(err)
return nil, err
}

41
pkg/connector/socks/v5/bind.go
View File

@ -10,15 +10,18 @@ import (
"github.com/go-gost/gost/pkg/common/util/socks"
"github.com/go-gost/gost/pkg/common/util/udp"
"github.com/go-gost/gost/pkg/connector"
"github.com/go-gost/gost/pkg/logger"
)
// Bind implements connector.Binder.
func (c *socks5Connector) Bind(ctx context.Context, conn net.Conn, network, address string, opts ...connector.BindOption) (net.Listener, error) {
c.logger = c.logger.WithFields(map[string]interface{}{
log := c.options.Logger.WithFields(map[string]interface{}{
"remote": conn.RemoteAddr().String(),
"local": conn.LocalAddr().String(),
"network": network,
"address": address,
})
c.logger.Infof("bind: %s/%s", address, network)
log.Infof("bind: %s/%s", address, network)
options := connector.BindOptions{}
for _, opt := range opts {
@ -28,20 +31,20 @@ func (c *socks5Connector) Bind(ctx context.Context, conn net.Conn, network, addr
switch network {
case "tcp", "tcp4", "tcp6":
if options.Mux {
return c.muxBindTCP(ctx, conn, network, address)
return c.muxBindTCP(ctx, conn, network, address, log)
}
return c.bindTCP(ctx, conn, network, address)
return c.bindTCP(ctx, conn, network, address, log)
case "udp", "udp4", "udp6":
return c.bindUDP(ctx, conn, network, address, &options)
return c.bindUDP(ctx, conn, network, address, &options, log)
default:
err := fmt.Errorf("network %s is unsupported", network)
c.logger.Error(err)
log.Error(err)
return nil, err
}
}
func (c *socks5Connector) bindTCP(ctx context.Context, conn net.Conn, network, address string) (net.Listener, error) {
laddr, err := c.bind(conn, gosocks5.CmdBind, network, address)
func (c *socks5Connector) bindTCP(ctx context.Context, conn net.Conn, network, address string, log logger.Logger) (net.Listener, error) {
laddr, err := c.bind(conn, gosocks5.CmdBind, network, address, log)
if err != nil {
return nil, err
}
@ -49,12 +52,12 @@ func (c *socks5Connector) bindTCP(ctx context.Context, conn net.Conn, network, a
return &tcpListener{
addr: laddr,
conn: conn,
logger: c.logger,
logger: log,
}, nil
}
func (c *socks5Connector) muxBindTCP(ctx context.Context, conn net.Conn, network, address string) (net.Listener, error) {
laddr, err := c.bind(conn, socks.CmdMuxBind, network, address)
func (c *socks5Connector) muxBindTCP(ctx context.Context, conn net.Conn, network, address string, log logger.Logger) (net.Listener, error) {
laddr, err := c.bind(conn, socks.CmdMuxBind, network, address, log)
if err != nil {
return nil, err
}
@ -67,12 +70,12 @@ func (c *socks5Connector) muxBindTCP(ctx context.Context, conn net.Conn, network
return &tcpMuxListener{
addr: laddr,
session: session,
logger: c.logger,
logger: log,
}, nil
}
func (c *socks5Connector) bindUDP(ctx context.Context, conn net.Conn, network, address string, opts *connector.BindOptions) (net.Listener, error) {
laddr, err := c.bind(conn, socks.CmdUDPTun, network, address)
func (c *socks5Connector) bindUDP(ctx context.Context, conn net.Conn, network, address string, opts *connector.BindOptions, log logger.Logger) (net.Listener, error) {
laddr, err := c.bind(conn, socks.CmdUDPTun, network, address, log)
if err != nil {
return nil, err
}
@ -83,19 +86,19 @@ func (c *socks5Connector) bindUDP(ctx context.Context, conn net.Conn, network, a
opts.Backlog,
opts.UDPDataQueueSize, opts.UDPDataBufferSize,
opts.UDPConnTTL,
c.logger)
log)
return ln, nil
}
func (l *socks5Connector) bind(conn net.Conn, cmd uint8, network, address string) (net.Addr, error) {
func (l *socks5Connector) bind(conn net.Conn, cmd uint8, network, address string, log logger.Logger) (net.Addr, error) {
addr := gosocks5.Addr{}
addr.ParseFrom(address)
req := gosocks5.NewRequest(cmd, &addr)
if err := req.Write(conn); err != nil {
return nil, err
}
l.logger.Debug(req)
log.Debug(req)
// first reply, bind status
reply, err := gosocks5.ReadReply(conn)
@ -103,7 +106,7 @@ func (l *socks5Connector) bind(conn net.Conn, cmd uint8, network, address string
return nil, err
}
l.logger.Debug(reply)
log.Debug(reply)
if reply.Rep != gosocks5.Succeeded {
return nil, fmt.Errorf("bind on %s/%s failed", address, network)
@ -121,7 +124,7 @@ func (l *socks5Connector) bind(conn net.Conn, cmd uint8, network, address string
if err != nil {
return nil, err
}
l.logger.Debugf("bind on %s/%s OK", baddr, baddr.Network())
log.Debugf("bind on %s/%s OK", baddr, baddr.Network())
return baddr, nil
}

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

@ -23,7 +23,6 @@ func init() {
type socks5Connector struct {
selector gosocks5.Selector
logger logger.Logger
md metadata
options connector.Options
}
@ -44,16 +43,14 @@ func (c *socks5Connector) Init(md md.Metadata) (err error) {
return
}
c.logger = c.options.Logger
selector := &clientSelector{
methods: []uint8{
gosocks5.MethodNoAuth,
gosocks5.MethodUserPass,
},
logger: c.logger,
User: c.options.User,
TLSConfig: c.options.TLSConfig,
logger: c.options.Logger,
}
if !c.md.noTLS {
selector.methods = append(selector.methods, socks.MethodTLS)
@ -70,7 +67,7 @@ func (c *socks5Connector) Init(md md.Metadata) (err error) {
// Handshake implements connector.Handshaker.
func (c *socks5Connector) Handshake(ctx context.Context, conn net.Conn) (net.Conn, error) {
c.logger = c.logger.WithFields(map[string]interface{}{
log := c.options.Logger.WithFields(map[string]interface{}{
"remote": conn.RemoteAddr().String(),
"local": conn.LocalAddr().String(),
})
@ -82,7 +79,7 @@ func (c *socks5Connector) Handshake(ctx context.Context, conn net.Conn) (net.Con
cc := gosocks5.ClientConn(conn, c.selector)
if err := cc.Handleshake(); err != nil {
c.logger.Error(err)
log.Error(err)
return nil, err
}
@ -90,11 +87,13 @@ func (c *socks5Connector) Handshake(ctx context.Context, conn net.Conn) (net.Con
}
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{}{
log := c.options.Logger.WithFields(map[string]interface{}{
"remote": conn.RemoteAddr().String(),
"local": conn.LocalAddr().String(),
"network": network,
"address": address,
})
c.logger.Infof("connect %s/%s", address, network)
log.Infof("connect %s/%s", address, network)
if c.md.connectTimeout > 0 {
conn.SetDeadline(time.Now().Add(c.md.connectTimeout))
@ -103,68 +102,68 @@ func (c *socks5Connector) Connect(ctx context.Context, conn net.Conn, network, a
switch network {
case "udp", "udp4", "udp6":
return c.connectUDP(ctx, conn, network, address)
return c.connectUDP(ctx, conn, network, address, log)
case "tcp", "tcp4", "tcp6":
if _, ok := conn.(net.PacketConn); ok {
err := fmt.Errorf("tcp over udp is unsupported")
c.logger.Error(err)
log.Error(err)
return nil, err
}
default:
err := fmt.Errorf("network %s is unsupported", network)
c.logger.Error(err)
log.Error(err)
return nil, err
}
addr := gosocks5.Addr{}
if err := addr.ParseFrom(address); err != nil {
c.logger.Error(err)
log.Error(err)
return nil, err
}
req := gosocks5.NewRequest(gosocks5.CmdConnect, &addr)
if err := req.Write(conn); err != nil {
c.logger.Error(err)
log.Error(err)
return nil, err
}
c.logger.Debug(req)
log.Debug(req)
reply, err := gosocks5.ReadReply(conn)
if err != nil {
c.logger.Error(err)
log.Error(err)
return nil, err
}
c.logger.Debug(reply)
log.Debug(reply)
if reply.Rep != gosocks5.Succeeded {
err = errors.New("host unreachable")
c.logger.Error(err)
log.Error(err)
return nil, err
}
return conn, nil
}
func (c *socks5Connector) connectUDP(ctx context.Context, conn net.Conn, network, address string) (net.Conn, error) {
func (c *socks5Connector) connectUDP(ctx context.Context, conn net.Conn, network, address string, log logger.Logger) (net.Conn, error) {
addr, err := net.ResolveUDPAddr(network, address)
if err != nil {
c.logger.Error(err)
log.Error(err)
return nil, err
}
req := gosocks5.NewRequest(socks.CmdUDPTun, nil)
if err := req.Write(conn); err != nil {
c.logger.Error(err)
log.Error(err)
return nil, err
}
c.logger.Debug(req)
log.Debug(req)
reply, err := gosocks5.ReadReply(conn)
if err != nil {
c.logger.Error(err)
log.Error(err)
return nil, err
}
c.logger.Debug(reply)
log.Debug(reply)
if reply.Rep != gosocks5.Succeeded {
return nil, errors.New("get socks5 UDP tunnel failure")