Merge pull request #4060 from fatedier/dev

bump version

Release.md

@@ -1,22 +1 @@
-### Features
-
-* Support range ports mapping in TOML/YAML/JSON configuration file by using go template syntax.
-
-  For example:
-
-  ```
-  {{- range $_, $v := parseNumberRangePair "6000-6006,6007" "6000-6006,6007" }}
-  [[proxies]]
-  name = "tcp-{{ $v.First }}"
-  type = "tcp"
-  localPort = {{ $v.First }}
-  remotePort = {{ $v.Second }}
-  {{- end }}
-  ```
-
-  This will create 8 proxies such as `tcp-6000, tcp-6001, ... tcp-6007`.
-
-### Fixes
-
-* Fix the issue of incorrect interval time for rotating the log by day.
-* Disable quic-go's ECN support by default. It may cause issues on certain operating systems.
+No feature changes, just a fix for the issue of no released assets in version 0.55.0.

client/service.go

@@ -19,7 +19,6 @@ import (
 	"errors"
 	"fmt"
 	"net"
-	"os"
 	"runtime"
 	"sync"
 	"time"
@@ -41,12 +40,6 @@ import (
 
 func init() {
 	crypto.DefaultSalt = "frp"
-	// Disable quic-go's receive buffer warning.
-	os.Setenv("QUIC_GO_DISABLE_RECEIVE_BUFFER_WARNING", "true")
-	// Disable quic-go's ECN support by default. It may cause issues on certain operating systems.
-	if os.Getenv("QUIC_GO_DISABLE_ECN") == "" {
-		os.Setenv("QUIC_GO_DISABLE_ECN", "true")
-	}
 }
 
 type cancelErr struct {

go.mod

@@ -5,7 +5,7 @@ go 1.22
 require (
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
 	github.com/coreos/go-oidc/v3 v3.6.0
-	github.com/fatedier/golib v0.4.1
+	github.com/fatedier/golib v0.4.0
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.5.0

go.sum

@@ -24,8 +24,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fatedier/golib v0.4.1 h1:C37VN3M+F3nUdh13laZsiyb5EXNe3tZnUdoHi+7rx+Q=
-github.com/fatedier/golib v0.4.1/go.mod h1:gpu+1vXxtJ072NYaNsn/YWgojDL8Ap2kFZQtbzT2qkg=
+github.com/fatedier/golib v0.4.0 h1:lafvYRMhFmqrfIUChKy/f5AXqs1eDSk+GAUtLexN5bU=
+github.com/fatedier/golib v0.4.0/go.mod h1:gpu+1vXxtJ072NYaNsn/YWgojDL8Ap2kFZQtbzT2qkg=
 github.com/fatedier/yamux v0.0.0-20230628132301-7aca4898904d h1:ynk1ra0RUqDWQfvFi5KtMiSobkVQ3cNc0ODb8CfIETo=
 github.com/fatedier/yamux v0.0.0-20230628132301-7aca4898904d/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/go-jose/go-jose/v3 v3.0.1 h1:pWmKFVtt+Jl0vBZTIpz/eAKwsm6LkIxDVVbFHKkchhA=

pkg/config/load.go

@@ -80,10 +80,7 @@ func DetectLegacyINIFormatFromFile(path string) bool {
 }
 
 func RenderWithTemplate(in []byte, values *Values) ([]byte, error) {
-	tmpl, err := template.New("frp").Funcs(template.FuncMap{
-		"parseNumberRange":     parseNumberRange,
-		"parseNumberRangePair": parseNumberRangePair,
-	}).Parse(string(in))
+	tmpl, err := template.New("frp").Parse(string(in))
 	if err != nil {
 		return nil, err
 	}

pkg/config/template.go

@@ -1,52 +0,0 @@
-// Copyright 2024 The frp Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package config
-
-import (
-	"fmt"
-
-	"github.com/fatedier/frp/pkg/util/util"
-)
-
-type NumberPair struct {
-	First  int64
-	Second int64
-}
-
-func parseNumberRangePair(firstRangeStr, secondRangeStr string) ([]NumberPair, error) {
-	firstRangeNumbers, err := util.ParseRangeNumbers(firstRangeStr)
-	if err != nil {
-		return nil, err
-	}
-	secondRangeNumbers, err := util.ParseRangeNumbers(secondRangeStr)
-	if err != nil {
-		return nil, err
-	}
-	if len(firstRangeNumbers) != len(secondRangeNumbers) {
-		return nil, fmt.Errorf("first and second range numbers are not in pairs")
-	}
-	pairs := make([]NumberPair, 0, len(firstRangeNumbers))
-	for i := 0; i < len(firstRangeNumbers); i++ {
-		pairs = append(pairs, NumberPair{
-			First:  firstRangeNumbers[i],
-			Second: secondRangeNumbers[i],
-		})
-	}
-	return pairs, nil
-}
-
-func parseNumberRange(firstRangeStr string) ([]int64, error) {
-	return util.ParseRangeNumbers(firstRangeStr)
-}

pkg/util/version/version.go

@@ -14,7 +14,7 @@
 
 package version
 
-var version = "0.56.0"
+var version = "0.55.1"
 
 func Full() string {
 	return version

server/service.go

@@ -22,7 +22,6 @@ import (
 	"io"
 	"net"
 	"net/http"
-	"os"
 	"strconv"
 	"time"
 
@@ -60,15 +59,6 @@ const (
 	vhostReadWriteTimeout time.Duration = 30 * time.Second
 )
 
-func init() {
-	// Disable quic-go's receive buffer warning.
-	os.Setenv("QUIC_GO_DISABLE_RECEIVE_BUFFER_WARNING", "true")
-	// Disable quic-go's ECN support by default. It may cause issues on certain operating systems.
-	if os.Getenv("QUIC_GO_DISABLE_ECN") == "" {
-		os.Setenv("QUIC_GO_DISABLE_ECN", "true")
-	}
-}
-
 // Server service
 type Service struct {
 	// Dispatch connections to different handlers listen on same port

test/e2e/framework/client.go

@@ -1,9 +1,11 @@
 package framework
 
-import (
-	clientsdk "github.com/fatedier/frp/pkg/sdk/client"
-)
-
-func (f *Framework) APIClientForFrpc(port int) *clientsdk.Client {
-	return clientsdk.New("127.0.0.1", port)
+type FRPClient struct {
+	port int
+}
+
+func (f *Framework) FRPClient(port int) *FRPClient {
+	return &FRPClient{
+		port: port,
+	}
 }

test/e2e/framework/expect.go

@@ -43,10 +43,6 @@ func ExpectNoErrorWithOffset(offset int, err error, explain ...interface{}) {
 	gomega.ExpectWithOffset(1+offset, err).NotTo(gomega.HaveOccurred(), explain...)
 }
 
-func ExpectContainSubstring(actual, substr string, explain ...interface{}) {
-	gomega.ExpectWithOffset(1, actual).To(gomega.ContainSubstring(substr), explain...)
-}
-
 // ExpectConsistOf expects actual contains precisely the extra elements.  The ordering of the elements does not matter.
 func ExpectConsistOf(actual interface{}, extra interface{}, explain ...interface{}) {
 	gomega.ExpectWithOffset(1, actual).To(gomega.ConsistOf(extra), explain...)

test/e2e/framework/framework.go

@@ -217,7 +217,7 @@ func (f *Framework) RenderTemplates(templates []string) (outs []string, ports ma
 	}
 
 	for _, t := range templates {
-		tmpl, err := template.New("frp-e2e").Parse(t)
+		tmpl, err := template.New("").Parse(t)
 		if err != nil {
 			return nil, nil, err
 		}

test/e2e/legacy/basic/client.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/onsi/ginkgo/v2"
 
+	clientsdk "github.com/fatedier/frp/pkg/sdk/client"
 	"github.com/fatedier/frp/test/e2e/framework"
 	"github.com/fatedier/frp/test/e2e/framework/consts"
 	"github.com/fatedier/frp/test/e2e/pkg/request"
@@ -53,7 +54,7 @@ var _ = ginkgo.Describe("[Feature: ClientManage]", func() {
 		framework.NewRequestExpect(f).Port(p2Port).Ensure()
 		framework.NewRequestExpect(f).Port(p3Port).Ensure()
 
-		client := f.APIClientForFrpc(adminPort)
+		client := clientsdk.New("127.0.0.1", adminPort)
 		conf, err := client.GetConfig()
 		framework.ExpectNoError(err)
 
@@ -119,7 +120,7 @@ var _ = ginkgo.Describe("[Feature: ClientManage]", func() {
 
 		framework.NewRequestExpect(f).Port(testPort).Ensure()
 
-		client := f.APIClientForFrpc(adminPort)
+		client := clientsdk.New("127.0.0.1", adminPort)
 		err := client.Stop()
 		framework.ExpectNoError(err)
 

test/e2e/legacy/basic/server.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/onsi/ginkgo/v2"
 
+	clientsdk "github.com/fatedier/frp/pkg/sdk/client"
 	"github.com/fatedier/frp/test/e2e/framework"
 	"github.com/fatedier/frp/test/e2e/framework/consts"
 	"github.com/fatedier/frp/test/e2e/pkg/port"
@@ -98,7 +99,7 @@ var _ = ginkgo.Describe("[Feature: Server Manager]", func() {
 
 		f.RunProcesses([]string{serverConf}, []string{clientConf})
 
-		client := f.APIClientForFrpc(adminPort)
+		client := clientsdk.New("127.0.0.1", adminPort)
 
 		// tcp random port
 		status, err := client.GetProxyStatus("tcp")

test/e2e/v1/basic/client.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/onsi/ginkgo/v2"
 
+	clientsdk "github.com/fatedier/frp/pkg/sdk/client"
 	"github.com/fatedier/frp/test/e2e/framework"
 	"github.com/fatedier/frp/test/e2e/framework/consts"
 	"github.com/fatedier/frp/test/e2e/pkg/request"
@@ -56,7 +57,7 @@ var _ = ginkgo.Describe("[Feature: ClientManage]", func() {
 		framework.NewRequestExpect(f).Port(p2Port).Ensure()
 		framework.NewRequestExpect(f).Port(p3Port).Ensure()
 
-		client := f.APIClientForFrpc(adminPort)
+		client := clientsdk.New("127.0.0.1", adminPort)
 		conf, err := client.GetConfig()
 		framework.ExpectNoError(err)
 
@@ -123,7 +124,7 @@ var _ = ginkgo.Describe("[Feature: ClientManage]", func() {
 
 		framework.NewRequestExpect(f).Port(testPort).Ensure()
 
-		client := f.APIClientForFrpc(adminPort)
+		client := clientsdk.New("127.0.0.1", adminPort)
 		err := client.Stop()
 		framework.ExpectNoError(err)
 

test/e2e/v1/basic/config.go

@@ -38,51 +38,6 @@ var _ = ginkgo.Describe("[Feature: Config]", func() {
 
 			framework.NewRequestExpect(f).PortName(portName).Ensure()
 		})
-
-		ginkgo.It("Range ports mapping", func() {
-			serverConf := consts.DefaultServerConfig
-			clientConf := consts.DefaultClientConfig
-
-			adminPort := f.AllocPort()
-
-			localPortsRange := "13010-13012,13014"
-			remotePortsRange := "23010-23012,23014"
-			escapeTemplate := func(s string) string {
-				return "{{ `" + s + "` }}"
-			}
-			clientConf += fmt.Sprintf(`
-			webServer.port = %d
-
-			%s
-			[[proxies]]
-			name = "tcp-%s"
-			type = "tcp"
-			localPort = %s
-			remotePort = %s
-			%s
-			`, adminPort,
-				escapeTemplate(fmt.Sprintf(`{{- range $_, $v := parseNumberRangePair "%s" "%s" }}`, localPortsRange, remotePortsRange)),
-				escapeTemplate("{{ $v.First }}"),
-				escapeTemplate("{{ $v.First }}"),
-				escapeTemplate("{{ $v.Second }}"),
-				escapeTemplate("{{- end }}"),
-			)
-
-			f.RunProcesses([]string{serverConf}, []string{clientConf})
-
-			client := f.APIClientForFrpc(adminPort)
-			checkProxyFn := func(name string, localPort, remotePort int) {
-				status, err := client.GetProxyStatus(name)
-				framework.ExpectNoError(err)
-
-				framework.ExpectContainSubstring(status.LocalAddr, fmt.Sprintf(":%d", localPort))
-				framework.ExpectContainSubstring(status.RemoteAddr, fmt.Sprintf(":%d", remotePort))
-			}
-			checkProxyFn("tcp-13010", 13010, 23010)
-			checkProxyFn("tcp-13011", 13011, 23011)
-			checkProxyFn("tcp-13012", 13012, 23012)
-			checkProxyFn("tcp-13014", 13014, 23014)
-		})
 	})
 
 	ginkgo.Describe("Includes", func() {

test/e2e/v1/basic/server.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/onsi/ginkgo/v2"
 
+	clientsdk "github.com/fatedier/frp/pkg/sdk/client"
 	"github.com/fatedier/frp/test/e2e/framework"
 	"github.com/fatedier/frp/test/e2e/framework/consts"
 	"github.com/fatedier/frp/test/e2e/pkg/port"
@@ -109,7 +110,7 @@ var _ = ginkgo.Describe("[Feature: Server Manager]", func() {
 
 		f.RunProcesses([]string{serverConf}, []string{clientConf})
 
-		client := f.APIClientForFrpc(adminPort)
+		client := clientsdk.New("127.0.0.1", adminPort)
 
 		// tcp random port
 		status, err := client.GetProxyStatus("tcp")