cyonjan/frp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix http_proxy support GET

Browse Source
This commit is contained in:
Wany 2021-06-23 12:14:53 +08:00 committed by GitHub
parent a51e221db3
commit 8e76acdda3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/plugin/client/http_proxy.go
View File

@ -74,8 +74,8 @@ func (hp *HTTPProxy) Handle(conn io.ReadWriteCloser, realConn net.Conn, extraBuf
wrapConn.Close() wrapConn.Close()
return return
} }
if strings.Index(strings.ToUpper(string(firstBytes)), "CONNECT") == 0 ||
if strings.ToUpper(string(firstBytes)) == "CONNECT" { strings.Index(strings.ToUpper(string(firstBytes)), "GET") == 0 {
bufRd := bufio.NewReader(sc) bufRd := bufio.NewReader(sc)
request, err := http.ReadRequest(bufRd) request, err := http.ReadRequest(bufRd)
if err != nil { if err != nil {
@ -192,7 +192,11 @@ func (hp *HTTPProxy) handleConnectReq(req *http.Request, rwc io.ReadWriteCloser)
return return
} }
remote, err := net.Dial("tcp", req.URL.Host) dialHost := req.URL.Host
if !strings.Contains(dialHost, ":") {
dialHost = dialHost + ":http"
}
remote, err := net.Dial("tcp", dialHost)
if err != nil { if err != nil {
res := &http.Response{ res := &http.Response{
StatusCode: 400, StatusCode: 400,
@ -203,8 +207,11 @@ func (hp *HTTPProxy) handleConnectReq(req *http.Request, rwc io.ReadWriteCloser)
res.Write(rwc) res.Write(rwc)
return return
} }
rwc.Write([]byte("HTTP/1.1 200 OK\r\n\r\n")) if req.Method == "GET" {
req.Write(remote)
} else {
rwc.Write([]byte("HTTP/1.1 200 OK\r\n\r\n"))
}
frpIo.Join(remote, rwc) frpIo.Join(remote, rwc)
} }