mirrors/hysteria
1
0
Fork 0
mirror of https://github.com/apernet/hysteria.git synced 2025-04-03 20:47:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: sniffing handled HTTP host header incorrectly

Browse source
This commit is contained in:
Toby 2024-08-16 15:46:30 -07:00
parent 442ee3898c
commit 48bf9b964a
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
extras/sniff/sniff.go
View file

@ -112,11 +112,21 @@ func (h *Sniffer) TCP(stream quic.Stream, reqAddr *string) ([]byte, error) {
tr := &teeReader{Stream: stream, Pre: pre} tr := &teeReader{Stream: stream, Pre: pre}
req, _ := http.ReadRequest(bufio.NewReader(tr)) req, _ := http.ReadRequest(bufio.NewReader(tr))
if req != nil && req.Host != "" { if req != nil && req.Host != "" {
_, port, err := net.SplitHostPort(*reqAddr) // req.Host may already contain the port.
// If it does, just overwrite the whole address with req.Host.
// Otherwise, use the port in reqAddr.
_, _, err := net.SplitHostPort(req.Host)
if err != nil { if err != nil {
return nil, err // Not host:port format, append the port from reqAddr
_, port, err := net.SplitHostPort(*reqAddr)
if err != nil {
return nil, err
}
*reqAddr = net.JoinHostPort(req.Host, port)
} else {
// Already host:port format
*reqAddr = req.Host
} }
*reqAddr = net.JoinHostPort(req.Host, port)
} }
return tr.Buffer(), nil return tr.Buffer(), nil
} else if h.isTLS(pre) { } else if h.isTLS(pre) {