v3.1.0 release

1. Fix an issue where the client has a chance of unable to connect to the server due to an error in the cipher cache (issue #138). 2. Fix an issue where the client has a chance of unable to properly close the underlay network connection. 3. Add "mieru test" command to test the connection between the mieru client and the mita server (issue #133). 4. Add metrics related to replay attacks (issue #132).
enfein · Jun 2, 2024 · 7233b64 · 7233b64
1 parent 4a189d8
commit 7233b64
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 26 deletions.
diff --git a/Makefile b/Makefile
@@ -32,7 +32,7 @@ PROJECT_NAME=$(shell basename "${ROOT}")
 # - pkg/version/current.go
 #
 # Use `tools/bump_version.sh` script to change all those files at one shot.
-VERSION="3.0.1"
+VERSION="3.1.0"
 
 # Build binaries and installation packages.
 .PHONY: build

diff --git a/build/package/mieru/amd64/debian/DEBIAN/control b/build/package/mieru/amd64/debian/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: mieru
-Version: 3.0.1
+Version: 3.1.0
 Section: net
 Priority: optional
 Architecture: amd64

diff --git a/build/package/mieru/amd64/rpm/mieru.spec b/build/package/mieru/amd64/rpm/mieru.spec
@@ -1,5 +1,5 @@
 Name: mieru
-Version: 3.0.1
+Version: 3.1.0
 Release: 1%{?dist}
 Summary: Mieru proxy client
 License: GPLv3+

diff --git a/build/package/mieru/arm64/debian/DEBIAN/control b/build/package/mieru/arm64/debian/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: mieru
-Version: 3.0.1
+Version: 3.1.0
 Section: net
 Priority: optional
 Architecture: arm64

diff --git a/build/package/mieru/arm64/rpm/mieru.spec b/build/package/mieru/arm64/rpm/mieru.spec
@@ -1,5 +1,5 @@
 Name: mieru
-Version: 3.0.1
+Version: 3.1.0
 Release: 1%{?dist}
 Summary: Mieru proxy client
 License: GPLv3+

diff --git a/build/package/mita/amd64/debian/DEBIAN/control b/build/package/mita/amd64/debian/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: mita
-Version: 3.0.1
+Version: 3.1.0
 Section: net
 Priority: optional
 Architecture: amd64

diff --git a/build/package/mita/amd64/rpm/mita.spec b/build/package/mita/amd64/rpm/mita.spec
@@ -1,5 +1,5 @@
 Name: mita
-Version: 3.0.1
+Version: 3.1.0
 Release: 1%{?dist}
 Summary: Mieru proxy server
 License: GPLv3+

diff --git a/build/package/mita/arm64/debian/DEBIAN/control b/build/package/mita/arm64/debian/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: mita
-Version: 3.0.1
+Version: 3.1.0
 Section: net
 Priority: optional
 Architecture: arm64

diff --git a/build/package/mita/arm64/rpm/mita.spec b/build/package/mita/arm64/rpm/mita.spec
@@ -1,5 +1,5 @@
 Name: mita
-Version: 3.0.1
+Version: 3.1.0
 Release: 1%{?dist}
 Summary: Mieru proxy server
 License: GPLv3+

diff --git a/docs/client-install.md b/docs/client-install.md
@@ -105,6 +105,14 @@ mieru stop
 
 Note that every time you change the settings with `mieru apply config <FILE>`, you need to restart the client with `mieru stop` and `mieru start` for the new settings to take effect.
 
+## Test the Connection Between Client and Server
+
+```sh
+mieru test
+```
+
+If the output shows `Connected to https://google.com`, it indicates that the mieru client has successfully connected to the proxy server.
+
 ## Configuring the browser
 
 Chrome / Firefox and other browsers can use socks5 proxy to access blocked websites by installing browser plugins. For the address of the socks5 proxy, please fill in `127.0.0.1:xxxx`, where `xxxx` is the value of `socks5Port` in the client settings. This address will also be printed when the `mieru start` command is called.

diff --git a/docs/client-install.zh_CN.md b/docs/client-install.zh_CN.md
@@ -105,6 +105,14 @@ mieru stop
 
 注意，每次使用 `mieru apply config <FILE>` 修改设置后，需要用 `mieru stop` 和 `mieru start` 重启客户端，才能使新设置生效。
 
+## 测试客户端与服务器的连接
+
+```sh
+mieru test
+```
+
+如果输出显示 `Connected to https://google.com`，表示 mieru 客户端成功连接了代理服务器。
+
 ## 配置浏览器
 
 Chrome / Firefox 等浏览器可以通过安装插件，使用 socks5 代理访问墙外的网站。关于 socks5 代理的地址，请填写 `127.0.0.1:xxxx`，其中 `xxxx` 是客户端设置中 `socks5Port` 的值。这个地址在调用 `mieru start` 指令时也会打印出来。

diff --git a/docs/server-install.md b/docs/server-install.md
@@ -8,32 +8,32 @@ Before installation and configuration, connect to the server via SSH and then ex
 
 ```sh
 # Debian / Ubuntu - X86_64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.0.1/mita_3.0.1_amd64.deb
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.1.0/mita_3.1.0_amd64.deb
 
 # Debian / Ubuntu - ARM 64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.0.1/mita_3.0.1_arm64.deb
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.1.0/mita_3.1.0_arm64.deb
 
 # RedHat / CentOS / Rocky Linux - X86_64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.0.1/mita-3.0.1-1.x86_64.rpm
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.1.0/mita-3.1.0-1.x86_64.rpm
 
 # RedHat / CentOS / Rocky Linux - ARM 64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.0.1/mita-3.0.1-1.aarch64.rpm
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.1.0/mita-3.1.0-1.aarch64.rpm
 ```
 
 ## Install mita package
 
 ```sh
 # Debian / Ubuntu - X86_64
-sudo dpkg -i mita_3.0.1_amd64.deb
+sudo dpkg -i mita_3.1.0_amd64.deb
 
 # Debian / Ubuntu - ARM 64
-sudo dpkg -i mita_3.0.1_arm64.deb
+sudo dpkg -i mita_3.1.0_arm64.deb
 
 # RedHat / CentOS / Rocky Linux - X86_64
-sudo rpm -Uvh --force mita-3.0.1-1.x86_64.rpm
+sudo rpm -Uvh --force mita-3.1.0-1.x86_64.rpm
 
 # RedHat / CentOS / Rocky Linux - ARM 64
-sudo rpm -Uvh --force mita-3.0.1-1.aarch64.rpm
+sudo rpm -Uvh --force mita-3.1.0-1.aarch64.rpm
 ```
 
 Those instructions can also be used to upgrade the version of mita software package.

diff --git a/docs/server-install.zh_CN.md b/docs/server-install.zh_CN.md
@@ -8,32 +8,32 @@
 
 ```sh
 # Debian / Ubuntu - X86_64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.0.1/mita_3.0.1_amd64.deb
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.1.0/mita_3.1.0_amd64.deb
 
 # Debian / Ubuntu - ARM 64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.0.1/mita_3.0.1_arm64.deb
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.1.0/mita_3.1.0_arm64.deb
 
 # RedHat / CentOS / Rocky Linux - X86_64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.0.1/mita-3.0.1-1.x86_64.rpm
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.1.0/mita-3.1.0-1.x86_64.rpm
 
 # RedHat / CentOS / Rocky Linux - ARM 64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.0.1/mita-3.0.1-1.aarch64.rpm
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.1.0/mita-3.1.0-1.aarch64.rpm
 ```
 
 ## 安装 mita 软件包
 
 ```sh
 # Debian / Ubuntu - X86_64
-sudo dpkg -i mita_3.0.1_amd64.deb
+sudo dpkg -i mita_3.1.0_amd64.deb
 
 # Debian / Ubuntu - ARM 64
-sudo dpkg -i mita_3.0.1_arm64.deb
+sudo dpkg -i mita_3.1.0_arm64.deb
 
 # RedHat / CentOS / Rocky Linux - X86_64
-sudo rpm -Uvh --force mita-3.0.1-1.x86_64.rpm
+sudo rpm -Uvh --force mita-3.1.0-1.x86_64.rpm
 
 # RedHat / CentOS / Rocky Linux - ARM 64
-sudo rpm -Uvh --force mita-3.0.1-1.aarch64.rpm
+sudo rpm -Uvh --force mita-3.1.0-1.aarch64.rpm
 ```
 
 上述指令也可以用来升级 mita 软件包的版本。

diff --git a/pkg/version/current.go b/pkg/version/current.go
@@ -16,5 +16,5 @@
 package version
 
 const (
-	AppVersion = "3.0.1"
+	AppVersion = "3.1.0"
 )