From 5999b6262d9ed6504effe2549e1add7769064bc7 Mon Sep 17 00:00:00 2001
From: yaling888 <73897884+yaling888@users.noreply.github.com>
Date: Mon, 11 Apr 2022 06:28:42 +0800
Subject: [PATCH] Chore: fix typos
---
config/config.go | 2 +-
dns/middleware.go | 17 ++++----
listener/http/proxy.go | 10 ++---
listener/http/utils.go | 2 +-
listener/mitm/proxy.go | 90 +++++++++++++++++-----------------------
listener/mitm/session.go | 11 +----
listener/mitm/utils.go | 5 +--
tunnel/tunnel.go | 16 ++++---
8 files changed, 70 insertions(+), 83 deletions(-)
diff --git a/config/config.go b/config/config.go
index e86a5e42..12fac706 100644
--- a/config/config.go
+++ b/config/config.go
@@ -547,7 +547,7 @@ func parseHosts(cfg *RawConfig) (*trie.DomainTrie[netip.Addr], error) {
}
// add mitm.clash hosts
- if err := tree.Insert("mitm.clash", netip.AddrFrom4([4]byte{8, 8, 9, 9})); err != nil {
+ if err := tree.Insert("mitm.clash", netip.AddrFrom4([4]byte{1, 2, 3, 4})); err != nil {
log.Errorln("insert mitm.clash to host error: %s", err.Error())
}
diff --git a/dns/middleware.go b/dns/middleware.go
index 4091fa9e..eeb40c1d 100644
--- a/dns/middleware.go
+++ b/dns/middleware.go
@@ -30,28 +30,25 @@ func withHosts(hosts *trie.DomainTrie[netip.Addr], mapping *cache.LruCache[strin
return next(ctx, r)
}
- qName := strings.TrimRight(q.Name, ".")
- record := hosts.Search(qName)
+ host := strings.TrimRight(q.Name, ".")
+
+ record := hosts.Search(host)
if record == nil {
return next(ctx, r)
}
ip := record.Data
- if mapping != nil {
- mapping.SetWithExpire(ip.Unmap().String(), qName, time.Now().Add(time.Second*5))
- }
-
msg := r.Copy()
if ip.Is4() && q.Qtype == D.TypeA {
rr := &D.A{}
- rr.Hdr = D.RR_Header{Name: q.Name, Rrtype: D.TypeA, Class: D.ClassINET, Ttl: 1}
+ rr.Hdr = D.RR_Header{Name: q.Name, Rrtype: D.TypeA, Class: D.ClassINET, Ttl: 10}
rr.A = ip.AsSlice()
msg.Answer = []D.RR{rr}
} else if ip.Is6() && q.Qtype == D.TypeAAAA {
rr := &D.AAAA{}
- rr.Hdr = D.RR_Header{Name: q.Name, Rrtype: D.TypeAAAA, Class: D.ClassINET, Ttl: 1}
+ rr.Hdr = D.RR_Header{Name: q.Name, Rrtype: D.TypeAAAA, Class: D.ClassINET, Ttl: 10}
rr.AAAA = ip.AsSlice()
msg.Answer = []D.RR{rr}
@@ -59,6 +56,10 @@ func withHosts(hosts *trie.DomainTrie[netip.Addr], mapping *cache.LruCache[strin
return next(ctx, r)
}
+ if mapping != nil {
+ mapping.SetWithExpire(ip.Unmap().String(), host, time.Now().Add(time.Second*10))
+ }
+
ctx.SetType(context.DNSTypeHost)
msg.SetRcode(r, D.RcodeSuccess)
msg.Authoritative = true
diff --git a/listener/http/proxy.go b/listener/http/proxy.go
index d29f80f5..bd39b8b4 100644
--- a/listener/http/proxy.go
+++ b/listener/http/proxy.go
@@ -70,11 +70,11 @@ func HandleConn(c net.Conn, in chan<- C.ConnContext, cache *cache.Cache[string,
RemoveExtraHTTPHostPort(request)
if request.URL.Scheme == "" || request.URL.Host == "" {
- resp = ResponseWith(request, http.StatusBadRequest)
+ resp = responseWith(request, http.StatusBadRequest)
} else {
resp, err = client.Do(request)
if err != nil {
- resp = ResponseWith(request, http.StatusBadGateway)
+ resp = responseWith(request, http.StatusBadGateway)
}
}
@@ -103,7 +103,7 @@ func Authenticate(request *http.Request, cache *cache.Cache[string, bool]) *http
if authenticator != nil {
credential := parseBasicProxyAuthorization(request)
if credential == "" {
- resp := ResponseWith(request, http.StatusProxyAuthRequired)
+ resp := responseWith(request, http.StatusProxyAuthRequired)
resp.Header.Set("Proxy-Authenticate", "Basic")
return resp
}
@@ -117,14 +117,14 @@ func Authenticate(request *http.Request, cache *cache.Cache[string, bool]) *http
if !authed {
log.Infoln("Auth failed from %s", request.RemoteAddr)
- return ResponseWith(request, http.StatusForbidden)
+ return responseWith(request, http.StatusForbidden)
}
}
return nil
}
-func ResponseWith(request *http.Request, statusCode int) *http.Response {
+func responseWith(request *http.Request, statusCode int) *http.Response {
return &http.Response{
StatusCode: statusCode,
Status: http.StatusText(statusCode),
diff --git a/listener/http/utils.go b/listener/http/utils.go
index 0e7c7535..94308f19 100644
--- a/listener/http/utils.go
+++ b/listener/http/utils.go
@@ -40,7 +40,7 @@ func RemoveExtraHTTPHostPort(req *http.Request) {
host = req.URL.Host
}
- if pHost, port, err := net.SplitHostPort(host); err == nil && port == "80" {
+ if pHost, port, err := net.SplitHostPort(host); err == nil && (port == "80" || port == "443") {
host = pHost
}
diff --git a/listener/mitm/proxy.go b/listener/mitm/proxy.go
index a0d3bab6..88fef3db 100644
--- a/listener/mitm/proxy.go
+++ b/listener/mitm/proxy.go
@@ -17,7 +17,7 @@ import (
"github.com/Dreamacro/clash/common/cache"
N "github.com/Dreamacro/clash/common/net"
C "github.com/Dreamacro/clash/constant"
- httpL "github.com/Dreamacro/clash/listener/http"
+ H "github.com/Dreamacro/clash/listener/http"
)
func HandleConn(c net.Conn, opt *Option, in chan<- C.ConnContext, cache *cache.Cache[string, bool]) {
@@ -48,9 +48,12 @@ startOver:
readLoop:
for {
- _ = conn.SetDeadline(time.Now().Add(30 * time.Second)) // use SetDeadline instead of Proxy-Connection keep-alive
+ err := conn.SetDeadline(time.Now().Add(30 * time.Second)) // use SetDeadline instead of Proxy-Connection keep-alive
+ if err != nil {
+ break readLoop
+ }
- request, err := httpL.ReadRequest(conn.Reader())
+ request, err := H.ReadRequest(conn.Reader())
if err != nil {
handleError(opt, nil, err)
break readLoop
@@ -58,15 +61,15 @@ readLoop:
var response *http.Response
- session := NewSession(conn, request, response)
+ session := newSession(conn, request, response)
source = parseSourceAddress(session.request, c, source)
- request.RemoteAddr = source.String()
+ session.request.RemoteAddr = source.String()
if !trusted {
- response = httpL.Authenticate(request, cache)
+ session.response = H.Authenticate(session.request, cache)
- trusted = response == nil
+ trusted = session.response == nil
}
if trusted {
@@ -84,19 +87,18 @@ readLoop:
break readLoop // close connection
}
- buf := make([]byte, session.conn.(*N.BufferedConn).Buffered())
- _, _ = session.conn.Read(buf)
+ buff := make([]byte, session.conn.(*N.BufferedConn).Buffered())
+ _, _ = session.conn.Read(buff)
- mc := &MultiReaderConn{
+ mrc := &multiReaderConn{
Conn: session.conn,
- reader: io.MultiReader(bytes.NewReader(b), bytes.NewReader(buf), session.conn),
+ reader: io.MultiReader(bytes.NewReader(b), bytes.NewReader(buff), session.conn),
}
- // 22 is the TLS handshake.
- // https://tools.ietf.org/html/rfc5246#section-6.2.1
- if b[0] == 22 {
+ // TLS handshake.
+ if b[0] == 0x16 {
// TODO serve by generic host name maybe better?
- tlsConn := tls.Server(mc, opt.CertConfig.NewTLSConfigForHost(session.request.URL.Host))
+ tlsConn := tls.Server(mrc, opt.CertConfig.NewTLSConfigForHost(session.request.URL.Host))
// Handshake with the local client
if err = tlsConn.Handshake(); err != nil {
@@ -109,15 +111,17 @@ readLoop:
}
// maybe it's the others encrypted connection
- in <- inbound.NewHTTPS(request, mc)
+ in <- inbound.NewHTTPS(session.request, mrc)
}
// maybe it's a http connection
goto readLoop
}
+ prepareRequest(c, session.request)
+
// hijack api
- if getHostnameWithoutPort(session.request) == opt.ApiHost {
+ if session.request.URL.Host == opt.ApiHost {
if err = handleApiRequest(session, opt); err != nil {
handleError(opt, session, err)
break readLoop
@@ -125,8 +129,6 @@ readLoop:
return
}
- prepareRequest(c, session.request)
-
// hijack custom request and write back custom response if necessary
if opt.Handler != nil {
newReq, newRes := opt.Handler.HandleRequest(session)
@@ -144,12 +146,9 @@ readLoop:
}
}
- httpL.RemoveHopByHopHeaders(session.request.Header)
- httpL.RemoveExtraHTTPHostPort(request)
-
session.request.RequestURI = ""
- if session.request.URL.Scheme == "" || session.request.URL.Host == "" {
+ if session.request.URL.Host == "" {
session.response = session.NewErrorResponse(errors.New("invalid URL"))
} else {
client = newClientBySourceAndUserAgentIfNil(client, session.request, source, in)
@@ -162,6 +161,8 @@ readLoop:
session.response = session.NewErrorResponse(err)
if errors.Is(err, ErrCertUnsupported) || strings.Contains(err.Error(), "x509: ") {
// TODO block unsupported host?
+ _ = writeResponse(session, false)
+ break readLoop
}
}
}
@@ -194,7 +195,7 @@ func writeResponseWithHandler(session *Session, opt *Option) error {
}
func writeResponse(session *Session, keepAlive bool) error {
- httpL.RemoveHopByHopHeaders(session.response.Header)
+ H.RemoveHopByHopHeaders(session.response.Header)
if keepAlive {
session.response.Header.Set("Connection", "keep-alive")
@@ -226,17 +227,15 @@ func handleApiRequest(session *Session, opt *Option) error {
return session.response.Write(session.conn)
}
- b := `
-
- Clash ManInTheMiddle Proxy Services - 404 Not Found
-
-
- Not Found
- The requested URL %s was not found on this server.
-
-