history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chore: remove unused http outbound proxy code

Browse Source
This commit is contained in:
Dreamacro 2019-12-05 18:22:07 +08:00
parent b8267a69f6
commit 4525707048
1 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
adapters/outbound/http.go
View File

@ -2,7 +2,6 @@ package adapters
import ( import (
"bufio" "bufio"
"bytes"
"context" "context"
"crypto/tls" "crypto/tls"
"encoding/base64" "encoding/base64"
@ -11,6 +10,7 @@ import (
"io" "io"
"net" "net"
"net/http" "net/http"
"net/url"
"strconv" "strconv"
C "github.com/Dreamacro/clash/constant" C "github.com/Dreamacro/clash/constant"
@ -18,12 +18,10 @@ import (
type Http struct { type Http struct {
*Base *Base
addr string addr string
user string user string
pass string pass string
tls bool tlsConfig *tls.Config
skipCertVerify bool
tlsConfig *tls.Config
} }
type HttpOption struct { type HttpOption struct {
@ -38,7 +36,7 @@ type HttpOption struct {
func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) { func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", h.addr) c, err := dialContext(ctx, "tcp", h.addr)
if err == nil && h.tls { if err == nil && h.tlsConfig != nil {
cc := tls.Client(c, h.tlsConfig) cc := tls.Client(c, h.tlsConfig)
err = cc.Handshake() err = cc.Handshake()
c = cc c = cc
@ -56,28 +54,28 @@ func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, e
} }
func (h *Http) shakeHand(metadata *C.Metadata, rw io.ReadWriter) error { func (h *Http) shakeHand(metadata *C.Metadata, rw io.ReadWriter) error {
var buf bytes.Buffer
var err error
addr := metadata.RemoteAddress() addr := metadata.RemoteAddress()
buf.WriteString("CONNECT " + addr + " HTTP/1.1\r\n") req := &http.Request{
buf.WriteString("Host: " + metadata.String() + "\r\n") Method: http.MethodConnect,
buf.WriteString("Proxy-Connection: Keep-Alive\r\n") URL: &url.URL{
Host: addr,
},
Host: addr,
Header: http.Header{
"Proxy-Connection": []string{"Keep-Alive"},
},
}
if h.user != "" && h.pass != "" { if h.user != "" && h.pass != "" {
auth := h.user + ":" + h.pass auth := h.user + ":" + h.pass
buf.WriteString("Proxy-Authorization: Basic " + base64.StdEncoding.EncodeToString([]byte(auth)) + "\r\n") req.Header.Add("Proxy-Authorization", "Basic "+base64.StdEncoding.EncodeToString([]byte(auth)))
} }
// header ended
buf.WriteString("\r\n")
_, err = rw.Write(buf.Bytes()) if err := req.Write(rw); err != nil {
if err != nil {
return err return err
} }
var req http.Request resp, err := http.ReadResponse(bufio.NewReader(rw), req)
resp, err := http.ReadResponse(bufio.NewReader(rw), &req)
if err != nil { if err != nil {
return err return err
} }
@ -97,6 +95,7 @@ func (h *Http) shakeHand(metadata *C.Metadata, rw io.ReadWriter) error {
if resp.StatusCode >= http.StatusInternalServerError { if resp.StatusCode >= http.StatusInternalServerError {
return errors.New(resp.Status) return errors.New(resp.Status)
} }
return fmt.Errorf("can not connect remote err code: %d", resp.StatusCode) return fmt.Errorf("can not connect remote err code: %d", resp.StatusCode)
} }
@ -115,11 +114,9 @@ func NewHttp(option HttpOption) *Http {
name: option.Name, name: option.Name,
tp: C.Http, tp: C.Http,
}, },
addr: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)), addr: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
user: option.UserName, user: option.UserName,
pass: option.Password, pass: option.Password,
tls: option.TLS, tlsConfig: tlsConfig,
skipCertVerify: option.SkipCertVerify,
tlsConfig: tlsConfig,
} }
} }