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

add resolver for router

Browse Source
This commit is contained in:
ginuerzh
2021-12-30 23:07:05 +08:00
parent a6671a468e
commit a430384bba
22 changed files with 362 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/handler/http/handler.go
View File

@ -29,8 +29,8 @@ func init() {
}
type httpHandler struct {
chain *chain.Chain
bypass bypass.Bypass
router *chain.Router
logger logger.Logger
md metadata
}
@ -43,17 +43,26 @@ func NewHandler(opts ...handler.Option) handler.Handler {
return &httpHandler{
bypass: options.Bypass,
router: (&chain.Router{}).
WithLogger(options.Logger).
WithResolver(options.Resolver),
logger: options.Logger,
}
}
func (h *httpHandler) Init(md md.Metadata) error {
return h.parseMetadata(md)
if err := h.parseMetadata(md); err != nil {
return err
}
h.router.WithRetry(h.md.retryCount)
return nil
}
// implements chain.Chainable interface
func (h *httpHandler) WithChain(chain *chain.Chain) {
h.chain = chain
h.router.WithChain(chain)
}
func (h *httpHandler) Handle(ctx context.Context, conn net.Conn) {
@ -192,11 +201,7 @@ func (h *httpHandler) handleRequest(ctx context.Context, conn net.Conn, req *htt
req.Header.Del("Proxy-Authorization")
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
cc, err := r.Dial(ctx, network, addr)
cc, err := h.router.Dial(ctx, network, addr)
if err != nil {
resp.StatusCode = http.StatusServiceUnavailable
resp.Write(conn)

7
pkg/handler/http/udp.go
View File

@ -7,7 +7,6 @@ import (
"net/http/httputil"
"time"
"github.com/go-gost/gost/pkg/chain"
"github.com/go-gost/gost/pkg/common/util/socks"
"github.com/go-gost/gost/pkg/handler"
"github.com/go-gost/gost/pkg/logger"
@ -51,11 +50,7 @@ func (h *httpHandler) handleUDP(ctx context.Context, conn net.Conn, network, add
}
// obtain a udp connection
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
c, err := r.Dial(ctx, "udp", "") // UDP association
c, err := h.router.Dial(ctx, "udp", "") // UDP association
if err != nil {
h.logger.Error(err)
return

27
pkg/handler/http2/handler.go
View File

@ -29,8 +29,8 @@ func init() {
}
type http2Handler struct {
chain *chain.Chain
bypass bypass.Bypass
router *chain.Router
logger logger.Logger
md metadata
}
@ -43,17 +43,26 @@ func NewHandler(opts ...handler.Option) handler.Handler {
return &http2Handler{
bypass: options.Bypass,
router: (&chain.Router{}).
WithLogger(options.Logger).
WithResolver(options.Resolver),
logger: options.Logger,
}
}
func (h *http2Handler) Init(md md.Metadata) error {
return h.parseMetadata(md)
if err := h.parseMetadata(md); err != nil {
return err
}
h.router.WithRetry(h.md.retryCount)
return nil
}
// implements chain.Chainable interface
func (h *http2Handler) WithChain(chain *chain.Chain) {
h.chain = chain
h.router.WithChain(chain)
}
func (h *http2Handler) Handle(ctx context.Context, conn net.Conn) {
@ -154,11 +163,7 @@ func (h *http2Handler) roundTrip(ctx context.Context, w http.ResponseWriter, req
req.Header.Del("Proxy-Authorization")
req.Header.Del("Proxy-Connection")
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
cc, err := r.Dial(ctx, "tcp", addr)
cc, err := h.router.Dial(ctx, "tcp", addr)
if err != nil {
h.logger.Error(err)
w.WriteHeader(http.StatusServiceUnavailable)
@ -312,11 +317,7 @@ func (h *http2Handler) handleRequest(ctx context.Context, conn net.Conn, req *ht
req.Header.Del("Proxy-Authorization")
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
cc, err := r.Dial(ctx, network, addr)
cc, err := h.router.Dial(ctx, network, addr)
if err != nil {
resp.StatusCode = http.StatusServiceUnavailable
resp.Write(conn)

12
pkg/handler/option.go
View File

@ -3,11 +3,13 @@ package handler
import (
"github.com/go-gost/gost/pkg/bypass"
"github.com/go-gost/gost/pkg/logger"
"github.com/go-gost/gost/pkg/resolver"
)
type Options struct {
Bypass bypass.Bypass
Logger logger.Logger
Bypass bypass.Bypass
Resolver resolver.Resolver
Logger logger.Logger
}
type Option func(opts *Options)
@ -23,3 +25,9 @@ func BypassOption(bypass bypass.Bypass) Option {
opts.Bypass = bypass
}
}
func ResolverOption(resolver resolver.Resolver) Option {
return func(opts *Options) {
opts.Resolver = resolver
}
}

7
pkg/handler/relay/connect.go
View File

@ -6,7 +6,6 @@ import (
"net"
"time"
"github.com/go-gost/gost/pkg/chain"
"github.com/go-gost/gost/pkg/handler"
"github.com/go-gost/relay"
)
@ -38,11 +37,7 @@ func (h *relayHandler) handleConnect(ctx context.Context, conn net.Conn, network
return
}
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
cc, err := r.Dial(ctx, network, address)
cc, err := h.router.Dial(ctx, network, address)
if err != nil {
resp.Status = relay.StatusNetworkUnreachable
resp.WriteTo(conn)

8
pkg/handler/relay/forward.go
View File

@ -6,7 +6,6 @@ import (
"net"
"time"
"github.com/go-gost/gost/pkg/chain"
"github.com/go-gost/gost/pkg/handler"
"github.com/go-gost/relay"
)
@ -30,12 +29,7 @@ func (h *relayHandler) handleForward(ctx context.Context, conn net.Conn, network
h.logger.Infof("%s >> %s", conn.RemoteAddr(), target.Addr())
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
cc, err := r.Dial(ctx, network, target.Addr())
cc, err := h.router.Dial(ctx, network, target.Addr())
if err != nil {
// TODO: the router itself may be failed due to the failed node in the router,
// the dead marker may be a wrong operation.

15
pkg/handler/relay/handler.go
View File

@ -21,8 +21,8 @@ func init() {
type relayHandler struct {
group *chain.NodeGroup
chain *chain.Chain
bypass bypass.Bypass
router *chain.Router
logger logger.Logger
md metadata
}
@ -35,17 +35,26 @@ func NewHandler(opts ...handler.Option) handler.Handler {
return &relayHandler{
bypass: options.Bypass,
router: (&chain.Router{}).
WithLogger(options.Logger).
WithResolver(options.Resolver),
logger: options.Logger,
}
}
func (h *relayHandler) Init(md md.Metadata) (err error) {
return h.parseMetadata(md)
if err := h.parseMetadata(md); err != nil {
return err
}
h.router.WithRetry(h.md.retryCount)
return nil
}
// WithChain implements chain.Chainable interface
func (h *relayHandler) WithChain(chain *chain.Chain) {
h.chain = chain
h.router.WithChain(chain)
}
// Forward implements handler.Forwarder.

15
pkg/handler/sni/handler.go
View File

@ -27,8 +27,8 @@ func init() {
type sniHandler struct {
httpHandler handler.Handler
chain *chain.Chain
bypass bypass.Bypass
router *chain.Router
logger logger.Logger
md metadata
}
@ -46,6 +46,9 @@ func NewHandler(opts ...handler.Option) handler.Handler {
h := &sniHandler{
bypass: options.Bypass,
router: (&chain.Router{}).
WithLogger(options.Logger).
WithResolver(options.Resolver),
logger: log,
}
@ -71,12 +74,14 @@ func (h *sniHandler) Init(md md.Metadata) (err error) {
}
}
h.router.WithRetry(h.md.retryCount)
return nil
}
// WithChain implements chain.Chainable interface
func (h *sniHandler) WithChain(chain *chain.Chain) {
h.chain = chain
h.router.WithChain(chain)
}
func (h *sniHandler) Handle(ctx context.Context, conn net.Conn) {
@ -141,11 +146,7 @@ func (h *sniHandler) Handle(ctx context.Context, conn net.Conn) {
return
}
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
cc, err := r.Dial(ctx, "tcp", target)
cc, err := h.router.Dial(ctx, "tcp", target)
if err != nil {
return
}

21
pkg/handler/socks/v4/handler.go
View File

@ -20,8 +20,8 @@ func init() {
}
type socks4Handler struct {
chain *chain.Chain
bypass bypass.Bypass
router *chain.Router
logger logger.Logger
md metadata
}
@ -34,17 +34,26 @@ func NewHandler(opts ...handler.Option) handler.Handler {
return &socks4Handler{
bypass: options.Bypass,
router: (&chain.Router{}).
WithLogger(options.Logger).
WithResolver(options.Resolver),
logger: options.Logger,
}
}
func (h *socks4Handler) Init(md md.Metadata) (err error) {
return h.parseMetadata(md)
if err := h.parseMetadata(md); err != nil {
return err
}
h.router.WithRetry(h.md.retryCount)
return nil
}
// implements chain.Chainable interface
func (h *socks4Handler) WithChain(chain *chain.Chain) {
h.chain = chain
h.router.WithChain(chain)
}
func (h *socks4Handler) Handle(ctx context.Context, conn net.Conn) {
@ -111,11 +120,7 @@ func (h *socks4Handler) handleConnect(ctx context.Context, conn net.Conn, req *g
return
}
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
cc, err := r.Dial(ctx, "tcp", addr)
cc, err := h.router.Dial(ctx, "tcp", addr)
if err != nil {
resp := gosocks4.NewReply(gosocks4.Failed, nil)
resp.Write(conn)

7
pkg/handler/socks/v5/connect.go
View File

@ -7,7 +7,6 @@ import (
"time"
"github.com/go-gost/gosocks5"
"github.com/go-gost/gost/pkg/chain"
"github.com/go-gost/gost/pkg/handler"
)
@ -26,11 +25,7 @@ func (h *socks5Handler) handleConnect(ctx context.Context, conn net.Conn, networ
return
}
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
cc, err := r.Dial(ctx, network, address)
cc, err := h.router.Dial(ctx, network, address)
if err != nil {
resp := gosocks5.NewReply(gosocks5.NetUnreachable, nil)
resp.Write(conn)

9
pkg/handler/socks/v5/handler.go
View File

@ -22,8 +22,8 @@ func init() {
type socks5Handler struct {
selector gosocks5.Selector
chain *chain.Chain
bypass bypass.Bypass
router *chain.Router
logger logger.Logger
md metadata
}
@ -36,6 +36,9 @@ func NewHandler(opts ...handler.Option) handler.Handler {
return &socks5Handler{
bypass: options.Bypass,
router: (&chain.Router{}).
WithLogger(options.Logger).
WithResolver(options.Resolver),
logger: options.Logger,
}
}
@ -52,12 +55,14 @@ func (h *socks5Handler) Init(md md.Metadata) (err error) {
noTLS: h.md.noTLS,
}
h.router.WithRetry(h.md.retryCount)
return
}
// implements chain.Chainable interface
func (h *socks5Handler) WithChain(chain *chain.Chain) {
h.chain = chain
h.router.WithChain(chain)
}
func (h *socks5Handler) Handle(ctx context.Context, conn net.Conn) {

7
pkg/handler/socks/v5/udp.go
View File

@ -9,7 +9,6 @@ import (
"time"
"github.com/go-gost/gosocks5"
"github.com/go-gost/gost/pkg/chain"
"github.com/go-gost/gost/pkg/common/util/socks"
"github.com/go-gost/gost/pkg/handler"
)
@ -54,11 +53,7 @@ func (h *socks5Handler) handleUDP(ctx context.Context, conn net.Conn) {
h.logger.Debugf("bind on %s OK", cc.LocalAddr())
// obtain a udp connection
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
c, err := r.Dial(ctx, "udp", "") // UDP association
c, err := h.router.Dial(ctx, "udp", "") // UDP association
if err != nil {
h.logger.Error(err)
return

7
pkg/handler/socks/v5/udp_tun.go
View File

@ -6,7 +6,6 @@ import (
"time"
"github.com/go-gost/gosocks5"
"github.com/go-gost/gost/pkg/chain"
"github.com/go-gost/gost/pkg/common/util/socks"
"github.com/go-gost/gost/pkg/handler"
)
@ -33,11 +32,7 @@ func (h *socks5Handler) handleUDPTun(ctx context.Context, conn net.Conn, network
h.logger.Debug(reply)
// obtain a udp connection
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
c, err := r.Dial(ctx, "udp", "") // UDP association
c, err := h.router.Dial(ctx, "udp", "") // UDP association
if err != nil {
h.logger.Error(err)
return

21
pkg/handler/ss/handler.go
View File

@ -22,8 +22,8 @@ func init() {
}
type ssHandler struct {
chain *chain.Chain
bypass bypass.Bypass
router *chain.Router
logger logger.Logger
md metadata
}
@ -36,17 +36,26 @@ func NewHandler(opts ...handler.Option) handler.Handler {
return &ssHandler{
bypass: options.Bypass,
router: (&chain.Router{}).
WithLogger(options.Logger).
WithResolver(options.Resolver),
logger: options.Logger,
}
}
func (h *ssHandler) Init(md md.Metadata) (err error) {
return h.parseMetadata(md)
if err := h.parseMetadata(md); err != nil {
return err
}
h.router.WithRetry(h.md.retryCount)
return nil
}
// implements chain.Chainable interface
func (h *ssHandler) WithChain(chain *chain.Chain) {
h.chain = chain
h.router.WithChain(chain)
}
func (h *ssHandler) Handle(ctx context.Context, conn net.Conn) {
@ -91,11 +100,7 @@ func (h *ssHandler) Handle(ctx context.Context, conn net.Conn) {
return
}
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
cc, err := r.Dial(ctx, "tcp", addr.String())
cc, err := h.router.Dial(ctx, "tcp", addr.String())
if err != nil {
return
}

21
pkg/handler/ss/udp/handler.go
View File

@ -21,8 +21,8 @@ func init() {
}
type ssuHandler struct {
chain *chain.Chain
bypass bypass.Bypass
router *chain.Router
logger logger.Logger
md metadata
}
@ -35,17 +35,26 @@ func NewHandler(opts ...handler.Option) handler.Handler {
return &ssuHandler{
bypass: options.Bypass,
router: (&chain.Router{}).
WithLogger(options.Logger).
WithResolver(options.Resolver),
logger: options.Logger,
}
}
func (h *ssuHandler) Init(md md.Metadata) (err error) {
return h.parseMetadata(md)
if err := h.parseMetadata(md); err != nil {
return err
}
h.router.WithRetry(h.md.retryCount)
return nil
}
// WithChain implements chain.Chainable interface
func (h *ssuHandler) WithChain(chain *chain.Chain) {
h.chain = chain
h.router.WithChain(chain)
}
func (h *ssuHandler) Handle(ctx context.Context, conn net.Conn) {
@ -80,11 +89,7 @@ func (h *ssuHandler) Handle(ctx context.Context, conn net.Conn) {
}
// obtain a udp connection
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
c, err := r.Dial(ctx, "udp", "") // UDP association
c, err := h.router.Dial(ctx, "udp", "") // UDP association
if err != nil {
h.logger.Error(err)
return

40
pkg/handler/tap/handler.go
View File

@ -20,7 +20,6 @@ import (
"github.com/go-gost/gost/pkg/registry"
"github.com/shadowsocks/go-shadowsocks2/shadowaead"
"github.com/songgao/water/waterutil"
"github.com/xtaci/tcpraw"
)
func init() {
@ -29,10 +28,10 @@ func init() {
type tapHandler struct {
group *chain.NodeGroup
chain *chain.Chain
bypass bypass.Bypass
routes sync.Map
exit chan struct{}
router *chain.Router
logger logger.Logger
md metadata
}
@ -45,18 +44,27 @@ func NewHandler(opts ...handler.Option) handler.Handler {
return &tapHandler{
bypass: options.Bypass,
exit: make(chan struct{}, 1),
router: (&chain.Router{}).
WithLogger(options.Logger).
WithResolver(options.Resolver),
logger: options.Logger,
exit: make(chan struct{}, 1),
}
}
func (h *tapHandler) Init(md md.Metadata) (err error) {
return h.parseMetadata(md)
if err := h.parseMetadata(md); err != nil {
return err
}
h.router.WithRetry(h.md.retryCount)
return nil
}
// implements chain.Chainable interface
func (h *tapHandler) WithChain(chain *chain.Chain) {
h.chain = chain
h.router.WithChain(chain)
}
// Forward implements handler.Forwarder.
@ -113,13 +121,9 @@ func (h *tapHandler) handleLoop(ctx context.Context, conn net.Conn, addr net.Add
err := func() error {
var err error
var pc net.PacketConn
// fake tcp mode will be ignored when the client specifies a chain.
if addr != nil && !h.chain.IsEmpty() {
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
cc, err := r.Dial(ctx, addr.Network(), addr.String())
if addr != nil {
cc, err := h.router.Dial(ctx, addr.Network(), addr.String())
if err != nil {
return err
}
@ -130,16 +134,8 @@ func (h *tapHandler) handleLoop(ctx context.Context, conn net.Conn, addr net.Add
return errors.New("invalid connection")
}
} else {
if h.md.tcpMode {
if addr != nil {
pc, err = tcpraw.Dial("tcp", addr.String())
} else {
pc, err = tcpraw.Listen("tcp", conn.LocalAddr().String())
}
} else {
laddr, _ := net.ResolveUDPAddr("udp", conn.LocalAddr().String())
pc, err = net.ListenUDP("udp", laddr)
}
laddr, _ := net.ResolveUDPAddr("udp", conn.LocalAddr().String())
pc, err = net.ListenUDP("udp", laddr)
}
if err != nil {
return err

3
pkg/handler/tap/metadata.go
View File

@ -11,7 +11,6 @@ import (
type metadata struct {
cipher core.Cipher
retryCount int
tcpMode bool
bufferSize int
}
@ -21,7 +20,6 @@ func (h *tapHandler) parseMetadata(md mdata.Metadata) (err error) {
key = "key"
readTimeout = "readTimeout"
retryCount = "retry"
tcpMode = "tcp"
bufferSize = "bufferSize"
)
@ -40,7 +38,6 @@ func (h *tapHandler) parseMetadata(md mdata.Metadata) (err error) {
return
}
h.md.retryCount = mdata.GetInt(md, retryCount)
h.md.tcpMode = mdata.GetBool(md, tcpMode)
h.md.bufferSize = mdata.GetInt(md, bufferSize)
if h.md.bufferSize <= 0 {

39
pkg/handler/tun/handler.go
View File

@ -20,7 +20,6 @@ import (
"github.com/go-gost/gost/pkg/registry"
"github.com/shadowsocks/go-shadowsocks2/shadowaead"
"github.com/songgao/water/waterutil"
"github.com/xtaci/tcpraw"
"golang.org/x/net/ipv4"
"golang.org/x/net/ipv6"
)
@ -31,10 +30,10 @@ func init() {
type tunHandler struct {
group *chain.NodeGroup
chain *chain.Chain
bypass bypass.Bypass
routes sync.Map
exit chan struct{}
router *chain.Router
logger logger.Logger
md metadata
}
@ -47,18 +46,27 @@ func NewHandler(opts ...handler.Option) handler.Handler {
return &tunHandler{
bypass: options.Bypass,
exit: make(chan struct{}, 1),
router: (&chain.Router{}).
WithLogger(options.Logger).
WithResolver(options.Resolver),
logger: options.Logger,
exit: make(chan struct{}, 1),
}
}
func (h *tunHandler) Init(md md.Metadata) (err error) {
return h.parseMetadata(md)
if err := h.parseMetadata(md); err != nil {
return err
}
h.router.WithRetry(h.md.retryCount)
return nil
}
// implements chain.Chainable interface
func (h *tunHandler) WithChain(chain *chain.Chain) {
h.chain = chain
h.router.WithChain(chain)
}
// Forward implements handler.Forwarder.
@ -115,13 +123,8 @@ func (h *tunHandler) handleLoop(ctx context.Context, conn net.Conn, addr net.Add
err := func() error {
var err error
var pc net.PacketConn
// fake tcp mode will be ignored when the client specifies a chain.
if addr != nil && !h.chain.IsEmpty() {
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
cc, err := r.Dial(ctx, addr.Network(), addr.String())
if addr != nil {
cc, err := h.router.Dial(ctx, addr.Network(), addr.String())
if err != nil {
return err
}
@ -132,16 +135,8 @@ func (h *tunHandler) handleLoop(ctx context.Context, conn net.Conn, addr net.Add
return errors.New("invalid connnection")
}
} else {
if h.md.tcpMode {
if addr != nil {
pc, err = tcpraw.Dial("tcp", addr.String())
} else {
pc, err = tcpraw.Listen("tcp", conn.LocalAddr().String())
}
} else {
laddr, _ := net.ResolveUDPAddr("udp", conn.LocalAddr().String())
pc, err = net.ListenUDP("udp", laddr)
}
laddr, _ := net.ResolveUDPAddr("udp", conn.LocalAddr().String())
pc, err = net.ListenUDP("udp", laddr)
}
if err != nil {
return err

3
pkg/handler/tun/metadata.go
View File

@ -11,7 +11,6 @@ import (
type metadata struct {
cipher core.Cipher
retryCount int
tcpMode bool
bufferSize int
}
@ -21,7 +20,6 @@ func (h *tunHandler) parseMetadata(md mdata.Metadata) (err error) {
key = "key"
readTimeout = "readTimeout"
retryCount = "retry"
tcpMode = "tcp"
bufferSize = "bufferSize"
)
@ -40,7 +38,6 @@ func (h *tunHandler) parseMetadata(md mdata.Metadata) (err error) {
return
}
h.md.retryCount = mdata.GetInt(md, retryCount)
h.md.tcpMode = mdata.GetBool(md, tcpMode)
h.md.bufferSize = mdata.GetInt(md, bufferSize)
if h.md.bufferSize <= 0 {