vikarti.anatra/opera-proxy
1
0
Fork 0
mirror of https://github.com/Snawoot/opera-proxy.git synced 2025-09-06 20:50:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

upstream: simplify CONNECT

Browse source
This commit is contained in:
ignoramous 2024-10-29 17:23:04 +05:30 • committed by GitHub
parent 27b3da3004
commit bc503b52e2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
upstream.go
View file

@ -159,11 +159,9 @@ func (d *ProxyDialer) DialContext(ctx context.Context, network, address string)
req := &http.Request{ req := &http.Request{
Method: PROXY_CONNECT_METHOD, Method: PROXY_CONNECT_METHOD,
Proto: "HTTP/1.1", Proto: "HTTP/1.1",
ProtoMajor: 1, URL: &url.URL{Opaque: dest},
ProtoMinor: 1,
RequestURI: address,
Host: address, Host: address,
Header: http.Header{ Header: http.Header{
PROXY_HOST_HEADER: []string{address}, PROXY_HOST_HEADER: []string{address},
}, },
} }
@ -172,17 +170,7 @@ func (d *ProxyDialer) DialContext(ctx context.Context, network, address string)
req.Header.Set(PROXY_AUTHORIZATION_HEADER, d.auth()) req.Header.Set(PROXY_AUTHORIZATION_HEADER, d.auth())
} }
rawreq, err := httputil.DumpRequest(req, false) proxyResp, err := roundtrip(conn, req)
if err != nil {
return nil, err
}
_, err = conn.Write(rawreq)
if err != nil {
return nil, err
}
proxyResp, err := readResponse(conn, req)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -202,29 +190,9 @@ func (d *ProxyDialer) Dial(network, address string) (net.Conn, error) {
return d.DialContext(context.Background(), network, address) return d.DialContext(context.Background(), network, address)
} }
func readResponse(r io.Reader, req *http.Request) (*http.Response, error) { func roundtrip(conn net.Conn, req *http.Request) (*http.Response, error) {
endOfResponse := []byte("\r\n\r\n") if err := req.Write(conn); err != nil {
buf := &bytes.Buffer{} return nil, fmt.Errorf("failed connect req: %v", err)
b := make([]byte, 1)
for {
n, err := r.Read(b)
if n < 1 && err == nil {
continue
}
buf.Write(b)
sl := buf.Bytes()
if len(sl) < len(endOfResponse) {
continue
}
if bytes.Equal(sl[len(sl)-4:], endOfResponse) {
break
}
if err != nil {
return nil, err
}
} }
return http.ReadResponse(bufio.NewReader(buf), req) return http.ReadResponse(bufio.NewReader(conn), req)
} }