chore(release): 0.1.7

fix #32

.github/workflows/release.yml

@@ -12,14 +12,11 @@ jobs:
         with:
           go-version: '^1.16.0'
       - name: compile
-        env:
-          CGO_ENABLE: 1
-          CGO_LDFLAGS: -static
         run: |
-          GOARCH="amd64" go build -v -ldflags="-s -w -extldflags=-static" -trimpath -o "bin/revsuit_linux_amd64" ./cmd/revsuit/revsuit.go
-          GOARCH="386" go build -v -ldflags="-s -w -extldflags=-static" -trimpath -o "bin/revsuit_linux_i386" ./cmd/revsuit/revsuit.go
-          GOARCH="arm" go build -v -ldflags="-s -w -extldflags=-static" -trimpath -o "bin/revsuit_linux_arm" ./cmd/revsuit/revsuit.go
-          GOARCH="arm64" go build -v -ldflags="-s -w -extldflags=-static" -trimpath -o "bin/revsuit_linux_arm64" ./cmd/revsuit/revsuit.go
+          GOARCH="amd64" go build -v -ldflags="-s -w -extldflags=-static" -tags netgo -trimpath -o "bin/revsuit_linux_amd64" ./cmd/revsuit/revsuit.go
+#          GOARCH="386" go build -v -ldflags="-s -w -extldflags=-static" -tags netgo -trimpath -o "bin/revsuit_linux_i386" ./cmd/revsuit/revsuit.go
+#          GOARCH="arm" go build -v -ldflags="-s -w -extldflags=-static" -tags netgo -trimpath -o "bin/revsuit_linux_arm" ./cmd/revsuit/revsuit.go
+#          GOARCH="arm64" go build -v -ldflags="-s -w -extldflags=-static"  -tags netgo -trimpath -o "bin/revsuit_linux_arm64" ./cmd/revsuit/revsuit.go
       - name: Upload the artifacts
         uses: li4n0/upload-release-action@v2
         with:
@@ -37,11 +34,9 @@ jobs:
         with:
           go-version: '^1.16.0'
       - name: compile
-        env:
-          CGO_ENABLE: 1
         run: |
           GOARCH="amd64" go build -v -ldflags="-s -w" -trimpath -o "bin/revsuit_darwin_amd64" ./cmd/revsuit/revsuit.go
-          GOARCH="arm64" go build -v -ldflags="-s -w" -trimpath -o "bin/revsuit_darwin_arm64" ./cmd/revsuit/revsuit.go
+#          GOARCH="arm64" go build -v -ldflags="-s -w" -trimpath -o "bin/revsuit_darwin_arm64" ./cmd/revsuit/revsuit.go
       - name: Upload the artifacts
         uses: li4n0/upload-release-action@v2
         with:
@@ -59,13 +54,10 @@ jobs:
         with:
           go-version: '^1.16.0'
       - name: compile
-        env:
-          CGO_ENABLE: 1
-          CGO_LDFLAGS: -static
         run: |
           env GOARCH=amd64 go build -v -ldflags="-s -w -extldflags=-static" -trimpath -o "bin/revsuit_windows_amd64.exe" ./cmd/revsuit/revsuit.go
-          env GOARCH=386 go build -v -ldflags="-s -w -extldflags=-static" -trimpath -o "bin/revsuit_windows_i386.exe" ./cmd/revsuit/revsuit.go
-          env GOARCH=arm go build -v -ldflags="-s -w -extldflags=-static" -trimpath -o "bin/revsuit_windows_arm.exe" ./cmd/revsuit/revsuit.go
+#          env GOARCH=386 go build -v -ldflags="-s -w -extldflags=-static" -trimpath -o "bin/revsuit_windows_i386.exe" ./cmd/revsuit/revsuit.go
+#          env GOARCH=arm go build -v -ldflags="-s -w -extldflags=-static" -trimpath -o "bin/revsuit_windows_arm.exe" ./cmd/revsuit/revsuit.go
       - name: Upload the artifacts
         uses: li4n0/upload-release-action@v2
         with:

CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.1.7](https://github.com/Li4n0/revsuit/compare/v0.1.6...v0.1.7) (2021-07-11)
+
+
+### Bug Fixes
+
+* **http:** fix the bug that http record url search does not work ([ffc4318](https://github.com/Li4n0/revsuit/commit/ffc4318725017c7eda7ec11ca67d5de16ad1e8a8))
+* **mysql:** fix the bug that crashes when mysql port conflicts ([c0bda70](https://github.com/Li4n0/revsuit/commit/c0bda707b750b7858fdd4efc414b726ee37e71da))
+
+### [0.1.6](https://github.com/Li4n0/revsuit/compare/v0.1.5...v0.1.6) (2021-06-25)
+
+
+### Bug Fixes
+
+* **cli:** fix the bug that the prompt may not be output when generating config file ([5615351](https://github.com/Li4n0/revsuit/commit/56153510e11783c08843cbb8b0f827d5f8567842))
+* **ipinfo:** fix a potential panic when downloading ip location database ([#33](https://github.com/Li4n0/revsuit/issues/33)) ([b1773ee](https://github.com/Li4n0/revsuit/commit/b1773ee5e9ebd8c8be72f315981268992c08b3f1))
+
 ### [0.1.5](https://github.com/Li4n0/revsuit/compare/v0.1.5-beta...v0.1.5) (2021-06-22 公开该项目以庆祝毕业，愿工作多年后的我，归来时仍是少年)
 
 

README.md

@@ -26,7 +26,8 @@ Powerful:
 
 ### Preparation
 
-Download the latest release firstly.
+Download the latest release firstly. For the time being, only the binary for amd64 architecture is available for
+download, if you need to use it in other architectures, you can compile it yourself.
 
 RevSuit will generate default configuration file on first run. Modify the configuration file according to your needs,
 then re-run.

README.zh-CN.md

@@ -23,7 +23,7 @@ RevSuit 是一款灵活并且强大的反连平台。目前支持 HTTP、DNS、R
 
 ### 安装
 
-在 Releases 里下载最新版本的 RevSuit。
+在 Releases 里下载最新版本的 RevSuit。暂时只提供 amd64 架构下的二进制文件下载，如需要在其它架构下使用，可以自行编译。
 
 RevSuit 首次运行时将会生成配置文件模板，你需要编辑其中的内容然后重新运行。
 

internal/cli/cli.go

@@ -16,6 +16,7 @@ func Start() {
 		log.ConsoleConfig{
 			Level: log.LevelInfo,
 		})
+	defer log.Stop()
 	app := &cli.App{
 		Name:  "RevSuit",
 		Usage: "An Open-Sourced Reverse Platform Designed for Receive Various Kinds of Connection",

internal/ipinfo/geoip/download.go

@@ -20,6 +20,7 @@ const (
 )
 
 func get(url string) (b []byte, err error) {
+	var resp *http.Response
 	client := http.Client{
 		Timeout: 90 * time.Second,
 		Transport: &http.Transport{
@@ -28,11 +29,17 @@ func get(url string) (b []byte, err error) {
 	request, _ := http.NewRequest(http.MethodGet, url, nil)
 	request.Header.Add("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36")
 
-	resp, err := client.Do(request)
+	resp, err = client.Do(request)
 	if err != nil {
 		return
 	}
-	defer resp.Body.Close()
+
+	defer func(Body io.ReadCloser) {
+		err := Body.Close()
+		if err != nil {
+			log.Warn("%v", err)
+		}
+	}(resp.Body)
 
 	return io.ReadAll(resp.Body)
 }
@@ -65,10 +72,14 @@ func extractTarGz(gzipStream io.Reader) error {
 			if err != nil {
 				return err
 			}
-			defer outFile.Close()
 			if _, err := io.Copy(outFile, tarReader); err != nil {
+				_ = outFile.Close()
 				return err
 			}
+			err = outFile.Close()
+			if err != nil {
+				log.Warn("%v", err)
+			}
 		}
 	}
 	return nil

internal/ipinfo/qqwry/download.go

@@ -21,6 +21,7 @@ const (
 )
 
 func get(url string) (b []byte, err error) {
+	var resp *http.Response
 	client := http.Client{
 		Timeout: 90 * time.Second,
 		Transport: &http.Transport{
@@ -29,11 +30,17 @@ func get(url string) (b []byte, err error) {
 	request, _ := http.NewRequest("GET", url, nil)
 	request.Header.Add("User-Agent", "Nali/2.1.2 (Nali CLI, https://nali.skk.moe)")
 
-	resp, err := client.Do(request)
+	resp, err = client.Do(request)
 	if err != nil {
 		return
 	}
-	defer resp.Body.Close()
+
+	defer func(Body io.ReadCloser) {
+		err := Body.Close()
+		if err != nil {
+			log.Warn("%v", err)
+		}
+	}(resp.Body)
 
 	return io.ReadAll(resp.Body)
 }
@@ -47,17 +54,25 @@ func getKey(b []byte) (key uint32, err error) {
 }
 
 func decrypt(b []byte, key uint32) (_ []byte, err error) {
+	var rc io.ReadCloser
 	for i := 0; i < 0x200; i++ {
 		key *= uint32(0x805)
 		key++
 		key &= uint32(0xff)
 		b[i] = b[i] ^ byte(key)
 	}
-	rc, err := zlib.NewReader(bytes.NewBuffer(b))
+	rc, err = zlib.NewReader(bytes.NewBuffer(b))
 	if err != nil {
 		return
 	}
-	defer rc.Close()
+
+	defer func(rc io.ReadCloser) {
+		err := rc.Close()
+		if err != nil {
+			log.Warn("%v", err)
+		}
+	}(rc)
+
 	return io.ReadAll(rc)
 }
 

pkg/mysql/mysql.go

@@ -302,10 +302,11 @@ func (s *Server) Run() {
 	s.listener, err = vmysql.NewListener("tcp", s.Addr, authServer, s, s.VersionString, 0, 0)
 	if err != nil {
 		log.Error("New MySQL Server failed: %s", err)
+		return
 	}
 
 	go func() {
-
+		s.livingLock.Lock()
 		if !s.Enable {
 			s.listener.Close()
 		}

pkg/rhttp/record.go

@@ -78,7 +78,7 @@ func ListRecords(c *gin.Context) {
 		db.Where("method = ?", httpRecord.Method)
 	}
 	if httpRecord.URI != "" {
-		db.Where("path like ?", "%"+httpRecord.URI+"%")
+		db.Where("uri like ?", "%"+httpRecord.URI+"%")
 	}
 	if httpRecord.RemoteIP != "" {
 		db.Where("remote_ip = ?", httpRecord.RemoteIP)

pkg/server/server.go

@@ -18,7 +18,7 @@ import (
 	log "unknwon.dev/clog/v2"
 )
 
-const VERSION = "0.1.5"
+const VERSION = "0.1.7"
 
 type Revsuit struct {
 	config   *Config