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

fix tls host for handler recorder

Browse Source
This commit is contained in:
ginuerzh
2024-09-15 21:12:10 +08:00
parent ce2da421fa
commit a618c5556e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
handler/redirect/tcp/handler.go
+4 -3
View File
@@ -142,7 +142,7 @@ func (h *redirectHandler) Handle(ctx context.Context, conn net.Conn, opts ...han
if err == nil && if err == nil &&
hdr[0] == dissector.Handshake && hdr[0] == dissector.Handshake &&
(tlsVersion >= tls.VersionTLS10 && tlsVersion <= tls.VersionTLS13) { (tlsVersion >= tls.VersionTLS10 && tlsVersion <= tls.VersionTLS13) {
return h.handleHTTPS(ctx, rw, conn.RemoteAddr(), dstAddr, log) return h.handleHTTPS(ctx, rw, conn.RemoteAddr(), dstAddr, ro, log)
} }
// try to sniff HTTP traffic // try to sniff HTTP traffic
@@ -272,7 +272,7 @@ func (h *redirectHandler) handleHTTP(ctx context.Context, rw io.ReadWriter, radd
return nil return nil
} }
func (h *redirectHandler) handleHTTPS(ctx context.Context, rw io.ReadWriter, raddr, dstAddr net.Addr, log logger.Logger) error { func (h *redirectHandler) handleHTTPS(ctx context.Context, rw io.ReadWriter, raddr, dstAddr net.Addr, ro *xrecorder.HandlerRecorderObject, log logger.Logger) error {
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
host, err := h.getServerName(ctx, io.TeeReader(rw, buf)) host, err := h.getServerName(ctx, io.TeeReader(rw, buf))
if err != nil { if err != nil {
@@ -293,10 +293,11 @@ func (h *redirectHandler) handleHTTPS(ctx context.Context, rw io.ReadWriter, rad
log = log.WithFields(map[string]any{ log = log.WithFields(map[string]any{
"host": host, "host": host,
}) })
ro.Host = host
if h.options.Bypass != nil && h.options.Bypass.Contains(ctx, "tcp", host) { if h.options.Bypass != nil && h.options.Bypass.Contains(ctx, "tcp", host) {
log.Debug("bypass: ", host) log.Debug("bypass: ", host)
return nil return xbypass.ErrBypass
} }
cc, err = h.options.Router.Dial(ctx, "tcp", host) cc, err = h.options.Router.Dial(ctx, "tcp", host)