SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-05 04:47:40 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Feat: rewritre http client with native string

Browse source
This commit is contained in:
PuerNya 2023-10-12 01:01:39 +08:00
parent e4d9384bcd
commit b15e02c3ed
1 changed files with 33 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

53
protocol/http/client.go
View file

@ -4,10 +4,11 @@ import (
std_bufio "bufio" std_bufio "bufio"
"context" "context"
"encoding/base64" "encoding/base64"
"fmt"
"net" "net"
"net/http" "net/http"
"net/url"
"os" "os"
"strings"
"github.com/sagernet/sing/common/buf" "github.com/sagernet/sing/common/buf"
"github.com/sagernet/sing/common/bufio" "github.com/sagernet/sing/common/bufio"
@ -65,42 +66,52 @@ func (c *Client) DialContext(ctx context.Context, network string, destination M.
if err != nil { if err != nil {
return nil, err return nil, err
} }
request := &http.Request{ URL := destination.String()
Method: http.MethodConnect, HeaderString := "CONNECT " + URL + " HTTP/1.1\r\n"
URL: &url.URL{ tempHeaders := map[string][]string{
Host: destination.String(), "Host": {destination.String()},
}, "User-Agent": {"Go-http-client/1.1"},
Header: http.Header{ "Proxy-Connection": {"Keep-Alive"},
"Proxy-Connection": []string{"Keep-Alive"},
},
}
if c.path != "" {
err = URLSetPath(request.URL, c.path)
if err != nil {
return nil, err
}
} }
for key, valueList := range c.headers { for key, valueList := range c.headers {
request.Header.Set(key, valueList[0]) tempHeaders[key] = valueList
for _, value := range valueList[1:] {
request.Header.Add(key, value)
} }
if c.path != "" {
tempHeaders["Path"] = []string{c.path}
} }
if c.username != "" { if c.username != "" {
auth := c.username + ":" + c.password auth := c.username + ":" + c.password
request.Header.Add("Proxy-Authorization", "Basic "+base64.StdEncoding.EncodeToString([]byte(auth))) if _, ok := tempHeaders["Proxy-Authorization"]; ok {
tempHeaders["Proxy-Authorization"][len(tempHeaders["Proxy-Authorization"])] = "Basic " + base64.StdEncoding.EncodeToString([]byte(auth))
} else {
tempHeaders["Proxy-Authorization"] = []string{"Basic " + base64.StdEncoding.EncodeToString([]byte(auth))}
} }
err = request.Write(conn) }
for key, valueList := range tempHeaders {
HeaderString += key + ": " + strings.Join(valueList, "; ") + "\r\n"
}
HeaderString += "\r\n"
_, err = fmt.Fprintf(conn, "%s", HeaderString)
if err != nil { if err != nil {
conn.Close() conn.Close()
return nil, err return nil, err
} }
reader := std_bufio.NewReader(conn) reader := std_bufio.NewReader(conn)
response, err := http.ReadResponse(reader, request)
response, err := http.ReadResponse(reader, nil)
if err != nil { if err != nil {
conn.Close() conn.Close()
return nil, err return nil, err
} }
if response.StatusCode == http.StatusOK { if response.StatusCode == http.StatusOK {
if reader.Buffered() > 0 { if reader.Buffered() > 0 {
buffer := buf.NewSize(reader.Buffered()) buffer := buf.NewSize(reader.Buffered())