Merge Release/v1.7.0 into Master

.github/workflows/ci.yml

@@ -56,7 +56,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.21
 
     # Build
     - name: Build
@@ -75,8 +75,8 @@ jobs:
     - name: setup Python
       uses: actions/setup-python@v2
       with:
-        python-version: '2.x' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-    - run: python -m SimpleHTTPServer 8181&
+        python-version: '3.x' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+    - run: python3 -m http.server 8181&
 
     # Modify Conf and Run
     - name: Run

.gitignore

@@ -27,5 +27,6 @@ coverage.txt
 .vscode/*
 bfe
 dist/*
+conf/wasm_plugin
 
 .DS_Store

ADOPTERS.md

@@ -14,6 +14,8 @@ Some of our users include:
 
 * [Haier](https://www.haier.com)
 
+* [PITS Global Data Recovery Services](https://pitsdatarecovery.net/)
+
 * [Postal Savings Bank of China](https://www.psbc.com)
 
 * [Resolink](https://www.crresolink.com.cn)

CHANGELOG.md

@@ -10,6 +10,46 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.7.0] - 2025-01-19
+
+### Added
+
+- Support building docker images for multiple architectures
+- Support WASM to allow dynamic plugin
+
+### Fixed
+
+- Upgrade versions of some third-paty modules for security reasons
+- Fix format issue in bfe_http/request_test.go
+- Temporarily remove some test cases using legacy test data
+- mod_tcp_keepalive: fix broken unit tests
+- http2: close connections when receiving too many headers
+- Fix readloop goroutine leak
+
+### Removed
+
+- The previous experimental dynamic plugin is deprecated
+
+## [v1.6.0] - 2022-10-21
+
+### Added
+
+- Allow user to disable monitor port ([Issue #936](/~https://github.com/bfenetworks/bfe/issues/936))
+- Support HTTP2 fingerprint ([Issue #1071](/~https://github.com/bfenetworks/bfe/issues/1071))
+- Documents optimization
+
+### Changed
+
+- Optimize idle connection handling  ([Pull #1044](/~https://github.com/bfenetworks/bfe/pull/1044))
+- Performance optimize in smooth least connection balancing algorithm([Pull #1062](/~https://github.com/bfenetworks/bfe/pull/1062))
+- Miscellaneous golang dependency updates
+- Miscellaneous improvements in makefile and other CI tools
+
+### Fixed
+
+- mod_trust_clientip: fix incorrect private IP address range ([Issue #856](/~https://github.com/bfenetworks/bfe/issues/856))
+- arm build error in golang 1.18
+
 ## [v1.6.0] - 2022-10-21
 
 ### Added

Dockerfile

@@ -12,11 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM golang:1.17.5-alpine3.15 AS build
+FROM --platform=${BUILDPLATFORM} golang:1.17.5-alpine3.15 AS build
+ARG TARGETARCH
+ARG TARGETOS
 
 WORKDIR /bfe
 COPY . .
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-X main.version=`cat VERSION`"
+RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags "-X main.version=`cat VERSION`"
 
 FROM alpine:3.15 AS run
 RUN apk update && apk add --no-cache ca-certificates

MAINTAINERS.md

@@ -6,21 +6,25 @@ This file lists who are the maintainers of the BFE project. The responsibilities
 
 | Name | GitHub ID | Affiliation |
 | ---- | --------- | ----------- |
-| [Miao Zhang](mailto:zhangmiao02@baidu.com) | [mileszhang2016](/~https://github.com/mileszhang2016) | Baidu |
-| [Sijie Yang](mailto:iyangsj@gmail.com)   | [iyangsj](/~https://github.com/iyangsj) | Baidu |
+| [Miao Zhang](mailto:zhangmiao@yf-networks.com) | [mileszhang2016](/~https://github.com/mileszhang2016) | Yingfei Networks |
+| [Sijie Yang](mailto:iyangsj@gmail.com)   | [iyangsj](/~https://github.com/iyangsj) | Tencent |
 
 ## Senior Maintainers
 
 | Name | GitHub ID | Affiliation |
 | ---- | --------- | ----------- |
-| [Sijie Yang](mailto:iyangsj@gmail.com)   | [iyangsj](/~https://github.com/iyangsj) | Baidu |
+| [Sijie Yang](mailto:iyangsj@gmail.com)   | [iyangsj](/~https://github.com/iyangsj) | Tencent |
 
 ## Maintainers
 
 | Name | GitHub ID | Affiliation |
 | ---- | --------- | ----------- |
 | [Derek Zheng](mailto:shanhu5739@gmail.com) | [shanhuhai5739](/~https://github.com/shanhuhai5739) | Kuaishou |
-| [Xiaofei Yu](mailto:nemo_00o@hotmail.com) | [xiaofei0800](/~https://github.com/xiaofei0800) | Baidu |
+| [Xiaofei Yu](mailto:nemo_00o@hotmail.com) | [xiaofei0800](/~https://github.com/xiaofei0800) | Tencent |
 | [Wensi Yang](mailto:tianxinheihei@gmail.com) | [tianxinheihei](/~https://github.com/tianxinheihei) | ByteDance |
 | [Kaiyu Zheng](mailto:412674752@qq.com) | [kaiyuzheng](/~https://github.com/kaiyuzheng) | ByteDance |
-| [Yuqi Xiao](mailto:xiao19910705@163.com) | [Yuqi Xiao](/~https://github.com/YuqiXiao) | Baidu |
+| [Yuqi Xiao](mailto:xiao19910705@163.com) | [YuqiXiao](/~https://github.com/YuqiXiao) | ByteDance |
+| [Wei Wei](mailto:ww990114@gmail.com) | [weiwei99](/~https://github.com/weiwei99) | Baidu |
+| [Andy Liang](mailto:lianglei@yf-networks.com) | [andyxmu](/~https://github.com/andyxmu) | Yingfei Networks |
+| [Leiming Xu](mailto:xuleiming@yf-networks.com) | [xuleiming](/~https://github.com/xuleiming) | Yingfei Networks |
+| [Jian Song](mailto:songjian@yf-networks.com) | [clarinette9](/~https://github.com/clarinette9) | Yingfei Networks |

Makefile

@@ -74,7 +74,7 @@ strip: prepare compile-strip package
 # make prepare, download dependencies
 prepare: prepare-dep prepare-gen
 prepare-dep:
-	$(call INSTALL_PKG, goyacc, golang.org/x/tools/cmd/goyacc)
+	$(call INSTALL_PKG, goyacc, golang.org/x/tools/cmd/goyacc@latest)
 prepare-gen:
 	cd "bfe_basic/condition/parser" && $(GOGEN)
 
@@ -117,7 +117,7 @@ package:
 # make deps
 deps:
 	$(call PIP_INSTALL_PKG, pre-commit)
-	$(call INSTALL_PKG, goyacc, golang.org/x/tools/cmd/goyacc)
+	$(call INSTALL_PKG, goyacc, golang.org/x/tools/cmd/goyacc@latest)
 	$(call INSTALL_PKG, staticcheck, honnef.co/go/tools/cmd/staticcheck)
 	$(call INSTALL_PKG, license-eye, github.com/apache/skywalking-eyes/cmd/license-eye@latest)
 

README.md

@@ -59,6 +59,13 @@ Besides, we also implement [BFE Ingress Controller](/~https://github.com/bfenetwor
 - [English version](https://www.bfe-networks.net/en_us/ABOUT/)
 - [Chinese version](https://www.bfe-networks.net/zh_cn/ABOUT/)
 
+## Book
+
+- [In-depth Understanding of BFE](/~https://github.com/baidu/bfe-book) (Released in Feb 2023)
+
+  This book focuses on BFE open source project, introduces the relevant technical principles of network access, explains the design idea of BFE open source software, and how to build a network front-end platform based on BFE open source software. Readers with development capabilities can also develop BFE extension modules according to their own needs or contribute code to BFE open source projects according to the instructions in this book.
+
+
 ## Contributing
 
 - Please create an issue in [issue list](http://github.com/bfenetworks/bfe/issues).

VERSION

@@ -1 +1 @@
-1.6.0
+1.7.0

bfe.go

@@ -43,6 +43,7 @@ var (
 	showVersion = flag.Bool("v", false, "to show version of bfe")
 	showVerbose = flag.Bool("V", false, "to show verbose information about bfe")
 	debugLog    = flag.Bool("d", false, "to show debug log (otherwise >= info)")
+	testConf    = flag.Bool("t", false, "test configuration and exit")
 )
 
 var version string
@@ -74,7 +75,12 @@ func main() {
 		logSwitch = "DEBUG"
 		bfe_debug.DebugIsOpen = true
 	} else {
-		logSwitch = "INFO"
+		// ignore under ERROR level
+		if *testConf {
+			logSwitch = "ERROR"
+		} else {
+			logSwitch = "INFO"
+		}
 		bfe_debug.DebugIsOpen = false
 	}
 
@@ -84,7 +90,7 @@ func main() {
 	log4go.SetLogFormat(log4go.FORMAT_DEFAULT_WITH_PID)
 	log4go.SetSrcLineForBinLog(false)
 
-	err = log.Init("bfe", logSwitch, *logPath, *stdOut, "midnight", 7)
+	err = log.Init("bfe", logSwitch, *logPath, *stdOut || *testConf, "midnight", 7)
 	if err != nil {
 		fmt.Printf("bfe: err in log.Init():%s\n", err.Error())
 		bfe_util.AbnormalExit()
@@ -97,10 +103,13 @@ func main() {
 	config, err = bfe_conf.BfeConfigLoad(confPath, *confRoot)
 	if err != nil {
 		log.Logger.Error("main(): in BfeConfigLoad():%s", err.Error())
+		if *testConf {
+			fmt.Printf("bfe: configuration file %s test failed\n", confPath)
+		}
 		bfe_util.AbnormalExit()
 	}
 
-	// maximum number of CPUs (GOMAXPROCS) defaults to runtime.CPUNUM 
+	// maximum number of CPUs (GOMAXPROCS) defaults to runtime.CPUNUM
 	// if running on machine, or CPU quota if running on container
 	// (with the help of "go.uber.org/automaxprocs").
 	// here, we change maximum number of cpus if the MaxCpus is positive.
@@ -112,11 +121,22 @@ func main() {
 	bfe_debug.SetDebugFlag(config.Server)
 
 	// start and serve
-	if err = bfe_server.StartUp(config, version, *confRoot); err != nil {
+	if err = bfe_server.StartUp(config, version, *confRoot, *testConf); err != nil {
 		log.Logger.Error("main(): bfe_server.StartUp(): %s", err.Error())
 	}
 
 	// waiting for logger finish jobs
 	time.Sleep(1 * time.Second)
 	log.Logger.Close()
+
+	// output final configuration test result
+	if *testConf {
+		if err != nil {
+			fmt.Printf("bfe: configuration file %s test failed\n", confPath)
+			bfe_util.AbnormalExit()
+		} else {
+			fmt.Printf("bfe: configuration file %s test is successful\n", confPath)
+			bfe_util.NormalExit()
+		}
+	}
 }