melosh/mal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle uTLS close errors

Browse Source
This commit is contained in:
mkelvers
2026-06-20 18:28:32 +02:00
committed by Milas Holsting
parent 86206127d6
commit 9e8e49691c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/net/utls.go
View File

@@ -3,6 +3,7 @@ package netutil
import ( import (
"bufio" "bufio"
"fmt" "fmt"
"mal/pkg/errlog"
"net" "net"
"net/http" "net/http"
"time" "time"
@@ -38,7 +39,7 @@ func (rt *UtlsRoundTripper) RoundTrip(req *http.Request) (*http.Response, error)
}, utls.HelloFirefox_120) }, utls.HelloFirefox_120)
if err := uconn.HandshakeContext(req.Context()); err != nil { if err := uconn.HandshakeContext(req.Context()); err != nil {
_ = uconn.Close() errlog.Close(uconn, "failed to close utls connection after handshake error")
return nil, fmt.Errorf("utls handshake: %w", err) return nil, fmt.Errorf("utls handshake: %w", err)
} }
@@ -47,7 +48,7 @@ func (rt *UtlsRoundTripper) RoundTrip(req *http.Request) (*http.Response, error)
t := &http2.Transport{} t := &http2.Transport{}
cc, err := t.NewClientConn(uconn) cc, err := t.NewClientConn(uconn)
if err != nil { if err != nil {
_ = uconn.Close() errlog.Close(uconn, "failed to close utls connection after http2 setup error")
return nil, fmt.Errorf("http2 client conn: %w", err) return nil, fmt.Errorf("http2 client conn: %w", err)
} }
return cc.RoundTrip(req) return cc.RoundTrip(req)
@@ -55,7 +56,7 @@ func (rt *UtlsRoundTripper) RoundTrip(req *http.Request) (*http.Response, error)
// Fallback to HTTP/1.1 // Fallback to HTTP/1.1
if err := req.Write(uconn); err != nil { if err := req.Write(uconn); err != nil {
_ = uconn.Close() errlog.Close(uconn, "failed to close utls connection after http1 write error")
return nil, fmt.Errorf("http1 write: %w", err) return nil, fmt.Errorf("http1 write: %w", err)
} }
return http.ReadResponse(bufio.NewReader(uconn), req) return http.ReadResponse(bufio.NewReader(uconn), req)