Fix linter issues

This commit is contained in:
2026-05-27 10:58:13 +03:00
parent 11a357ebc4
commit 024d5fd96c
13 changed files with 145 additions and 46 deletions

View File

@@ -2,17 +2,18 @@ package deconnector
import (
"bufio"
"context"
"fmt"
"io"
"net"
"net/http"
"net/url"
)
func (d *Deconnector) handleTunnel(clientConn net.Conn, host string, upstreamURL *url.URL) {
//nolint:funlen
func (d *Deconnector) handleTunnel(ctx context.Context, clientConn net.Conn, host string) {
d.app.Logger().WithField("host", host).Info("Handling CONNECT tunnel")
upstreamConn, err := d.dialer.Dial()
upstreamConn, err := d.dialer.Dial(ctx)
if err != nil {
d.app.Logger().WithError(err).Error("upstream dial failed")
fmt.Fprintf(clientConn, "HTTP/1.1 502 Bad Gateway\r\n\r\n")
@@ -24,6 +25,10 @@ func (d *Deconnector) handleTunnel(clientConn net.Conn, host string, upstreamURL
connectLine := fmt.Sprintf(
"CONNECT %s HTTP/1.1\r\nHost: %s\r\n\r\n", host, host,
)
if authHeader, ok := d.dialer.Auth(); ok {
connectLine += fmt.Sprintf("Proxy-Authorization: Basic %s\r\n", authHeader)
}
fmt.Fprint(upstreamConn, connectLine)
resp, err := http.ReadResponse(bufio.NewReader(upstreamConn), nil)
@@ -33,13 +38,40 @@ func (d *Deconnector) handleTunnel(clientConn net.Conn, host string, upstreamURL
return
}
defer resp.Body.Close()
fmt.Fprintf(clientConn, "HTTP/1.1 200 Connection established\r\n\r\n")
done := make(chan struct{}, 2)
go func() { io.Copy(upstreamConn, clientConn); done <- struct{}{} }()
go func() { io.Copy(clientConn, upstreamConn); done <- struct{}{} }()
go func() {
defer func() {
_ = upstreamConn.Close()
_ = clientConn.Close()
done <- struct{}{}
}()
if _, err := io.Copy(upstreamConn, clientConn); err != nil {
d.app.Logger().
WithError(err).
Debug("client -> upstream copy stopped")
}
}()
go func() {
defer func() {
_ = upstreamConn.Close()
_ = clientConn.Close()
done <- struct{}{}
}()
if _, err := io.Copy(clientConn, upstreamConn); err != nil {
d.app.Logger().
WithError(err).
Debug("upstream -> client copy stopped")
}
}()
<-done
}