Merge pull request #2508 from fatedier/dev

bump version
fatedier · Aug 3, 2021 · 997d406 · 997d406
2 parents cfd1a31 + 87e6068
commit 997d406
Show file tree

Hide file tree

Showing 88 changed files with 3,830 additions and 2,319 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,14 +1,14 @@
 version: 2
 jobs:
-  test1:
+  go-version-latest:
     docker:
       - image: circleci/golang:1.16-node
     working_directory: /go/src/github.com/fatedier/frp
     steps:
       - checkout
       - run: make
       - run: make alltest
-  test2:
+  go-version-last:
     docker:
       - image: circleci/golang:1.15-node
     working_directory: /go/src/github.com/fatedier/frp
@@ -21,5 +21,5 @@ workflows:
   version: 2
   build_and_test:
     jobs:
-      - test1
-      - test2
+      - go-version-latest
+      - go-version-last
diff --git a/Makefile b/Makefile
@@ -34,13 +34,13 @@ gotest:
 	go test -v --cover ./server/...
 	go test -v --cover ./pkg/...
 
-ci:
-	go test -count=1 -p=1 -v ./tests/...
-
 e2e:
 	./hack/run-e2e.sh
 
-alltest: gotest ci e2e
+e2e-trace:
+	DEBUG=true LOG_LEVEL=trace ./hack/run-e2e.sh
+
+alltest: gotest e2e
 
 clean:
 	rm -f ./bin/frpc

diff --git a/Release.md b/Release.md
@@ -0,0 +1,5 @@
+### Fix
+
+* Plugin `https2https` not work.
+* `context canceled` problem for `http_proxy` plugin when multiple requests reuse same connection.
+* In some cases, frps can't get server name for `https` proxy.
diff --git a/assets/frpc/static/index.html b/assets/frpc/static/index.html
@@ -1 +1 @@
-<!doctype html> <html lang=en> <head> <meta charset=utf-8> <title>frp client admin UI</title> <link rel="shortcut icon" href="favicon.ico"></head> <body> <div id=app></div> <script type="text/javascript" src="manifest.js?5a0eb52788515d02ca46"></script><script type="text/javascript" src="vendor.js?3e5221f064f1295497bf"></script></body> </html> 
+<!doctype html> <html lang=en> <head> <meta charset=utf-8> <title>frp client admin UI</title> <link rel="shortcut icon" href="favicon.ico"></head> <body> <div id=app></div> <script type="text/javascript" src="manifest.js?5d5774096cf5c1b4d5af"></script><script type="text/javascript" src="vendor.js?dc42700731a508d39009"></script></body> </html> 
diff --git a/assets/frpc/static/manifest.js b/assets/frpc/static/manifest.js
diff --git a/assets/frpc/static/vendor.js b/assets/frpc/static/vendor.js
diff --git a/assets/frpc/statik/statik.go b/assets/frpc/statik/statik.go
diff --git a/assets/frps/static/index.html b/assets/frps/static/index.html
@@ -1 +1 @@
-<!doctype html> <html lang=en> <head> <meta charset=utf-8> <title>frps dashboard</title> <link rel="shortcut icon" href="favicon.ico"></head> <body> <div id=app></div> <script type="text/javascript" src="manifest.js?41dbccdbc87e6bcbd79c"></script><script type="text/javascript" src="vendor.js?d7109b07f8f86bab2eeb"></script></body> </html> 
+<!doctype html> <html lang=en> <head> <meta charset=utf-8> <title>frps dashboard</title> <link rel="shortcut icon" href="favicon.ico"></head> <body> <div id=app></div> <script type="text/javascript" src="manifest.js?5d154ba4c6b342d8c0c3"></script><script type="text/javascript" src="vendor.js?ddbd1f69fb6e67be4b78"></script></body> </html> 
diff --git a/assets/frps/static/manifest.js b/assets/frps/static/manifest.js
diff --git a/assets/frps/static/vendor.js b/assets/frps/static/vendor.js
diff --git a/assets/frps/statik/statik.go b/assets/frps/statik/statik.go
diff --git a/client/proxy/proxy.go b/client/proxy/proxy.go
@@ -757,12 +757,12 @@ func HandleTCPWorkConnection(ctx context.Context, localInfo *config.LocalSvrConf
 			if m.DstAddr == "" {
 				m.DstAddr = "127.0.0.1"
 			}
+			srcAddr, _ := net.ResolveTCPAddr("tcp", net.JoinHostPort(m.SrcAddr, strconv.Itoa(int(m.SrcPort))))
+			dstAddr, _ := net.ResolveTCPAddr("tcp", net.JoinHostPort(m.DstAddr, strconv.Itoa(int(m.DstPort))))
 			h := &pp.Header{
-				Command:            pp.PROXY,
-				SourceAddress:      net.ParseIP(m.SrcAddr),
-				SourcePort:         m.SrcPort,
-				DestinationAddress: net.ParseIP(m.DstAddr),
-				DestinationPort:    m.DstPort,
+				Command:         pp.PROXY,
+				SourceAddr:      srcAddr,
+				DestinationAddr: dstAddr,
 			}
 
 			if strings.Contains(m.SrcAddr, ".") {

diff --git a/cmd/frpc/sub/status.go b/cmd/frpc/sub/status.go
@@ -89,7 +89,7 @@ func status(clientCfg config.ClientCommonConf) error {
 
 	fmt.Println("Proxy Status...")
 	if len(res.TCP) > 0 {
-		fmt.Printf("TCP")
+		fmt.Println("TCP")
 		tbl := table.New("Name", "Status", "LocalAddr", "Plugin", "RemoteAddr", "Error")
 		for _, ps := range res.TCP {
 			tbl.AddRow(ps.Name, ps.Status, ps.LocalAddr, ps.Plugin, ps.RemoteAddr, ps.Err)
@@ -98,7 +98,7 @@ func status(clientCfg config.ClientCommonConf) error {
 		fmt.Println("")
 	}
 	if len(res.UDP) > 0 {
-		fmt.Printf("UDP")
+		fmt.Println("UDP")
 		tbl := table.New("Name", "Status", "LocalAddr", "Plugin", "RemoteAddr", "Error")
 		for _, ps := range res.UDP {
 			tbl.AddRow(ps.Name, ps.Status, ps.LocalAddr, ps.Plugin, ps.RemoteAddr, ps.Err)
@@ -107,7 +107,7 @@ func status(clientCfg config.ClientCommonConf) error {
 		fmt.Println("")
 	}
 	if len(res.HTTP) > 0 {
-		fmt.Printf("HTTP")
+		fmt.Println("HTTP")
 		tbl := table.New("Name", "Status", "LocalAddr", "Plugin", "RemoteAddr", "Error")
 		for _, ps := range res.HTTP {
 			tbl.AddRow(ps.Name, ps.Status, ps.LocalAddr, ps.Plugin, ps.RemoteAddr, ps.Err)
@@ -116,7 +116,7 @@ func status(clientCfg config.ClientCommonConf) error {
 		fmt.Println("")
 	}
 	if len(res.HTTPS) > 0 {
-		fmt.Printf("HTTPS")
+		fmt.Println("HTTPS")
 		tbl := table.New("Name", "Status", "LocalAddr", "Plugin", "RemoteAddr", "Error")
 		for _, ps := range res.HTTPS {
 			tbl.AddRow(ps.Name, ps.Status, ps.LocalAddr, ps.Plugin, ps.RemoteAddr, ps.Err)
@@ -125,7 +125,7 @@ func status(clientCfg config.ClientCommonConf) error {
 		fmt.Println("")
 	}
 	if len(res.STCP) > 0 {
-		fmt.Printf("STCP")
+		fmt.Println("STCP")
 		tbl := table.New("Name", "Status", "LocalAddr", "Plugin", "RemoteAddr", "Error")
 		for _, ps := range res.STCP {
 			tbl.AddRow(ps.Name, ps.Status, ps.LocalAddr, ps.Plugin, ps.RemoteAddr, ps.Err)
@@ -134,7 +134,7 @@ func status(clientCfg config.ClientCommonConf) error {
 		fmt.Println("")
 	}
 	if len(res.XTCP) > 0 {
-		fmt.Printf("XTCP")
+		fmt.Println("XTCP")
 		tbl := table.New("Name", "Status", "LocalAddr", "Plugin", "RemoteAddr", "Error")
 		for _, ps := range res.XTCP {
 			tbl.AddRow(ps.Name, ps.Status, ps.LocalAddr, ps.Plugin, ps.RemoteAddr, ps.Err)

diff --git a/conf/frps_full.ini b/conf/frps_full.ini
@@ -36,7 +36,7 @@ vhost_https_port = 443
 dashboard_addr = 0.0.0.0
 dashboard_port = 7500
 
-# dashboard user and passwd for basic auth protect, if not set, both default value is admin
+# dashboard user and passwd for basic auth protect
 dashboard_user = admin
 dashboard_pwd = admin
 

diff --git a/conf/systemd/frpc.service b/conf/systemd/frpc.service
@@ -9,6 +9,7 @@ Restart=on-failure
 RestartSec=5s
 ExecStart=/usr/bin/frpc -c /etc/frp/frpc.ini
 ExecReload=/usr/bin/frpc reload -c /etc/frp/frpc.ini
+LimitNOFILE=1048576
 
 [Install]
 WantedBy=multi-user.target
diff --git a/conf/systemd/[email protected] b/conf/systemd/[email protected]
@@ -3,12 +3,13 @@ Description=Frp Client Service
 After=network.target
 
 [Service]
-Type=idle
+Type=simple
 User=nobody
 Restart=on-failure
 RestartSec=5s
 ExecStart=/usr/bin/frpc -c /etc/frp/%i.ini
 ExecReload=/usr/bin/frpc reload -c /etc/frp/%i.ini
+LimitNOFILE=1048576
 
 [Install]
 WantedBy=multi-user.target
diff --git a/conf/systemd/frps.service b/conf/systemd/frps.service
@@ -8,6 +8,7 @@ User=nobody
 Restart=on-failure
 RestartSec=5s
 ExecStart=/usr/bin/frps -c /etc/frp/frps.ini
+LimitNOFILE=1048576
 
 [Install]
 WantedBy=multi-user.target
diff --git a/conf/systemd/[email protected] b/conf/systemd/[email protected]
@@ -8,6 +8,7 @@ User=nobody
 Restart=on-failure
 RestartSec=5s
 ExecStart=/usr/bin/frps -c /etc/frp/%i.ini
+LimitNOFILE=1048576
 
 [Install]
 WantedBy=multi-user.target
diff --git a/go.mod b/go.mod
@@ -8,33 +8,33 @@ require (
 	github.com/fatedier/beego v0.0.0-20171024143340-6c6a4f5bd5eb
 	github.com/fatedier/golib v0.1.1-0.20200901083111-1f870741e185
 	github.com/fatedier/kcp-go v2.0.4-0.20190803094908-fe8645b0a904+incompatible
-	github.com/google/uuid v1.1.1
-	github.com/gorilla/mux v1.7.3
-	github.com/gorilla/websocket v1.4.0
-	github.com/hashicorp/yamux v0.0.0-20210316155119-a95892c5f864
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/go-playground/validator/v10 v10.6.1
+	github.com/google/uuid v1.2.0
+	github.com/gorilla/mux v1.8.0
+	github.com/gorilla/websocket v1.4.2
+	github.com/hashicorp/yamux v0.0.0-20210707203944-259a57b3608c
 	github.com/klauspost/cpuid v1.2.0 // indirect
 	github.com/klauspost/reedsolomon v1.9.1 // indirect
-	github.com/mattn/go-runewidth v0.0.4 // indirect
-	github.com/onsi/ginkgo v1.12.3
-	github.com/onsi/gomega v1.10.1
-	github.com/pires/go-proxyproto v0.0.0-20190111085350-4d51b51e3bfc
+	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/onsi/ginkgo v1.16.4
+	github.com/onsi/gomega v1.13.0
+	github.com/pires/go-proxyproto v0.5.0
 	github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
-	github.com/prometheus/client_golang v1.4.1
+	github.com/prometheus/client_golang v1.11.0
 	github.com/rakyll/statik v0.1.1
-	github.com/rodaine/table v1.0.0
-	github.com/smartystreets/goconvey v1.6.4 // indirect
-	github.com/spf13/cobra v0.0.3
-	github.com/stretchr/testify v1.4.0
+	github.com/rodaine/table v1.0.1
+	github.com/spf13/cobra v1.1.3
+	github.com/stretchr/testify v1.7.0
 	github.com/templexxx/cpufeat v0.0.0-20170927014610-3794dfbfb047 // indirect
 	github.com/templexxx/xor v0.0.0-20170926022130-0af8e873c554 // indirect
 	github.com/tjfoc/gmsm v0.0.0-20171124023159-98aa888b79d8 // indirect
 	github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae // indirect
-	golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7
+	golang.org/x/net v0.0.0-20210428140749-89ef3d95e781
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
-	golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 // indirect
-	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
+	golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
+	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
 	gopkg.in/ini.v1 v1.62.0
 	gopkg.in/square/go-jose.v2 v2.4.1 // indirect
-	k8s.io/apimachinery v0.18.3
+	k8s.io/apimachinery v0.21.2
+	k8s.io/client-go v0.21.2
 )
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html> <html lang=en> <head> <meta charset=utf-8> <title>frp client admin UI</title> <link rel="shortcut icon" href="favicon.ico"></head> <body> <div id=app></div> <script type="text/javascript" src="manifest.js?5a0eb52788515d02ca46"></script><script type="text/javascript" src="vendor.js?3e5221f064f1295497bf"></script></body> </html>
		<!doctype html> <html lang=en> <head> <meta charset=utf-8> <title>frp client admin UI</title> <link rel="shortcut icon" href="favicon.ico"></head> <body> <div id=app></div> <script type="text/javascript" src="manifest.js?5d5774096cf5c1b4d5af"></script><script type="text/javascript" src="vendor.js?dc42700731a508d39009"></script></body> </html>