From 2a53ac1b72d899d6b10521cb729ba5577b609913 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Thu, 10 Oct 2024 20:51:54 +0800 Subject: [PATCH 001/129] 24w13c --- .github/workflows/build-dev.yml | 3 +++ CHANGELOG.md | 6 ++++++ DEV-VERSION | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 8f8de42..8aa0096 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -34,6 +34,9 @@ jobs: with: go-version: ${{ env.GO_VERSION }} - name: Build + env: + GOOS: ${{ matrix.goos }} + GOARCH: ${{ matrix.goarch }} run: | CGO_ENABLED=0 go build -o ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./main.go - name: Package diff --git a/CHANGELOG.md b/CHANGELOG.md index 9900383..5fdd8c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ v1.4.2 - CHANGE: 对Docker镜像构建进行优化,大幅减少镜像体积,从v1.4.0的`111 MB`,到v1.4.1的`58 MB`,再到v1.4.2的`28 MB` - CHANGE: 切换至wjqserver/caddy:2.9.0-rc-alpine作为基础镜像 +24w13c +--- +- PRE-RELEASE: 此版本是v1.4.2的预发布版本,请勿在生产环境中使用 +- CHANGE: 优化代码结构,提升性能 +- CHANGE: 修正交叉编译问题 + 24w13b --- - PRE-RELEASE: 此版本是v1.4.2的预发布版本,请勿在生产环境中使用 diff --git a/DEV-VERSION b/DEV-VERSION index ef86b22..57b9f51 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w13b \ No newline at end of file +24w13c \ No newline at end of file From 71c5f25d1d4b273e018ade9a480e0a2aa5cf86d1 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Thu, 10 Oct 2024 22:38:41 +0800 Subject: [PATCH 002/129] update --- .github/workflows/build-dev.yml | 1 - .github/workflows/build.yml | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 8aa0096..a1041ec 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -17,7 +17,6 @@ jobs: goarch: [amd64, arm64] env: OUTPUT_BINARY: ghproxy - #OUTPUT_ARCHIVE: ghproxy.tar.gz GO_VERSION: 1.23.2 steps: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c44e0f..af33986 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,6 +33,9 @@ jobs: with: go-version: ${{ env.GO_VERSION }} - name: Build + env: + GOOS: ${{ matrix.goos }} + GOARCH: ${{ matrix.goarch }} run: | CGO_ENABLED=0 go build -o ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./main.go - name: Package From 38430a3a68be60d1cb63faf52683929486988078 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Thu, 10 Oct 2024 22:55:22 +0800 Subject: [PATCH 003/129] 1.4.2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 13175fd..c9929e3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.1 \ No newline at end of file +1.4.2 \ No newline at end of file From 96fba543a279e4bf7400ae5571ce528d6ad349e4 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Thu, 10 Oct 2024 23:00:52 +0800 Subject: [PATCH 004/129] 1.4.2 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index af33986..85d469d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: goos: [linux] goarch: [amd64, arm64] env: - OUTPUT_BINARY: go + OUTPUT_BINARY: ghproxy GO_VERSION: 1.23.2 steps: From 245040a4970d09d8f564515c18543bead87b0235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8C=E8=A6=8B=20=E7=81=AF=E8=8A=B1?= <172008506+satomitoka@users.noreply.github.com> Date: Fri, 11 Oct 2024 00:21:06 +0800 Subject: [PATCH 005/129] 24w14a --- .github/workflows/build-dev.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index a1041ec..12a1966 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -37,7 +37,8 @@ jobs: GOOS: ${{ matrix.goos }} GOARCH: ${{ matrix.goarch }} run: | - CGO_ENABLED=0 go build -o ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./main.go + CGO_ENABLED=0 go build -ldflags="-s -w" -o ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}}./main.go + - name: Package run: | tar -czvf ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}}.tar.gz ./${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} From 87b62e0342a2db76ec54df4f196904e6408e616d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8C=E8=A6=8B=20=E7=81=AF=E8=8A=B1?= <172008506+satomitoka@users.noreply.github.com> Date: Fri, 11 Oct 2024 00:21:34 +0800 Subject: [PATCH 006/129] 24w14a --- DEV-VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEV-VERSION b/DEV-VERSION index 57b9f51..efb7733 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w13c \ No newline at end of file +24w14a From 62ee8ede1a1b309c344c36e33a57737487735d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8C=E8=A6=8B=20=E7=81=AF=E8=8A=B1?= <172008506+satomitoka@users.noreply.github.com> Date: Fri, 11 Oct 2024 00:23:38 +0800 Subject: [PATCH 007/129] 24w14a --- .github/workflows/build-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 12a1966..d682c79 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -37,7 +37,7 @@ jobs: GOOS: ${{ matrix.goos }} GOARCH: ${{ matrix.goarch }} run: | - CGO_ENABLED=0 go build -ldflags="-s -w" -o ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}}./main.go + CGO_ENABLED=0 go build -ldflags="-s -w" -o ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./main.go - name: Package run: | From 1277af445c8dd58dbd160b166ceb4236716daf8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8C=E8=A6=8B=20=E7=81=AF=E8=8A=B1?= <172008506+satomitoka@users.noreply.github.com> Date: Fri, 11 Oct 2024 01:17:59 +0800 Subject: [PATCH 008/129] Update build-dev.yml --- .github/workflows/build-dev.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index d682c79..5df473d 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -32,13 +32,17 @@ jobs: uses: actions/setup-go@v3 with: go-version: ${{ env.GO_VERSION }} + - name: Install UPX + run: | + apt update + apt install upx -y - name: Build env: GOOS: ${{ matrix.goos }} GOARCH: ${{ matrix.goarch }} run: | CGO_ENABLED=0 go build -ldflags="-s -w" -o ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./main.go - + upx - 9 ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} - name: Package run: | tar -czvf ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}}.tar.gz ./${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} From 8eb6c09562af94aa3f3dd9a6bbe8115519666637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8C=E8=A6=8B=20=E7=81=AF=E8=8A=B1?= <172008506+satomitoka@users.noreply.github.com> Date: Fri, 11 Oct 2024 01:20:16 +0800 Subject: [PATCH 009/129] Update build-dev.yml --- .github/workflows/build-dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 5df473d..62a0c67 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -34,8 +34,8 @@ jobs: go-version: ${{ env.GO_VERSION }} - name: Install UPX run: | - apt update - apt install upx -y + sudo apt update + sudo apt install upx -y - name: Build env: GOOS: ${{ matrix.goos }} From 23bb4634905b5597bbfc7d577a58f7b407704152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8C=E8=A6=8B=20=E7=81=AF=E8=8A=B1?= <172008506+satomitoka@users.noreply.github.com> Date: Fri, 11 Oct 2024 01:31:14 +0800 Subject: [PATCH 010/129] Update build-dev.yml --- .github/workflows/build-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 62a0c67..e2a1b41 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -42,7 +42,7 @@ jobs: GOARCH: ${{ matrix.goarch }} run: | CGO_ENABLED=0 go build -ldflags="-s -w" -o ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./main.go - upx - 9 ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} + upx -9 ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} - name: Package run: | tar -czvf ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}}.tar.gz ./${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} From 1e496fb09e021406e2caa4a8b68175f6d5529ec4 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 11 Oct 2024 02:54:16 +0800 Subject: [PATCH 011/129] 24w14a --- .github/workflows/build-dev.yml | 2 +- .github/workflows/build.yml | 7 ++++++- CHANGELOG.md | 6 ++++++ docker/dockerfile/dev/init.sh | 2 +- init.sh | 2 +- main.go | 7 +++++++ 6 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index e2a1b41..402fb8e 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -41,7 +41,7 @@ jobs: GOOS: ${{ matrix.goos }} GOARCH: ${{ matrix.goarch }} run: | - CGO_ENABLED=0 go build -ldflags="-s -w" -o ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./main.go + CGO_ENABLED=0 go build -o ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./main.go upx -9 ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} - name: Package run: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 85d469d..a342b5a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,12 +32,17 @@ jobs: uses: actions/setup-go@v3 with: go-version: ${{ env.GO_VERSION }} + - name: Install UPX + run: | + sudo apt-get update + sudo apt-get install -y upx - name: Build env: GOOS: ${{ matrix.goos }} GOARCH: ${{ matrix.goarch }} run: | - CGO_ENABLED=0 go build -o ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./main.go + CGO_ENABLED=0 go build -ldflags="-s -w" -o ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./main.go + upx -9 ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} - name: Package run: | tar -czvf ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}}.tar.gz ./${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fdd8c6..9e23362 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # 更新日志 +24w14a +--- +- PRE-RELEASE: 此版本是v1.4.3的预发布版本,请勿在生产环境中使用 +- CHANGE: 优化代码结构,提升性能 +- ADD: 新增命令行参数 `-cfg string` 用于指定配置文件路径 + v1.4.2 --- - CHANGE: 优化代码结构,提升性能 diff --git a/docker/dockerfile/dev/init.sh b/docker/dockerfile/dev/init.sh index a4dea96..78f8bc3 100644 --- a/docker/dockerfile/dev/init.sh +++ b/docker/dockerfile/dev/init.sh @@ -20,7 +20,7 @@ fi /data/caddy/caddy run --config /data/caddy/config/Caddyfile > /data/${APPLICATION}/log/caddy.log 2>&1 & -/data/${APPLICATION}/${APPLICATION} > /data/${APPLICATION}/log/run.log 2>&1 & +/data/${APPLICATION}/${APPLICATION} -cfg /data/${APPLICATION}/config/config.yaml > /data/${APPLICATION}/log/run.log 2>&1 & while true; do sleep 1 diff --git a/init.sh b/init.sh index 86db1e1..9af2dd6 100644 --- a/init.sh +++ b/init.sh @@ -20,7 +20,7 @@ fi /data/caddy/caddy run --config /data/caddy/config/Caddyfile > /data/${APPLICATON}/log/caddy.log 2>&1 & -/data/${APPLICATON}/${APPLICATON} > /data/ghproxy/log/run.log 2>&1 & +/data/${APPLICATON}/${APPLICATON} > /data/${APPLICATON}/log/run.log 2>&1 & while [[ true ]]; do sleep 1 diff --git a/main.go b/main.go index 38bc5c6..ca48578 100644 --- a/main.go +++ b/main.go @@ -2,6 +2,7 @@ package main import ( "encoding/json" + "flag" "fmt" "log" "net/http" @@ -21,6 +22,11 @@ var ( configfile = "/data/ghproxy/config/config.yaml" ) +func ReadFlag() { + cfgfile := flag.String("cfg", configfile, "config file path") + configfile = *cfgfile +} + func loadConfig() { var err error // 初始化配置 @@ -48,6 +54,7 @@ func Loadlist(cfg *config.Config) { } func init() { + ReadFlag() loadConfig() setupLogger() Loadlist(cfg) From 2bdc2d0ace787ba3329c26fe33012f843b3af197 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 11 Oct 2024 08:04:08 +0800 Subject: [PATCH 012/129] 1.4.3 --- CHANGELOG.md | 6 ++++++ docker/dockerfile/release/init.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e23362..18fb084 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # 更新日志 +v1.4.3 +--- +- CHANGE: 优化代码结构,提升性能 +- ADD: 新增命令行参数 `-cfg string` 用于指定配置文件路径 +- CHANGE: 对二进制文件大小进行改进 + 24w14a --- - PRE-RELEASE: 此版本是v1.4.3的预发布版本,请勿在生产环境中使用 diff --git a/docker/dockerfile/release/init.sh b/docker/dockerfile/release/init.sh index a4dea96..78f8bc3 100644 --- a/docker/dockerfile/release/init.sh +++ b/docker/dockerfile/release/init.sh @@ -20,7 +20,7 @@ fi /data/caddy/caddy run --config /data/caddy/config/Caddyfile > /data/${APPLICATION}/log/caddy.log 2>&1 & -/data/${APPLICATION}/${APPLICATION} > /data/${APPLICATION}/log/run.log 2>&1 & +/data/${APPLICATION}/${APPLICATION} -cfg /data/${APPLICATION}/config/config.yaml > /data/${APPLICATION}/log/run.log 2>&1 & while true; do sleep 1 From 6864925dbed4eb90c689cffeec894da47eb6223b Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 11 Oct 2024 08:04:39 +0800 Subject: [PATCH 013/129] 1.4.3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c9929e3..3c80e4f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.2 \ No newline at end of file +1.4.3 \ No newline at end of file From 69d4d53a5161960a747a8a8d5d7072e346c810ab Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 11 Oct 2024 10:25:33 +0800 Subject: [PATCH 014/129] 24w15a --- .github/workflows/build-dev.yml | 32 +++++++++++++------ DEV-VERSION | 2 +- config/config.go | 54 +++++++++++++++++++++++++++++--- config/config.toml | 23 ++++++++++++++ docker/dockerfile/dev/Dockerfile | 2 +- docker/dockerfile/dev/init.sh | 2 +- go.mod | 1 + go.sum | 2 ++ 8 files changed, 102 insertions(+), 16 deletions(-) create mode 100644 config/config.toml diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 402fb8e..169c187 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -70,6 +70,7 @@ jobs: needs: build env: IMAGE_NAME: wjqserver/ghproxy + PROG_NAME: ghproxy DOCKERFILE: docker/dockerfile/dev/Dockerfile steps: @@ -95,12 +96,25 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: 构建镜像 - uses: docker/build-push-action@v6 - with: - file: ./${{ env.DOCKERFILE }} - platforms: linux/amd64,linux/arm64 - push: true - tags: | - ${{ env.IMAGE_NAME }}:${{ env.VERSION }} - ${{ env.IMAGE_NAME }}:dev + - name: Build Docker image + run: | + docker buildx build --platform linux/amd64,linux/arm64 -t ${{ env.PROG_NAME }}:dev,${{ env.PROG_NAME }}:${{ env.VERSION }} -f ./${{ env.DOCKERFILE }} + + - name: Install Slim + run: | + curl -L -o ds.tar.gz https://github.com/slimtoolkit/slim/releases/download/1.40.11/dist_linux.tar.gz + tar -xvf ds.tar.gz + mv dist_linux/slim /usr/local/bin/ + mv dist_linux/slim-sensor /usr/local/bin/ + rm -rf ds.tar.gz dist_linux + + - name: Optimize Docker image using Slim + run: | + slimlim build --include-path /data --http-probe --continue-after 20 --tag ${{ env.PROG_NAME }}:${{ env.VERSION }} ${{ env.PROG_NAME }}:dev + + - name: Push Docker image + run: | + docker tag ${{ env.PROG_NAME }}:${{ env.VERSION }} ${{ env.IMAGE_NAME }}:${{ env.VERSION }} + docker tag ${{ env.PROG_NAME }}:dev ${{ env.IMAGE_NAME }}:dev + docker push ${{ env.IMAGE_NAME }}:${{ env.VERSION }} + docker push ${{ env.IMAGE_NAME }}:dev diff --git a/DEV-VERSION b/DEV-VERSION index efb7733..8684a7d 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w14a +24w15a \ No newline at end of file diff --git a/config/config.go b/config/config.go index 2acfc51..04928d5 100644 --- a/config/config.go +++ b/config/config.go @@ -1,12 +1,10 @@ package config import ( - "os" - - "gopkg.in/yaml.v3" + "github.com/BurntSushi/toml" ) -type Config struct { +/*type Config struct { Server struct { Port int `yaml:"port"` Host string `yaml:"host"` @@ -54,4 +52,52 @@ func loadYAML(filePath string, out interface{}) error { return err } return yaml.Unmarshal(data, out) +}*/ + +type Config struct { + Server ServerConfig + Log LoggerConfig + CORS CORSConfig + Auth AuthConfig + Blacklist BlacklistConfig + Whitelist WhitelistConfig +} + +type ServerConfig struct { + Port int `toml:"port"` + Host string `toml:"host"` + SizeLimit int `toml:"sizelimit"` +} + +type LoggerConfig struct { + LogFilePath string `toml:"logfilepath"` + MaxLogSize int `toml:"maxlogsize"` +} + +type CORSConfig struct { + Enabled bool `toml:"enabled"` +} + +type AuthConfig struct { + Enabled bool `toml:"enabled"` + AuthToken string `toml:"authtoken"` +} + +type BlacklistConfig struct { + Enabled bool `toml:"enabled"` + BlacklistFile string `toml:"blacklistfile"` +} + +type WhitelistConfig struct { + Enabled bool `toml:"enabled"` + WhitelistFile string `toml:"whitelistfile"` +} + +// LoadConfig 从 TOML 配置文件加载配置 +func LoadConfig(filePath string) (*Config, error) { + var config Config + if _, err := toml.DecodeFile(filePath, &config); err != nil { + return nil, err + } + return &config, nil } diff --git a/config/config.toml b/config/config.toml new file mode 100644 index 0000000..9379db8 --- /dev/null +++ b/config/config.toml @@ -0,0 +1,23 @@ +[server] +host = "127.0.0.1" +port = 8080 +sizelimit = 131072000 # 125MB + +[logger] +logfilepath = "/data/ghproxy/log/ghproxy.log" +maxlogsize = 5 # MB + +[cors] +enabled = true + +[auth] +authtoken = "test" +enabled = false + +[blacklist] +blacklistfile = "/data/ghproxy/config/blacklist.json" +enabled = false + +[whitelist] +enabled = false +whitelistfile = "/data/ghproxy/config/whitelist.json" diff --git a/docker/dockerfile/dev/Dockerfile b/docker/dockerfile/dev/Dockerfile index cd15be6..ec9fac4 100644 --- a/docker/dockerfile/dev/Dockerfile +++ b/docker/dockerfile/dev/Dockerfile @@ -26,7 +26,7 @@ RUN wget -O /usr/local/bin/init.sh https://raw.githubusercontent.com/${USER}/${R # 拉取配置 RUN wget -O /data/caddy/Caddyfile https://raw.githubusercontent.com/${USER}/${REPO}/main/caddyfile/dev/Caddyfile -RUN wget -O /data/${APPLICATION}/config.yaml https://raw.githubusercontent.com/${USER}/${REPO}/main/config/config.yaml +RUN wget -O /data/${APPLICATION}/config.toml https://raw.githubusercontent.com/${USER}/${REPO}/main/config/config.toml RUN wget -O /data/${APPLICATION}/blacklist.json https://raw.githubusercontent.com/${USER}/${REPO}/main/config/blacklist.json RUN wget -O /data/${APPLICATION}/whitelist.json https://raw.githubusercontent.com/${USER}/${REPO}/main/config/whitelist.json diff --git a/docker/dockerfile/dev/init.sh b/docker/dockerfile/dev/init.sh index 78f8bc3..a8f1655 100644 --- a/docker/dockerfile/dev/init.sh +++ b/docker/dockerfile/dev/init.sh @@ -20,7 +20,7 @@ fi /data/caddy/caddy run --config /data/caddy/config/Caddyfile > /data/${APPLICATION}/log/caddy.log 2>&1 & -/data/${APPLICATION}/${APPLICATION} -cfg /data/${APPLICATION}/config/config.yaml > /data/${APPLICATION}/log/run.log 2>&1 & +/data/${APPLICATION}/${APPLICATION} -cfg /data/${APPLICATION}/config/config.toml > /data/${APPLICATION}/log/run.log 2>&1 & while true; do sleep 1 diff --git a/go.mod b/go.mod index bbfa29e..05ba622 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( ) require ( + github.com/BurntSushi/toml v1.4.0 // indirect github.com/andybalholm/brotli v1.1.0 // indirect github.com/bytedance/sonic v1.12.3 // indirect github.com/bytedance/sonic/loader v0.2.0 // indirect diff --git a/go.sum b/go.sum index f4753ff..a686c25 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= +github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0= From b47638d0661a877e0a547b35d0fa0df1417dbb34 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 11 Oct 2024 10:29:43 +0800 Subject: [PATCH 015/129] 24w15a --- .github/workflows/build-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 169c187..11b2d13 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -98,7 +98,7 @@ jobs: - name: Build Docker image run: | - docker buildx build --platform linux/amd64,linux/arm64 -t ${{ env.PROG_NAME }}:dev,${{ env.PROG_NAME }}:${{ env.VERSION }} -f ./${{ env.DOCKERFILE }} + docker buildx build --platform linux/amd64,linux/arm64 --tag ${{ env.PROG_NAME }}:dev --tag ${{ env.PROG_NAME }}:${{ env.VERSION }} -f ./${{ env.DOCKERFILE }} - name: Install Slim run: | From a0de2f627d49cba950f58f015d3b3a8ba277838c Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 11 Oct 2024 10:34:42 +0800 Subject: [PATCH 016/129] 24w15a --- .github/workflows/build-dev.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 11b2d13..e560fe9 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -72,6 +72,7 @@ jobs: IMAGE_NAME: wjqserver/ghproxy PROG_NAME: ghproxy DOCKERFILE: docker/dockerfile/dev/Dockerfile + DOCKERFILE_PATH: docker/dockerfile/dev steps: - name: Checkout @@ -98,7 +99,7 @@ jobs: - name: Build Docker image run: | - docker buildx build --platform linux/amd64,linux/arm64 --tag ${{ env.PROG_NAME }}:dev --tag ${{ env.PROG_NAME }}:${{ env.VERSION }} -f ./${{ env.DOCKERFILE }} + docker buildx build --platform linux/amd64,linux/arm64 --tag ${{ env.PROG_NAME }}:dev --tag ${{ env.PROG_NAME }}:${{ env.VERSION }} -f ./${{ env.DOCKERFILE }} ./${{ env.DOCKERFILE_PATH }} - name: Install Slim run: | From a21d5659ac475b1c8c1fdbde211c0fdaf79b2ae7 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 11 Oct 2024 10:39:03 +0800 Subject: [PATCH 017/129] 24w15a --- .github/workflows/build-dev.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index e560fe9..9f14645 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -108,10 +108,11 @@ jobs: mv dist_linux/slim /usr/local/bin/ mv dist_linux/slim-sensor /usr/local/bin/ rm -rf ds.tar.gz dist_linux + slim version - name: Optimize Docker image using Slim run: | - slimlim build --include-path /data --http-probe --continue-after 20 --tag ${{ env.PROG_NAME }}:${{ env.VERSION }} ${{ env.PROG_NAME }}:dev + slim build --include-path /data --http-probe --continue-after 20 --tag ${{ env.PROG_NAME }}:${{ env.VERSION }} ${{ env.PROG_NAME }}:dev - name: Push Docker image run: | From 6a1a1b3c8bfd4545563ddda1465c79da428b9b63 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 11 Oct 2024 10:45:15 +0800 Subject: [PATCH 018/129] 24w15a --- .github/workflows/build-dev.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 9f14645..ffbe1b5 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -70,7 +70,6 @@ jobs: needs: build env: IMAGE_NAME: wjqserver/ghproxy - PROG_NAME: ghproxy DOCKERFILE: docker/dockerfile/dev/Dockerfile DOCKERFILE_PATH: docker/dockerfile/dev @@ -92,14 +91,11 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin - name: Build Docker image run: | - docker buildx build --platform linux/amd64,linux/arm64 --tag ${{ env.PROG_NAME }}:dev --tag ${{ env.PROG_NAME }}:${{ env.VERSION }} -f ./${{ env.DOCKERFILE }} ./${{ env.DOCKERFILE_PATH }} + docker buildx build --platform linux/amd64,linux/arm64 --tag ${{ env.IMAGE_NAME }}:dev --tag ${{ env.IMAGE_NAME }}:${{ env.VERSION }} -f ./${{ env.DOCKERFILE }} ./${{ env.DOCKERFILE_PATH }} - name: Install Slim run: | @@ -116,7 +112,5 @@ jobs: - name: Push Docker image run: | - docker tag ${{ env.PROG_NAME }}:${{ env.VERSION }} ${{ env.IMAGE_NAME }}:${{ env.VERSION }} - docker tag ${{ env.PROG_NAME }}:dev ${{ env.IMAGE_NAME }}:dev docker push ${{ env.IMAGE_NAME }}:${{ env.VERSION }} docker push ${{ env.IMAGE_NAME }}:dev From 4173617e729221db4a29d2abe50747d9a5033475 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 11 Oct 2024 10:48:33 +0800 Subject: [PATCH 019/129] fix --- .github/workflows/build-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index ffbe1b5..4424c67 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -91,7 +91,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Login to Docker Hub - run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin + run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin - name: Build Docker image run: | From 80d2bc0068596edad5e34aaa5243134dcdcd4c66 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 11 Oct 2024 10:51:15 +0800 Subject: [PATCH 020/129] fix1 --- .github/workflows/build-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 4424c67..b024c82 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -108,7 +108,7 @@ jobs: - name: Optimize Docker image using Slim run: | - slim build --include-path /data --http-probe --continue-after 20 --tag ${{ env.PROG_NAME }}:${{ env.VERSION }} ${{ env.PROG_NAME }}:dev + slim build --include-path /data --http-probe --continue-after 20 --tag ${{ env.IMAGE_NAME }}:${{ env.VERSION }} ${{ env.IMAGE_NAME }}:dev - name: Push Docker image run: | From 81c35030e6e18a81c81233103db1c8c922946cbe Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 11 Oct 2024 10:57:04 +0800 Subject: [PATCH 021/129] 24w15a --- .github/workflows/build-dev.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index b024c82..c413623 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -93,6 +93,16 @@ jobs: - name: Login to Docker Hub run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin + - name: 构建镜像 + uses: docker/build-push-action@v6 + with: + file: ./${{ env.DOCKERFILE }} + platforms: linux/amd64,linux/arm64 + push: true + tags: | + ${{ env.IMAGE_NAME }}:${{ env.VERSION }} + ${{ env.IMAGE_NAME }}:dev + - name: Build Docker image run: | docker buildx build --platform linux/amd64,linux/arm64 --tag ${{ env.IMAGE_NAME }}:dev --tag ${{ env.IMAGE_NAME }}:${{ env.VERSION }} -f ./${{ env.DOCKERFILE }} ./${{ env.DOCKERFILE_PATH }} From 997860f3efce367b5e9555143967907736678605 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 11 Oct 2024 11:38:17 +0800 Subject: [PATCH 022/129] 24w15a --- .github/workflows/build-dev.yml | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index c413623..df601a4 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -91,7 +91,10 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Login to Docker Hub - run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: 构建镜像 uses: docker/build-push-action@v6 @@ -102,25 +105,3 @@ jobs: tags: | ${{ env.IMAGE_NAME }}:${{ env.VERSION }} ${{ env.IMAGE_NAME }}:dev - - - name: Build Docker image - run: | - docker buildx build --platform linux/amd64,linux/arm64 --tag ${{ env.IMAGE_NAME }}:dev --tag ${{ env.IMAGE_NAME }}:${{ env.VERSION }} -f ./${{ env.DOCKERFILE }} ./${{ env.DOCKERFILE_PATH }} - - - name: Install Slim - run: | - curl -L -o ds.tar.gz https://github.com/slimtoolkit/slim/releases/download/1.40.11/dist_linux.tar.gz - tar -xvf ds.tar.gz - mv dist_linux/slim /usr/local/bin/ - mv dist_linux/slim-sensor /usr/local/bin/ - rm -rf ds.tar.gz dist_linux - slim version - - - name: Optimize Docker image using Slim - run: | - slim build --include-path /data --http-probe --continue-after 20 --tag ${{ env.IMAGE_NAME }}:${{ env.VERSION }} ${{ env.IMAGE_NAME }}:dev - - - name: Push Docker image - run: | - docker push ${{ env.IMAGE_NAME }}:${{ env.VERSION }} - docker push ${{ env.IMAGE_NAME }}:dev From f71c95e38135bcfe4431a997419a618918e57b13 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 11 Oct 2024 11:45:19 +0800 Subject: [PATCH 023/129] 24w15b --- DEV-VERSION | 2 +- docker/dockerfile/dev/init.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DEV-VERSION b/DEV-VERSION index 8684a7d..ad29565 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w15a \ No newline at end of file +24w15b \ No newline at end of file diff --git a/docker/dockerfile/dev/init.sh b/docker/dockerfile/dev/init.sh index a8f1655..34d3477 100644 --- a/docker/dockerfile/dev/init.sh +++ b/docker/dockerfile/dev/init.sh @@ -14,8 +14,8 @@ if [ ! -f /data/${APPLICATION}/config/whitelist.json ]; then cp /data/${APPLICATION}/whitelist.json /data/${APPLICATION}/config/whitelist.json fi -if [ ! -f /data/${APPLICATION}/config/config.yaml ]; then - cp /data/${APPLICATION}/config.yaml /data/${APPLICATION}/config/config.yaml +if [ ! -f /data/${APPLICATION}/config/config.toml ]; then + cp /data/${APPLICATION}/config.toml /data/${APPLICATION}/config/config.toml fi /data/caddy/caddy run --config /data/caddy/config/Caddyfile > /data/${APPLICATION}/log/caddy.log 2>&1 & From 794ba222322f69b07c8add6754d3136f75ac82df Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 11 Oct 2024 11:59:15 +0800 Subject: [PATCH 024/129] 24w15b --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index ca48578..8f25b16 100644 --- a/main.go +++ b/main.go @@ -19,7 +19,7 @@ var ( cfg *config.Config logw = logger.Logw router *gin.Engine - configfile = "/data/ghproxy/config/config.yaml" + configfile = "/data/ghproxy/config/config.toml" ) func ReadFlag() { From e3d56ae9b739320bc2ca8cd88e0840fd07b31686 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 11 Oct 2024 12:06:16 +0800 Subject: [PATCH 025/129] 24w15b --- main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 8f25b16..ce99d12 100644 --- a/main.go +++ b/main.go @@ -37,7 +37,7 @@ func loadConfig() { fmt.Printf("Loaded config: %v\n", cfg) } -func setupLogger() { +func setupLogger(cfg *config.Config) { // 初始化日志模块 var err error err = logger.Init(cfg.Log.LogFilePath, cfg.Log.MaxLogSize) // 传递日志文件路径 @@ -56,7 +56,7 @@ func Loadlist(cfg *config.Config) { func init() { ReadFlag() loadConfig() - setupLogger() + setupLogger(cfg) Loadlist(cfg) // 设置 Gin 模式 From 824656f9d0d1b3c74d5bf35e736cfaacaff3a36a Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sat, 12 Oct 2024 03:50:34 +0800 Subject: [PATCH 026/129] 24w15c --- DEV-VERSION | 2 +- auth/auth.go | 27 +++++++-- auth/blacklist.go | 17 +++++- auth/whitelist.go | 20 +++++-- config/blacklist.json | 13 ++--- config/config.go | 4 +- config/whitelist.json | 13 ++--- logger/logger.go | 24 +++++++- main.go | 15 +++-- proxy/proxy.go | 131 +++++++++++++++++++++++++++++------------- 10 files changed, 191 insertions(+), 75 deletions(-) diff --git a/DEV-VERSION b/DEV-VERSION index ad29565..aaa059b 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w15b \ No newline at end of file +24w15c \ No newline at end of file diff --git a/auth/auth.go b/auth/auth.go index 4a8a7b0..bdb74eb 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -7,7 +7,24 @@ import ( "github.com/gin-gonic/gin" ) -var logw = logger.Logw +// 日志模块 +var ( + logw = logger.Logw + logInfo = logger.LogInfo + LogWarning = logger.LogWarning + logError = logger.LogError +) + +// Auth Init +func Init(cfg *config.Config) { + if cfg.Blacklist.Enabled { + LoadBlacklist(cfg) + } + if cfg.Whitelist.Enabled { + LoadWhitelist(cfg) + } + logInfo("Auth Init") +} func AuthHandler(c *gin.Context, cfg *config.Config) bool { // 如果身份验证未启用,直接返回 true @@ -17,19 +34,19 @@ func AuthHandler(c *gin.Context, cfg *config.Config) bool { // 获取 auth_token 参数 authToken := c.Query("auth_token") - logw("auth_token received: %s", authToken) + logInfo("auth_token received: %s", authToken) // 验证 token if authToken == "" { - logw("auth FAILED: no auth_token provided") + LogWarning("auth FAILED: no auth_token provided") return false } isValid := authToken == cfg.Auth.AuthToken if !isValid { - logw("auth FAILED: invalid auth_token: %s", authToken) + LogWarning("auth FAILED: invalid auth_token: %s", authToken) } - logw("auth SUCCESS: %t", isValid) + logInfo("auth SUCCESS: %t", isValid) return isValid } diff --git a/auth/blacklist.go b/auth/blacklist.go index 830537f..4b8f17d 100644 --- a/auth/blacklist.go +++ b/auth/blacklist.go @@ -4,6 +4,7 @@ import ( "encoding/json" "ghproxy/config" "os" + "strings" ) type BlacklistConfig struct { @@ -22,22 +23,32 @@ func LoadBlacklist(cfg *config.Config) { data, err := os.ReadFile(blacklistfile) if err != nil { - logw("Failed to read blacklist file: %v", err) + logError("Failed to read blacklist file: %v", err) } err = json.Unmarshal(data, blacklist) if err != nil { - logw("Failed to unmarshal blacklist JSON: %v", err) + logError("Failed to unmarshal blacklist JSON: %v", err) } } +// fullrepo: "owner/repo" or "owner/*" func CheckBlacklist(fullrepo string) bool { return forRangeCheckBlacklist(blacklist.Blacklist, fullrepo) } +func sliceRepoName_Blacklist(fullrepo string) (string, string) { + s := strings.Split(fullrepo, "/") + if len(s) != 2 { + return "", "" + } + return s[0], s[1] +} + func forRangeCheckBlacklist(blist []string, fullrepo string) bool { + repoUser, _ := sliceRepoName_Blacklist(fullrepo) for _, blocked := range blist { - if blocked == fullrepo { + if blocked == fullrepo || (strings.HasSuffix(blocked, "/*") && strings.HasPrefix(repoUser, blocked[:len(blocked)-2])) { return true } } diff --git a/auth/whitelist.go b/auth/whitelist.go index 326b3aa..340be52 100644 --- a/auth/whitelist.go +++ b/auth/whitelist.go @@ -4,6 +4,7 @@ import ( "encoding/json" "ghproxy/config" "os" + "strings" ) type WhitelistConfig struct { @@ -21,12 +22,12 @@ func LoadWhitelist(cfg *config.Config) { data, err := os.ReadFile(whitelistfile) if err != nil { - logw("Failed to read whitelist file: %v", err) + logError("Failed to read whitelist file: %v", err) } err = json.Unmarshal(data, whitelist) if err != nil { - logw("Failed to unmarshal whitelist JSON: %v", err) + logError("Failed to unmarshal whitelist JSON: %v", err) } } @@ -34,9 +35,18 @@ func CheckWhitelist(fullrepo string) bool { return forRangeCheckWhitelist(whitelist.Whitelist, fullrepo) } -func forRangeCheckWhitelist(blist []string, fullrepo string) bool { - for _, blocked := range blist { - if blocked == fullrepo { +func sliceRepoName_Whitelist(fullrepo string) (string, string) { + s := strings.Split(fullrepo, "/") + if len(s) != 2 { + return "", "" + } + return s[0], s[1] +} + +func forRangeCheckWhitelist(wlist []string, fullrepo string) bool { + repoUser, _ := sliceRepoName_Whitelist(fullrepo) + for _, blocked := range wlist { + if blocked == fullrepo || (strings.HasSuffix(blocked, "/*") && strings.HasPrefix(repoUser, blocked[:len(blocked)-2])) { return true } } diff --git a/config/blacklist.json b/config/blacklist.json index 286d110..8062ee0 100644 --- a/config/blacklist.json +++ b/config/blacklist.json @@ -1,8 +1,7 @@ { - "blacklist": [ - "black/list", - "test/test1", - "example/repo2" - ] - } - \ No newline at end of file + "blacklist": [ + "black/list", + "test/test1", + "example/repo2" + ] +} \ No newline at end of file diff --git a/config/config.go b/config/config.go index 04928d5..afebe99 100644 --- a/config/config.go +++ b/config/config.go @@ -56,7 +56,7 @@ func loadYAML(filePath string, out interface{}) error { type Config struct { Server ServerConfig - Log LoggerConfig + Log LogConfig CORS CORSConfig Auth AuthConfig Blacklist BlacklistConfig @@ -69,7 +69,7 @@ type ServerConfig struct { SizeLimit int `toml:"sizelimit"` } -type LoggerConfig struct { +type LogConfig struct { LogFilePath string `toml:"logfilepath"` MaxLogSize int `toml:"maxlogsize"` } diff --git a/config/whitelist.json b/config/whitelist.json index d7ba053..e39661b 100644 --- a/config/whitelist.json +++ b/config/whitelist.json @@ -1,8 +1,7 @@ { - "whitelist": [ - "white/list", - "white/test1", - "example/white" - ] - } - \ No newline at end of file + "whitelist": [ + "white/list", + "white/test1", + "example/white" + ] +} \ No newline at end of file diff --git a/logger/logger.go b/logger/logger.go index b6e7057..09d262f 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -19,14 +19,16 @@ var ( logChannel = make(chan string, 100) quitChannel = make(chan struct{}) logFileMutex sync.Mutex // 保护 logFile 的互斥锁 + logFilePath = "/data/ghproxy/log/ghproxy.log" ) // Init 初始化日志记录器,接受日志文件路径作为参数 -func Init(logFilePath string, maxLogsize int) error { +func Init(logFilePath_input string, maxLogsize int) error { logFileMutex.Lock() defer logFileMutex.Unlock() var err error + logFilePath = logFilePath_input logFile, err = os.OpenFile(logFilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666) if err != nil { return err @@ -62,6 +64,26 @@ func Logw(format string, args ...interface{}) { Log(message) } +// 日志等级INFO +func LogInfo(format string, args ...interface{}) { + message := fmt.Sprintf(format, args...) + output := fmt.Sprintf("[INFO] %s", message) + Log(output) +} + +// 日志等级WARNING +func LogWarning(format string, args ...interface{}) { + message := fmt.Sprintf(format, args...) + output := fmt.Sprintf("[WARNING] %s", message) + Log(output) +} + +// 日志等级ERROR +func LogError(format string, args ...interface{}) { + message := fmt.Sprintf(format, args...) + Log(message) +} + // Close 关闭日志文件 func Close() { logFileMutex.Lock() diff --git a/main.go b/main.go index ce99d12..1adc9e9 100644 --- a/main.go +++ b/main.go @@ -17,11 +17,18 @@ import ( var ( cfg *config.Config - logw = logger.Logw router *gin.Engine configfile = "/data/ghproxy/config/config.toml" ) +// 日志模块 +var ( + logw = logger.Logw + logInfo = logger.LogInfo + LogWarning = logger.LogWarning + logError = logger.LogError +) + func ReadFlag() { cfgfile := flag.String("cfg", configfile, "config file path") configfile = *cfgfile @@ -44,8 +51,8 @@ func setupLogger(cfg *config.Config) { if err != nil { log.Fatalf("Failed to initialize logger: %v", err) } - logw("Logger initialized") - logw("Init Completed") + logInfo("Logger initialized") + logInfo("Init Completed") } func Loadlist(cfg *config.Config) { @@ -87,7 +94,7 @@ func main() { // 启动服务器 err := router.Run(fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port)) if err != nil { - log.Fatalf("Error starting server: %v\n", err) + logError("Error starting server: %v\n", err) } fmt.Println("Program finished") diff --git a/proxy/proxy.go b/proxy/proxy.go index d830103..309ddb0 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -17,7 +17,13 @@ import ( "github.com/imroc/req/v3" ) -var logw = logger.Logw +// 日志模块 +var ( + logw = logger.Logw + logInfo = logger.LogInfo + LogWarning = logger.LogWarning + logError = logger.LogError +) var exps = []*regexp.Regexp{ regexp.MustCompile(`^(?:https?://)?github\.com/([^/]+)/([^/]+)/(?:releases|archive)/.*`), @@ -34,7 +40,7 @@ func NoRouteHandler(cfg *config.Config) gin.HandlerFunc { matches := re.FindStringSubmatch(rawPath) if len(matches) < 3 { - logw("Invalid URL: %s", rawPath) + LogWarning("Invalid URL: %s", rawPath) c.String(http.StatusForbidden, "Invalid URL.") return } @@ -45,14 +51,14 @@ func NoRouteHandler(cfg *config.Config) gin.HandlerFunc { pathmatches := regexp.MustCompile(`^([^/]+)/([^/]+)/([^/]+)/.*`) pathParts := pathmatches.FindStringSubmatch(matches[2]) if len(pathParts) < 4 { - logw("Invalid path: %s", rawPath) + LogWarning("Invalid path: %s", rawPath) c.String(http.StatusForbidden, "Invalid path; expected username/repo.") return } username := pathParts[2] repo := pathParts[3] - logw("Blacklist Check > Username: %s, Repo: %s", username, repo) + LogWarning("Blacklist Check > Username: %s, Repo: %s", username, repo) fullrepo := fmt.Sprintf("%s/%s", username, repo) // 白名单检查 @@ -61,7 +67,7 @@ func NoRouteHandler(cfg *config.Config) gin.HandlerFunc { if !whitelistpass { errMsg := fmt.Sprintf("Whitelist Blocked repo: %s", fullrepo) c.JSON(http.StatusForbidden, gin.H{"error": errMsg}) - logw(errMsg) + LogWarning(errMsg) return } } @@ -72,7 +78,7 @@ func NoRouteHandler(cfg *config.Config) gin.HandlerFunc { if blacklistpass { errMsg := fmt.Sprintf("Blacklist Blocked repo: %s", fullrepo) c.JSON(http.StatusForbidden, gin.H{"error": errMsg}) - logw(errMsg) + LogWarning(errMsg) return } } @@ -89,18 +95,18 @@ func NoRouteHandler(cfg *config.Config) gin.HandlerFunc { if !auth.AuthHandler(c, cfg) { c.AbortWithStatusJSON(401, gin.H{"error": "Unauthorized"}) - logw("Unauthorized request: %s", rawPath) + LogWarning("Unauthorized request: %s", rawPath) return } - logw("Matches: %v", matches) + logInfo("Matches: %v", matches) switch { case exps[0].MatchString(rawPath), exps[1].MatchString(rawPath), exps[3].MatchString(rawPath), exps[4].MatchString(rawPath): - logw("%s Matched - USE proxy-chrome", rawPath) + logInfo("%s Matched - USE proxy-chrome", rawPath) ProxyRequest(c, rawPath, cfg, "chrome") case exps[2].MatchString(rawPath): - logw("%s Matched - USE proxy-git", rawPath) + logInfo("%s Matched - USE proxy-git", rawPath) ProxyRequest(c, rawPath, cfg, "git") default: c.String(http.StatusForbidden, "Invalid input.") @@ -111,33 +117,18 @@ func NoRouteHandler(cfg *config.Config) gin.HandlerFunc { func ProxyRequest(c *gin.Context, u string, cfg *config.Config, mode string) { method := c.Request.Method - logw("%s %s", method, u) + logInfo("%s %s", method, u) - client := req.C() + client := createHTTPClient(mode) - switch mode { - case "chrome": - client.SetUserAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36"). - SetTLSFingerprintChrome(). - ImpersonateChrome() - case "git": - client.SetUserAgent("git/2.33.1") - } - - body, err := io.ReadAll(c.Request.Body) + body, err := readRequestBody(c) if err != nil { - HandleError(c, fmt.Sprintf("Failed to read request body: %v", err)) + HandleError(c, err.Error()) return } - defer c.Request.Body.Close() req := client.R().SetBody(body) - - for key, values := range c.Request.Header { - for _, value := range values { - req.SetHeader(key, value) - } - } + setRequestHeaders(c, req) resp, err := SendRequest(req, method, u) if err != nil { @@ -147,17 +138,56 @@ func ProxyRequest(c *gin.Context, u string, cfg *config.Config, mode string) { defer resp.Body.Close() if err := HandleResponseSize(resp, cfg, c); err != nil { - logw("Error handling response size: %v", err) + LogWarning("Error handling response size: %v", err) return } CopyResponseHeaders(resp, c, cfg) c.Status(resp.StatusCode) - if _, err := io.Copy(c.Writer, resp.Body); err != nil { - logw("Failed to copy response body: %v", err) + if err := copyResponseBody(c, resp.Body); err != nil { + logError("Failed to copy response body: %v", err) } } +// createHTTPClient 创建并配置 HTTP 客户端 +func createHTTPClient(mode string) *req.Client { + client := req.C() + switch mode { + case "chrome": + client.SetUserAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36"). + SetTLSFingerprintChrome(). + ImpersonateChrome() + case "git": + client.SetUserAgent("git/2.33.1") + } + return client +} + +// readRequestBody 读取请求体 +func readRequestBody(c *gin.Context) ([]byte, error) { + body, err := io.ReadAll(c.Request.Body) + if err != nil { + return nil, fmt.Errorf("failed to read request body: %v", err) + } + defer c.Request.Body.Close() + return body, nil +} + +// setRequestHeaders 设置请求头 +func setRequestHeaders(c *gin.Context, req *req.Request) { + for key, values := range c.Request.Header { + for _, value := range values { + req.SetHeader(key, value) + } + } +} + +// copyResponseBody 复制响应体到客户端 +func copyResponseBody(c *gin.Context, respBody io.Reader) error { + _, err := io.Copy(c.Writer, respBody) + return err +} + func SendRequest(req *req.Request, method, url string) (*req.Response, error) { switch method { case "GET": @@ -169,7 +199,7 @@ func SendRequest(req *req.Request, method, url string) (*req.Response, error) { case "DELETE": return req.Delete(url) default: - logw("Unsupported method: %s", method) + logInfo("Unsupported method: %s", method) return nil, fmt.Errorf("unsupported method: %s", method) } } @@ -181,14 +211,25 @@ func HandleResponseSize(resp *req.Response, cfg *config.Config, c *gin.Context) if err == nil && size > cfg.Server.SizeLimit { finalURL := resp.Request.URL.String() c.Redirect(http.StatusMovedPermanently, finalURL) - logw("Redirecting to %s due to size limit (%d bytes)", finalURL, size) - return fmt.Errorf("response size exceeds limit") + LogWarning("Size limit exceeded: %s, Size: %d", finalURL, size) + return fmt.Errorf("size limit exceeded: %d", size) } } return nil } func CopyResponseHeaders(resp *req.Response, c *gin.Context, cfg *config.Config) { + removeHeaders(resp) + + copyHeaders(resp, c) + + setCORSHeaders(c, cfg) + + setDefaultHeaders(c) +} + +// removeHeaders 移除指定的响应头 +func removeHeaders(resp *req.Response) { headersToRemove := map[string]struct{}{ "Content-Security-Policy": {}, "Referrer-Policy": {}, @@ -198,35 +239,45 @@ func CopyResponseHeaders(resp *req.Response, c *gin.Context, cfg *config.Config) for header := range headersToRemove { resp.Header.Del(header) } +} +// copyHeaders 复制响应头到 Gin 上下文 +func copyHeaders(resp *req.Response, c *gin.Context) { for key, values := range resp.Header { for _, value := range values { c.Header(key, value) } } +} - c.Header("Access-Control-Allow-Origin", "") +// setCORSHeaders 设置 CORS 相关的响应头 +func setCORSHeaders(c *gin.Context, cfg *config.Config) { if cfg.CORS.Enabled { c.Header("Access-Control-Allow-Origin", "*") + } else { + c.Header("Access-Control-Allow-Origin", "") } +} +// setDefaultHeaders 设置默认的响应头 +func setDefaultHeaders(c *gin.Context) { c.Header("Age", "10") c.Header("Cache-Control", "max-age=300") } func HandleError(c *gin.Context, message string) { c.String(http.StatusInternalServerError, fmt.Sprintf("server error %v", message)) - logw(message) + LogWarning(message) } func CheckURL(u string) []string { for _, exp := range exps { if matches := exp.FindStringSubmatch(u); matches != nil { - logw("URL matched: %s, Matches: %v", u, matches[1:]) + logInfo("URL matched: %s, Matches: %v", u, matches[1:]) return matches[1:] } } errMsg := fmt.Sprintf("Invalid URL: %s", u) - logw(errMsg) + LogWarning(errMsg) return nil } From 0cb7c9f948bf189b54c31e16f1de3518979931cc Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sat, 12 Oct 2024 04:30:09 +0800 Subject: [PATCH 027/129] 24w15c --- config/config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.toml b/config/config.toml index 9379db8..9ad12bf 100644 --- a/config/config.toml +++ b/config/config.toml @@ -3,7 +3,7 @@ host = "127.0.0.1" port = 8080 sizelimit = 131072000 # 125MB -[logger] +[log] logfilepath = "/data/ghproxy/log/ghproxy.log" maxlogsize = 5 # MB From 03118a24a3480021df8347846b2bfa6895fbbf27 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sat, 12 Oct 2024 06:32:16 +0800 Subject: [PATCH 028/129] 24w15d --- CHANGELOG.md | 21 +++++++++++++++ DEV-VERSION | 2 +- api/api.go | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++ go.mod | 14 +++++----- go.sum | 13 +++++++++ main.go | 27 +++++++------------ 6 files changed, 125 insertions(+), 26 deletions(-) create mode 100644 api/api.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 18fb084..aef0599 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,26 @@ # 更新日志 +24w15c +--- +- PRE-RELEASE: 此版本是v1.5.0的预发布版本,请勿在生产环境中使用 +- CHANGE: 优化代码结构,提升性能 +- CHANGE: 改进核心部分,即proxy模块的转发部分,对请求体处理与响应体处理进行优化 +- CHANGE: 改进黑白名单机制,若禁用相关功能,则不对对应模块进行初始化 +- ADD: 黑白名单引入通配符支持,支持完全屏蔽或放行某个用户,例如`onwer/*`表示匹配`owner`的所有仓库 +- ADD: 日志模块引入日志级别,排障更加直观 + +24w15b +--- +- PRE-RELEASE: 此版本是v1.5.0的预发布版本,请勿在生产环境中使用 +- CHANGE: 优化代码结构,提升性能 +- FIX: 修正24w15a版本的部分问题 + +24w15a +--- +- PRE-RELEASE: 此版本是v1.5.0的预发布版本,请勿在生产环境中使用 +- CHANGE: 优化代码结构,提升性能 +- CHANGE: 将配置文件由yaml切换至toml + v1.4.3 --- - CHANGE: 优化代码结构,提升性能 diff --git a/DEV-VERSION b/DEV-VERSION index aaa059b..60263f3 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w15c \ No newline at end of file +24w15d \ No newline at end of file diff --git a/api/api.go b/api/api.go new file mode 100644 index 0000000..11a2f3d --- /dev/null +++ b/api/api.go @@ -0,0 +1,74 @@ +package api + +import ( + "encoding/json" + "ghproxy/config" + "ghproxy/logger" + + "github.com/gin-gonic/gin" +) + +var ( + router *gin.Engine + cfg *config.Config +) + +// 日志模块 +var ( + logw = logger.Logw + logInfo = logger.LogInfo + LogWarning = logger.LogWarning + logError = logger.LogError +) + +func InitHandleRouter(cfg *config.Config, router *gin.Engine) { + // 设置路由 + apiRouter := router.Group("api") + { + apiRouter.GET("/size_limit", func(c *gin.Context) { + SizeLimitHandler(cfg, c) + }) + apiRouter.GET("/whitelist/status", func(c *gin.Context) { + WhiteListStatusHandler(c, cfg) + }) + apiRouter.GET("/blacklist/status", func(c *gin.Context) { + BlackListStatusHandler(c, cfg) + }) + apiRouter.GET("/healthcheck", func(c *gin.Context) { + HealthcheckHandler(c) + }) + } + logInfo("API router Init success") +} + +func SizeLimitHandler(cfg *config.Config, c *gin.Context) { + // 设置响应头 + c.Writer.Header().Set("Content-Type", "application/json") + json.NewEncoder(c.Writer).Encode(map[string]interface{}{ + "MaxResponseBodySize": cfg.Server.SizeLimit, + }) +} + +func WhiteListStatusHandler(c *gin.Context, cfg *config.Config) { + // 设置响应头 + c.Writer.Header().Set("Content-Type", "application/json") + json.NewEncoder(c.Writer).Encode(map[string]interface{}{ + "Whitelist": cfg.Whitelist.Enabled, + }) +} + +func BlackListStatusHandler(c *gin.Context, cfg *config.Config) { + // 设置响应头 + c.Writer.Header().Set("Content-Type", "application/json") + json.NewEncoder(c.Writer).Encode(map[string]interface{}{ + "Blacklist": cfg.Blacklist.Enabled, + }) +} + +func HealthcheckHandler(c *gin.Context) { + // 设置响应头 + c.Writer.Header().Set("Content-Type", "application/json") + json.NewEncoder(c.Writer).Encode(map[string]interface{}{ + "Status": "OK", + }) +} diff --git a/go.mod b/go.mod index 05ba622..86b1f9d 100644 --- a/go.mod +++ b/go.mod @@ -3,17 +3,17 @@ module ghproxy go 1.23.2 require ( + github.com/BurntSushi/toml v1.4.0 github.com/gin-gonic/gin v1.10.0 - github.com/imroc/req/v3 v3.46.1 + github.com/imroc/req/v3 v3.47.0 gopkg.in/yaml.v3 v3.0.1 ) require ( - github.com/BurntSushi/toml v1.4.0 // indirect - github.com/andybalholm/brotli v1.1.0 // indirect + github.com/andybalholm/brotli v1.1.1 // indirect github.com/bytedance/sonic v1.12.3 // indirect github.com/bytedance/sonic/loader v0.2.0 // indirect - github.com/cloudflare/circl v1.4.0 // indirect + github.com/cloudflare/circl v1.5.0 // indirect github.com/cloudwego/base64x v0.1.4 // indirect github.com/cloudwego/iasm v0.2.0 // indirect github.com/gabriel-vasile/mimetype v1.4.5 // indirect @@ -23,11 +23,11 @@ require ( github.com/go-playground/validator/v10 v10.22.1 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/goccy/go-json v0.10.3 // indirect - github.com/google/pprof v0.0.0-20241008150032-332c0e1a4a34 // indirect + github.com/google/pprof v0.0.0-20241009165004-a3522334989c // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.10 // indirect + github.com/klauspost/compress v1.17.11 // indirect github.com/klauspost/cpuid/v2 v2.2.8 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect @@ -43,7 +43,7 @@ require ( go.uber.org/mock v0.4.0 // indirect golang.org/x/arch v0.11.0 // indirect golang.org/x/crypto v0.28.0 // indirect - golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 // indirect + golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect golang.org/x/mod v0.21.0 // indirect golang.org/x/net v0.30.0 // indirect golang.org/x/sync v0.8.0 // indirect diff --git a/go.sum b/go.sum index a686c25..2ef9151 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= +github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA= +github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA= github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0= github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= github.com/bytedance/sonic v1.12.3 h1:W2MGa7RCU1QTeYRTPE3+88mVC0yXmsRQRChiyVocVjU= @@ -12,6 +14,8 @@ github.com/bytedance/sonic/loader v0.2.0 h1:zNprn+lsIP06C/IqCHs3gPQIvnvpKbbxyXQP github.com/bytedance/sonic/loader v0.2.0/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= github.com/cloudflare/circl v1.4.0 h1:BV7h5MgrktNzytKmWjpOtdYrf0lkkbF8YMlBGPhJQrY= github.com/cloudflare/circl v1.4.0/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= +github.com/cloudflare/circl v1.5.0 h1:hxIWksrX6XN5a1L2TI/h53AGPhNHoUBo+TD1ms9+pys= +github.com/cloudflare/circl v1.5.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs= github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= @@ -46,6 +50,8 @@ github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 h1:c5FlPPgxOn7kJz3VoP github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/pprof v0.0.0-20241008150032-332c0e1a4a34 h1:4iExbL0TFWhkSCZx6nfKwjM+CbnBySx18KssYmdL1fc= github.com/google/pprof v0.0.0-20241008150032-332c0e1a4a34/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/google/pprof v0.0.0-20241009165004-a3522334989c h1:NDovD0SMpBYXlE1zJmS1q55vWB/fUQBcPAqAboZSccA= +github.com/google/pprof v0.0.0-20241009165004-a3522334989c/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -53,12 +59,16 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/imroc/req/v3 v3.46.1 h1:oahr2hBTb3AaFI4P6jkN0Elj2ZVKJcdQ/IjWqeIKjvc= github.com/imroc/req/v3 v3.46.1/go.mod h1:weam9gmyb00QnOtu6HXSnk44dNFkIUQb5QdMx13FeUU= +github.com/imroc/req/v3 v3.47.0 h1:O8D1KtZSEuhHIrWA+YBd4MZeFg3KprfbNSFR49EWdNA= +github.com/imroc/req/v3 v3.47.0/go.mod h1:weam9gmyb00QnOtu6HXSnk44dNFkIUQb5QdMx13FeUU= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0= github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -102,6 +112,7 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= @@ -119,6 +130,8 @@ golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWB golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 h1:1wqE9dj9NpSm04INVsJhhEUzhuDVjbcyKH91sVyPATw= golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8= +golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY= +golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8= golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= diff --git a/main.go b/main.go index 1adc9e9..5c3cb63 100644 --- a/main.go +++ b/main.go @@ -1,12 +1,12 @@ package main import ( - "encoding/json" "flag" "fmt" "log" "net/http" + "ghproxy/api" "ghproxy/auth" "ghproxy/config" "ghproxy/logger" @@ -56,8 +56,12 @@ func setupLogger(cfg *config.Config) { } func Loadlist(cfg *config.Config) { - auth.LoadBlacklist(cfg) - auth.LoadWhitelist(cfg) + auth.Init(cfg) +} + +func setupApi(cfg *config.Config, router *gin.Engine) { + // 注册 API 接口 + api.InitHandleRouter(cfg, router) } func init() { @@ -72,18 +76,13 @@ func init() { // 初始化路由 router = gin.Default() + setupApi(cfg, router) + // 定义路由 router.GET("/", func(c *gin.Context) { c.Redirect(http.StatusMovedPermanently, "https://ghproxy0rtt.1888866.xyz/") }) - router.GET("/api", api) - - // 健康检查 - router.GET("/api/healthcheck", func(c *gin.Context) { - c.String(http.StatusOK, "OK") - }) - // 未匹配路由处理 router.NoRoute(func(c *gin.Context) { proxy.NoRouteHandler(cfg)(c) @@ -99,11 +98,3 @@ func main() { fmt.Println("Program finished") } - -func api(c *gin.Context) { - // 设置响应头 - c.Writer.Header().Set("Content-Type", "application/json") - json.NewEncoder(c.Writer).Encode(map[string]interface{}{ - "MaxResponseBodySize": cfg.Server.SizeLimit, - }) -} From 6dc20398aea30389b145db28fae46c3e1b89e0e1 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sat, 12 Oct 2024 07:03:23 +0800 Subject: [PATCH 029/129] 24w15d --- CHANGELOG.md | 7 +++++ api/api.go | 4 ++- pages/index.html | 67 +++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 70 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aef0599..18ba301 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # 更新日志 +24w15d +--- +- PRE-RELEASE: 此版本是v1.5.0的预发布版本,请勿在生产环境中使用 +- CHANGE: 优化代码结构,提升性能 +- ADD: 新增API模块,新增配置开关状态接口,以在前端指示功能状态 +- CHANGE: 由于API变动,对前端进行相应调整 + 24w15c --- - PRE-RELEASE: 此版本是v1.5.0的预发布版本,请勿在生产环境中使用 diff --git a/api/api.go b/api/api.go index 11a2f3d..b30d80b 100644 --- a/api/api.go +++ b/api/api.go @@ -42,10 +42,12 @@ func InitHandleRouter(cfg *config.Config, router *gin.Engine) { } func SizeLimitHandler(cfg *config.Config, c *gin.Context) { + // 转换为MB + sizeLimit := cfg.Server.SizeLimit / 1024 / 1024 // 设置响应头 c.Writer.Header().Set("Content-Type", "application/json") json.NewEncoder(c.Writer).Encode(map[string]interface{}{ - "MaxResponseBodySize": cfg.Server.SizeLimit, + "MaxResponseBodySize": sizeLimit, }) } diff --git a/pages/index.html b/pages/index.html index 4987c93..ac42dd9 100644 --- a/pages/index.html +++ b/pages/index.html @@ -91,6 +91,18 @@ } + .status-container { + display: flex; + justify-content: center; + align-items: center; + margin-bottom: 5px; + } + + .status-container p { + margin: 0px 5px; + } + + .code { position: relative; padding-right: 0px; @@ -136,7 +148,11 @@

GitHub链接带不带协议头均可,支持release、archive以及文件,转换后链接均可使用。

-

文件大小限制: ...

+
+

文件大小限制: ...

+

白名单状态: ...

+

黑名单状态: ...

+
@@ -173,19 +189,57 @@ alert('链接已复制到剪贴板'); }); - function fetchAPI() { - fetch(window.location.origin + '/api') + function fetchSizeLimit() { + fetch(window.location.origin + '/api/size_limit') .then(response => response.json()) .then(data => { const sizeLimitDisplay = document.getElementById('sizeLimitDisplay'); - const sizeInMB = (data.MaxResponseBodySize / (1024 * 1024)).toFixed(0); - sizeLimitDisplay.textContent = `文件大小限制: ${sizeInMB} MB`; + sizeLimitDisplay.textContent = `文件大小限制: ${data.MaxResponseBodySize} MB`; }) .catch(error => { console.error('Error fetching API:', error); }); } + function fetchWhiteList() { + fetch(window.location.origin + '/api/whitelist/status') + .then(response => response.json()) + .then(data => { + const whiteListStatus = document.getElementById('whiteListStatus'); + if (data.Whitelist) { + whiteListStatus.textContent = `白名单状态: 已开启`; + } else if (!data.Whitelist) { + whiteListStatus.textContent = `白名单状态: 已关闭`; + } else { + whiteListStatus.textContent = `白名单状态: 未知`; + } + }) + .catch(error => { + console.error('Error fetching API:', error); + }); + } + function fetchBlackList() { + fetch(window.location.origin + '/api/blacklist/status') + .then(response => response.json()) + .then(data => { + const blackListStatus = document.getElementById('blackListStatus'); + if (data.Blacklist) { + blackListStatus.textContent = `黑名单状态: 已开启`; + } else if (!data.Blacklist) { + blackListStatus.textContent = `黑名单状态: 已关闭`; + } else { + blackListStatus.textContent = `黑名单状态: 未知`; + } + }) + .catch(error => { + console.error('Error fetching API:', error); + }); + } + function fetchAPI() { + fetchSizeLimit(); + fetchWhiteList(); + fetchBlackList(); + } document.addEventListener('DOMContentLoaded', fetchAPI); @@ -195,8 +249,7 @@ Copyright © 2024 WJQSERVER-STUDIO

- GitHub仓库地址:https://github.com/WJQSERVER-STUDIO/ghproxy + GitHub仓库地址:https://github.com/WJQSERVER-STUDIO/ghproxy

您的IP地址:

From 7fabd3c3e2dc39bb9ad6f0338326e64071961cce Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sat, 12 Oct 2024 10:20:20 +0800 Subject: [PATCH 030/129] 1.5.0 --- CHANGELOG.md | 11 ++++++ README.md | 58 ++++++++++++++-------------- docker/dockerfile/release/Dockerfile | 2 +- docker/dockerfile/release/init.sh | 6 +-- 4 files changed, 43 insertions(+), 34 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18ba301..bfcbfbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # 更新日志 +v1.5.0 +--- +- CHANGE: 优化代码结构,提升性能 +- CHANGE: 改进核心部分,即proxy模块的转发部分,对请求体处理与响应体处理进行优化 +- CHANGE: 配置文件格式由yaml切换至toml,使其具备更好的可读性 +- ADD: 黑白名单引入通配符支持,支持完全屏蔽或放行某个用户,例如`onwer/*`表示匹配`owner`的所有仓库 +- ADD: 新增API模块,新增配置开关状态接口,以在前端指示功能状态 +- CHANGE: 由于API变动,对前端进行相应调整 +- ADD: 日志模块引入日志级别,排障更加直观 +- CHANGE: 改进黑白名单机制,若禁用相关功能,则不对相关模块进行初始化 + 24w15d --- - PRE-RELEASE: 此版本是v1.5.0的预发布版本,请勿在生产环境中使用 diff --git a/README.md b/README.md index 4218ca2..3e78dd0 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ - 支持Docker部署 - 支持速率限制 - 支持用户鉴权 -- 支持自定义黑名单 +- 支持自定义黑名单/白名单 - 符合[RFC 7234](https://httpwg.org/specs/rfc7234.html)的HTTP Cache - 使用Caddy作为Web Server - 基于[WJQSERVER-STUDIO/golang-temp](https://github.com/WJQSERVER-STUDIO/golang-temp)模板构建,具有标准化的日志记录与构建流程 @@ -60,39 +60,33 @@ docker run -p 7210:80 -v ./ghproxy/log/run:/data/ghproxy/log -v ./ghproxy/log/ca ### 外部配置文件 -本项目采用config.yaml作为外部配置,默认配置如下 -使用Docker部署时,慎重修改config.yaml,以免造成不必要的麻烦 +本项目采用`config.toml`作为外部配置,默认配置如下 +使用Docker部署时,慎重修改`config.toml`,以免造成不必要的麻烦 -```yaml -# 核心配置 -server: - port: 8080 # 监听端口(小白请勿修改) - host: "127.0.0.1" # 监听地址(小白请勿修改) - sizelimit: 131072000 # 125MB +```toml +[server] +host = "127.0.0.1" # 监听地址(小白请勿修改) +port = 8080 #监听端口(小白请勿修改) +sizelimit = 131072000 # 125MB -# 日志配置 -logger: - logfilepath: "/data/ghproxy/log/ghproxy.log" # 日志文件路径(小白请勿修改) - maxlogsize: 5 # MB +[log] +logfilepath = "/data/ghproxy/log/ghproxy.log" # 日志文件路径(小白请勿修改) +maxlogsize = 5 # MB -# CORS 配置 -cors: - enabled: true # 是否开启CORS +[cors] +enabled = true # 是否开启CORS -# 鉴权配置 -auth: - enabled: false # 是否开启鉴权 - authtoken: "test" # 鉴权Token +[auth] +authtoken = "test" # 鉴权Token +enabled = false # 是否开启鉴权 -# 黑名单配置 -blacklist: - enabled: true # 是否开启黑名单 - blacklistfile: "/data/ghproxy/config/blacklist.json" +[blacklist] +blacklistfile = "/data/ghproxy/config/blacklist.json" # 黑名单文件路径 +enabled = false # 是否开启黑名单 -# 白名单配置 -whitelist: - enabled: false # 是否开启白名单 - whitelistfile: "/data/ghproxy/config/whitelist.json" +[whitelist] +enabled = false # 是否开启白名单 +whitelistfile = "/data/ghproxy/config/whitelist.json" # 白名单文件路径 ``` @@ -105,7 +99,7 @@ whitelist: "blacklist": [ "test/test1", "example/repo2", - "another/repo3" + "another/*" ] } ``` @@ -119,7 +113,7 @@ whitelist: "whitelist": [ "test/test1", "example/repo2", - "another/repo3" + "another/*" ] } ``` @@ -139,6 +133,10 @@ example.com { } ``` +### 前端页面 + +![ghproxy-demo-v1.5.0.png](https://webp.wjqserver.com/ghproxy/ghproxy-demo-v1.5.0.png) + ## TODO & DEV ### TODO diff --git a/docker/dockerfile/release/Dockerfile b/docker/dockerfile/release/Dockerfile index 5247449..9f50ae2 100644 --- a/docker/dockerfile/release/Dockerfile +++ b/docker/dockerfile/release/Dockerfile @@ -26,7 +26,7 @@ RUN wget -O /usr/local/bin/init.sh https://raw.githubusercontent.com/${USER}/${R # 拉取配置 RUN wget -O /data/caddy/Caddyfile https://raw.githubusercontent.com/${USER}/${REPO}/main/caddyfile/release/Caddyfile -RUN wget -O /data/${APPLICATION}/config.yaml https://raw.githubusercontent.com/${USER}/${REPO}/main/config/config.yaml +RUN wget -O /data/${APPLICATION}/config.toml https://raw.githubusercontent.com/${USER}/${REPO}/main/config/config.toml RUN wget -O /data/${APPLICATION}/blacklist.json https://raw.githubusercontent.com/${USER}/${REPO}/main/config/blacklist.json RUN wget -O /data/${APPLICATION}/whitelist.json https://raw.githubusercontent.com/${USER}/${REPO}/main/config/whitelist.json diff --git a/docker/dockerfile/release/init.sh b/docker/dockerfile/release/init.sh index 78f8bc3..34d3477 100644 --- a/docker/dockerfile/release/init.sh +++ b/docker/dockerfile/release/init.sh @@ -14,13 +14,13 @@ if [ ! -f /data/${APPLICATION}/config/whitelist.json ]; then cp /data/${APPLICATION}/whitelist.json /data/${APPLICATION}/config/whitelist.json fi -if [ ! -f /data/${APPLICATION}/config/config.yaml ]; then - cp /data/${APPLICATION}/config.yaml /data/${APPLICATION}/config/config.yaml +if [ ! -f /data/${APPLICATION}/config/config.toml ]; then + cp /data/${APPLICATION}/config.toml /data/${APPLICATION}/config/config.toml fi /data/caddy/caddy run --config /data/caddy/config/Caddyfile > /data/${APPLICATION}/log/caddy.log 2>&1 & -/data/${APPLICATION}/${APPLICATION} -cfg /data/${APPLICATION}/config/config.yaml > /data/${APPLICATION}/log/run.log 2>&1 & +/data/${APPLICATION}/${APPLICATION} -cfg /data/${APPLICATION}/config/config.toml > /data/${APPLICATION}/log/run.log 2>&1 & while true; do sleep 1 From b05dd3750044d1997275f1072261510aa57d081a Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sat, 12 Oct 2024 10:20:43 +0800 Subject: [PATCH 031/129] 1.5.0 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3c80e4f..3e1ad72 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.3 \ No newline at end of file +1.5.0 \ No newline at end of file From 1d8c3914d2ce2b7790f7de2facfc4fd24303a639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8C=E8=A6=8B=20=E7=81=AF=E8=8A=B1?= <172008506+satomitoka@users.noreply.github.com> Date: Sun, 13 Oct 2024 08:50:57 +0800 Subject: [PATCH 032/129] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 3e78dd0..f518e8f 100644 --- a/README.md +++ b/README.md @@ -140,9 +140,6 @@ example.com { ## TODO & DEV ### TODO - -- [x] 允许更多参数通过config结构传入 -- [x] 改进程序效率 - [x] 用户鉴权 - [x] 仓库黑名单 - [x] 仓库白名单 From a156f1b2e78073795411741ccb2f23475a94d2a7 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sun, 13 Oct 2024 09:41:18 +0800 Subject: [PATCH 033/129] update --- config/config.go | 50 ------------------------------------------------ 1 file changed, 50 deletions(-) diff --git a/config/config.go b/config/config.go index afebe99..e6d46a8 100644 --- a/config/config.go +++ b/config/config.go @@ -4,56 +4,6 @@ import ( "github.com/BurntSushi/toml" ) -/*type Config struct { - Server struct { - Port int `yaml:"port"` - Host string `yaml:"host"` - SizeLimit int `yaml:"sizelimit"` - } `yaml:"server"` - - Log struct { - LogFilePath string `yaml:"logfilepath"` - MaxLogSize int `yaml:"maxlogsize"` - } `yaml:"logger"` - - CORS struct { - Enabled bool `yaml:"enabled"` - } `yaml:"cors"` - - Auth struct { - Enabled bool `yaml:"enabled"` - AuthToken string `yaml:"authtoken"` - } `yaml:"auth"` - - Blacklist struct { - Enabled bool `yaml:"enabled"` - BlacklistFile string `yaml:"blacklistfile"` - } `yaml:"blacklist"` - - Whitelist struct { - Enabled bool `yaml:"enabled"` - WhitelistFile string `yaml:"whitelistfile"` - } `yaml:"whitelist"` -} - -// LoadConfig 从 YAML 配置文件加载配置 -func LoadConfig(filePath string) (*Config, error) { - var config Config - if err := loadYAML(filePath, &config); err != nil { - return nil, err - } - return &config, nil -} - -// LoadyamlConfig 从 YAML 配置文件加载配置 -func loadYAML(filePath string, out interface{}) error { - data, err := os.ReadFile(filePath) - if err != nil { - return err - } - return yaml.Unmarshal(data, out) -}*/ - type Config struct { Server ServerConfig Log LogConfig From 072f73fdce62a9ab0c1a6f336f46d744f12aee1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 13:38:56 +0800 Subject: [PATCH 034/129] Bump github.com/imroc/req/v3 from 3.47.0 to 3.48.0 (#6) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [github.com/imroc/req/v3](https://github.com/imroc/req) from 3.47.0 to 3.48.0. - [Release notes](https://github.com/imroc/req/releases) - [提交](https://github.com/imroc/req/compare/v3.47.0...v3.48.0) --- updated-dependencies: - dependency-name: github.com/imroc/req/v3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 4 +-- go.sum | 77 +++++++++++++--------------------------------------------- 2 files changed, 19 insertions(+), 62 deletions(-) diff --git a/go.mod b/go.mod index 86b1f9d..980ef26 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,7 @@ go 1.23.2 require ( github.com/BurntSushi/toml v1.4.0 github.com/gin-gonic/gin v1.10.0 - github.com/imroc/req/v3 v3.47.0 - gopkg.in/yaml.v3 v3.0.1 + github.com/imroc/req/v3 v3.48.0 ) require ( @@ -51,4 +50,5 @@ require ( golang.org/x/text v0.19.0 // indirect golang.org/x/tools v0.26.0 // indirect google.golang.org/protobuf v1.35.1 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 2ef9151..bf9a9e5 100644 --- a/go.sum +++ b/go.sum @@ -1,19 +1,12 @@ github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= -github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= -github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA= github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA= -github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0= -github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= github.com/bytedance/sonic v1.12.3 h1:W2MGa7RCU1QTeYRTPE3+88mVC0yXmsRQRChiyVocVjU= github.com/bytedance/sonic v1.12.3/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= -github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= github.com/bytedance/sonic/loader v0.2.0 h1:zNprn+lsIP06C/IqCHs3gPQIvnvpKbbxyXQP1iU4kWM= github.com/bytedance/sonic/loader v0.2.0/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= -github.com/cloudflare/circl v1.4.0 h1:BV7h5MgrktNzytKmWjpOtdYrf0lkkbF8YMlBGPhJQrY= -github.com/cloudflare/circl v1.4.0/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= github.com/cloudflare/circl v1.5.0 h1:hxIWksrX6XN5a1L2TI/h53AGPhNHoUBo+TD1ms9+pys= github.com/cloudflare/circl v1.5.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs= github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= @@ -21,35 +14,31 @@ github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJ github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= -github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4= github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8= -github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA= github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= -github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= -github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 h1:c5FlPPgxOn7kJz3VoPLkQYQXGBS3EklQ4Zfi57uOuqQ= -github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= -github.com/google/pprof v0.0.0-20241008150032-332c0e1a4a34 h1:4iExbL0TFWhkSCZx6nfKwjM+CbnBySx18KssYmdL1fc= -github.com/google/pprof v0.0.0-20241008150032-332c0e1a4a34/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/pprof v0.0.0-20241009165004-a3522334989c h1:NDovD0SMpBYXlE1zJmS1q55vWB/fUQBcPAqAboZSccA= github.com/google/pprof v0.0.0-20241009165004-a3522334989c/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -57,21 +46,13 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/imroc/req/v3 v3.46.1 h1:oahr2hBTb3AaFI4P6jkN0Elj2ZVKJcdQ/IjWqeIKjvc= -github.com/imroc/req/v3 v3.46.1/go.mod h1:weam9gmyb00QnOtu6HXSnk44dNFkIUQb5QdMx13FeUU= -github.com/imroc/req/v3 v3.47.0 h1:O8D1KtZSEuhHIrWA+YBd4MZeFg3KprfbNSFR49EWdNA= -github.com/imroc/req/v3 v3.47.0/go.mod h1:weam9gmyb00QnOtu6HXSnk44dNFkIUQb5QdMx13FeUU= +github.com/imroc/req/v3 v3.48.0 h1:IYuMGetuwLzOOTzDCquDqs912WNwpsPK0TBXWPIvoqg= +github.com/imroc/req/v3 v3.48.0/go.mod h1:weam9gmyb00QnOtu6HXSnk44dNFkIUQb5QdMx13FeUU= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= -github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= -github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0= -github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= -github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= @@ -86,10 +67,11 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4= github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag= -github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= -github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= +github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI= github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg= @@ -100,73 +82,48 @@ github.com/refraction-networking/utls v1.6.7/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5D github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU= github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= -golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= -golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/arch v0.11.0 h1:KXV8WWKCXm6tRpLirl2szsO5j/oOODwZf4hATmGVNs4= golang.org/x/arch v0.11.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= -golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= -golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= -golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= -golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= -golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 h1:1wqE9dj9NpSm04INVsJhhEUzhuDVjbcyKH91sVyPATw= -golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8= golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY= golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8= golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= -golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= -rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= From d42ed119d46b44a65eecb4c5f91379cdf4f0df46 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Mon, 14 Oct 2024 13:49:30 +0800 Subject: [PATCH 035/129] 24w16a --- DEV-VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEV-VERSION b/DEV-VERSION index 60263f3..34618f2 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w15d \ No newline at end of file +24w16a \ No newline at end of file From 18f78385f3493bbd7dbf13b66d960d7835b01714 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Mon, 14 Oct 2024 16:16:04 +0800 Subject: [PATCH 036/129] 1.5.1 --- CHANGELOG.md | 13 +++++++ README.md | 10 ++++++ VERSION | 2 +- config/blacklist.json | 2 +- config/config.yaml | 29 ---------------- config/whitelist.json | 2 +- deploy/config.toml | 23 +++++++++++++ deploy/ghproxy.service | 13 +++++++ deploy/install.sh | 78 ++++++++++++++++++++++++++++++++++++++++++ deploy/uninstall.sh | 13 +++++++ 10 files changed, 153 insertions(+), 32 deletions(-) delete mode 100644 config/config.yaml create mode 100644 deploy/config.toml create mode 100644 deploy/ghproxy.service create mode 100644 deploy/install.sh create mode 100644 deploy/uninstall.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index bfcbfbf..27de1ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # 更新日志 +v1.5.1 +--- +- CHANGE: 优化代码结构,提升性能 +- CHANGE: Bump github.com/imroc/req/v3 from 3.48.0 to 3.49.0 by @dependabot in https://github.com/WJQSERVER-STUDIO/ghproxy/pull/7 +- ADD: 新增一键部署脚本,简化二进制文件部署流程 + +24w16a +--- +- PRE-RELEASE: 此版本是v1.5.1的预发布版本,请勿在生产环境中使用 +- CHANGE: 优化代码结构,提升性能 +- CHANGE: Bump github.com/imroc/req/v3 from 3.47.0 to 3.48.0 by @dependabot in https://github.com/WJQSERVER-STUDIO/ghproxy/pull/6 +- ADD: 新增一键部署脚本,简化二进制文件部署流程 + v1.5.0 --- - CHANGE: 优化代码结构,提升性能 diff --git a/README.md b/README.md index f518e8f..667d60c 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,16 @@ docker run -p 7210:80 -v ./ghproxy/log/run:/data/ghproxy/log -v ./ghproxy/log/ca 参看[docker-compose.yml](https://github.com/WJQSERVER-STUDIO/ghproxy/blob/main/docker/compose/docker-compose.yml) +### 二进制文件部署 + +一键部署脚本: + +```bash +wget -O install.sh https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/install.sh && chmod +x install.sh &&./install.sh +``` + +## 配置说明 + ### 外部配置文件 本项目采用`config.toml`作为外部配置,默认配置如下 diff --git a/VERSION b/VERSION index 3e1ad72..8e03717 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.0 \ No newline at end of file +1.5.1 \ No newline at end of file diff --git a/config/blacklist.json b/config/blacklist.json index 8062ee0..839d3f6 100644 --- a/config/blacklist.json +++ b/config/blacklist.json @@ -2,6 +2,6 @@ "blacklist": [ "black/list", "test/test1", - "example/repo2" + "example/*" ] } \ No newline at end of file diff --git a/config/config.yaml b/config/config.yaml deleted file mode 100644 index 21bc68b..0000000 --- a/config/config.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# Server Configuration -server: - port: 8080 - host: "127.0.0.1" - sizelimit: 131072000 # 125MB - -# Logging Configuration -logger: - logfilepath: "/data/ghproxy/log/ghproxy.log" - maxlogsize: 5 # MB - -# CORS Configuration -cors: - enabled: true - -# Authentication Configuration -auth: - enabled: false - authtoken: "test" - -# Blacklist Configuration -blacklist: - enabled: false - blacklistfile: "/data/ghproxy/config/blacklist.json" - -# Whitelist Configuration -whitelist: - enabled: false - whitelistfile: "/data/ghproxy/config/whitelist.json" \ No newline at end of file diff --git a/config/whitelist.json b/config/whitelist.json index e39661b..868a3a8 100644 --- a/config/whitelist.json +++ b/config/whitelist.json @@ -2,6 +2,6 @@ "whitelist": [ "white/list", "white/test1", - "example/white" + "example/*" ] } \ No newline at end of file diff --git a/deploy/config.toml b/deploy/config.toml new file mode 100644 index 0000000..2e2fd46 --- /dev/null +++ b/deploy/config.toml @@ -0,0 +1,23 @@ +[server] +host = "127.0.0.1" +port = 8080 +sizelimit = 131072000 # 125MB + +[log] +logfilepath = "/root/data/ghproxy/log/ghproxy.log" +maxlogsize = 5 # MB + +[cors] +enabled = true + +[auth] +authtoken = "test" +enabled = false + +[blacklist] +blacklistfile = "/root/data/ghproxy/config/blacklist.json" +enabled = false + +[whitelist] +enabled = false +whitelistfile = "/root/data/ghproxy/config/whitelist.json" diff --git a/deploy/ghproxy.service b/deploy/ghproxy.service new file mode 100644 index 0000000..b2a24a7 --- /dev/null +++ b/deploy/ghproxy.service @@ -0,0 +1,13 @@ +[Unit] +Description=Github Proxy Service +After=network.target + +[Service] +ExecStart=/bin/bash -c '/root/data/ghproxy/ghproxy -cfg /root/data/ghproxy/config/config.toml > /root/data/ghproxy/log/run.log 2>&1' +WorkingDirectory=/root/data/ghproxy +Restart=always +User=root +Group=root + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/deploy/install.sh b/deploy/install.sh new file mode 100644 index 0000000..b260752 --- /dev/null +++ b/deploy/install.sh @@ -0,0 +1,78 @@ +# /bin/bash + +# install packages +install() { + if [ $# -eq 0 ]; then + echo "ARGS NOT FOUND" + return 1 + fi + + for package in "$@"; do + if ! command -v "$package" &>/dev/null; then + if command -v dnf &>/dev/null; then + dnf -y update && dnf install -y "$package" + elif command -v yum &>/dev/null; then + yum -y update && yum -y install "$package" + elif command -v apt &>/dev/null; then + apt update -y && apt install -y "$package" + elif command -v apk &>/dev/null; then + apk update && apk add "$package" + else + echo "UNKNOWN PACKAGE MANAGER" + return 1 + fi + fi + done + + return 0 +} + +# 安装依赖包 +install curl wget sed + +# 查看当前架构是否为linux/amd64或linux/arm64 +ARCH=$(uname -m) +if [ "$ARCH" != "x86_64" ] && [ "$ARCH" != "aarch64" ]; then + echo " $ARCH 架构不被支持" + exit 1 +fi + +# 重写架构值,改为amd64或arm64 +if [ "$ARCH" == "x86_64" ]; then + ARCH="amd64" +elif [ "$ARCH" == "aarch64" ]; then + ARCH="arm64" +fi + +read -p "请输入程序监听的端口(默认8080): " PORT +if [ -z "$PORT" ]; then + PORT=8080 +fi + +# 创建目录 +mkdir -p /root/data/ghproxy +mkdir -p /root/data/ghproxy/config +mkdir -p /root/data/ghproxy/log + +# 获取最新版本号 +VERSION=$(curl -s https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/VERSION) +wget -O /root/data/ghproxy/VERSION https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/VERSION + +# 下载ghproxy +wget -O /root/data/ghproxy/ghproxy https://github.com/WJQSERVER-STUDIO/ghproxy/releases/download/$VERSION/ghproxy-linux-$ARCH +chmod +x /root/data/ghproxy/ghproxy + +# 下载配置文件 +wget -O /root/data/ghproxy/config/config.toml https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/config.toml +# 替换 port = 8080 +sed -i "s/port = 8080/port = $PORT/g" /root/data/ghproxy/config/config.toml + +# 下载systemd服务文件 +wget -O /etc/systemd/system/ghproxy.service https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/ghproxy.service + +# 启动ghproxy +systemctl daemon-reload +systemctl enable ghproxy +systemctl start ghproxy + +echo "ghproxy 安装成功, 监听端口为 $PORT" diff --git a/deploy/uninstall.sh b/deploy/uninstall.sh new file mode 100644 index 0000000..7d1804e --- /dev/null +++ b/deploy/uninstall.sh @@ -0,0 +1,13 @@ +# /bin/bash + +# 停止 ghproxy 服务 +systemctl stop ghproxy + +# 删除 ghproxy 服务 +systemctl disable ghproxy +rm /etc/systemd/system/ghproxy.service + +# 删除 ghproxy 文件夹 +rm -r /root/data/ghproxy + +echo "ghproxy 已成功卸载" \ No newline at end of file From 6d055e19e3f81e7ba1a73c9b5dbc44ade81529f3 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Mon, 14 Oct 2024 16:16:56 +0800 Subject: [PATCH 037/129] 1.5.1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 667d60c..d52c357 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ docker run -p 7210:80 -v ./ghproxy/log/run:/data/ghproxy/log -v ./ghproxy/log/ca 参看[docker-compose.yml](https://github.com/WJQSERVER-STUDIO/ghproxy/blob/main/docker/compose/docker-compose.yml) -### 二进制文件部署 +### 二进制文件部署(不推荐) 一键部署脚本: From d383c2d2a65bc45109b7cac1357e94211aa72fad Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Wed, 16 Oct 2024 06:25:59 +0800 Subject: [PATCH 038/129] 24w17a --- CHANGELOG.md | 5 +++++ DEV-VERSION | 2 +- main.go | 8 +++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27de1ac..1be8344 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # 更新日志 +24w17a +--- +- PRE-RELEASE: 此版本是v1.5.2的预发布版本,请勿在生产环境中使用 +- FIX: 初步修正flag传入问题,但仍有可能存在其他问题 + v1.5.1 --- - CHANGE: 优化代码结构,提升性能 diff --git a/DEV-VERSION b/DEV-VERSION index 34618f2..458ce3b 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w16a \ No newline at end of file +24w17a \ No newline at end of file diff --git a/main.go b/main.go index 5c3cb63..ff078ae 100644 --- a/main.go +++ b/main.go @@ -19,6 +19,7 @@ var ( cfg *config.Config router *gin.Engine configfile = "/data/ghproxy/config/config.toml" + cfgfile string ) // 日志模块 @@ -30,14 +31,14 @@ var ( ) func ReadFlag() { - cfgfile := flag.String("cfg", configfile, "config file path") - configfile = *cfgfile + flag.StringVar(&cfgfile, "cfg", configfile, "config file path") + fmt.Printf("Config file path: %s\n", cfgfile) } func loadConfig() { var err error // 初始化配置 - cfg, err = config.LoadConfig(configfile) + cfg, err = config.LoadConfig(cfgfile) if err != nil { log.Fatalf("Failed to load config: %v", err) } @@ -66,6 +67,7 @@ func setupApi(cfg *config.Config, router *gin.Engine) { func init() { ReadFlag() + flag.Parse() loadConfig() setupLogger(cfg) Loadlist(cfg) From 518bbf2600191358d9e8d24440908e230f270441 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Wed, 16 Oct 2024 06:27:28 +0800 Subject: [PATCH 039/129] 24w17a --- deploy/install-dev.sh | 78 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 deploy/install-dev.sh diff --git a/deploy/install-dev.sh b/deploy/install-dev.sh new file mode 100644 index 0000000..cc719aa --- /dev/null +++ b/deploy/install-dev.sh @@ -0,0 +1,78 @@ +# /bin/bash + +# install packages +install() { + if [ $# -eq 0 ]; then + echo "ARGS NOT FOUND" + return 1 + fi + + for package in "$@"; do + if ! command -v "$package" &>/dev/null; then + if command -v dnf &>/dev/null; then + dnf -y update && dnf install -y "$package" + elif command -v yum &>/dev/null; then + yum -y update && yum -y install "$package" + elif command -v apt &>/dev/null; then + apt update -y && apt install -y "$package" + elif command -v apk &>/dev/null; then + apk update && apk add "$package" + else + echo "UNKNOWN PACKAGE MANAGER" + return 1 + fi + fi + done + + return 0 +} + +# 安装依赖包 +install curl wget sed + +# 查看当前架构是否为linux/amd64或linux/arm64 +ARCH=$(uname -m) +if [ "$ARCH" != "x86_64" ] && [ "$ARCH" != "aarch64" ]; then + echo " $ARCH 架构不被支持" + exit 1 +fi + +# 重写架构值,改为amd64或arm64 +if [ "$ARCH" == "x86_64" ]; then + ARCH="amd64" +elif [ "$ARCH" == "aarch64" ]; then + ARCH="arm64" +fi + +read -p "请输入程序监听的端口(默认8080): " PORT +if [ -z "$PORT" ]; then + PORT=8080 +fi + +# 创建目录 +mkdir -p /root/data/ghproxy +mkdir -p /root/data/ghproxy/config +mkdir -p /root/data/ghproxy/log + +# 获取最新版本号 +VERSION=$(curl -s https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/DEV-VERSION) +wget -O /root/data/ghproxy/VERSION https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/DEV-VERSION + +# 下载ghproxy +wget -O /root/data/ghproxy/ghproxy https://github.com/WJQSERVER-STUDIO/ghproxy/releases/download/$VERSION/ghproxy-linux-$ARCH +chmod +x /root/data/ghproxy/ghproxy + +# 下载配置文件 +wget -O /root/data/ghproxy/config/config.toml https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/config.toml +# 替换 port = 8080 +sed -i "s/port = 8080/port = $PORT/g" /root/data/ghproxy/config/config.toml + +# 下载systemd服务文件 +wget -O /etc/systemd/system/ghproxy.service https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/ghproxy.service + +# 启动ghproxy +systemctl daemon-reload +systemctl enable ghproxy +systemctl start ghproxy + +echo "ghproxy 安装成功, 监听端口为 $PORT" From ac859c39a6c9f548562d8670e0edfeb4824113f4 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Wed, 16 Oct 2024 06:31:36 +0800 Subject: [PATCH 040/129] 24w17a --- main.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index ff078ae..27b1d1e 100644 --- a/main.go +++ b/main.go @@ -32,7 +32,6 @@ var ( func ReadFlag() { flag.StringVar(&cfgfile, "cfg", configfile, "config file path") - fmt.Printf("Config file path: %s\n", cfgfile) } func loadConfig() { @@ -72,6 +71,8 @@ func init() { setupLogger(cfg) Loadlist(cfg) + fmt.Println("Config File Path: ", cfgfile) + // 设置 Gin 模式 gin.SetMode(gin.ReleaseMode) From 2187514da7cf1794266cef9ebb948855ddc802f6 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Wed, 16 Oct 2024 12:48:02 +0800 Subject: [PATCH 041/129] 24w17b --- CHANGELOG.md | 7 +++++++ deploy/install-dev.sh | 7 ++++++- deploy/install.sh | 7 ++++++- main.go | 11 +++++++---- proxy/proxy.go | 3 ++- 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1be8344..baa3eab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # 更新日志 +24w17b +--- +- PRE-RELEASE: 此版本是v1.5.2的预发布版本,请勿在生产环境中使用 +- FIX: 修正flag传入问题 +- CHANGE: 去除/路径重定向,改为返回403,并记录对应请求日志 +- CHANGE: 优化Proxy模块的日志记录,记录请求详细信息 + 24w17a --- - PRE-RELEASE: 此版本是v1.5.2的预发布版本,请勿在生产环境中使用 diff --git a/deploy/install-dev.sh b/deploy/install-dev.sh index cc719aa..fd87dbd 100644 --- a/deploy/install-dev.sh +++ b/deploy/install-dev.sh @@ -63,7 +63,12 @@ wget -O /root/data/ghproxy/ghproxy https://github.com/WJQSERVER-STUDIO/ghproxy/r chmod +x /root/data/ghproxy/ghproxy # 下载配置文件 -wget -O /root/data/ghproxy/config/config.toml https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/config.toml +if [ -f /root/data/ghproxy/config/config.toml ]; then + echo "配置文件已存在, 跳过下载" +else + wget -O /root/data/ghproxy/config/config.toml https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/config.toml +fi + # 替换 port = 8080 sed -i "s/port = 8080/port = $PORT/g" /root/data/ghproxy/config/config.toml diff --git a/deploy/install.sh b/deploy/install.sh index b260752..9e28eb7 100644 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -63,7 +63,12 @@ wget -O /root/data/ghproxy/ghproxy https://github.com/WJQSERVER-STUDIO/ghproxy/r chmod +x /root/data/ghproxy/ghproxy # 下载配置文件 -wget -O /root/data/ghproxy/config/config.toml https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/config.toml +if [ -f /root/data/ghproxy/config/config.toml ]; then + echo "配置文件已存在, 跳过下载" +else + wget -O /root/data/ghproxy/config/config.toml https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/config.toml +fi + # 替换 port = 8080 sed -i "s/port = 8080/port = $PORT/g" /root/data/ghproxy/config/config.toml diff --git a/main.go b/main.go index 27b1d1e..90144dc 100644 --- a/main.go +++ b/main.go @@ -41,6 +41,7 @@ func loadConfig() { if err != nil { log.Fatalf("Failed to load config: %v", err) } + fmt.Println("Config File Path: ", cfgfile) fmt.Printf("Loaded config: %v\n", cfg) } @@ -51,7 +52,8 @@ func setupLogger(cfg *config.Config) { if err != nil { log.Fatalf("Failed to initialize logger: %v", err) } - logInfo("Logger initialized") + logInfo("Config File Path: ", cfgfile) + logInfo("Loaded config: %v\n", cfg) logInfo("Init Completed") } @@ -71,8 +73,6 @@ func init() { setupLogger(cfg) Loadlist(cfg) - fmt.Println("Config File Path: ", cfgfile) - // 设置 Gin 模式 gin.SetMode(gin.ReleaseMode) @@ -83,7 +83,10 @@ func init() { // 定义路由 router.GET("/", func(c *gin.Context) { - c.Redirect(http.StatusMovedPermanently, "https://ghproxy0rtt.1888866.xyz/") + // 返回403错误 + c.String(http.StatusForbidden, "403 Forbidden This route is not allowed to access.") + // 记录访问者IP UA METHOD + LogWarning("Forbidden: IP:%s UA:%s METHOD:%s", c.ClientIP(), c.Request.UserAgent(), c.Request.Method) }) // 未匹配路由处理 diff --git a/proxy/proxy.go b/proxy/proxy.go index 309ddb0..76e62b6 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -117,7 +117,8 @@ func NoRouteHandler(cfg *config.Config) gin.HandlerFunc { func ProxyRequest(c *gin.Context, u string, cfg *config.Config, mode string) { method := c.Request.Method - logInfo("%s %s", method, u) + // 记录 IP Method URL UA + logInfo("%s %s %s %s", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent")) client := createHTTPClient(mode) From 22273f166c720641354943a89e88c429aaf9c002 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Wed, 16 Oct 2024 12:54:21 +0800 Subject: [PATCH 042/129] 24w17b --- DEV-VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEV-VERSION b/DEV-VERSION index 458ce3b..a9d0bd3 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w17a \ No newline at end of file +24w17b \ No newline at end of file From e94a98668e4a944942252b468f4e065ac7fc443a Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Wed, 16 Oct 2024 13:08:58 +0800 Subject: [PATCH 043/129] 24w17b --- deploy/install-dev.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/install-dev.sh b/deploy/install-dev.sh index fd87dbd..6e4b675 100644 --- a/deploy/install-dev.sh +++ b/deploy/install-dev.sh @@ -66,7 +66,7 @@ chmod +x /root/data/ghproxy/ghproxy if [ -f /root/data/ghproxy/config/config.toml ]; then echo "配置文件已存在, 跳过下载" else - wget -O /root/data/ghproxy/config/config.toml https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/config.toml + wget -O /root/data/ghproxy/config/config.toml https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/config.toml fi # 替换 port = 8080 From a1fdd0f477fcb521d1d9cf051c864bec43ba8622 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Wed, 16 Oct 2024 15:19:10 +0800 Subject: [PATCH 044/129] 1.5.2 --- CHANGELOG.md | 6 ++++++ VERSION | 2 +- deploy/install.sh | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index baa3eab..35660ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # 更新日志 +v1.5.2 +--- +- FIX: 修正flag传入问题 +- CHANGE: 去除/路径重定向,改为返回403,并记录对应请求日志 +- CHANGE: 优化Proxy模块的日志记录,记录请求详细信息 + 24w17b --- - PRE-RELEASE: 此版本是v1.5.2的预发布版本,请勿在生产环境中使用 diff --git a/VERSION b/VERSION index 8e03717..a73b432 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.1 \ No newline at end of file +1.5.2 \ No newline at end of file diff --git a/deploy/install.sh b/deploy/install.sh index 9e28eb7..18ab6a6 100644 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -66,7 +66,7 @@ chmod +x /root/data/ghproxy/ghproxy if [ -f /root/data/ghproxy/config/config.toml ]; then echo "配置文件已存在, 跳过下载" else - wget -O /root/data/ghproxy/config/config.toml https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/config.toml + wget -O /root/data/ghproxy/config/config.toml https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/config.toml fi # 替换 port = 8080 From a386304d42bf2a9b3e10c8d51e112504b54793ce Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Wed, 16 Oct 2024 17:45:51 +0800 Subject: [PATCH 045/129] update --- SECURITY.MD | 1 + 1 file changed, 1 insertion(+) diff --git a/SECURITY.MD b/SECURITY.MD index 9bc5d86..aef0700 100644 --- a/SECURITY.MD +++ b/SECURITY.MD @@ -16,6 +16,7 @@ 使用本项目,请遵循 **[WSL (WJQSERVER-STUDIO LICENSE)](https://wjqserver-studio.github.io/LICENSE/LICENSE.html)** 协议。 +本项目所有文件均受到 WSL (WJQSERVER-STUDIO LICENSE) 协议保护,任何人不得在任何情况下以非 WSL (WJQSERVER-STUDIO LICENSE) 协议内规定的方式使用,复制,修改,编译,发布,分发,再许可,或者出售本项目的任何部分。 ## 报告漏洞 如果您发现本项目存在安全漏洞,请通过发送ISSUES或尝试联系项目维护者来报告。请在您的报告中包含以下信息: From 1c18ccc363ea76a5f4e682eaa6cdf04516ba9392 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Wed, 16 Oct 2024 21:51:24 +0800 Subject: [PATCH 046/129] 24w18a --- README.md | 2 ++ pages/index.html | 43 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d52c357..38ed747 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ [DEMO](https://ghproxy.1888866.xyz) +[TG讨论群](https://t.me/ghproxy_go) + ## 项目说明 ### 项目特点 diff --git a/pages/index.html b/pages/index.html index ac42dd9..7eae23f 100644 --- a/pages/index.html +++ b/pages/index.html @@ -131,6 +131,28 @@ text-align: center; line-height: 0.5; } + + #toast { + position: fixed; + top: 10%; + /* 垂直居中 */ + left: 50%; + /* 水平居中 */ + transform: translate(-50%, -50%); + /* 调整使其中心对齐 */ + background-color: rgba(97, 97, 97, 0.7); + /* 半透明黑色背景 */ + color: white; + /* 字体颜色 */ + padding: 15px 20px; + /* 内边距 */ + border-radius: 10px; + /* 圆角 */ + font-size: 16px; + /* 字体大小 */ + z-index: 1000; + /* 确保显示在其他元素上面 */ + } @@ -143,7 +165,7 @@
- +

         
@@ -155,6 +177,10 @@
+ + diff --git a/proxy/proxy.go b/proxy/proxy.go index be1223f..352d7c7 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -60,14 +60,14 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter) gin.HandlerFu username, repo := MatchUserRepo(rawPath, cfg, c, matches) logInfo("%s %s %s %s %s Matched-Username: %s, Matched-Repo: %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, username, repo) - fullrepo := fmt.Sprintf("%s/%s", username, repo) + repouser := fmt.Sprintf("%s/%s", username, repo) // 白名单检查 if cfg.Whitelist.Enabled { - whitelist := auth.CheckWhitelist(fullrepo) + whitelist := auth.CheckWhitelist(repouser) if !whitelist { - logErrMsg := fmt.Sprintf("%s %s %s %s %s Whitelist Blocked repo: %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, fullrepo) - errMsg := fmt.Sprintf("Whitelist Blocked repo: %s", fullrepo) + logErrMsg := fmt.Sprintf("%s %s %s %s %s Whitelist Blocked repo: %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, repouser) + errMsg := fmt.Sprintf("Whitelist Blocked repo: %s", repouser) c.JSON(http.StatusForbidden, gin.H{"error": errMsg}) logWarning(logErrMsg) return @@ -76,10 +76,10 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter) gin.HandlerFu // 黑名单检查 if cfg.Blacklist.Enabled { - blacklist := auth.CheckBlacklist(fullrepo) + blacklist := auth.CheckBlacklist(repouser, username, repo) if blacklist { - logErrMsg := fmt.Sprintf("%s %s %s %s %s Whitelist Blocked repo: %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, fullrepo) - errMsg := fmt.Sprintf("Blacklist Blocked repo: %s", fullrepo) + logErrMsg := fmt.Sprintf("%s %s %s %s %s Whitelist Blocked repo: %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, repouser) + errMsg := fmt.Sprintf("Blacklist Blocked repo: %s", repouser) c.JSON(http.StatusForbidden, gin.H{"error": errMsg}) logWarning(logErrMsg) return From b1e3a9c1bdecca9e857fe4bfcf9e11a743bc1d64 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Mon, 4 Nov 2024 05:59:39 +0800 Subject: [PATCH 088/129] 24w21d --- pages/index.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pages/index.html b/pages/index.html index 15d9590..60b5053 100644 --- a/pages/index.html +++ b/pages/index.html @@ -55,6 +55,11 @@ right: 0%; } + .version p { + margin: 0px; + padding: 0px; + } + *::-webkit-scrollbar { height: 10px; margin-top: 0px; From f1ff3e9d27f763b3529fdbea297799314771afc0 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Mon, 4 Nov 2024 18:38:12 +0800 Subject: [PATCH 089/129] 1.7.0 --- .github/ISSUE_TEMPLATE/features_request.md | 20 +++++++++ .github/workflows/build-nocache.yml | 51 ---------------------- .github/workflows/build.yml | 20 +++++---- CHANGELOG.md | 12 ++++- auth/blacklist.go | 13 ------ auth/whitelist.go | 19 +++++--- config/config.toml | 4 +- deploy/config.toml | 5 +++ deploy/install.sh | 4 +- docker/dockerfile/nocache/Dockerfile | 6 ++- docker/dockerfile/release/Dockerfile | 6 ++- proxy/proxy.go | 3 +- 12 files changed, 75 insertions(+), 88 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/features_request.md delete mode 100644 .github/workflows/build-nocache.yml diff --git a/.github/ISSUE_TEMPLATE/features_request.md b/.github/ISSUE_TEMPLATE/features_request.md new file mode 100644 index 0000000..603c02f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/features_request.md @@ -0,0 +1,20 @@ +--- +name: Features request +about: 提出新功能建议 +title: "[Features]" +labels: enhancement +assignees: '' + +--- + +### 功能描述 + +请简要描述您希望增加的功能。 + +### 功能原因 + +请说明您为什么需要这个功能。 + +### 功能实现 + +请详细描述您期望的功能实现。 \ No newline at end of file diff --git a/.github/workflows/build-nocache.yml b/.github/workflows/build-nocache.yml deleted file mode 100644 index 8f84886..0000000 --- a/.github/workflows/build-nocache.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Build NoCache Docker Image - -on: - workflow_dispatch: - push: - branches: - - 'main' - paths: - - 'VERSION' - -jobs: - docker: - runs-on: ubuntu-latest - env: - IMAGE_NAME: wjqserver/ghproxy # 定义镜像名称变量 - DOCKERFILE: docker/dockerfile/nocache/Dockerfile # 定义 Dockerfile 路径变量 - - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Load VERSION - run: | - if [ -f VERSION ]; then - echo "VERSION=$(cat VERSION)" >> $GITHUB_ENV - else - echo "VERSION file not found!" && exit 1 - fi - - name: Wait for Compile - run: sleep 300s - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: 构建镜像 - uses: docker/build-push-action@v6 - with: - file: ./${{ env.DOCKERFILE }} - platforms: linux/amd64,linux/arm64 - push: true - tags: | - ${{ env.IMAGE_NAME }}:${{ env.VERSION }}-nocache - ${{ env.IMAGE_NAME }}:nocache diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2b23b64..52c96f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,31 +21,35 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Load VERSION + - name: 加载版本号 run: | if [ -f VERSION ]; then echo "VERSION=$(cat VERSION)" >> $GITHUB_ENV else echo "VERSION file not found!" && exit 1 fi - - name: Set up Go + - name: 安装 Go uses: actions/setup-go@v3 with: go-version: ${{ env.GO_VERSION }} - - name: Install UPX + - name: 安装 UPX run: | sudo apt-get update sudo apt-get install -y upx - - name: Build + - name: 编译 env: GOOS: ${{ matrix.goos }} GOARCH: ${{ matrix.goarch }} run: | - CGO_ENABLED=0 go build -ldflags="-s -w" -o ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./main.go + CGO_ENABLED=0 go build -ldflags "-s -w -X main.version=${{ env.VERSION }}" -o ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./main.go upx -9 ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} - - name: Package + - name: 打包 run: | - tar -czvf ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}}.tar.gz ./${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} + mkdir ghproxyd + cp ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./ghproxyd/ + mv ./ghproxyd/${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./ghproxyd/${{ env.OUTPUT_BINARY }} + cp LICENSE ./ghproxyd/ + tar -czf ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}}.tar.gz -C ghproxyd . - name: Upload to GitHub Artifacts uses: actions/upload-artifact@v3 with: @@ -57,7 +61,7 @@ jobs: uses: ncipollo/release-action@v1 with: name: ${{ env.VERSION }} - artifacts: ./${{ env.OUTPUT_BINARY }}* + artifacts: ./${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}}.tar.gz token: ${{ secrets.GITHUB_TOKEN }} tag: ${{ env.VERSION }} allowUpdates: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cae8bb..292085f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # 更新日志 +v1.7.0 +--- +- ADD: 加入`rate`模块,实现内置速率限制 +- CHANGE: 优化`blacklist`与`whitelist`模块的匹配算法,提升性能;由原先的完整匹配改为切片匹配,提升匹配效率 +- ADD: 加入`version`相关表示与API接口 +- ADD: 加入`rate`相关API接口 +- CHANGE: 优化前端界面,优化部分样式 +- CHANGE: 更新相关依赖库 +- CHANGE: 对编译打包进行改进,此后不再提供独立可执行文件,请改为拉取`tar.gz`压缩包 + 24w21d --- - PRE-RELEASE: 此版本是v1.7.0的预发布版本,请勿在生产环境中使用 @@ -8,7 +18,7 @@ - ADD: 前端新增 `重定向` 按钮,用于重定向到代理后的链接 - CHANGE: 优化输出代码块,使样式更加美观 - CHANGE: 更新相关依赖库 -- CHANGE: 对黑名单模块进行实验性功能优化,提升性能 +- CHANGE: 对黑名单模块进行实验性功能优化,提升性能(改进匹配算法,在切片后优先匹配user,减少无效匹配) 24w21c --- diff --git a/auth/blacklist.go b/auth/blacklist.go index f293ffc..3aac712 100644 --- a/auth/blacklist.go +++ b/auth/blacklist.go @@ -32,7 +32,6 @@ func LoadBlacklist(cfg *config.Config) { } } -// fullrepo: "owner/repo" or "owner/*" func CheckBlacklist(repouser string, user string, repo string) bool { return forRangeCheckBlacklist(blacklist.Blacklist, repouser, user) } @@ -46,28 +45,16 @@ func sliceRepoName_Blacklist(fullrepo string) (string, string) { } func forRangeCheckBlacklist(blist []string, fullrepo string, user string) bool { - // 先匹配user,再匹配user/*,最后匹配完整repo for _, blocked := range blist { - // 切片 users, _ := sliceRepoName_Blacklist(blocked) - logw("users:%s, blocked:%s", users, blocked) - // 匹配 user if user == users { - // 匹配 user/* if strings.HasSuffix(blocked, "/*") { return true } - // 匹配完整repo if fullrepo == blocked { return true } } } - - /* for _, blocked := range blist { - if blocked == fullrepo || (strings.HasSuffix(blocked, "/*") && strings.HasPrefix(repoUser, blocked[:len(blocked)-2])) { - return true - } - } */ return false } diff --git a/auth/whitelist.go b/auth/whitelist.go index 340be52..000b016 100644 --- a/auth/whitelist.go +++ b/auth/whitelist.go @@ -31,8 +31,8 @@ func LoadWhitelist(cfg *config.Config) { } } -func CheckWhitelist(fullrepo string) bool { - return forRangeCheckWhitelist(whitelist.Whitelist, fullrepo) +func CheckWhitelist(fullrepo string, user string, repo string) bool { + return forRangeCheckWhitelist(whitelist.Whitelist, fullrepo, user) } func sliceRepoName_Whitelist(fullrepo string) (string, string) { @@ -43,11 +43,16 @@ func sliceRepoName_Whitelist(fullrepo string) (string, string) { return s[0], s[1] } -func forRangeCheckWhitelist(wlist []string, fullrepo string) bool { - repoUser, _ := sliceRepoName_Whitelist(fullrepo) - for _, blocked := range wlist { - if blocked == fullrepo || (strings.HasSuffix(blocked, "/*") && strings.HasPrefix(repoUser, blocked[:len(blocked)-2])) { - return true +func forRangeCheckWhitelist(wlist []string, fullrepo string, user string) bool { + for _, passd := range wlist { + users, _ := sliceRepoName_Whitelist(passd) + if users == user { + if strings.HasSuffix(passd, "/*") { + return true + } + if fullrepo == passd { + return true + } } } return false diff --git a/config/config.toml b/config/config.toml index 8481dc1..2592dae 100644 --- a/config/config.toml +++ b/config/config.toml @@ -28,5 +28,5 @@ whitelistFile = "/data/ghproxy/config/whitelist.json" [rateLimit] enabled = false -ratePerMinute = 100 -burst = 10 +ratePerMinute = 180 +burst = 5 diff --git a/deploy/config.toml b/deploy/config.toml index ad7ff2e..4ad6468 100644 --- a/deploy/config.toml +++ b/deploy/config.toml @@ -25,3 +25,8 @@ enabled = false [whitelist] enabled = false whitelistFile = "/usr/local/ghproxy/config/whitelist.json" + +[rateLimit] +enabled = false +ratePerMinute = 180 +burst = 5 diff --git a/deploy/install.sh b/deploy/install.sh index 4ff84ae..c6ef3d1 100644 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -96,7 +96,9 @@ VERSION=$(curl -s https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/mai wget -q -O ${ghproxy_dir}/VERSION https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/VERSION # 下载ghproxy -wget -q -O ${ghproxy_dir}/ghproxy https://github.com/WJQSERVER-STUDIO/ghproxy/releases/download/$VERSION/ghproxy-linux-$ARCH +wget -q -O ${ghproxy_dir}/ghproxy https://github.com/WJQSERVER-STUDIO/ghproxy/releases/download/$VERSION/ghproxy-linux-$ARCH.tar.gz +install tar +tar -zxvf ${ghproxy_dir}/ghproxy-linux-$ARCH.tar.gz -C ${ghproxy_dir} chmod +x ${ghproxy_dir}/ghproxy # 下载pages diff --git a/docker/dockerfile/nocache/Dockerfile b/docker/dockerfile/nocache/Dockerfile index 31680a6..578d5d6 100644 --- a/docker/dockerfile/nocache/Dockerfile +++ b/docker/dockerfile/nocache/Dockerfile @@ -13,7 +13,7 @@ RUN mkdir -p /data/${APPLICATION}/config RUN mkdir -p /data/${APPLICATION}/log # 安装依赖 -RUN apk add --no-cache curl wget +RUN apk add --no-cache curl wget tar # 前端 RUN wget -O /data/www/index.html https://raw.githubusercontent.com/${USER}/${REPO}/main/pages/index.html @@ -21,7 +21,9 @@ RUN wget -O /data/www/favicon.ico https://raw.githubusercontent.com/${USER}/${RE # 后端 RUN VERSION=$(curl -s https://raw.githubusercontent.com/${USER}/${REPO}/main/VERSION) && \ - wget -O /data/${APPLICATION}/${APPLICATION} https://github.com/${USER}/${REPO}/releases/download/$VERSION/${APPLICATION}-${TARGETOS}-${TARGETARCH} + wget -O /data/${APPLICATION}/${APPLICATION}-${TARGETOS}-${TARGETARCH}.tar.gz https://github.com/${USER}/${REPO}/releases/download/$VERSION/${APPLICATION}-${TARGETOS}-${TARGETARCH}.tar.gz && \ + tar -zxvf /data/${APPLICATION}/${APPLICATION}-${TARGETOS}-${TARGETARCH}.tar.gz -C /data/${APPLICATION} && \ + rm -rf /data/${APPLICATION}/${APPLICATION}-${TARGETOS}-${TARGETARCH}.tar.gz RUN wget -O /usr/local/bin/init.sh https://raw.githubusercontent.com/${USER}/${REPO}/main/docker/dockerfile/nocache/init.sh # 拉取配置 diff --git a/docker/dockerfile/release/Dockerfile b/docker/dockerfile/release/Dockerfile index 9f50ae2..e668161 100644 --- a/docker/dockerfile/release/Dockerfile +++ b/docker/dockerfile/release/Dockerfile @@ -13,7 +13,7 @@ RUN mkdir -p /data/${APPLICATION}/config RUN mkdir -p /data/${APPLICATION}/log # 安装依赖 -RUN apk add --no-cache curl wget +RUN apk add --no-cache curl wget tar # 前端 RUN wget -O /data/www/index.html https://raw.githubusercontent.com/${USER}/${REPO}/main/pages/index.html @@ -21,7 +21,9 @@ RUN wget -O /data/www/favicon.ico https://raw.githubusercontent.com/${USER}/${RE # 后端 RUN VERSION=$(curl -s https://raw.githubusercontent.com/${USER}/${REPO}/main/VERSION) && \ - wget -O /data/${APPLICATION}/${APPLICATION} https://github.com/${USER}/${REPO}/releases/download/$VERSION/${APPLICATION}-${TARGETOS}-${TARGETARCH} + wget -O /data/${APPLICATION}/${APPLICATION}-${TARGETOS}-${TARGETARCH}.tar.gz https://github.com/${USER}/${REPO}/releases/download/$VERSION/${APPLICATION}-${TARGETOS}-${TARGETARCH}.tar.gz && \ + tar -zxvf /data/${APPLICATION}/${APPLICATION}-${TARGETOS}-${TARGETARCH}.tar.gz -C /data/${APPLICATION} && \ + rm -rf /data/${APPLICATION}/${APPLICATION}-${TARGETOS}-${TARGETARCH}.tar.gz RUN wget -O /usr/local/bin/init.sh https://raw.githubusercontent.com/${USER}/${REPO}/main/docker/dockerfile/release/init.sh # 拉取配置 diff --git a/proxy/proxy.go b/proxy/proxy.go index 352d7c7..74b8008 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -37,6 +37,7 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter) gin.HandlerFu return func(c *gin.Context) { // 限制访问频率 if cfg.RateLimit.Enabled { + logInfo("Rate_Limit Enabled") if !limiter.Allow() { c.JSON(http.StatusTooManyRequests, gin.H{"error": "Too Many Requests"}) logWarning("%s %s %s %s %s 429-TooManyRequests", c.ClientIP(), c.Request.Method, c.Request.URL.RequestURI(), c.Request.Header.Get("User-Agent"), c.Request.Proto) @@ -64,7 +65,7 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter) gin.HandlerFu // 白名单检查 if cfg.Whitelist.Enabled { - whitelist := auth.CheckWhitelist(repouser) + whitelist := auth.CheckWhitelist(repouser, username, repo) if !whitelist { logErrMsg := fmt.Sprintf("%s %s %s %s %s Whitelist Blocked repo: %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, repouser) errMsg := fmt.Sprintf("Whitelist Blocked repo: %s", repouser) From 11ba7cb0e594dd861e76dec79032f51644edf8fe Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Mon, 4 Nov 2024 18:38:47 +0800 Subject: [PATCH 090/129] 1.7.0 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 308b6fa..9dbb0c0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6.2 \ No newline at end of file +1.7.0 \ No newline at end of file From 723ab6c3e97c813be744b4f8a51ee4216c46717a Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Mon, 4 Nov 2024 19:05:36 +0800 Subject: [PATCH 091/129] 1.7.0 --- .github/workflows/build.yml | 2 -- README.md | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 52c96f9..a9dd357 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -125,8 +125,6 @@ jobs: else echo "VERSION file not found!" && exit 1 fi - - name: Wait for Compile - run: sleep 300s - name: Set up QEMU uses: docker/setup-qemu-action@v3 diff --git a/README.md b/README.md index ee6960b..13f3c8e 100644 --- a/README.md +++ b/README.md @@ -105,6 +105,10 @@ enabled = false # 是否开启黑名单 enabled = false # 是否开启白名单 whitelistFile = "/data/ghproxy/config/whitelist.json" # 白名单文件路径 +[rateLimit] +enabled = false # 是否开启速率限制 +ratePerMinute = 180 # 每分钟限制请求数量 +burst = 5 # 突发请求数量 ``` ### 黑名单配置 From d9cc088dce16342863cbdf22c981512892b08c13 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Tue, 5 Nov 2024 09:58:10 +0800 Subject: [PATCH 092/129] 24w22a --- CHANGELOG.md | 5 +++++ DEV-VERSION | 2 +- docker/dockerfile/dev/Dockerfile | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 292085f..c46a842 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # 更新日志 +24w22a +--- +- PRE-RELEASE: 此版本是v1.7.1的预发布版本,请勿在生产环境中使用 +- CHANGE: 更新底包 + v1.7.0 --- - ADD: 加入`rate`模块,实现内置速率限制 diff --git a/DEV-VERSION b/DEV-VERSION index 9aa2b7c..90bbb5b 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w21d \ No newline at end of file +24w22a \ No newline at end of file diff --git a/docker/dockerfile/dev/Dockerfile b/docker/dockerfile/dev/Dockerfile index 49054f7..b32a303 100644 --- a/docker/dockerfile/dev/Dockerfile +++ b/docker/dockerfile/dev/Dockerfile @@ -1,4 +1,4 @@ -FROM wjqserver/caddy:2.9.0-rc-alpine AS builder +FROM wjqserver/caddy:2.9.0-rc2-alpine AS builder ARG USER=WJQSERVER-STUDIO ARG REPO=ghproxy @@ -36,7 +36,7 @@ RUN wget -O /data/${APPLICATION}/whitelist.json https://raw.githubusercontent.co RUN chmod +x /data/${APPLICATION}/${APPLICATION} RUN chmod +x /usr/local/bin/init.sh -FROM wjqserver/caddy:2.9.0-rc-alpine +FROM wjqserver/caddy:2.9.0-rc2-alpine COPY --from=builder /data/www /data/www COPY --from=builder /data/caddy /data/caddy From b6c4dbbf9cd6a5a44c1cba15c333318cc52ab65a Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Tue, 5 Nov 2024 11:28:11 +0800 Subject: [PATCH 093/129] 24w22a --- docker/dockerfile/dev/Dockerfile | 2 ++ init.sh | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docker/dockerfile/dev/Dockerfile b/docker/dockerfile/dev/Dockerfile index b32a303..15de071 100644 --- a/docker/dockerfile/dev/Dockerfile +++ b/docker/dockerfile/dev/Dockerfile @@ -38,6 +38,8 @@ RUN chmod +x /usr/local/bin/init.sh FROM wjqserver/caddy:2.9.0-rc2-alpine +RUN apk add --no-cache curl + COPY --from=builder /data/www /data/www COPY --from=builder /data/caddy /data/caddy COPY --from=builder /data/${APPLICATION} /data/${APPLICATION} diff --git a/init.sh b/init.sh index 9af2dd6..2a62223 100644 --- a/init.sh +++ b/init.sh @@ -22,7 +22,11 @@ fi /data/${APPLICATON}/${APPLICATON} > /data/${APPLICATON}/log/run.log 2>&1 & +sleep 30 + while [[ true ]]; do - sleep 1 + # 健康检查 + curl -f http://localhost:8080/api/healthcheck || exit 1 + sleep 120 done From 45b99393e6dccd01be11612803414ccda260bf42 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Tue, 5 Nov 2024 11:32:16 +0800 Subject: [PATCH 094/129] 24w22a --- docker/dockerfile/dev/init.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docker/dockerfile/dev/init.sh b/docker/dockerfile/dev/init.sh index 34d3477..c65df4a 100644 --- a/docker/dockerfile/dev/init.sh +++ b/docker/dockerfile/dev/init.sh @@ -22,6 +22,10 @@ fi /data/${APPLICATION}/${APPLICATION} -cfg /data/${APPLICATION}/config/config.toml > /data/${APPLICATION}/log/run.log 2>&1 & -while true; do - sleep 1 -done \ No newline at end of file +sleep 30 + +while [[ true ]]; do + # 健康检查 + curl -f http://localhost:8080/api/healthcheck || exit 1 + sleep 120 +done \ No newline at end of file From 67a006df0fbd630b092f46f076864336e5a5e131 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Thu, 7 Nov 2024 13:31:53 +0800 Subject: [PATCH 095/129] Bump Go From 1.23.2 to 1.23.3 --- .github/workflows/build-dev.yml | 2 +- .github/workflows/build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 0f48cdb..4558231 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -17,7 +17,7 @@ jobs: goarch: [amd64, arm64] env: OUTPUT_BINARY: ghproxy - GO_VERSION: 1.23.2 + GO_VERSION: 1.23.3 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a9dd357..cc4e143 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: goarch: [amd64, arm64] env: OUTPUT_BINARY: ghproxy - GO_VERSION: 1.23.2 + GO_VERSION: 1.23.3 steps: - uses: actions/checkout@v3 From 2113205123d3139ede357a0e2fbc0ccb611e11a3 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Thu, 7 Nov 2024 13:32:41 +0800 Subject: [PATCH 096/129] Update deps --- go.mod | 4 ++-- go.sum | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index bc42874..094b7fc 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module ghproxy -go 1.23.2 +go 1.23.3 require ( github.com/BurntSushi/toml v1.4.0 @@ -11,7 +11,7 @@ require ( require ( github.com/andybalholm/brotli v1.1.1 // indirect - github.com/bytedance/sonic v1.12.3 // indirect + github.com/bytedance/sonic v1.12.4 // indirect github.com/bytedance/sonic/loader v0.2.1 // indirect github.com/cloudflare/circl v1.5.0 // indirect github.com/cloudwego/base64x v0.1.4 // indirect diff --git a/go.sum b/go.sum index 9fab411..33032ca 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,8 @@ github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7X github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA= github.com/bytedance/sonic v1.12.3 h1:W2MGa7RCU1QTeYRTPE3+88mVC0yXmsRQRChiyVocVjU= github.com/bytedance/sonic v1.12.3/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= +github.com/bytedance/sonic v1.12.4 h1:9Csb3c9ZJhfUWeMtpCDCq6BUoH5ogfDFLUgQ/jG+R0k= +github.com/bytedance/sonic v1.12.4/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= github.com/bytedance/sonic/loader v0.2.0 h1:zNprn+lsIP06C/IqCHs3gPQIvnvpKbbxyXQP1iU4kWM= github.com/bytedance/sonic/loader v0.2.0/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= From 06191e52e55a70602e994cc5948ad5bfd656e3c4 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Thu, 7 Nov 2024 13:37:40 +0800 Subject: [PATCH 097/129] Add HEAD request to fetch Content-Length --- proxy/proxy.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/proxy/proxy.go b/proxy/proxy.go index 74b8008..0eb3b50 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -150,6 +150,22 @@ func ProxyRequest(c *gin.Context, u string, cfg *config.Config, mode string) { client := createHTTPClient(mode) + // 发送HEAD请求, 预获取Content-Length + headReq := client.R() + setRequestHeaders(c, headReq) + + headResp, err := headReq.Head(u) + if err != nil { + HandleError(c, fmt.Sprintf("Failed to send request: %v", err)) + return + } + defer headResp.Body.Close() + + if err := HandleResponseSize(headResp, cfg, c); err != nil { + logWarning("%s %s %s %s %s Response-Size-Error: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err) + return + } + body, err := readRequestBody(c) if err != nil { HandleError(c, err.Error()) From 8787c11e06fcf5096a18b4c17716bd15f7b14732 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Thu, 7 Nov 2024 13:52:49 +0800 Subject: [PATCH 098/129] 24w22b --- CHANGELOG.md | 10 +++++++++ DEV-VERSION | 2 +- docker/compose/docker-compose.yml | 6 +++++ docker/dockerfile/dev/Dockerfile | 4 ++-- docker/dockerfile/nocache/Dockerfile | 11 ++++----- docker/dockerfile/nocache/config.toml | 32 +++++++++++++++++++++++++++ docker/dockerfile/nocache/init.sh | 6 ----- docker/dockerfile/release/Dockerfile | 4 ++-- 8 files changed, 59 insertions(+), 16 deletions(-) create mode 100644 docker/dockerfile/nocache/config.toml diff --git a/CHANGELOG.md b/CHANGELOG.md index c46a842..aaf276b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,19 @@ # 更新日志 +24w22b +--- +- PRE-RELEASE: 此版本是v1.7.1的预发布版本,请勿在生产环境中使用 +- CHANGE: 更新Go版本至1.23.3 +- CHANGE: 更新相关依赖库 +- ADD: 对`Proxy`模块进行优化,增加使用`HEAD`方式预获取`Content-Length`头 +- CHANGE: 将`release`与`dev`版本的底包切换至`wjqserver/caddy:2.9.0-rc4-alpine`,将`nocache`版本的底包切换至`alpine:latest` +- CHANGE: 对`nocache`版本的`config.toml`与`init.sh`进行适配性修改 + 24w22a --- - PRE-RELEASE: 此版本是v1.7.1的预发布版本,请勿在生产环境中使用 - CHANGE: 更新底包 +- CHANGE: 加入测试性的故障熔断机制(Failure Circuit Breaker) v1.7.0 --- diff --git a/DEV-VERSION b/DEV-VERSION index 90bbb5b..c2b048e 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w22a \ No newline at end of file +24w22b \ No newline at end of file diff --git a/docker/compose/docker-compose.yml b/docker/compose/docker-compose.yml index 2c3c2f9..e87395e 100644 --- a/docker/compose/docker-compose.yml +++ b/docker/compose/docker-compose.yml @@ -3,6 +3,12 @@ services: ghproxy: image: 'wjqserver/ghproxy:latest' restart: always + healthcheck: + test: ["CMD", "curl", "-f", "http://127.0.0.1:80/api/healthcheck"] + interval: 60s + timeout: 10s + retries: 3 + start_period: 30s volumes: - './ghproxy/log/run:/data/ghproxy/log' - './ghproxy/log/caddy:/data/caddy/log' diff --git a/docker/dockerfile/dev/Dockerfile b/docker/dockerfile/dev/Dockerfile index 15de071..f7d0ca4 100644 --- a/docker/dockerfile/dev/Dockerfile +++ b/docker/dockerfile/dev/Dockerfile @@ -1,4 +1,4 @@ -FROM wjqserver/caddy:2.9.0-rc2-alpine AS builder +FROM wjqserver/caddy:2.9.0-rc4-alpine AS builder ARG USER=WJQSERVER-STUDIO ARG REPO=ghproxy @@ -36,7 +36,7 @@ RUN wget -O /data/${APPLICATION}/whitelist.json https://raw.githubusercontent.co RUN chmod +x /data/${APPLICATION}/${APPLICATION} RUN chmod +x /usr/local/bin/init.sh -FROM wjqserver/caddy:2.9.0-rc2-alpine +FROM wjqserver/caddy:2.9.0-rc4-alpine RUN apk add --no-cache curl diff --git a/docker/dockerfile/nocache/Dockerfile b/docker/dockerfile/nocache/Dockerfile index 578d5d6..2d7327b 100644 --- a/docker/dockerfile/nocache/Dockerfile +++ b/docker/dockerfile/nocache/Dockerfile @@ -1,4 +1,4 @@ -FROM wjqserver/caddy:2.9.0-rc-alpine AS builder +FROM alpine:latest AS builder ARG USER=WJQSERVER-STUDIO ARG REPO=ghproxy @@ -27,8 +27,8 @@ RUN VERSION=$(curl -s https://raw.githubusercontent.com/${USER}/${REPO}/main/VER RUN wget -O /usr/local/bin/init.sh https://raw.githubusercontent.com/${USER}/${REPO}/main/docker/dockerfile/nocache/init.sh # 拉取配置 -RUN wget -O /data/caddy/Caddyfile https://raw.githubusercontent.com/${USER}/${REPO}/main/caddyfile/nocache/Caddyfile -RUN wget -O /data/${APPLICATION}/config.toml https://raw.githubusercontent.com/${USER}/${REPO}/main/config/config.toml +#RUN wget -O /data/caddy/Caddyfile https://raw.githubusercontent.com/${USER}/${REPO}/main/caddyfile/nocache/Caddyfile +RUN wget -O /data/${APPLICATION}/config.toml https://raw.githubusercontent.com/${USER}/${REPO}/main/docker/dockerfile/nocache/config.toml RUN wget -O /data/${APPLICATION}/blacklist.json https://raw.githubusercontent.com/${USER}/${REPO}/main/config/blacklist.json RUN wget -O /data/${APPLICATION}/whitelist.json https://raw.githubusercontent.com/${USER}/${REPO}/main/config/whitelist.json @@ -36,10 +36,11 @@ RUN wget -O /data/${APPLICATION}/whitelist.json https://raw.githubusercontent.co RUN chmod +x /data/${APPLICATION}/${APPLICATION} RUN chmod +x /usr/local/bin/init.sh -FROM wjqserver/caddy:2.9.0-rc-alpine +FROM alpine:latest + +RUN apk add --no-cache curl COPY --from=builder /data/www /data/www -COPY --from=builder /data/caddy /data/caddy COPY --from=builder /data/${APPLICATION} /data/${APPLICATION} COPY --from=builder /usr/local/bin/init.sh /usr/local/bin/init.sh diff --git a/docker/dockerfile/nocache/config.toml b/docker/dockerfile/nocache/config.toml new file mode 100644 index 0000000..f28b683 --- /dev/null +++ b/docker/dockerfile/nocache/config.toml @@ -0,0 +1,32 @@ +[server] +host = "0.0.0.0" +port = 80 +sizeLimit = 125 # MB + +[pages] +enabled = true +staticDir = "/data/www" + +[log] +logFilePath = "/data/ghproxy/log/ghproxy.log" +maxLogSize = 5 # MB + +[cors] +enabled = true + +[auth] +authToken = "token" +enabled = false + +[blacklist] +blacklistFile = "/data/ghproxy/config/blacklist.json" +enabled = false + +[whitelist] +enabled = false +whitelistFile = "/data/ghproxy/config/whitelist.json" + +[rateLimit] +enabled = false +ratePerMinute = 180 +burst = 5 diff --git a/docker/dockerfile/nocache/init.sh b/docker/dockerfile/nocache/init.sh index 34d3477..7820e43 100644 --- a/docker/dockerfile/nocache/init.sh +++ b/docker/dockerfile/nocache/init.sh @@ -2,10 +2,6 @@ APPLICATION=ghproxy -if [ ! -f /data/caddy/config/Caddyfile ]; then - cp /data/caddy/Caddyfile /data/caddy/config/Caddyfile -fi - if [ ! -f /data/${APPLICATION}/config/blacklist.json ]; then cp /data/${APPLICATION}/blacklist.json /data/${APPLICATION}/config/blacklist.json fi @@ -18,8 +14,6 @@ if [ ! -f /data/${APPLICATION}/config/config.toml ]; then cp /data/${APPLICATION}/config.toml /data/${APPLICATION}/config/config.toml fi -/data/caddy/caddy run --config /data/caddy/config/Caddyfile > /data/${APPLICATION}/log/caddy.log 2>&1 & - /data/${APPLICATION}/${APPLICATION} -cfg /data/${APPLICATION}/config/config.toml > /data/${APPLICATION}/log/run.log 2>&1 & while true; do diff --git a/docker/dockerfile/release/Dockerfile b/docker/dockerfile/release/Dockerfile index e668161..bf168f0 100644 --- a/docker/dockerfile/release/Dockerfile +++ b/docker/dockerfile/release/Dockerfile @@ -1,4 +1,4 @@ -FROM wjqserver/caddy:2.9.0-rc-alpine AS builder +FROM wjqserver/caddy:2.9.0-rc4-alpine AS builder ARG USER=WJQSERVER-STUDIO ARG REPO=ghproxy @@ -36,7 +36,7 @@ RUN wget -O /data/${APPLICATION}/whitelist.json https://raw.githubusercontent.co RUN chmod +x /data/${APPLICATION}/${APPLICATION} RUN chmod +x /usr/local/bin/init.sh -FROM wjqserver/caddy:2.9.0-rc-alpine +FROM wjqserver/caddy:2.9.0-rc4-alpine COPY --from=builder /data/www /data/www COPY --from=builder /data/caddy /data/caddy From 0ab01a9b83fce2871592c97f9b05aa8ff154ceca Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 8 Nov 2024 12:14:04 +0800 Subject: [PATCH 099/129] 1.7.1 --- CHANGELOG.md | 9 +++++++++ VERSION | 2 +- docker/dockerfile/dev/init.sh | 4 ++-- docker/dockerfile/release/Dockerfile | 2 ++ docker/dockerfile/release/init.sh | 8 ++++++-- main.go | 2 +- 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aaf276b..9be95ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # 更新日志 +v1.7.1 +--- +- CHANGE: 更新Go版本至1.23.3 +- CHANGE: 更新相关依赖库 +- ADD: 对`Proxy`模块进行优化,增加使用`HEAD`方式预获取`Content-Length`头 +- CHANGE: 将`release`与`dev`版本的底包切换至`wjqserver/caddy:2.9.0-rc4-alpine`,将`nocache`版本的底包切换至`alpine:latest` +- CHANGE: 对`nocache`版本的`config.toml`与`init.sh`进行适配性修改 +- CHANGE: 加入测试性的故障熔断机制(Failure Circuit Breaker) (nocache版本暂不支持) + 24w22b --- - PRE-RELEASE: 此版本是v1.7.1的预发布版本,请勿在生产环境中使用 diff --git a/VERSION b/VERSION index 9dbb0c0..081af9a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.7.0 \ No newline at end of file +1.7.1 \ No newline at end of file diff --git a/docker/dockerfile/dev/init.sh b/docker/dockerfile/dev/init.sh index c65df4a..262164c 100644 --- a/docker/dockerfile/dev/init.sh +++ b/docker/dockerfile/dev/init.sh @@ -25,7 +25,7 @@ fi sleep 30 while [[ true ]]; do - # 健康检查 - curl -f http://localhost:8080/api/healthcheck || exit 1 + # Failure Circuit Breaker + curl -f -max-time 5 -retry 3 http://localhost:8080/api/healthcheck || exit 1 sleep 120 done \ No newline at end of file diff --git a/docker/dockerfile/release/Dockerfile b/docker/dockerfile/release/Dockerfile index bf168f0..8818b62 100644 --- a/docker/dockerfile/release/Dockerfile +++ b/docker/dockerfile/release/Dockerfile @@ -38,6 +38,8 @@ RUN chmod +x /usr/local/bin/init.sh FROM wjqserver/caddy:2.9.0-rc4-alpine +RUN apk add --no-cache curl + COPY --from=builder /data/www /data/www COPY --from=builder /data/caddy /data/caddy COPY --from=builder /data/${APPLICATION} /data/${APPLICATION} diff --git a/docker/dockerfile/release/init.sh b/docker/dockerfile/release/init.sh index 34d3477..67058de 100644 --- a/docker/dockerfile/release/init.sh +++ b/docker/dockerfile/release/init.sh @@ -22,6 +22,10 @@ fi /data/${APPLICATION}/${APPLICATION} -cfg /data/${APPLICATION}/config/config.toml > /data/${APPLICATION}/log/run.log 2>&1 & -while true; do - sleep 1 +sleep 30 + +while [[ true ]]; do + # Failure Circuit Breaker + curl -f -max-time 5 -retry 3 http://localhost:8080/api/healthcheck || exit 1 + sleep 120 done \ No newline at end of file diff --git a/main.go b/main.go index 3671b72..ef0d301 100644 --- a/main.go +++ b/main.go @@ -113,6 +113,6 @@ func main() { if err != nil { logError("Failed to start server: %v\n", err) } - + defer logger.Close() fmt.Println("Program Exit") } From 391c4b3594f26bccf5ddb4665f7d8746796eb8d6 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sun, 10 Nov 2024 18:14:45 +0800 Subject: [PATCH 100/129] 1.7.2 --- CHANGELOG.md | 4 ++++ VERSION | 2 +- docker/dockerfile/nocache/config.toml | 2 +- docker/dockerfile/nocache/init.sh | 8 ++++++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9be95ab..6e7f502 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # 更新日志 +v1.7.2 +--- +CHANGE: 为`nocache`版本加入测试性的故障熔断机制 + v1.7.1 --- - CHANGE: 更新Go版本至1.23.3 diff --git a/VERSION b/VERSION index 081af9a..0a182f2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.7.1 \ No newline at end of file +1.7.2 \ No newline at end of file diff --git a/docker/dockerfile/nocache/config.toml b/docker/dockerfile/nocache/config.toml index f28b683..66a16ca 100644 --- a/docker/dockerfile/nocache/config.toml +++ b/docker/dockerfile/nocache/config.toml @@ -1,6 +1,6 @@ [server] host = "0.0.0.0" -port = 80 +port = 80 #修改此配置会导致容器异常 sizeLimit = 125 # MB [pages] diff --git a/docker/dockerfile/nocache/init.sh b/docker/dockerfile/nocache/init.sh index 7820e43..5d0c53f 100644 --- a/docker/dockerfile/nocache/init.sh +++ b/docker/dockerfile/nocache/init.sh @@ -16,6 +16,10 @@ fi /data/${APPLICATION}/${APPLICATION} -cfg /data/${APPLICATION}/config/config.toml > /data/${APPLICATION}/log/run.log 2>&1 & -while true; do - sleep 1 +sleep 30 + +while [[ true ]]; do + # Failure Circuit Breaker + curl -f -max-time 5 -retry 3 http://localhost:80/api/healthcheck || exit 1 + sleep 120 done \ No newline at end of file From 3ea6d34fb2f13108e172b4f0ad36a038f97fe204 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 19:32:32 +0800 Subject: [PATCH 101/129] Bump golang.org/x/time from 0.7.0 to 0.8.0 (#20) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [golang.org/x/time](https://github.com/golang/time) from 0.7.0 to 0.8.0. - [提交](https://github.com/golang/time/compare/v0.7.0...v0.8.0) --- updated-dependencies: - dependency-name: golang.org/x/time dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 32 +++----------------------------- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/go.mod b/go.mod index 094b7fc..83131e7 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/BurntSushi/toml v1.4.0 github.com/gin-gonic/gin v1.10.0 github.com/imroc/req/v3 v3.48.0 - golang.org/x/time v0.7.0 + golang.org/x/time v0.8.0 ) require ( diff --git a/go.sum b/go.sum index 33032ca..5e6a715 100644 --- a/go.sum +++ b/go.sum @@ -2,13 +2,9 @@ github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA= github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA= -github.com/bytedance/sonic v1.12.3 h1:W2MGa7RCU1QTeYRTPE3+88mVC0yXmsRQRChiyVocVjU= -github.com/bytedance/sonic v1.12.3/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= github.com/bytedance/sonic v1.12.4 h1:9Csb3c9ZJhfUWeMtpCDCq6BUoH5ogfDFLUgQ/jG+R0k= github.com/bytedance/sonic v1.12.4/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= -github.com/bytedance/sonic/loader v0.2.0 h1:zNprn+lsIP06C/IqCHs3gPQIvnvpKbbxyXQP1iU4kWM= -github.com/bytedance/sonic/loader v0.2.0/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= github.com/bytedance/sonic/loader v0.2.1 h1:1GgorWTqf12TA8mma4DDSbaQigE2wOgQo7iCjjJv3+E= github.com/bytedance/sonic/loader v0.2.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= github.com/cloudflare/circl v1.5.0 h1:hxIWksrX6XN5a1L2TI/h53AGPhNHoUBo+TD1ms9+pys= @@ -20,8 +16,6 @@ github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4= -github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4= github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc= github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= @@ -38,7 +32,6 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA= github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= @@ -46,14 +39,6 @@ github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PU github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20241009165004-a3522334989c h1:NDovD0SMpBYXlE1zJmS1q55vWB/fUQBcPAqAboZSccA= -github.com/google/pprof v0.0.0-20241009165004-a3522334989c/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= -github.com/google/pprof v0.0.0-20241017200806-017d972448fc h1:NGyrhhFhwvRAZg02jnYVg3GBQy0qGBKmFQJwaPmpmxs= -github.com/google/pprof v0.0.0-20241017200806-017d972448fc/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= -github.com/google/pprof v0.0.0-20241023014458-598669927662 h1:SKMkD83p7FwUqKmBsPdLHF5dNyxq3jOWwu9w9UyH5vA= -github.com/google/pprof v0.0.0-20241023014458-598669927662/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= -github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo= -github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 h1:sAGdeJj0bnMgUNVeUpp6AYlVdCt3/GdI3pGRqsNSQLs= github.com/google/pprof v0.0.0-20241101162523-b92577c0c142/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -80,23 +65,16 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4= -github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag= github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM= github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= -github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= -github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= +github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI= github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg= -github.com/quic-go/quic-go v0.47.0 h1:yXs3v7r2bm1wmPTYNLKAAJTHMYkPEsfYJmTazXrCZ7Y= -github.com/quic-go/quic-go v0.47.0/go.mod h1:3bCapYsJvXGZcipOHuu7plYtaV6tnF+z7wIFsU0WK9E= -github.com/quic-go/quic-go v0.48.0 h1:2TCyvBrMu1Z25rvIAlnp2dPT4lgh/uTqLqiXVpp5AeU= -github.com/quic-go/quic-go v0.48.0/go.mod h1:yBgs3rWBOADpga7F+jJsb6Ybg1LSYiQvwWlLX+/6HMs= github.com/quic-go/quic-go v0.48.1 h1:y/8xmfWI9qmGTc+lBr4jKRUWLGSlSigv847ULJ4hYXA= github.com/quic-go/quic-go v0.48.1/go.mod h1:yBgs3rWBOADpga7F+jJsb6Ybg1LSYiQvwWlLX+/6HMs= github.com/refraction-networking/utls v1.6.7 h1:zVJ7sP1dJx/WtVuITug3qYUq034cDq9B2MR1K67ULZM= @@ -117,8 +95,6 @@ github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65E github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU= github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= -go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= -go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= golang.org/x/arch v0.11.0 h1:KXV8WWKCXm6tRpLirl2szsO5j/oOODwZf4hATmGVNs4= @@ -139,10 +115,8 @@ golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= -golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= -golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= +golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= From 4397bc2cf9400491800025cb2639cbfd85629c90 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Mon, 11 Nov 2024 19:35:39 +0800 Subject: [PATCH 102/129] 1.7.3 --- CHANGELOG.md | 7 ++++++- VERSION | 2 +- docker/dockerfile/dev/init.sh | 2 +- docker/dockerfile/nocache/init.sh | 2 +- docker/dockerfile/release/init.sh | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e7f502..54e51ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,13 @@ # 更新日志 +v1.7.3 +--- +- CHANGE: Bump golang.org/x/time from 0.7.0 to 0.8.0 +- FIX: 修复故障熔断的相关问题 + v1.7.2 --- -CHANGE: 为`nocache`版本加入测试性的故障熔断机制 +- CHANGE: 为`nocache`版本加入测试性的故障熔断机制 v1.7.1 --- diff --git a/VERSION b/VERSION index 0a182f2..bbf649f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.7.2 \ No newline at end of file +1.7.3 \ No newline at end of file diff --git a/docker/dockerfile/dev/init.sh b/docker/dockerfile/dev/init.sh index 262164c..993de64 100644 --- a/docker/dockerfile/dev/init.sh +++ b/docker/dockerfile/dev/init.sh @@ -26,6 +26,6 @@ sleep 30 while [[ true ]]; do # Failure Circuit Breaker - curl -f -max-time 5 -retry 3 http://localhost:8080/api/healthcheck || exit 1 + curl -f --max-time 5 -retry 3 http://127.0.0.1:8080/api/healthcheck || exit 1 sleep 120 done \ No newline at end of file diff --git a/docker/dockerfile/nocache/init.sh b/docker/dockerfile/nocache/init.sh index 5d0c53f..27a153f 100644 --- a/docker/dockerfile/nocache/init.sh +++ b/docker/dockerfile/nocache/init.sh @@ -20,6 +20,6 @@ sleep 30 while [[ true ]]; do # Failure Circuit Breaker - curl -f -max-time 5 -retry 3 http://localhost:80/api/healthcheck || exit 1 + curl -f --max-time 5 -retry 3 http://127.0.0.1:80/api/healthcheck || exit 1 sleep 120 done \ No newline at end of file diff --git a/docker/dockerfile/release/init.sh b/docker/dockerfile/release/init.sh index 67058de..66d65c6 100644 --- a/docker/dockerfile/release/init.sh +++ b/docker/dockerfile/release/init.sh @@ -26,6 +26,6 @@ sleep 30 while [[ true ]]; do # Failure Circuit Breaker - curl -f -max-time 5 -retry 3 http://localhost:8080/api/healthcheck || exit 1 + curl -f --max-time 5 -retry 3 http://127.0.0.1:8080/api/healthcheck || exit 1 sleep 120 done \ No newline at end of file From c55ae4a5b71e4577ca40e2c56174a042f9b11600 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 15 Nov 2024 19:04:35 +0800 Subject: [PATCH 103/129] 24w23a --- CHANGELOG.md | 7 +++++++ DEV-VERSION | 2 +- auth/auth-header.go | 30 ++++++++++++++++++++++++++++++ auth/auth-parameters.go | 31 +++++++++++++++++++++++++++++++ auth/auth.go | 30 +++++++++++------------------- config/config.go | 6 ++++-- config/config.toml | 2 ++ deploy/install-dev.sh | 6 ++++++ deploy/install.sh | 8 +++++++- init.sh | 1 - main.go | 4 +++- 11 files changed, 102 insertions(+), 25 deletions(-) create mode 100644 auth/auth-header.go create mode 100644 auth/auth-parameters.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 54e51ed..413955e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # 更新日志 +24w23a +--- +- PRE-RELEASE: 此版本是v1.7.4的预发布版本,请勿在生产环境中使用 +- ADD: `Auth`模块加入`Header`鉴权,使用`GH-Auth`的值进行鉴权 +- CHANGE: 对二进制文件部署脚本进行优化 +- CHANGE&ADD: 新增H2C相关配置 + v1.7.3 --- - CHANGE: Bump golang.org/x/time from 0.7.0 to 0.8.0 diff --git a/DEV-VERSION b/DEV-VERSION index c2b048e..1ffeae0 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w22b \ No newline at end of file +24w23a \ No newline at end of file diff --git a/auth/auth-header.go b/auth/auth-header.go new file mode 100644 index 0000000..5089254 --- /dev/null +++ b/auth/auth-header.go @@ -0,0 +1,30 @@ +package auth + +import ( + "fmt" + "ghproxy/config" + + "github.com/gin-gonic/gin" +) + +func AuthHeaderHandler(c *gin.Context, cfg *config.Config) (isValid bool, err string) { + if !cfg.Auth.Enabled { + return true, "" + } + // 获取"GH-Auth"的值 + authToken := c.GetHeader("GH-Auth") + logInfo("%s %s %s %s %s AUTH_TOKEN: %s", c.Request.Method, c.Request.Host, c.Request.URL.Path, c.Request.Proto, c.Request.RemoteAddr, authToken) + if authToken == "" { + err := "Auth Header == nil" + return false, err + } + + isValid = authToken == cfg.Auth.AuthToken + if !isValid { + err := fmt.Sprintf("Auth token incorrect: %s", authToken) + return false, err + } + + logInfo("auth SUCCESS: %t", isValid) + return isValid, "" +} diff --git a/auth/auth-parameters.go b/auth/auth-parameters.go new file mode 100644 index 0000000..c14e23a --- /dev/null +++ b/auth/auth-parameters.go @@ -0,0 +1,31 @@ +package auth + +import ( + "fmt" + "ghproxy/config" + + "github.com/gin-gonic/gin" +) + +func AuthParametersHandler(c *gin.Context, cfg *config.Config) (isValid bool, err string) { + if !cfg.Auth.Enabled { + return true, "" + } + + authToken := c.Query("auth_token") + logInfo("%s %s %s %s %s AUTH_TOKEN: %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto, authToken) + + if authToken == "" { + err := "Auth token == nil" + return false, err + } + + isValid = authToken == cfg.Auth.AuthToken + if !isValid { + err := fmt.Sprintf("Auth token incorrect: %s", authToken) + return false, err + } + + logInfo("auth SUCCESS: %t", isValid) + return isValid, "" +} diff --git a/auth/auth.go b/auth/auth.go index 339486f..281eeff 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -1,7 +1,6 @@ package auth import ( - "fmt" "ghproxy/config" "ghproxy/logger" @@ -26,24 +25,17 @@ func Init(cfg *config.Config) { } func AuthHandler(c *gin.Context, cfg *config.Config) (isValid bool, err string) { - if !cfg.Auth.Enabled { + if cfg.Auth.AuthMethod == "parameters" { + isValid, err = AuthParametersHandler(c, cfg) + return isValid, err + } else if cfg.Auth.AuthMethod == "header" { + isValid, err = AuthHeaderHandler(c, cfg) + return isValid, err + } else if cfg.Auth.AuthMethod == "" { + logWarning("Auth method not set") return true, "" + } else { + logWarning("Auth method not supported") + return false, "Auth method not supported" } - - authToken := c.Query("auth_token") - logInfo("%s %s %s %s %s AUTH_TOKEN: %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto, authToken) - - if authToken == "" { - err := "Auth token == nil" - return false, err - } - - isValid = authToken == cfg.Auth.AuthToken - if !isValid { - err := fmt.Sprintf("Auth token incorrect: %s", authToken) - return false, err - } - - logInfo("auth SUCCESS: %t", isValid) - return isValid, "" } diff --git a/config/config.go b/config/config.go index 033a7ea..a9eaa58 100644 --- a/config/config.go +++ b/config/config.go @@ -19,6 +19,7 @@ type ServerConfig struct { Port int `toml:"port"` Host string `toml:"host"` SizeLimit int `toml:"sizeLimit"` + EnableH2C bool `toml:"enableH2C"` } type PagesConfig struct { @@ -36,8 +37,9 @@ type CORSConfig struct { } type AuthConfig struct { - Enabled bool `toml:"enabled"` - AuthToken string `toml:"authToken"` + Enabled bool `toml:"enabled"` + AuthMethod string `toml:"authMethod"` + AuthToken string `toml:"authToken"` } type BlacklistConfig struct { diff --git a/config/config.toml b/config/config.toml index 2592dae..6b65e7b 100644 --- a/config/config.toml +++ b/config/config.toml @@ -2,6 +2,7 @@ host = "127.0.0.1" port = 8080 sizeLimit = 125 # MB +enableH2C = true [pages] enabled = false @@ -15,6 +16,7 @@ maxLogSize = 5 # MB enabled = true [auth] +authMethod = "parameters" # "header" or "parameters" authToken = "token" enabled = false diff --git a/deploy/install-dev.sh b/deploy/install-dev.sh index 0119c63..44609e4 100644 --- a/deploy/install-dev.sh +++ b/deploy/install-dev.sh @@ -50,6 +50,12 @@ EOF } +# 检查是否为root用户 +if [ "$EUID" -ne 0 ]; then + echo "请以root用户运行此脚本" + exit 1 +fi + # 安装依赖包 install curl wget sed diff --git a/deploy/install.sh b/deploy/install.sh index c6ef3d1..3361e94 100644 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -50,6 +50,12 @@ EOF } +# 检查是否为root用户 +if [ "$EUID" -ne 0 ]; then + echo "请以root用户运行此脚本" + exit 1 +fi + # 安装依赖包 install curl wget sed @@ -96,7 +102,7 @@ VERSION=$(curl -s https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/mai wget -q -O ${ghproxy_dir}/VERSION https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/VERSION # 下载ghproxy -wget -q -O ${ghproxy_dir}/ghproxy https://github.com/WJQSERVER-STUDIO/ghproxy/releases/download/$VERSION/ghproxy-linux-$ARCH.tar.gz +wget -q -O ${ghproxy_dir}/ghproxy https://github.com/WJQSERVER-STUDIO/ghproxy/releases/download/${VERSION}/ghproxy-linux-${ARCH}.tar.gz install tar tar -zxvf ${ghproxy_dir}/ghproxy-linux-$ARCH.tar.gz -C ${ghproxy_dir} chmod +x ${ghproxy_dir}/ghproxy diff --git a/init.sh b/init.sh index 2a62223..ce3bc05 100644 --- a/init.sh +++ b/init.sh @@ -25,7 +25,6 @@ fi sleep 30 while [[ true ]]; do - # 健康检查 curl -f http://localhost:8080/api/healthcheck || exit 1 sleep 120 done diff --git a/main.go b/main.go index ef0d301..a71b119 100644 --- a/main.go +++ b/main.go @@ -84,7 +84,9 @@ func init() { gin.SetMode(gin.ReleaseMode) router = gin.Default() - router.UseH2C = true + if cfg.Server.EnableH2C { + router.UseH2C = true + } setupApi(cfg, router, version) From 06dc7640638e95cddacb8ce10472d6aa14bb3f62 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sun, 17 Nov 2024 18:32:33 +0800 Subject: [PATCH 104/129] 1.7.4 --- CHANGELOG.md | 6 ++++++ README.md | 2 ++ VERSION | 2 +- config/config.toml | 2 +- deploy/config.toml | 2 ++ docker/dockerfile/nocache/config.toml | 2 ++ 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 413955e..e568896 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # 更新日志 +v1.7.4 +--- +- CHANGE: 对二进制文件部署脚本进行优化 +- CHANGE&ADD: 新增H2C相关配置 +- ADD: `Auth`模块加入`Header`鉴权,使用`GH-Auth`的值进行鉴权 + 24w23a --- - PRE-RELEASE: 此版本是v1.7.4的预发布版本,请勿在生产环境中使用 diff --git a/README.md b/README.md index 13f3c8e..d025581 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,7 @@ wget -O install.sh https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/ma host = "127.0.0.1" # 监听地址 port = 8080 # 监听端口 sizeLimit = 125 # 125MB +enableH2C = false # 是否开启H2C传输 [pages] enabled = false # 是否开启内置静态页面(Docker版本请关闭此项) @@ -94,6 +95,7 @@ maxLogSize = 5 # MB 日志文件最大大小 enabled = true # 是否开启跨域 [auth] +authMethod = "parameters" # 鉴权方式,支持parameters,header authToken = "token" # 用户鉴权Token enabled = false # 是否开启用户鉴权 diff --git a/VERSION b/VERSION index bbf649f..3511591 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.7.3 \ No newline at end of file +1.7.4 \ No newline at end of file diff --git a/config/config.toml b/config/config.toml index 6b65e7b..a7cccbb 100644 --- a/config/config.toml +++ b/config/config.toml @@ -2,7 +2,7 @@ host = "127.0.0.1" port = 8080 sizeLimit = 125 # MB -enableH2C = true +enableH2C = false [pages] enabled = false diff --git a/deploy/config.toml b/deploy/config.toml index 4ad6468..06c8678 100644 --- a/deploy/config.toml +++ b/deploy/config.toml @@ -2,6 +2,7 @@ host = "127.0.0.1" port = 8080 sizeLimit = 125 # MB +enableH2C = false [pages] enabled = true @@ -15,6 +16,7 @@ maxLogSize = 5 # MB enabled = true [auth] +authMethod = "parameters" # "header" or "parameters" authToken = "token" enabled = false diff --git a/docker/dockerfile/nocache/config.toml b/docker/dockerfile/nocache/config.toml index 66a16ca..68af852 100644 --- a/docker/dockerfile/nocache/config.toml +++ b/docker/dockerfile/nocache/config.toml @@ -2,6 +2,7 @@ host = "0.0.0.0" port = 80 #修改此配置会导致容器异常 sizeLimit = 125 # MB +enableH2C = false [pages] enabled = true @@ -15,6 +16,7 @@ maxLogSize = 5 # MB enabled = true [auth] +authMethod = "parameters" # "header" or "parameters" authToken = "token" enabled = false From 6bd4a84dc17604eea823c0e5b5d8100d35428748 Mon Sep 17 00:00:00 2001 From: WJQSERVER <114663932+WJQSERVER@users.noreply.github.com> Date: Fri, 22 Nov 2024 02:04:55 +0800 Subject: [PATCH 105/129] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index d025581..ed5d47e 100644 --- a/README.md +++ b/README.md @@ -158,8 +158,7 @@ example.com { ### 前端页面 -![ghproxy-demo-v1.5.0.png](https://webp.wjqserver.com/ghproxy/ghproxy-demo-v1.5.0.png) - +![ghproxy-demo.png](https://webp.wjqserver.com/ghproxy/ghproxy-demo-v1.7.0-mobile-night.png) 结语 --- From 1bfb2af51d83ee2a2789cedbabbaac86518a829c Mon Sep 17 00:00:00 2001 From: WJQSERVER <114663932+WJQSERVER@users.noreply.github.com> Date: Fri, 22 Nov 2024 02:05:40 +0800 Subject: [PATCH 106/129] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ed5d47e..5efc497 100644 --- a/README.md +++ b/README.md @@ -159,9 +159,10 @@ example.com { ### 前端页面 ![ghproxy-demo.png](https://webp.wjqserver.com/ghproxy/ghproxy-demo-v1.7.0-mobile-night.png) + 结语 --- -本项目基于Go语言实现的GHProxy,使用Gin框架与req库 +本项目基于Go语言实现,使用Gin框架与req库 Docker镜像基于[WJQSERVER-STUDIO/caddy](https://github.com/WJQSERVER-STUDIO/caddy) 本项目使用WSL LICENSE Version1.2 (WJQSERVER STUDIO LICENSE Version1.2) 授权协议,请遵守相关条例。 From 0ce5c2c11c3265d000ec5e9492589abf41339ccc Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 22 Nov 2024 10:29:13 +0800 Subject: [PATCH 107/129] update deps --- go.mod | 28 ++++++++++++++-------------- go.sum | 29 +++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 83131e7..47695a0 100644 --- a/go.mod +++ b/go.mod @@ -16,11 +16,11 @@ require ( github.com/cloudflare/circl v1.5.0 // indirect github.com/cloudwego/base64x v0.1.4 // indirect github.com/cloudwego/iasm v0.2.0 // indirect - github.com/gabriel-vasile/mimetype v1.4.6 // indirect + github.com/gabriel-vasile/mimetype v1.4.7 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.22.1 // indirect + github.com/go-playground/validator/v10 v10.23.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/goccy/go-json v0.10.3 // indirect github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 // indirect @@ -28,12 +28,12 @@ require ( github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.11 // indirect - github.com/klauspost/cpuid/v2 v2.2.8 // indirect + github.com/klauspost/cpuid/v2 v2.2.9 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/onsi/ginkgo/v2 v2.21.0 // indirect + github.com/onsi/ginkgo/v2 v2.22.0 // indirect github.com/pelletier/go-toml/v2 v2.2.3 // indirect github.com/quic-go/qpack v0.5.1 // indirect github.com/quic-go/quic-go v0.48.1 // indirect @@ -41,15 +41,15 @@ require ( github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect go.uber.org/mock v0.5.0 // indirect - golang.org/x/arch v0.11.0 // indirect - golang.org/x/crypto v0.28.0 // indirect - golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect - golang.org/x/mod v0.21.0 // indirect - golang.org/x/net v0.30.0 // indirect - golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.26.0 // indirect - golang.org/x/text v0.19.0 // indirect - golang.org/x/tools v0.26.0 // indirect - google.golang.org/protobuf v1.35.1 // indirect + golang.org/x/arch v0.12.0 // indirect + golang.org/x/crypto v0.29.0 // indirect + golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect + golang.org/x/mod v0.22.0 // indirect + golang.org/x/net v0.31.0 // indirect + golang.org/x/sync v0.9.0 // indirect + golang.org/x/sys v0.27.0 // indirect + golang.org/x/text v0.20.0 // indirect + golang.org/x/tools v0.27.0 // indirect + google.golang.org/protobuf v1.35.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 5e6a715..4fc4715 100644 --- a/go.sum +++ b/go.sum @@ -18,6 +18,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc= github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc= +github.com/gabriel-vasile/mimetype v1.4.7 h1:SKFKl7kD0RiPdbht0s7hFtjl489WcQ1VyPW8ZzUMYCA= +github.com/gabriel-vasile/mimetype v1.4.7/go.mod h1:GDlAgAyIRT27BhFl53XNAFtfjzOkLaF35JdEG0P7LtU= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= @@ -32,6 +34,9 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA= github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL8sThn8IHr/sO+o= +github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= @@ -55,6 +60,8 @@ github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY= +github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= @@ -67,6 +74,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM= github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= +github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg= +github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= @@ -99,28 +108,48 @@ go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= golang.org/x/arch v0.11.0 h1:KXV8WWKCXm6tRpLirl2szsO5j/oOODwZf4hATmGVNs4= golang.org/x/arch v0.11.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= +golang.org/x/arch v0.12.0 h1:UsYJhbzPYGsT0HbEdmYcqtCv8UNGvnaL561NnIUvaKg= +golang.org/x/arch v0.12.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= +golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ= +golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg= golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY= golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8= +golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f h1:XdNn9LlyWAhLVp6P/i8QYBW+hlyhrhei9uErw2B5GJo= +golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:D5SMRVC3C2/4+F/DB1wZsLRnSNimn2Sp/NPsCrsv8ak= golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= +golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= +golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= +golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= +golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= +golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o= +golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q= google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= +google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 32584f95165afc1f9e06a5969f153196682f86ca Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sat, 23 Nov 2024 12:25:17 +0800 Subject: [PATCH 108/129] 24w24a --- CHANGELOG.md | 20 +++++++++++++ config/config.go | 7 +++-- config/config.toml | 1 + deploy/config.toml | 1 + docker/dockerfile/nocache/config.toml | 1 + go.mod | 2 +- go.sum | 2 ++ main.go | 13 +++++++-- proxy/proxy.go | 18 ++++++++++-- rate/rate.go | 42 +++++++++++++++++++++++++++ 10 files changed, 97 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e568896..80fcb42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # 更新日志 +24w24a +--- +- PRE-RELEASE: 此版本是v1.7.5的预发布版本,请勿在生产环境中使用 +- ADD: `Rate`模块加入`IP`速率限制,可限制单个IP的请求速率 +- CHANGE: 处理积攒的依赖库更新,更新如下依赖库: +- **github.com/gabriel-vasile/mimetype**: 从 v1.4.6 升级到 v1.4.7 +- **github.com/go-playground/validator/v10**: 从 v10.22.1 升级到 v10.23.0 +- **github.com/klauspost/cpuid/v2**: 从 v2.2.8 升级到 v2.2.9 +- **github.com/onsi/ginkgo/v2**: 从 v2.21.0 升级到 v2.22.0 +- **golang.org/x/arch**: 从 v0.11.0 升级到 v0.12.0 +- **golang.org/x/crypto**: 从 v0.28.0 升级到 v0.29.0 +- **golang.org/x/exp**: 从 v0.0.0-20241009180824-f66d83c29e7c 升级到 v0.0.0-20241108190413-2d47ceb2692f +- **golang.org/x/mod**: 从 v0.21.0 升级到 v0.22.0 +- **golang.org/x/net**: 从 v0.30.0 升级到 v0.31.0 +- **golang.org/x/sync**: 从 v0.8.0 升级到 v0.9.0 +- **golang.org/x/sys**: 从 v0.26.0 升级到 v0.27.0 +- **golang.org/x/text**: 从 v0.19.0 升级到 v0.20.0 +- **golang.org/x/tools**: 从 v0.26.0 升级到 v0.27.0 +- **google.golang.org/protobuf**: 从 v1.35.1 升级到 v1.35.2 + v1.7.4 --- - CHANGE: 对二进制文件部署脚本进行优化 diff --git a/config/config.go b/config/config.go index a9eaa58..3a27dd0 100644 --- a/config/config.go +++ b/config/config.go @@ -53,9 +53,10 @@ type WhitelistConfig struct { } type RateLimitConfig struct { - Enabled bool `toml:"enabled"` - RatePerMinute int `toml:"ratePerMinute"` - Burst int `toml:"burst"` + Enabled bool `toml:"enabled"` + RateMethod string `toml:"rateMethod"` + RatePerMinute int `toml:"ratePerMinute"` + Burst int `toml:"burst"` } // LoadConfig 从 TOML 配置文件加载配置 diff --git a/config/config.toml b/config/config.toml index a7cccbb..61cce03 100644 --- a/config/config.toml +++ b/config/config.toml @@ -30,5 +30,6 @@ whitelistFile = "/data/ghproxy/config/whitelist.json" [rateLimit] enabled = false +rateMrthod = "total" # "ip" or "total" ratePerMinute = 180 burst = 5 diff --git a/deploy/config.toml b/deploy/config.toml index 06c8678..4789d92 100644 --- a/deploy/config.toml +++ b/deploy/config.toml @@ -30,5 +30,6 @@ whitelistFile = "/usr/local/ghproxy/config/whitelist.json" [rateLimit] enabled = false +rateMrthod = "total" # "ip" or "total" ratePerMinute = 180 burst = 5 diff --git a/docker/dockerfile/nocache/config.toml b/docker/dockerfile/nocache/config.toml index 68af852..ed8a857 100644 --- a/docker/dockerfile/nocache/config.toml +++ b/docker/dockerfile/nocache/config.toml @@ -30,5 +30,6 @@ whitelistFile = "/data/ghproxy/config/whitelist.json" [rateLimit] enabled = false +rateMrthod = "total" # "ip" or "total" ratePerMinute = 180 burst = 5 diff --git a/go.mod b/go.mod index 47695a0..243b9d6 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/go-playground/validator/v10 v10.23.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/goccy/go-json v0.10.3 // indirect - github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 // indirect + github.com/google/pprof v0.0.0-20241122213907-cbe949e5a41b // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/json-iterator/go v1.1.12 // indirect diff --git a/go.sum b/go.sum index 4fc4715..3c5fdb5 100644 --- a/go.sum +++ b/go.sum @@ -46,6 +46,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 h1:sAGdeJj0bnMgUNVeUpp6AYlVdCt3/GdI3pGRqsNSQLs= github.com/google/pprof v0.0.0-20241101162523-b92577c0c142/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/google/pprof v0.0.0-20241122213907-cbe949e5a41b h1:SXO0REt4iu865upYCk8aKBBJQ4BqoE0ReP23ClMu60s= +github.com/google/pprof v0.0.0-20241122213907-cbe949e5a41b/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= diff --git a/main.go b/main.go index a71b119..3fd40e6 100644 --- a/main.go +++ b/main.go @@ -22,8 +22,9 @@ var ( router *gin.Engine configfile = "/data/ghproxy/config/config.toml" cfgfile string - limiter *rate.RateLimiter version string + limiter *rate.RateLimiter + iplimiter *rate.IPRateLimiter ) var ( @@ -68,7 +69,13 @@ func setupApi(cfg *config.Config, router *gin.Engine, version string) { func setupRateLimit(cfg *config.Config) { if cfg.RateLimit.Enabled { - limiter = rate.New(cfg.RateLimit.RatePerMinute, cfg.RateLimit.Burst, 1*time.Minute) + if cfg.RateLimit.RateMethod == "ip" { + iplimiter = rate.NewIPRateLimiter(cfg.RateLimit.RatePerMinute, cfg.RateLimit.Burst, 1*time.Minute) + } else if cfg.RateLimit.RateMethod == "total" { + limiter = rate.New(cfg.RateLimit.RatePerMinute, cfg.RateLimit.Burst, 1*time.Minute) + } else { + logError("Invalid RateLimit Method: %s", cfg.RateLimit.RateMethod) + } logInfo("Rate Limit Loaded") } } @@ -106,7 +113,7 @@ func init() { } router.NoRoute(func(c *gin.Context) { - proxy.NoRouteHandler(cfg, limiter)(c) + proxy.NoRouteHandler(cfg, limiter, iplimiter)(c) }) } diff --git a/proxy/proxy.go b/proxy/proxy.go index 0eb3b50..8e77941 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -33,12 +33,24 @@ var exps = []*regexp.Regexp{ regexp.MustCompile(`^(?:https?://)?gist\.github(?:usercontent|)\.com/([^/]+)/.+?/.+`), } -func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter) gin.HandlerFunc { +func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *rate.IPRateLimiter) gin.HandlerFunc { return func(c *gin.Context) { // 限制访问频率 if cfg.RateLimit.Enabled { - logInfo("Rate_Limit Enabled") - if !limiter.Allow() { + + var allowed bool + + switch cfg.RateLimit.RateMethod { + case "ip": + allowed = iplimiter.Allow(c.ClientIP()) + case "total": + allowed = limiter.Allow() + default: + logWarning("Invalid RateLimit Method") + return + } + + if !allowed { c.JSON(http.StatusTooManyRequests, gin.H{"error": "Too Many Requests"}) logWarning("%s %s %s %s %s 429-TooManyRequests", c.ClientIP(), c.Request.Method, c.Request.URL.RequestURI(), c.Request.Header.Get("User-Agent"), c.Request.Proto) return diff --git a/rate/rate.go b/rate/rate.go index 707e183..1b06857 100644 --- a/rate/rate.go +++ b/rate/rate.go @@ -1,15 +1,33 @@ package rate import ( + "ghproxy/logger" "time" "golang.org/x/time/rate" ) +// 日志输出 +var ( + logw = logger.Logw + logInfo = logger.LogInfo + logWarning = logger.LogWarning + logError = logger.LogError +) + +// 总体限流器 type RateLimiter struct { limiter *rate.Limiter } +// 基于IP的限流器 +type IPRateLimiter struct { + limiters map[string]*RateLimiter + limit int + burst int + duration time.Duration +} + func New(limit int, burst int, duration time.Duration) *RateLimiter { return &RateLimiter{ limiter: rate.NewLimiter(rate.Limit(float64(limit)/duration.Seconds()), burst), @@ -19,3 +37,27 @@ func New(limit int, burst int, duration time.Duration) *RateLimiter { func (rl *RateLimiter) Allow() bool { return rl.limiter.Allow() } + +func NewIPRateLimiter(limit int, burst int, duration time.Duration) *IPRateLimiter { + return &IPRateLimiter{ + limiters: make(map[string]*RateLimiter), + limit: limit, + burst: burst, + duration: duration, + } +} + +func (rl *IPRateLimiter) Allow(ip string) bool { + if ip == "" { + logWarning("empty ip") + return false + } + + limiter, ok := rl.limiters[ip] + if !ok { + // 创建新的 RateLimiter 并存储 + limiter = New(rl.limit, rl.burst, rl.duration) + rl.limiters[ip] = limiter + } + return limiter.Allow() +} From 32fcc1071f189a0d1c08f8c6c4ba6f87880b6b02 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sat, 23 Nov 2024 12:45:39 +0800 Subject: [PATCH 109/129] 24w24a --- DEV-VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEV-VERSION b/DEV-VERSION index 1ffeae0..a1f2a41 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w23a \ No newline at end of file +24w24a \ No newline at end of file From 784407b2dd80b015707869024b2d8722f9f77610 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sun, 24 Nov 2024 07:49:22 +0800 Subject: [PATCH 110/129] update changeLog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80fcb42..7136f62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ 24w24a --- - PRE-RELEASE: 此版本是v1.7.5的预发布版本,请勿在生产环境中使用 -- ADD: `Rate`模块加入`IP`速率限制,可限制单个IP的请求速率 +- ADD: `Rate`模块加入`IP`速率限制,可限制单个IP的请求速率 (需要更多测试) - CHANGE: 处理积攒的依赖库更新,更新如下依赖库: - **github.com/gabriel-vasile/mimetype**: 从 v1.4.6 升级到 v1.4.7 - **github.com/go-playground/validator/v10**: 从 v10.22.1 升级到 v10.23.0 From 9d59731afe4180627ff866a5c58a71db955b9e2f Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Mon, 25 Nov 2024 10:08:10 +0800 Subject: [PATCH 111/129] fix H2C --- CHANGELOG.md | 5 +++++ config/config.toml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7136f62..948105b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # 更新日志 +24w24b +--- +- PRE-RELEASE: 此版本是v1.7.5的预发布版本,请勿在生产环境中使用 +- FIX: 修复 Docker 默认配置导致的 403 问题 + 24w24a --- - PRE-RELEASE: 此版本是v1.7.5的预发布版本,请勿在生产环境中使用 diff --git a/config/config.toml b/config/config.toml index 61cce03..d06ce47 100644 --- a/config/config.toml +++ b/config/config.toml @@ -2,7 +2,7 @@ host = "127.0.0.1" port = 8080 sizeLimit = 125 # MB -enableH2C = false +enableH2C = true [pages] enabled = false From a14202f75d3bf93c239d677fd18b703d07375f17 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Mon, 25 Nov 2024 10:08:34 +0800 Subject: [PATCH 112/129] 24w24b --- DEV-VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEV-VERSION b/DEV-VERSION index a1f2a41..2d57c61 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w24a \ No newline at end of file +24w24b \ No newline at end of file From e3f9a0d4c6132e9162501ab459c7809039b71e37 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Mon, 25 Nov 2024 10:25:12 +0800 Subject: [PATCH 113/129] update deps --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 243b9d6..133f0e9 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( require ( github.com/andybalholm/brotli v1.1.1 // indirect - github.com/bytedance/sonic v1.12.4 // indirect + github.com/bytedance/sonic v1.12.5 // indirect github.com/bytedance/sonic/loader v0.2.1 // indirect github.com/cloudflare/circl v1.5.0 // indirect github.com/cloudwego/base64x v0.1.4 // indirect diff --git a/go.sum b/go.sum index 3c5fdb5..6b4dfa1 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,8 @@ github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7X github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA= github.com/bytedance/sonic v1.12.4 h1:9Csb3c9ZJhfUWeMtpCDCq6BUoH5ogfDFLUgQ/jG+R0k= github.com/bytedance/sonic v1.12.4/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= +github.com/bytedance/sonic v1.12.5 h1:hoZxY8uW+mT+OpkcUWw4k0fDINtOcVavEsGfzwzFU/w= +github.com/bytedance/sonic v1.12.5/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= github.com/bytedance/sonic/loader v0.2.1 h1:1GgorWTqf12TA8mma4DDSbaQigE2wOgQo7iCjjJv3+E= github.com/bytedance/sonic/loader v0.2.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= From 59428e47aa7c1174662e11a7676f2ad133fc7b89 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Mon, 25 Nov 2024 10:26:48 +0800 Subject: [PATCH 114/129] 24w24c --- CHANGELOG.md | 11 +++++++++++ DEV-VERSION | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 948105b..ad4d480 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # 更新日志 +v1.7.5 +--- +- FIX: 修复 v1.7.4 版本 Docker 镜像默认配置导致的 403 问题 +- ADD: `Rate`模块加入`IP`速率限制,可限制单个IP的请求速率 (需要更多测试) +- CHANGE: 处理积攒的依赖库更新 + +24w24c +--- +- PRE-RELEASE: 此版本是v1.7.5的预发布版本,请勿在生产环境中使用 +- CHANGE: 更新依赖 + 24w24b --- - PRE-RELEASE: 此版本是v1.7.5的预发布版本,请勿在生产环境中使用 diff --git a/DEV-VERSION b/DEV-VERSION index 2d57c61..e5459da 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w24b \ No newline at end of file +24w24c \ No newline at end of file From 920b025fda77ac60023a6e44f8e6ac8550cae34e Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Mon, 25 Nov 2024 10:30:06 +0800 Subject: [PATCH 115/129] 1.7.5 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3511591..5849151 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.7.4 \ No newline at end of file +1.7.5 \ No newline at end of file From f6f1ff736267e873d35512b5835ae8181e9379ee Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Mon, 25 Nov 2024 10:43:05 +0800 Subject: [PATCH 116/129] update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5efc497..638ec6c 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ wget -O install.sh https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/ma host = "127.0.0.1" # 监听地址 port = 8080 # 监听端口 sizeLimit = 125 # 125MB -enableH2C = false # 是否开启H2C传输 +enableH2C = true # 是否开启H2C传输(latest和dev版本请开启) [pages] enabled = false # 是否开启内置静态页面(Docker版本请关闭此项) @@ -109,6 +109,7 @@ whitelistFile = "/data/ghproxy/config/whitelist.json" # 白名单文件路径 [rateLimit] enabled = false # 是否开启速率限制 +rateMrthod = "total" # "ip" or "total" 速率限制方式 ratePerMinute = 180 # 每分钟限制请求数量 burst = 5 # 突发请求数量 ``` From d297f785dbf0ce9cbada05f8bfe2d39f533834db Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Thu, 28 Nov 2024 08:58:27 +0800 Subject: [PATCH 117/129] H2C-fix2 --- config/config.go | 2 +- config/config.toml | 2 +- main.go | 12 +++++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/config/config.go b/config/config.go index 3a27dd0..bf9e30f 100644 --- a/config/config.go +++ b/config/config.go @@ -19,7 +19,7 @@ type ServerConfig struct { Port int `toml:"port"` Host string `toml:"host"` SizeLimit int `toml:"sizeLimit"` - EnableH2C bool `toml:"enableH2C"` + EnableH2C string `toml:"enableH2C"` } type PagesConfig struct { diff --git a/config/config.toml b/config/config.toml index d06ce47..ce83e2a 100644 --- a/config/config.toml +++ b/config/config.toml @@ -2,7 +2,7 @@ host = "127.0.0.1" port = 8080 sizeLimit = 125 # MB -enableH2C = true +enableH2C = "on" # "on" or "off" [pages] enabled = false diff --git a/main.go b/main.go index 3fd40e6..3297f91 100644 --- a/main.go +++ b/main.go @@ -91,9 +91,19 @@ func init() { gin.SetMode(gin.ReleaseMode) router = gin.Default() - if cfg.Server.EnableH2C { + //H2C默认值为true,而后遵循cfg.Server.EnableH2C的设置 + if cfg.Server.EnableH2C == "on" { router.UseH2C = true + } else if cfg.Server.EnableH2C == "" { + router.UseH2C = true + } else { + router.UseH2C = false } + /*if !cfg.Server.EnableH2C { + router.UseH2C = false + } else { + router.UseH2C = true + }*/ setupApi(cfg, router, version) From c2af045019d5c2d2a87d7a9b9b6c145ec289d485 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 29 Nov 2024 23:28:59 +0800 Subject: [PATCH 118/129] update deps --- go.mod | 4 ++-- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 133f0e9..959ef58 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/go-playground/validator/v10 v10.23.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/goccy/go-json v0.10.3 // indirect - github.com/google/pprof v0.0.0-20241122213907-cbe949e5a41b // indirect + github.com/google/pprof v0.0.0-20241128161848-dc51965c6481 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -36,7 +36,7 @@ require ( github.com/onsi/ginkgo/v2 v2.22.0 // indirect github.com/pelletier/go-toml/v2 v2.2.3 // indirect github.com/quic-go/qpack v0.5.1 // indirect - github.com/quic-go/quic-go v0.48.1 // indirect + github.com/quic-go/quic-go v0.48.2 // indirect github.com/refraction-networking/utls v1.6.7 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/go.sum b/go.sum index 6b4dfa1..5ff8932 100644 --- a/go.sum +++ b/go.sum @@ -50,6 +50,8 @@ github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 h1:sAGdeJj0bnMgUNVeUp github.com/google/pprof v0.0.0-20241101162523-b92577c0c142/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/pprof v0.0.0-20241122213907-cbe949e5a41b h1:SXO0REt4iu865upYCk8aKBBJQ4BqoE0ReP23ClMu60s= github.com/google/pprof v0.0.0-20241122213907-cbe949e5a41b/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/google/pprof v0.0.0-20241128161848-dc51965c6481 h1:yudKIrXagAOl99WQzrP1gbz5HLB9UjhcOFnPzdd6Qec= +github.com/google/pprof v0.0.0-20241128161848-dc51965c6481/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -90,6 +92,8 @@ github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI= github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg= github.com/quic-go/quic-go v0.48.1 h1:y/8xmfWI9qmGTc+lBr4jKRUWLGSlSigv847ULJ4hYXA= github.com/quic-go/quic-go v0.48.1/go.mod h1:yBgs3rWBOADpga7F+jJsb6Ybg1LSYiQvwWlLX+/6HMs= +github.com/quic-go/quic-go v0.48.2 h1:wsKXZPeGWpMpCGSWqOcqpW2wZYic/8T3aqiOID0/KWE= +github.com/quic-go/quic-go v0.48.2/go.mod h1:yBgs3rWBOADpga7F+jJsb6Ybg1LSYiQvwWlLX+/6HMs= github.com/refraction-networking/utls v1.6.7 h1:zVJ7sP1dJx/WtVuITug3qYUq034cDq9B2MR1K67ULZM= github.com/refraction-networking/utls v1.6.7/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= From 580865d082bb69ff56a0701149e52e6f0d6e2be4 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 29 Nov 2024 23:29:15 +0800 Subject: [PATCH 119/129] update caddyfile --- caddyfile/dev/Caddyfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/caddyfile/dev/Caddyfile b/caddyfile/dev/Caddyfile index 212f40d..1324c8e 100644 --- a/caddyfile/dev/Caddyfile +++ b/caddyfile/dev/Caddyfile @@ -13,6 +13,9 @@ roll_keep 10 } } + servers :80 { + protocals h1 h2c + } } (log) { @@ -68,8 +71,11 @@ :80 { reverse_proxy { - to h2c://127.0.0.1:8080 + to 127.0.0.1:8080 import header_realip + transport http { + versions 1.1 2 h2c + } } import log ghproxy import cache 0s 300s From 43c576bd82b340821d612b0ef127983d831e1a9b Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 29 Nov 2024 23:29:45 +0800 Subject: [PATCH 120/129] 24w25a --- CHANGELOG.md | 8 ++++++++ DEV-VERSION | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad4d480..cc660a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # 更新日志 +24w25a +--- +- PRE-RELEASE: 此版本是v1.7.6的预发布版本,请勿在生产环境中使用 +- 说明: 本版本为v1.7.6的其中一个候选与开发测试版本,相关改动不一定实装 +- FIX: 进一步修正 H2C相关配置逻辑问题 +- CHANGE: 对Caddy配置进行实验性修改,优化H2C配置 +- CHANGE: 更新相关依赖库 + v1.7.5 --- - FIX: 修复 v1.7.4 版本 Docker 镜像默认配置导致的 403 问题 diff --git a/DEV-VERSION b/DEV-VERSION index e5459da..d603c30 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w24c \ No newline at end of file +24w25a \ No newline at end of file From 96bd4a2c188bf478e0a8d26d4b719afe10313b33 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sat, 30 Nov 2024 16:23:33 +0800 Subject: [PATCH 121/129] 24w25a-fix0 --- caddyfile/dev/Caddyfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/caddyfile/dev/Caddyfile b/caddyfile/dev/Caddyfile index 1324c8e..cd58447 100644 --- a/caddyfile/dev/Caddyfile +++ b/caddyfile/dev/Caddyfile @@ -14,7 +14,7 @@ } } servers :80 { - protocals h1 h2c + protocols h1 h2c } } @@ -74,7 +74,7 @@ to 127.0.0.1:8080 import header_realip transport http { - versions 1.1 2 h2c + versions 1.1 h2c } } import log ghproxy From b1a60017e4f7c73baebf984514e9202f7f004f63 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sat, 30 Nov 2024 16:37:35 +0800 Subject: [PATCH 122/129] 24w25b --- CHANGELOG.md | 6 ++++++ DEV-VERSION | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc660a9..f9fd400 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # 更新日志 +24w25b +--- +- PRE-RELEASE: 此版本是v1.7.6的预发布版本,请勿在生产环境中使用 +- 说明: 本版本为24w25a-fix0 +- FIX: 进一步修正 H2C相关配置逻辑问题 + 24w25a --- - PRE-RELEASE: 此版本是v1.7.6的预发布版本,请勿在生产环境中使用 diff --git a/DEV-VERSION b/DEV-VERSION index d603c30..7a5e69e 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w25a \ No newline at end of file +24w25b \ No newline at end of file From 8dea98f795f9f1623778ea7286041c1783f7714f Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sat, 30 Nov 2024 17:49:28 +0800 Subject: [PATCH 123/129] 1.7.6 --- CHANGELOG.md | 7 +++++++ README.md | 2 +- caddyfile/nocache/Caddyfile | 3 +++ caddyfile/release/Caddyfile | 8 +++++++- docker/dockerfile/nocache/config.toml | 2 +- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9fd400..8b0c48f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # 更新日志 +v1.7.6 +--- +- RELEASE: 版本在v1.7.4及以上的用户,我们建议升级到此版本以解决于v1.7.4版本功能更新所引入的问题 +- FIX: 进一步修正 H2C相关配置逻辑问题 +- CHANGE: 对Caddy配置进行实验性修改,优化H2C配置 +- CHANGE: 更新相关依赖库 + 24w25b --- - PRE-RELEASE: 此版本是v1.7.6的预发布版本,请勿在生产环境中使用 diff --git a/README.md b/README.md index 638ec6c..03ca5ac 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ wget -O install.sh https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/ma host = "127.0.0.1" # 监听地址 port = 8080 # 监听端口 sizeLimit = 125 # 125MB -enableH2C = true # 是否开启H2C传输(latest和dev版本请开启) +enableH2C = "on" # 是否开启H2C传输(latest和dev版本请开启) on/off [pages] enabled = false # 是否开启内置静态页面(Docker版本请关闭此项) diff --git a/caddyfile/nocache/Caddyfile b/caddyfile/nocache/Caddyfile index db1fe4b..b63e936 100644 --- a/caddyfile/nocache/Caddyfile +++ b/caddyfile/nocache/Caddyfile @@ -13,6 +13,9 @@ roll_keep 10 } } + servers :80 { + protocols h1 h2c + } } diff --git a/caddyfile/release/Caddyfile b/caddyfile/release/Caddyfile index 9fc8120..962fa39 100644 --- a/caddyfile/release/Caddyfile +++ b/caddyfile/release/Caddyfile @@ -13,6 +13,9 @@ roll_keep 10 } } + servers :80 { + protocols h1 h2c + } } (log) { @@ -68,8 +71,11 @@ :80 { reverse_proxy { - to h2c://127.0.0.1:8080 + to 127.0.0.1:8080 import header_realip + transport http { + versions 1.1 h2c + } } import log ghproxy import cache 0s 300s diff --git a/docker/dockerfile/nocache/config.toml b/docker/dockerfile/nocache/config.toml index ed8a857..99147a8 100644 --- a/docker/dockerfile/nocache/config.toml +++ b/docker/dockerfile/nocache/config.toml @@ -2,7 +2,7 @@ host = "0.0.0.0" port = 80 #修改此配置会导致容器异常 sizeLimit = 125 # MB -enableH2C = false +enableH2C = "off" # on / off [pages] enabled = true From d5e3b7fc23a011e9cf10b5e011ef3398735c4396 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sat, 30 Nov 2024 17:49:42 +0800 Subject: [PATCH 124/129] 1.7.6 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5849151..d263485 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.7.5 \ No newline at end of file +1.7.6 \ No newline at end of file From d1f862e7990d462299bc83620c765a076305a1e4 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Wed, 4 Dec 2024 22:40:15 +0800 Subject: [PATCH 125/129] 24w26a --- .github/workflows/build-dev.yml | 2 +- .github/workflows/build.yml | 2 +- CHANGELOG.md | 7 +++++++ DEV-VERSION | 2 +- docker/dockerfile/dev/Dockerfile | 4 ++-- docker/dockerfile/release/Dockerfile | 4 ++-- go.mod | 8 ++++---- go.sum | 6 ++++++ 8 files changed, 24 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 4558231..912f2ab 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -17,7 +17,7 @@ jobs: goarch: [amd64, arm64] env: OUTPUT_BINARY: ghproxy - GO_VERSION: 1.23.3 + GO_VERSION: 1.23.4 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc4e143..ecd561b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: goarch: [amd64, arm64] env: OUTPUT_BINARY: ghproxy - GO_VERSION: 1.23.3 + GO_VERSION: 1.23.4 steps: - uses: actions/checkout@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b0c48f..fdedd5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # 更新日志 +24w26a +--- +- PRE-RELEASE: 此版本是v1.7.7的预发布版本,请勿在生产环境中使用 +- CHANGE: 更新相关依赖库 +- CHANGE: 更新Go版本至1.23.4 +- CHANGE: 更新release及dev版本底包 + v1.7.6 --- - RELEASE: 版本在v1.7.4及以上的用户,我们建议升级到此版本以解决于v1.7.4版本功能更新所引入的问题 diff --git a/DEV-VERSION b/DEV-VERSION index 7a5e69e..406bfcf 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w25b \ No newline at end of file +24w26a \ No newline at end of file diff --git a/docker/dockerfile/dev/Dockerfile b/docker/dockerfile/dev/Dockerfile index f7d0ca4..20fffd1 100644 --- a/docker/dockerfile/dev/Dockerfile +++ b/docker/dockerfile/dev/Dockerfile @@ -1,4 +1,4 @@ -FROM wjqserver/caddy:2.9.0-rc4-alpine AS builder +FROM wjqserver/caddy:2.9.0-rc5-alpine AS builder ARG USER=WJQSERVER-STUDIO ARG REPO=ghproxy @@ -36,7 +36,7 @@ RUN wget -O /data/${APPLICATION}/whitelist.json https://raw.githubusercontent.co RUN chmod +x /data/${APPLICATION}/${APPLICATION} RUN chmod +x /usr/local/bin/init.sh -FROM wjqserver/caddy:2.9.0-rc4-alpine +FROM wjqserver/caddy:2.9.0-rc5-alpine RUN apk add --no-cache curl diff --git a/docker/dockerfile/release/Dockerfile b/docker/dockerfile/release/Dockerfile index 8818b62..3f90415 100644 --- a/docker/dockerfile/release/Dockerfile +++ b/docker/dockerfile/release/Dockerfile @@ -1,4 +1,4 @@ -FROM wjqserver/caddy:2.9.0-rc4-alpine AS builder +FROM wjqserver/caddy:2.9.0-rc5-alpine AS builder ARG USER=WJQSERVER-STUDIO ARG REPO=ghproxy @@ -36,7 +36,7 @@ RUN wget -O /data/${APPLICATION}/whitelist.json https://raw.githubusercontent.co RUN chmod +x /data/${APPLICATION}/${APPLICATION} RUN chmod +x /usr/local/bin/init.sh -FROM wjqserver/caddy:2.9.0-rc4-alpine +FROM wjqserver/caddy:2.9.0-rc5-alpine RUN apk add --no-cache curl diff --git a/go.mod b/go.mod index 959ef58..770acd0 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module ghproxy -go 1.23.3 +go 1.23.4 require ( github.com/BurntSushi/toml v1.4.0 @@ -23,7 +23,7 @@ require ( github.com/go-playground/validator/v10 v10.23.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/goccy/go-json v0.10.3 // indirect - github.com/google/pprof v0.0.0-20241128161848-dc51965c6481 // indirect + github.com/google/pprof v0.0.0-20241203143554-1e3fdc7de467 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -46,8 +46,8 @@ require ( golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect golang.org/x/mod v0.22.0 // indirect golang.org/x/net v0.31.0 // indirect - golang.org/x/sync v0.9.0 // indirect - golang.org/x/sys v0.27.0 // indirect + golang.org/x/sync v0.10.0 // indirect + golang.org/x/sys v0.28.0 // indirect golang.org/x/text v0.20.0 // indirect golang.org/x/tools v0.27.0 // indirect google.golang.org/protobuf v1.35.2 // indirect diff --git a/go.sum b/go.sum index 5ff8932..05bce3c 100644 --- a/go.sum +++ b/go.sum @@ -52,6 +52,8 @@ github.com/google/pprof v0.0.0-20241122213907-cbe949e5a41b h1:SXO0REt4iu865upYCk github.com/google/pprof v0.0.0-20241122213907-cbe949e5a41b/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/pprof v0.0.0-20241128161848-dc51965c6481 h1:yudKIrXagAOl99WQzrP1gbz5HLB9UjhcOFnPzdd6Qec= github.com/google/pprof v0.0.0-20241128161848-dc51965c6481/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/google/pprof v0.0.0-20241203143554-1e3fdc7de467 h1:keEZFtbLJugfE0qHn+Ge1JCE71spzkchQobDf3mzS/4= +github.com/google/pprof v0.0.0-20241203143554-1e3fdc7de467/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -138,12 +140,16 @@ golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= From e59c1184759cbdd29e268bd216239e875c35b4ca Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sun, 8 Dec 2024 00:12:18 +0800 Subject: [PATCH 126/129] 1.7.7 --- CHANGELOG.md | 6 ++++++ VERSION | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fdedd5f..8203615 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # 更新日志 +v1.7.7 +--- +- CHANGE: 更新相关依赖库 +- CHANGE: 更新Go版本至1.23.4 +- CHANGE: 更新release及dev版本底包 + 24w26a --- - PRE-RELEASE: 此版本是v1.7.7的预发布版本,请勿在生产环境中使用 diff --git a/VERSION b/VERSION index d263485..73c8b4f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.7.6 \ No newline at end of file +1.7.7 \ No newline at end of file From a43f1f20f605ac1cbd8f6c05678a98e4a78c2448 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Thu, 12 Dec 2024 11:48:23 +0800 Subject: [PATCH 127/129] add api.github.com support --- CHANGELOG.md | 5 +++++ proxy/proxy.go | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8203615..f775b69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # 更新日志 +24w27a +--- +- PRE-RELEASE: 此版本做为实验性功能测试版本,请勿在生产环境中使用 +- ADD: 新增`api.github.com`反代支持, 强制性要求开启`Header Auth`功能 + v1.7.7 --- - CHANGE: 更新相关依赖库 diff --git a/proxy/proxy.go b/proxy/proxy.go index 8e77941..c3607c8 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -31,6 +31,7 @@ var exps = []*regexp.Regexp{ regexp.MustCompile(`^(?:https?://)?github\.com/([^/]+)/([^/]+)/(?:info|git-).*`), regexp.MustCompile(`^(?:https?://)?raw\.github(?:usercontent|)\.com/([^/]+)/([^/]+)/.+?/.+`), regexp.MustCompile(`^(?:https?://)?gist\.github(?:usercontent|)\.com/([^/]+)/.+?/.+`), + regexp.MustCompile(`^(?:https?://)?api\.github\.com/repos/([^/]+)/([^/]+)/.*`), } func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *rate.IPRateLimiter) gin.HandlerFunc { @@ -106,6 +107,16 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra return } + // 若匹配api.github.com/repos/用户名/仓库名/路径, 则检查是否开启HeaderAuth + if exps[5].MatchString(rawPath) { + if cfg.Auth.AuthMethod != "header" || !cfg.Auth.Enabled { + c.JSON(http.StatusForbidden, gin.H{"error": "HeaderAuth is not enabled."}) + logWarning("%s %s %s %s %s HeaderAuth-Error: HeaderAuth is not enabled.", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto) + return + } + } + + // 处理blob/raw路径 if exps[1].MatchString(rawPath) { rawPath = strings.Replace(rawPath, "/blob/", "/raw/", 1) } From 890dc067b991b51fc03dc7560abe01fe4341ab15 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Thu, 12 Dec 2024 11:48:49 +0800 Subject: [PATCH 128/129] 24w27a --- DEV-VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEV-VERSION b/DEV-VERSION index 406bfcf..1ec6f33 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w26a \ No newline at end of file +24w27a \ No newline at end of file From efe734d976fd32533c9aae2cefe30cea77dec068 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:56:42 +0800 Subject: [PATCH 129/129] Bump golang.org/x/crypto from 0.29.0 to 0.31.0 in the go_modules group (#23) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the go_modules group with 1 update: [golang.org/x/crypto](https://github.com/golang/crypto). Updates `golang.org/x/crypto` from 0.29.0 to 0.31.0 - [提交](https://github.com/golang/crypto/compare/v0.29.0...v0.31.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: indirect dependency-group: go_modules ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 4 ++-- go.sum | 52 ++++------------------------------------------------ 2 files changed, 6 insertions(+), 50 deletions(-) diff --git a/go.mod b/go.mod index 770acd0..1a7c7f2 100644 --- a/go.mod +++ b/go.mod @@ -42,13 +42,13 @@ require ( github.com/ugorji/go/codec v1.2.12 // indirect go.uber.org/mock v0.5.0 // indirect golang.org/x/arch v0.12.0 // indirect - golang.org/x/crypto v0.29.0 // indirect + golang.org/x/crypto v0.31.0 // indirect golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect golang.org/x/mod v0.22.0 // indirect golang.org/x/net v0.31.0 // indirect golang.org/x/sync v0.10.0 // indirect golang.org/x/sys v0.28.0 // indirect - golang.org/x/text v0.20.0 // indirect + golang.org/x/text v0.21.0 // indirect golang.org/x/tools v0.27.0 // indirect google.golang.org/protobuf v1.35.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 05bce3c..642efb1 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,6 @@ github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA= github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA= -github.com/bytedance/sonic v1.12.4 h1:9Csb3c9ZJhfUWeMtpCDCq6BUoH5ogfDFLUgQ/jG+R0k= -github.com/bytedance/sonic v1.12.4/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= github.com/bytedance/sonic v1.12.5 h1:hoZxY8uW+mT+OpkcUWw4k0fDINtOcVavEsGfzwzFU/w= github.com/bytedance/sonic v1.12.5/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= @@ -18,8 +16,6 @@ github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc= -github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc= github.com/gabriel-vasile/mimetype v1.4.7 h1:SKFKl7kD0RiPdbht0s7hFtjl489WcQ1VyPW8ZzUMYCA= github.com/gabriel-vasile/mimetype v1.4.7/go.mod h1:GDlAgAyIRT27BhFl53XNAFtfjzOkLaF35JdEG0P7LtU= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= @@ -34,11 +30,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA= -github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL8sThn8IHr/sO+o= github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= @@ -46,12 +39,6 @@ github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PU github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 h1:sAGdeJj0bnMgUNVeUpp6AYlVdCt3/GdI3pGRqsNSQLs= -github.com/google/pprof v0.0.0-20241101162523-b92577c0c142/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= -github.com/google/pprof v0.0.0-20241122213907-cbe949e5a41b h1:SXO0REt4iu865upYCk8aKBBJQ4BqoE0ReP23ClMu60s= -github.com/google/pprof v0.0.0-20241122213907-cbe949e5a41b/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= -github.com/google/pprof v0.0.0-20241128161848-dc51965c6481 h1:yudKIrXagAOl99WQzrP1gbz5HLB9UjhcOFnPzdd6Qec= -github.com/google/pprof v0.0.0-20241128161848-dc51965c6481/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/pprof v0.0.0-20241203143554-1e3fdc7de467 h1:keEZFtbLJugfE0qHn+Ge1JCE71spzkchQobDf3mzS/4= github.com/google/pprof v0.0.0-20241203143554-1e3fdc7de467/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -66,8 +53,6 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= -github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY= github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= @@ -80,8 +65,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM= -github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg= github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= @@ -92,8 +75,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI= github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg= -github.com/quic-go/quic-go v0.48.1 h1:y/8xmfWI9qmGTc+lBr4jKRUWLGSlSigv847ULJ4hYXA= -github.com/quic-go/quic-go v0.48.1/go.mod h1:yBgs3rWBOADpga7F+jJsb6Ybg1LSYiQvwWlLX+/6HMs= github.com/quic-go/quic-go v0.48.2 h1:wsKXZPeGWpMpCGSWqOcqpW2wZYic/8T3aqiOID0/KWE= github.com/quic-go/quic-go v0.48.2/go.mod h1:yBgs3rWBOADpga7F+jJsb6Ybg1LSYiQvwWlLX+/6HMs= github.com/refraction-networking/utls v1.6.7 h1:zVJ7sP1dJx/WtVuITug3qYUq034cDq9B2MR1K67ULZM= @@ -116,52 +97,27 @@ github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZ github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= -golang.org/x/arch v0.11.0 h1:KXV8WWKCXm6tRpLirl2szsO5j/oOODwZf4hATmGVNs4= -golang.org/x/arch v0.11.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/arch v0.12.0 h1:UsYJhbzPYGsT0HbEdmYcqtCv8UNGvnaL561NnIUvaKg= golang.org/x/arch v0.12.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= -golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= -golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= -golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ= -golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg= -golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY= -golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f h1:XdNn9LlyWAhLVp6P/i8QYBW+hlyhrhei9uErw2B5GJo= golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:D5SMRVC3C2/4+F/DB1wZsLRnSNimn2Sp/NPsCrsv8ak= -golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= -golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= -golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= -golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= -golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= -golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= -golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= -golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= -golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= -golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= -golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o= golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q= -google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= -google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=