vendor: update

tests/func_test.go

@@ -12,7 +12,8 @@ import (
 
 	"github.com/fatedier/frp/client"
 	"github.com/fatedier/frp/server"
-	"github.com/fatedier/frp/utils/net"
+
+	gnet "github.com/fatedier/golib/net"
 )
 
 var (
@@ -279,7 +280,7 @@ func TestPluginHttpProxy(t *testing.T) {
 		}
 
 		// connect method
-		conn, err := net.ConnectTcpServerByProxy("http://"+addr, fmt.Sprintf("127.0.0.1:%d", TEST_TCP_FRP_PORT))
+		conn, err := gnet.DialTcpByProxy("http://"+addr, fmt.Sprintf("127.0.0.1:%d", TEST_TCP_FRP_PORT))
 		if assert.NoError(err) {
 			res, err := sendTcpMsgByConn(conn, TEST_TCP_ECHO_STR)
 			assert.NoError(err)

utils/net/conn.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/fatedier/frp/utils/log"
 
+	gnet "github.com/fatedier/golib/net"
 	kcp "github.com/fatedier/kcp-go"
 )
 
@@ -123,7 +124,11 @@ func ConnectServer(protocol string, addr string) (c Conn, err error) {
 func ConnectServerByProxy(proxyUrl string, protocol string, addr string) (c Conn, err error) {
 	switch protocol {
 	case "tcp":
-		return ConnectTcpServerByProxy(proxyUrl, addr)
+		var conn net.Conn
+		if conn, err = gnet.DialTcpByProxy(proxyUrl, addr); err != nil {
+			return
+		}
+		return WrapConn(conn), nil
 	case "kcp":
 		// http proxy is not supported for kcp
 		return ConnectServer(protocol, addr)

utils/net/tcp.go

@@ -15,16 +15,10 @@
 package net
 
 import (
-	"bufio"
-	"encoding/base64"
 	"fmt"
 	"net"
-	"net/http"
-	"net/url"
 
 	"github.com/fatedier/frp/utils/log"
-
-	"golang.org/x/net/proxy"
 )
 
 type TcpListener struct {
@@ -115,88 +109,3 @@ func ConnectTcpServer(addr string) (c Conn, err error) {
 	c = NewTcpConn(conn)
 	return
 }
-
-// ConnectTcpServerByProxy try to connect remote server by proxy.
-func ConnectTcpServerByProxy(proxyStr string, serverAddr string) (c Conn, err error) {
-	if proxyStr == "" {
-		return ConnectTcpServer(serverAddr)
-	}
-
-	var (
-		proxyUrl *url.URL
-		username string
-		passwd   string
-	)
-	if proxyUrl, err = url.Parse(proxyStr); err != nil {
-		return
-	}
-	if proxyUrl.User != nil {
-		username = proxyUrl.User.Username()
-		passwd, _ = proxyUrl.User.Password()
-	}
-
-	switch proxyUrl.Scheme {
-	case "http":
-		return ConnectTcpServerByHttpProxy(proxyUrl, username, passwd, serverAddr)
-	case "socks5":
-		return ConnectTcpServerBySocks5Proxy(proxyUrl, username, passwd, serverAddr)
-	default:
-		err = fmt.Errorf("Proxy URL scheme must be http or socks5, not [%s]", proxyUrl.Scheme)
-		return
-	}
-}
-
-// ConnectTcpServerByHttpProxy try to connect remote server by http proxy.
-func ConnectTcpServerByHttpProxy(proxyUrl *url.URL, user string, passwd string, serverAddr string) (c Conn, err error) {
-	var proxyAuth string
-	if proxyUrl.User != nil {
-		proxyAuth = "Basic " + base64.StdEncoding.EncodeToString([]byte(user+":"+passwd))
-	}
-
-	if c, err = ConnectTcpServer(proxyUrl.Host); err != nil {
-		return
-	}
-
-	req, err := http.NewRequest("CONNECT", "http://"+serverAddr, nil)
-	if err != nil {
-		return
-	}
-	if proxyAuth != "" {
-		req.Header.Set("Proxy-Authorization", proxyAuth)
-	}
-	req.Header.Set("User-Agent", "Mozilla/5.0")
-	req.Write(c)
-
-	resp, err := http.ReadResponse(bufio.NewReader(c), req)
-	if err != nil {
-		return
-	}
-	resp.Body.Close()
-	if resp.StatusCode != 200 {
-		err = fmt.Errorf("ConnectTcpServer using proxy error, StatusCode [%d]", resp.StatusCode)
-		return
-	}
-	return
-}
-
-func ConnectTcpServerBySocks5Proxy(proxyUrl *url.URL, user string, passwd string, serverAddr string) (c Conn, err error) {
-	var auth *proxy.Auth
-	if proxyUrl.User != nil {
-		auth = &proxy.Auth{
-			User:     user,
-			Password: passwd,
-		}
-	}
-
-	dialer, err := proxy.SOCKS5("tcp", proxyUrl.Host, auth, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	var conn net.Conn
-	if conn, err = dialer.Dial("tcp", serverAddr); err != nil {
-		return
-	}
-	c = NewTcpConn(conn)
-	return
-}