From 07db20c9a895883621865517a4b079a4443ad225 Mon Sep 17 00:00:00 2001 From: ginuerzh Date: Wed, 4 Oct 2023 16:34:17 +0800 Subject: [PATCH] fix socks5 connector --- connector/socks/v5/selector.go | 6 +++--- go.sum | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/connector/socks/v5/selector.go b/connector/socks/v5/selector.go index b7076ad..93ed6a9 100644 --- a/connector/socks/v5/selector.go +++ b/connector/socks/v5/selector.go @@ -34,9 +34,10 @@ func (s *clientSelector) OnSelected(method uint8, conn net.Conn) (string, net.Co s.logger.Debug("method selected: ", method) switch method { + case gosocks5.MethodNoAuth: + case socks.MethodTLS: conn = tls.Client(conn, s.TLSConfig) - return "", conn, nil case gosocks5.MethodUserPass, socks.MethodTLSAuth: if method == socks.MethodTLSAuth { @@ -66,12 +67,11 @@ func (s *clientSelector) OnSelected(method uint8, conn net.Conn) (string, net.Co if resp.Status != gosocks5.Succeeded { return "", nil, gosocks5.ErrAuthFailure } - return "", conn, nil case gosocks5.MethodNoAcceptable: return "", nil, gosocks5.ErrBadMethod default: return "", nil, gosocks5.ErrBadFormat } - + return "", conn, nil } diff --git a/go.sum b/go.sum index 453ed27..99af399 100644 --- a/go.sum +++ b/go.sum @@ -100,16 +100,12 @@ github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SU github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gost/core v0.0.0-20230928130125-b0bd45c1b862 h1:hbCHyfYE96WZefTBitiL35FCYxHCgEWpS+W/5oCyEXk= -github.com/go-gost/core v0.0.0-20230928130125-b0bd45c1b862/go.mod h1:ndkgWVYRLwupVaFFWv8ML1Nr8tD3xhHK245PLpUDg4E= github.com/go-gost/core v0.0.0-20230930094840-bf3b76a27306 h1:+5jZhk7GTofLvcxwUQrthj1Vwyk73h3B7ux0gJ3BeQ0= github.com/go-gost/core v0.0.0-20230930094840-bf3b76a27306/go.mod h1:ndkgWVYRLwupVaFFWv8ML1Nr8tD3xhHK245PLpUDg4E= github.com/go-gost/gosocks4 v0.0.1 h1:+k1sec8HlELuQV7rWftIkmy8UijzUt2I6t+iMPlGB2s= github.com/go-gost/gosocks4 v0.0.1/go.mod h1:3B6L47HbU/qugDg4JnoFPHgJXE43Inz8Bah1QaN9qCc= github.com/go-gost/gosocks5 v0.4.0 h1:EIrOEkpJez4gwHrMa33frA+hHXJyevjp47thpMQsJzI= github.com/go-gost/gosocks5 v0.4.0/go.mod h1:1G6I7HP7VFVxveGkoK8mnprnJqSqJjdcASKsdUn4Pp4= -github.com/go-gost/plugin v0.0.0-20230928130211-8bc0679b5c15 h1:SKPbGuJUBKhh4qE2G5juT4PNMrzYH86itiY3TGwvYcs= -github.com/go-gost/plugin v0.0.0-20230928130211-8bc0679b5c15/go.mod h1:mM/RLNsVy2nz5PiOijuqLYR3LhMzyQ9Kh/p0rXybJoo= github.com/go-gost/plugin v0.0.0-20230930094933-bc86458bf2fb h1:pJP1zrNLyKPsDQhL+ITyP2uCaS4Kax9T4ap2dZF3QaM= github.com/go-gost/plugin v0.0.0-20230930094933-bc86458bf2fb/go.mod h1:mM/RLNsVy2nz5PiOijuqLYR3LhMzyQ9Kh/p0rXybJoo= github.com/go-gost/relay v0.4.1-0.20230916134211-828f314ddfe7 h1:qAG1OyjvdA5h221CfFSS3J359V3d2E7dJWyP29QoDSI=