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

update handler options

Browse Source
This commit is contained in:
ginuerzh
2022-01-04 21:56:58 +08:00
parent 566e930010
commit c428b37a36
36 changed files with 468 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,8 +7,8 @@ import (
"github.com/go-gost/gosocks4"
"github.com/go-gost/gost/pkg/auth"
"github.com/go-gost/gost/pkg/bypass"
"github.com/go-gost/gost/pkg/chain"
auth_util "github.com/go-gost/gost/pkg/common/util/auth"
"github.com/go-gost/gost/pkg/handler"
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
@ -21,23 +21,21 @@ func init() {
}
type socks4Handler struct {
bypass bypass.Bypass
router *chain.Router
authenticator auth.Authenticator
logger logger.Logger
md metadata
options handler.Options
}
func NewHandler(opts ...handler.Option) handler.Handler {
options := &handler.Options{}
options := handler.Options{}
for _, opt := range opts {
opt(options)
opt(&options)
}
return &socks4Handler{
bypass: options.Bypass,
router: options.Router,
logger: options.Logger,
options: options,
}
}
@ -46,6 +44,16 @@ func (h *socks4Handler) Init(md md.Metadata) (err error) {
return err
}
h.authenticator = auth_util.AuthFromUsers(h.options.Auths...)
h.router = &chain.Router{
Retries: h.options.Retries,
Chain: h.options.Chain,
Resolver: h.options.Resolver,
Hosts: h.options.Hosts,
Logger: h.options.Logger,
}
h.logger = h.options.Logger
return nil
}
@ -105,7 +113,7 @@ func (h *socks4Handler) handleConnect(ctx context.Context, conn net.Conn, req *g
})
h.logger.Infof("%s >> %s", conn.RemoteAddr(), addr)
if h.bypass != nil && h.bypass.Contains(addr) {
if h.options.Bypass != nil && h.options.Bypass.Contains(addr) {
resp := gosocks4.NewReply(gosocks4.Rejected, nil)
resp.Write(conn)
h.logger.Debug(resp)

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

@ -17,7 +17,7 @@ func (h *socks5Handler) handleConnect(ctx context.Context, conn net.Conn, networ
})
h.logger.Infof("%s >> %s", conn.RemoteAddr(), address)
if h.bypass != nil && h.bypass.Contains(address) {
if h.options.Bypass != nil && h.options.Bypass.Contains(address) {
resp := gosocks5.NewReply(gosocks5.NotAllowed, nil)
resp.Write(conn)
h.logger.Debug(resp)

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

@ -6,9 +6,8 @@ import (
"time"
"github.com/go-gost/gosocks5"
"github.com/go-gost/gost/pkg/auth"
"github.com/go-gost/gost/pkg/bypass"
"github.com/go-gost/gost/pkg/chain"
auth_util "github.com/go-gost/gost/pkg/common/util/auth"
"github.com/go-gost/gost/pkg/common/util/socks"
"github.com/go-gost/gost/pkg/handler"
"github.com/go-gost/gost/pkg/logger"
@ -22,24 +21,21 @@ func init() {
}
type socks5Handler struct {
selector gosocks5.Selector
bypass bypass.Bypass
router *chain.Router
authenticator auth.Authenticator
logger logger.Logger
md metadata
selector gosocks5.Selector
router *chain.Router
logger logger.Logger
md metadata
options handler.Options
}
func NewHandler(opts ...handler.Option) handler.Handler {
options := &handler.Options{}
options := handler.Options{}
for _, opt := range opts {
opt(options)
opt(&options)
}
return &socks5Handler{
bypass: options.Bypass,
router: options.Router,
logger: options.Logger,
options: options,
}
}
@ -48,8 +44,17 @@ func (h *socks5Handler) Init(md md.Metadata) (err error) {
return
}
h.logger = h.options.Logger
h.router = &chain.Router{
Retries: h.options.Retries,
Chain: h.options.Chain,
Resolver: h.options.Resolver,
Hosts: h.options.Hosts,
Logger: h.options.Logger,
}
h.selector = &serverSelector{
Authenticator: h.authenticator,
Authenticator: auth_util.AuthFromUsers(h.options.Auths...),
TLSConfig: h.md.tlsConfig,
logger: h.logger,
noTLS: h.md.noTLS,

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

@ -67,7 +67,7 @@ func (h *socks5Handler) handleUDP(ctx context.Context, conn net.Conn) {
}
relay := handler.NewUDPRelay(socks.UDPConn(cc, h.md.udpBufferSize), pc).
WithBypass(h.bypass).
WithBypass(h.options.Bypass).
WithLogger(h.logger)
relay.SetBufferSize(h.md.udpBufferSize)

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

@ -46,7 +46,7 @@ func (h *socks5Handler) handleUDPTun(ctx context.Context, conn net.Conn, network
}
relay := handler.NewUDPRelay(socks.UDPTunServerConn(conn), pc).
WithBypass(h.bypass).
WithBypass(h.options.Bypass).
WithLogger(h.logger)
relay.SetBufferSize(h.md.udpBufferSize)