1.7.0

.github/ISSUE_TEMPLATE/features_request.md

@@ -0,0 +1,20 @@
+---
+name: Features request
+about: 提出新功能建议
+title: "[Features]"
+labels: enhancement
+assignees: ''
+
+---
+
+### 功能描述
+
+请简要描述您希望增加的功能。
+
+### 功能原因
+
+请说明您为什么需要这个功能。
+
+### 功能实现
+
+请详细描述您期望的功能实现。

.github/workflows/build-dev.yml

@@ -21,31 +21,36 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Load VERSION
+      - name: 加载版本号
         run: |
           if [ -f DEV-VERSION ]; then
             echo "VERSION=$(cat DEV-VERSION)" >> $GITHUB_ENV
           else
             echo "DEV-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 update
           sudo apt install upx -y
-      - name: Build
+      - name: 编译
         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 "-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 .
+          ls
       - name: Upload to GitHub Artifacts
         uses: actions/upload-artifact@v3
         with:
@@ -57,7 +62,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

.github/workflows/build-nocache.yml

@@ -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

.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,12 +61,13 @@ 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
         env:
-          export PATH: $PATH:/usr/local/go/bin     
+          export PATH: $PATH:/usr/local/go/bin
+
   docker:
     runs-on: ubuntu-latest
     needs: build  # 确保这个作业在 build 作业完成后运行
@@ -102,3 +107,45 @@ jobs:
           tags: | 
             ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
             ${{ env.IMAGE_NAME }}:latest
+
+  docker-nocache:
+    runs-on: ubuntu-latest 
+    needs: build  # 确保这个作业在 build 作业完成后运行
+    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

CHANGELOG.md

@@ -1,5 +1,68 @@
 # 更新日志
 
+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的预发布版本,请勿在生产环境中使用
+- ADD: 新增`ratePerMinute` API可供查询
+- ADD: 前端新增 version 标识
+- ADD: 前端新增 `重定向` 按钮,用于重定向到代理后的链接
+- CHANGE: 优化输出代码块,使样式更加美观
+- CHANGE: 更新相关依赖库
+- CHANGE: 对黑名单模块进行实验性功能优化,提升性能(改进匹配算法,在切片后优先匹配user,减少无效匹配)
+
+24w21c
+---
+- PRE-RELEASE: 此版本是v1.7.0的预发布版本,请勿在生产环境中使用
+- CHANGE: 对编译打包进行改进,此后不再提供独立可执行文件,请改为拉取`tar.gz`压缩包
+- CHANGE: 由于上述原因,对Docker打包进行相应改进
+
+24w21b
+---
+- PRE-RELEASE: 此版本是v1.7.0的预发布版本,请勿在生产环境中使用
+- ADD: 加入版本号标识与对应API接口
+- ADD: 加入速率限制API接口
+- CHANGE: 修改打包部分
+
+24w21a
+---
+- PRE-RELEASE: 此版本是v1.7.0的预发布版本,请勿在生产环境中使用
+- ADD: 尝试加入程序内置速率限制
+- CHANGE: 更新相关依赖库
+- CHANGE: 更换Dev版本底包,于release版本保持一致
+
+v1.6.2
+---
+- CHANGE: 优化前端界面,优化部分样式
+- ADD: 前端加入黑夜模式
+- CHANGE: 优化移动端适配
+- CHANGE: 优化一键部署脚本,使其更加易用,并增加更多的功能(已于早些时候hotfix)
+- CHANGE: 优化部分代码结构,提升性能
+- CHANGE: 优化日志记录,对各个部分的日志记录进行统一格式,并对部分重复日志进行合并
+
+24w20b
+---
+- PRE-RELEASE: 此版本是v1.6.2的预发布版本,请勿在生产环境中使用
+- CHANGE: 优化前端界面,优化部分样式
+- ADD: 前端加入黑夜模式
+- CHANGE: 优化移动端适配
+
+24w20a
+---
+- PRE-RELEASE: 此版本是v1.6.2的预发布版本,请勿在生产环境中使用
+- CHANGE: 大幅修改日志记录,对各个部分的日志记录进行统一格式,并对部分重复日志进行合并
+- CHANGE: 大幅优化一键部署脚本,使其更加易用,并增加更多的功能(已于早些时候hotfix)
+- CHANGE: 优化部分代码结构,提升性能
+
 v1.6.1
 ---
 - CHANGE: 根据社区建议,将`sizeLimit`由过去的以`byte`为单位,改为以`MB`为单位,以便于直观理解

DEV-VERSION

@@ -1 +1 @@
-24w19d
+24w21d

README.md

@@ -1,4 +1,4 @@
-# GhProxy
+# GHProxy
 
 ![pull](https://img.shields.io/docker/pulls/wjqserver/ghproxy.svg)
 [![Go Report Card](https://goreportcard.com/badge/github.com/WJQSERVER-STUDIO/ghproxy)](https://goreportcard.com/report/github.com/WJQSERVER-STUDIO/ghproxy)
@@ -9,6 +9,8 @@
 
 [TG讨论群组](https://t.me/ghproxy_go)
 
+[版本更新介绍](https://blog.wjqserver.com/categories/my-program/)
+
 ## 项目说明
 
 ### 项目特点
@@ -26,11 +28,10 @@
 ### 项目开发过程
 
 **本项目是[WJQSERVER-STUDIO/ghproxy-go](https://github.com/WJQSERVER-STUDIO/ghproxy-go)的重构版本,实现了原项目原定功能的同时,进一步优化了性能**
-本项目源于[WJQSERVER-STUDIO/ghproxy-go](https://github.com/WJQSERVER-STUDIO/ghproxy-go)与[WJQSERVER/ghproxy-go-0RTT](https://github.com/WJQSERVER/ghproxy-go-0RTT)两个项目,前者带来了实现框架与资源,后者带来了解决Git clone问题的办法,使得本项目从net/http标准库切换至Gin框架,已解决此困扰已久的问题,在此基础上,本项目进一步优化了性能,并添加了用户鉴权功能,使得部署更加安全可靠。
 关于此项目的详细开发过程,请参看Commit记录与[CHANGELOG.md](https://github.com/WJQSERVER-STUDIO/ghproxy/blob/main/CHANGELOG.md)
 
 - V1.0.0 迁移至本仓库,并再次重构内容实现
-- v0.2.0 重构项目实现,Git clone的实现完全自主化
+- v0.2.0 重构项目实现
 
 ### LICENSE
 
@@ -56,7 +57,7 @@ git clone https://ghproxy.1888866.xyz/github.com/WJQSERVER-STUDIO/ghproxy.git
 docker run -p 7210:80 -v ./ghproxy/log/run:/data/ghproxy/log -v ./ghproxy/log/caddy:/data/caddy/log -v ./ghproxy/config:/data/ghproxy/config  --restart always wjqserver/ghproxy
 ```
 
-- Docker-Compose
+- Docker-Compose (建议使用)
 
     参看[docker-compose.yml](https://github.com/WJQSERVER-STUDIO/ghproxy/blob/main/docker/compose/docker-compose.yml)
 
@@ -153,13 +154,9 @@ example.com {
 
 ![ghproxy-demo-v1.5.0.png](https://webp.wjqserver.com/ghproxy/ghproxy-demo-v1.5.0.png)
 
-## TODO & DEV
+结语
+---
 
-### TODO
-- [x] 用户鉴权
-- [x] 仓库黑名单
-- [x] 仓库白名单
-
-### DEV
-
-- [x] Docker Pull 代理
+本项目基于Go语言实现的GHProxy,使用Gin框架与req库
+Docker镜像基于[WJQSERVER-STUDIO/caddy](https://github.com/WJQSERVER-STUDIO/caddy)
+本项目使用WSL LICENSE Version1.2 (WJQSERVER STUDIO LICENSE Version1.2) 授权协议,请遵守相关条例。

SECURITY.MD

@@ -7,7 +7,7 @@
 | 版本 | 是否支持 |
 | --- | --- |
 | v1.x.x | :white_check_mark: |
-| **w**a/b/c... | :warning: 此为PRE-RELEASE版本,用于开发与测试,可能存在未知的问题 |
+| 24w*a/b/c... | :warning: 此为PRE-RELEASE版本,用于开发与测试,可能存在未知的问题 |
 | v0.x.x | :x: 这些版本不再受支持 |
 
 ### 用户须知

VERSION

@@ -1 +1 @@
-1.6.1
+1.7.0

api/api.go

@@ -13,7 +13,6 @@ var (
 	cfg    *config.Config
 )
 
-// 日志模块
 var (
 	logw       = logger.Logw
 	logInfo    = logger.LogInfo
@@ -21,8 +20,7 @@ var (
 	logError   = logger.LogError
 )
 
-func InitHandleRouter(cfg *config.Config, router *gin.Engine) {
-	// 设置路由
+func InitHandleRouter(cfg *config.Config, router *gin.Engine, version string) {
 	apiRouter := router.Group("api")
 	{
 		apiRouter.GET("/size_limit", func(c *gin.Context) {
@@ -40,12 +38,22 @@ func InitHandleRouter(cfg *config.Config, router *gin.Engine) {
 		apiRouter.GET("/healthcheck", func(c *gin.Context) {
 			HealthcheckHandler(c)
 		})
+		apiRouter.GET("/version", func(c *gin.Context) {
+			VersionHandler(c, version)
+		})
+		apiRouter.GET("/rate_limit/status", func(c *gin.Context) {
+			RateLimitStatusHandler(c, cfg)
+		})
+		apiRouter.GET("/rate_limit/limit", func(c *gin.Context) {
+			RateLimitLimitHandler(c, cfg)
+		})
 	}
 	logInfo("API router Init success")
 }
 
 func SizeLimitHandler(cfg *config.Config, c *gin.Context) {
 	sizeLimit := cfg.Server.SizeLimit
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
 	c.Writer.Header().Set("Content-Type", "application/json")
 	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
 		"MaxResponseBodySize": sizeLimit,
@@ -53,6 +61,7 @@ func SizeLimitHandler(cfg *config.Config, c *gin.Context) {
 }
 
 func WhiteListStatusHandler(c *gin.Context, cfg *config.Config) {
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
 	c.Writer.Header().Set("Content-Type", "application/json")
 	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
 		"Whitelist": cfg.Whitelist.Enabled,
@@ -60,6 +69,7 @@ func WhiteListStatusHandler(c *gin.Context, cfg *config.Config) {
 }
 
 func BlackListStatusHandler(c *gin.Context, cfg *config.Config) {
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
 	c.Writer.Header().Set("Content-Type", "application/json")
 	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
 		"Blacklist": cfg.Blacklist.Enabled,
@@ -67,6 +77,7 @@ func BlackListStatusHandler(c *gin.Context, cfg *config.Config) {
 }
 
 func CorsStatusHandler(c *gin.Context, cfg *config.Config) {
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
 	c.Writer.Header().Set("Content-Type", "application/json")
 	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
 		"Cors": cfg.CORS.Enabled,
@@ -74,8 +85,33 @@ func CorsStatusHandler(c *gin.Context, cfg *config.Config) {
 }
 
 func HealthcheckHandler(c *gin.Context) {
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
 	c.Writer.Header().Set("Content-Type", "application/json")
 	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
 		"Status": "OK",
 	})
 }
+
+func VersionHandler(c *gin.Context, version string) {
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	c.Writer.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
+		"Version": version,
+	})
+}
+
+func RateLimitStatusHandler(c *gin.Context, cfg *config.Config) {
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	c.Writer.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
+		"RateLimit": cfg.RateLimit.Enabled,
+	})
+}
+
+func RateLimitLimitHandler(c *gin.Context, cfg *config.Config) {
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	c.Writer.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
+		"RatePerMinute": cfg.RateLimit.RatePerMinute,
+	})
+}

auth/auth.go

@@ -1,13 +1,13 @@
 package auth
 
 import (
+	"fmt"
 	"ghproxy/config"
 	"ghproxy/logger"
 
 	"github.com/gin-gonic/gin"
 )
 
-// 日志模块
 var (
 	logw       = logger.Logw
 	logInfo    = logger.LogInfo
@@ -15,7 +15,6 @@ var (
 	logError   = logger.LogError
 )
 
-// Auth Init
 func Init(cfg *config.Config) {
 	if cfg.Blacklist.Enabled {
 		LoadBlacklist(cfg)
@@ -26,27 +25,25 @@ func Init(cfg *config.Config) {
 	logInfo("Auth Init")
 }
 
-func AuthHandler(c *gin.Context, cfg *config.Config) bool {
-	// 如果身份验证未启用，直接返回 true
+func AuthHandler(c *gin.Context, cfg *config.Config) (isValid bool, err string) {
 	if !cfg.Auth.Enabled {
-		return true
+		return true, ""
 	}
 
-	// 获取 auth_token 参数
 	authToken := c.Query("auth_token")
-	logInfo("auth_token received: %s", authToken)
+	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)
 
-	// 验证 token
 	if authToken == "" {
-		logWarning("auth FAILED: no auth_token provided")
-		return false
+		err := "Auth token == nil"
+		return false, err
 	}
 
-	isValid := authToken == cfg.Auth.AuthToken
+	isValid = authToken == cfg.Auth.AuthToken
 	if !isValid {
-		logWarning("auth FAILED: invalid auth_token: %s", authToken)
+		err := fmt.Sprintf("Auth token incorrect: %s", authToken)
+		return false, err
 	}
 
 	logInfo("auth SUCCESS: %t", isValid)
-	return isValid
+	return isValid, ""
 }

auth/blacklist.go

@@ -32,9 +32,8 @@ func LoadBlacklist(cfg *config.Config) {
 	}
 }
 
-// fullrepo: "owner/repo" or "owner/*"
-func CheckBlacklist(fullrepo string) bool {
-	return forRangeCheckBlacklist(blacklist.Blacklist, fullrepo)
+func CheckBlacklist(repouser string, user string, repo string) bool {
+	return forRangeCheckBlacklist(blacklist.Blacklist, repouser, user)
 }
 
 func sliceRepoName_Blacklist(fullrepo string) (string, string) {
@@ -45,11 +44,16 @@ func sliceRepoName_Blacklist(fullrepo string) (string, string) {
 	return s[0], s[1]
 }
 
-func forRangeCheckBlacklist(blist []string, fullrepo string) bool {
-	repoUser, _ := sliceRepoName_Blacklist(fullrepo)
+func forRangeCheckBlacklist(blist []string, fullrepo string, user string) bool {
 	for _, blocked := range blist {
-		if blocked == fullrepo || (strings.HasSuffix(blocked, "/*") && strings.HasPrefix(repoUser, blocked[:len(blocked)-2])) {
-			return true
+		users, _ := sliceRepoName_Blacklist(blocked)
+		if user == users {
+			if strings.HasSuffix(blocked, "/*") {
+				return true
+			}
+			if fullrepo == blocked {
+				return true
+			}
 		}
 	}
 	return false

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

config/config.go

@@ -12,6 +12,7 @@ type Config struct {
 	Auth      AuthConfig
 	Blacklist BlacklistConfig
 	Whitelist WhitelistConfig
+	RateLimit RateLimitConfig
 }
 
 type ServerConfig struct {
@@ -49,6 +50,12 @@ type WhitelistConfig struct {
 	WhitelistFile string `toml:"whitelistFile"`
 }
 
+type RateLimitConfig struct {
+	Enabled       bool `toml:"enabled"`
+	RatePerMinute int  `toml:"ratePerMinute"`
+	Burst         int  `toml:"burst"`
+}
+
 // LoadConfig 从 TOML 配置文件加载配置
 func LoadConfig(filePath string) (*Config, error) {
 	var config Config

config/config.toml

@@ -25,3 +25,8 @@ enabled = false
 [whitelist]
 enabled = false
 whitelistFile = "/data/ghproxy/config/whitelist.json"
+
+[rateLimit]
+enabled = false
+ratePerMinute = 180
+burst = 5

deploy/config.toml

@@ -5,10 +5,10 @@ sizeLimit = 125 # MB
 
 [pages]
 enabled = true
-staticDir = "/root/data/ghproxy/pages" 
+staticDir = "/usr/local/ghproxy/pages" 
 
 [log]
-logFilePath = "/root/data/ghproxy/log/ghproxy.log" 
+logFilePath = "/usr/local/ghproxy/log/ghproxy.log" 
 maxLogSize = 5 # MB
 
 [cors]
@@ -19,9 +19,14 @@ authToken = "token"
 enabled = false
 
 [blacklist]
-blacklistFile = "/root/data/ghproxy/config/blacklist.json"
+blacklistFile = "/usr/local/ghproxy/config/blacklist.json"
 enabled = false
 
 [whitelist]
 enabled = false
-whitelistFile = "/root/data/ghproxy/config/whitelist.json"
+whitelistFile = "/usr/local/ghproxy/config/whitelist.json"
+
+[rateLimit]
+enabled = false
+ratePerMinute = 180
+burst = 5

deploy/ghproxy.service

@@ -3,8 +3,8 @@ 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
+ExecStart=/bin/bash -c '/usr/local/ghproxy/ghproxy -cfg /usr/local/ghproxy/config/config.toml > /usr/local/ghproxy/log/run.log 2>&1'
+WorkingDirectory=/usr/local/ghproxy
 Restart=always
 User=root
 Group=root

deploy/install-dev.sh

@@ -1,4 +1,7 @@
 # /bin/bash
+# https://github.com/WJQSERVER-STUDIO/ghproxy
+
+ghproxy_dir="/usr/local/ghproxy"
 
 # install packages
 install() {
@@ -27,6 +30,26 @@ install() {
     return 0
 }
 
+make_systemd_service() {
+    cat <<EOF > /etc/systemd/system/ghproxy.service
+[Unit]
+Description=Github Proxy Service
+After=network.target
+
+[Service]
+ExecStart=/bin/bash -c '$ghproxy_dir/ghproxy -cfg $ghproxy_dir/config/config.toml > $ghproxy_dir/log/run.log 2>&1'
+WorkingDirectory=$ghproxy_dir
+Restart=always
+User=root
+Group=root
+
+[Install]
+WantedBy=multi-user.target
+
+EOF
+
+}
+
 # 安装依赖包
 install curl wget sed
 
@@ -44,44 +67,68 @@ elif [ "$ARCH" == "aarch64" ]; then
     ARCH="arm64"
 fi
 
+# 获取监听端口
 read -p "请输入程序监听的端口(默认8080): " PORT
 if [ -z "$PORT" ]; then
     PORT=8080
 fi
 
+# 本机监听/泛监听(127.0.0.1/0.0.0.0)
+read -p "请键入程序监听的IP(默认127.0.0.1)(0.0.0.0为泛监听): " IP
+if [ -z "$IP" ]; then
+    IP="127.0.0.1"
+fi
+
+# 安装目录
+read -p "请输入安装目录(默认/usr/local/ghproxy): " ghproxy_dir
+if [ -z "$ghproxy_dir" ]; then
+    ghproxy_dir="/usr/local/ghproxy"
+fi
+
 # 创建目录
-mkdir -p /root/data/ghproxy
-mkdir -p /root/data/ghproxy/config
-mkdir -p /root/data/ghproxy/log
-mkdir -p /root/data/ghproxy/pages
+mkdir -p ${ghproxy_dir}
+mkdir -p ${ghproxy_dir}/config
+mkdir -p ${ghproxy_dir}/log
+mkdir -p ${ghproxy_dir}/pages
 
 # 获取最新版本号
 VERSION=$(curl -s https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/DEV-VERSION)
-wget -q -O /root/data/ghproxy/VERSION https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/DEV-VERSION
+wget -q -O ${ghproxy_dir}/VERSION https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/DEV-VERSION
 
 # 下载ghproxy
-wget -q -O /root/data/ghproxy/ghproxy https://github.com/WJQSERVER-STUDIO/ghproxy/releases/download/$VERSION/ghproxy-linux-$ARCH
-chmod +x /root/data/ghproxy/ghproxy
+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
-wget -q -O /root/data/ghproxy/pages/index.html https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/pages/index.html
-wget -q -O /root/data/ghproxy/pages/favicon.ico https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/pages/favicon.ico
+wget -q -O ${ghproxy_dir}/pages/index.html https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/pages/index.html
+wget -q -O ${ghproxy_dir}/pages/favicon.ico https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/pages/favicon.ico
 
 
 # 下载配置文件
-if [ -f /root/data/ghproxy/config/config.toml ]; then
+if [ -f ${ghproxy_dir}/config/config.toml ]; then
     echo "配置文件已存在, 跳过下载"
     echo "[WARNING] 请检查配置文件是否正确，DEV版本升级时请注意配置文件兼容性"
     sleep 2
 else
-    wget -q -O /root/data/ghproxy/config/config.toml https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/config.toml
+    wget -q -O ${ghproxy_dir}/config/config.toml https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/config.toml
 fi
 
 # 替换 port = 8080 
-sed -i "s/port = 8080/port = $PORT/g" /root/data/ghproxy/config/config.toml
+sed -i "s/port = 8080/port = $PORT/g" ${ghproxy_dir}/config/config.toml
+sed -i 's/host = "127.0.0.1"/host = "'"$IP"'"/g' ${ghproxy_dir}/config/config.toml
+sed -i "s|staticDir = \"/usr/local/ghproxy/pages\"|staticDir = \"${ghproxy_dir}/pages\"|g" ${ghproxy_dir}/config/config.toml
+sed -i "s|logFilePath = \"/usr/local/ghproxy/log/ghproxy.log\"|logFilePath = \"${ghproxy_dir}/log/ghproxy.log\"|g" ${ghproxy_dir}/config/config.toml
+sed -i "s|blacklistFile = \"/usr/local/ghproxy/config/blacklist.json\"|blacklistFile = \"${ghproxy_dir}/config/blacklist.json\"|g" ${ghproxy_dir}/config/config.toml
+sed -i "s|whitelistFile = \"/usr/local/ghproxy/config/whitelist.json\"|whitelistFile = \"${ghproxy_dir}/config/whitelist.json\"|g" ${ghproxy_dir}/config/config.toml
 
 # 下载systemd服务文件
-wget -q -O /etc/systemd/system/ghproxy.service https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/ghproxy.service
+if [ "$ghproxy_dir" = "/usr/local/ghproxy" ]; then
+    wget -q -O /etc/systemd/system/ghproxy.service https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/ghproxy.service
+else
+    make_systemd_service
+fi
 
 # 启动ghproxy
 systemctl daemon-reload

deploy/install.sh

@@ -1,4 +1,7 @@
 # /bin/bash
+# https://github.com/WJQSERVER-STUDIO/ghproxy
+
+ghproxy_dir="/usr/local/ghproxy"
 
 # install packages
 install() {
@@ -27,8 +30,28 @@ install() {
     return 0
 }
 
+make_systemd_service() {
+    cat <<EOF > /etc/systemd/system/ghproxy.service
+[Unit]
+Description=Github Proxy Service
+After=network.target
+
+[Service]
+ExecStart=/bin/bash -c '$ghproxy_dir/ghproxy -cfg $ghproxy_dir/config/config.toml > $ghproxy_dir/log/run.log 2>&1'
+WorkingDirectory=$ghproxy_dir
+Restart=always
+User=root
+Group=root
+
+[Install]
+WantedBy=multi-user.target
+
+EOF
+
+}
+
 # 安装依赖包
-install curl wget -q sed
+install curl wget sed
 
 # 查看当前架构是否为linux/amd64或linux/arm64
 ARCH=$(uname -m)
@@ -44,38 +67,68 @@ elif [ "$ARCH" == "aarch64" ]; then
     ARCH="arm64"
 fi
 
+# 获取监听端口
 read -p "请输入程序监听的端口(默认8080): " PORT
 if [ -z "$PORT" ]; then
     PORT=8080
 fi
 
+# 本机监听/泛监听(127.0.0.1/0.0.0.0)
+read -p "请键入程序监听的IP(默认127.0.0.1)(0.0.0.0为泛监听): " IP
+if [ -z "$IP" ]; then
+    IP="127.0.0.1"
+fi
+
+# 安装目录
+read -p "请输入安装目录(默认/usr/local/ghproxy): " ghproxy_dir
+if [ -z "$ghproxy_dir" ]; then
+    ghproxy_dir="/usr/local/ghproxy"
+fi
+
 # 创建目录
-mkdir -p /root/data/ghproxy
-mkdir -p /root/data/ghproxy/config
-mkdir -p /root/data/ghproxy/log
+mkdir -p ${ghproxy_dir}
+mkdir -p ${ghproxy_dir}/config
+mkdir -p ${ghproxy_dir}/log
+mkdir -p ${ghproxy_dir}/pages
 
 # 获取最新版本号
 VERSION=$(curl -s https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/VERSION)
-wget -q -O /root/data/ghproxy/VERSION https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/VERSION
+wget -q -O ${ghproxy_dir}/VERSION https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/VERSION
 
 # 下载ghproxy
-wget -q -O /root/data/ghproxy/ghproxy https://github.com/WJQSERVER-STUDIO/ghproxy/releases/download/$VERSION/ghproxy-linux-$ARCH
-chmod +x /root/data/ghproxy/ghproxy
+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
+wget -q -O ${ghproxy_dir}/pages/index.html https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/pages/index.html
+wget -q -O ${ghproxy_dir}/pages/favicon.ico https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/pages/favicon.ico
+
 
 # 下载配置文件
-if [ -f /root/data/ghproxy/config/config.toml ]; then
+if [ -f ${ghproxy_dir}/config/config.toml ]; then
     echo "配置文件已存在, 跳过下载"
-    echo "请检查配置文件是否正确，跨大版本升级时请注意配置文件兼容性"
+    echo "[WARNING] 请检查配置文件是否正确，DEV版本升级时请注意配置文件兼容性"
     sleep 2
 else
-    wget -q -O /root/data/ghproxy/config/config.toml https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/config.toml
+    wget -q -O ${ghproxy_dir}/config/config.toml https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/config.toml
 fi
 
 # 替换 port = 8080 
-sed -i "s/port = 8080/port = $PORT/g" /root/data/ghproxy/config/config.toml
+sed -i "s/port = 8080/port = $PORT/g" ${ghproxy_dir}/config/config.toml
+sed -i 's/host = "127.0.0.1"/host = "'"$IP"'"/g' ${ghproxy_dir}/config/config.toml
+sed -i "s|staticDir = \"/usr/local/ghproxy/pages\"|staticDir = \"${ghproxy_dir}/pages\"|g" ${ghproxy_dir}/config/config.toml
+sed -i "s|logFilePath = \"/usr/local/ghproxy/log/ghproxy.log\"|logFilePath = \"${ghproxy_dir}/log/ghproxy.log\"|g" ${ghproxy_dir}/config/config.toml
+sed -i "s|blacklistFile = \"/usr/local/ghproxy/config/blacklist.json\"|blacklistFile = \"${ghproxy_dir}/config/blacklist.json\"|g" ${ghproxy_dir}/config/config.toml
+sed -i "s|whitelistFile = \"/usr/local/ghproxy/config/whitelist.json\"|whitelistFile = \"${ghproxy_dir}/config/whitelist.json\"|g" ${ghproxy_dir}/config/config.toml
 
 # 下载systemd服务文件
-wget -q -O /etc/systemd/system/ghproxy.service https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/ghproxy.service
+if [ "$ghproxy_dir" = "/usr/local/ghproxy" ]; then
+    wget -q -O /etc/systemd/system/ghproxy.service https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/ghproxy.service
+else
+    make_systemd_service
+fi
 
 # 启动ghproxy
 systemctl daemon-reload

deploy/uninstall.sh

@@ -7,7 +7,21 @@ systemctl stop ghproxy
 systemctl disable ghproxy
 rm /etc/systemd/system/ghproxy.service
 
+# 获取安装文件夹
+read -p "请输入 ghproxy 安装文件夹路径(默认 /usr/local/ghproxy): " install_path
+if [ -z "$install_path" ]; then
+    install_path="/usr/local/ghproxy"
+fi
+
 # 删除 ghproxy 文件夹
-rm -r /root/data/ghproxy
+# 检查目录是否存在ghproxy文件
+if [ -f "$install_path" ]; then
+    echo "ghproxy 未安装或安装路径错误"
+    exit 1
+else
+    echo "ghproxy 安装目录已确认，正在卸载..."
+    rm -r $install_path
+fi
+
 
 echo "ghproxy 已成功卸载"

docker/dockerfile/dev/Dockerfile

@@ -1,4 +1,4 @@
-FROM wjqserver/caddy:daily-alpine AS builder
+FROM wjqserver/caddy:2.9.0-rc-alpine AS builder
 
 ARG USER=WJQSERVER-STUDIO
 ARG REPO=ghproxy
@@ -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/DEV-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/dev/init.sh
 
 # 拉取配置
@@ -34,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:daily-alpine
+FROM wjqserver/caddy:2.9.0-rc-alpine
 
 COPY --from=builder /data/www /data/www
 COPY --from=builder /data/caddy /data/caddy

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
 
 # 拉取配置

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
 
 # 拉取配置

go.mod

@@ -6,6 +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
 )
 
 require (
@@ -22,7 +23,7 @@ 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-20241023014458-598669927662 // indirect
+	github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 // 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
@@ -32,7 +33,7 @@ require (
 	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.20.2 // indirect
+	github.com/onsi/ginkgo/v2 v2.21.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

go.sum

@@ -50,6 +50,10 @@ github.com/google/pprof v0.0.0-20241017200806-017d972448fc h1:NGyrhhFhwvRAZg02jn
 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=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -76,8 +80,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/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/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=
@@ -132,6 +139,8 @@ 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/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=

logger/logger.go

@@ -56,7 +56,6 @@ func Log(customMessage string) {
 	logChannel <- customMessage
 }
 
-// 格式化日志记录
 func Logw(format string, args ...interface{}) {
 	message := fmt.Sprintf(format, args...)
 	Log(message)
@@ -82,7 +81,6 @@ func LogError(format string, args ...interface{}) {
 	Log(message)
 }
 
-// 关闭日志文件
 func Close() {
 	logFileMutex.Lock()
 	defer logFileMutex.Unlock()

main.go

@@ -5,12 +5,14 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"time"
 
 	"ghproxy/api"
 	"ghproxy/auth"
 	"ghproxy/config"
 	"ghproxy/logger"
 	"ghproxy/proxy"
+	"ghproxy/rate"
 
 	"github.com/gin-gonic/gin"
 )
@@ -20,9 +22,10 @@ var (
 	router     *gin.Engine
 	configfile = "/data/ghproxy/config/config.toml"
 	cfgfile    string
+	limiter    *rate.RateLimiter
+	version    string
 )
 
-// 日志模块
 var (
 	logw       = logger.Logw
 	logInfo    = logger.LogInfo
@@ -36,7 +39,6 @@ func readFlag() {
 
 func loadConfig() {
 	var err error
-	// 初始化配置
 	cfg, err = config.LoadConfig(cfgfile)
 	if err != nil {
 		log.Fatalf("Failed to load config: %v", err)
@@ -46,9 +48,8 @@ func loadConfig() {
 }
 
 func setupLogger(cfg *config.Config) {
-	// 初始化日志模块
 	var err error
-	err = logger.Init(cfg.Log.LogFilePath, cfg.Log.MaxLogSize) // 传递日志文件路径
+	err = logger.Init(cfg.Log.LogFilePath, cfg.Log.MaxLogSize)
 	if err != nil {
 		log.Fatalf("Failed to initialize logger: %v", err)
 	}
@@ -61,8 +62,15 @@ func loadlist(cfg *config.Config) {
 	auth.Init(cfg)
 }
 
-func setupApi(cfg *config.Config, router *gin.Engine) {
-	api.InitHandleRouter(cfg, router)
+func setupApi(cfg *config.Config, router *gin.Engine, version string) {
+	api.InitHandleRouter(cfg, router, version)
+}
+
+func setupRateLimit(cfg *config.Config) {
+	if cfg.RateLimit.Enabled {
+		limiter = rate.New(cfg.RateLimit.RatePerMinute, cfg.RateLimit.Burst, 1*time.Minute)
+		logInfo("Rate Limit Loaded")
+	}
 }
 
 func init() {
@@ -71,13 +79,14 @@ func init() {
 	loadConfig()
 	setupLogger(cfg)
 	loadlist(cfg)
+	setupRateLimit(cfg)
 
 	gin.SetMode(gin.ReleaseMode)
 
 	router = gin.Default()
 	router.UseH2C = true
 
-	setupApi(cfg, router)
+	setupApi(cfg, router, version)
 
 	if cfg.Pages.Enabled {
 		indexPagePath := fmt.Sprintf("%s/index.html", cfg.Pages.StaticDir)
@@ -89,22 +98,21 @@ func init() {
 		router.StaticFile("/favicon.ico", faviconPath)
 	} else if !cfg.Pages.Enabled {
 		router.GET("/", func(c *gin.Context) {
-			c.String(http.StatusForbidden, "403 Forbidden This route is not allowed to access.")
-			logWarning("Forbidden: IP:%s UA:%s METHOD:%s HTTPv:%s", c.ClientIP(), c.Request.UserAgent(), c.Request.Method, c.Request.Proto)
+			c.String(http.StatusForbidden, "403 Forbidden Access")
+			logWarning("403 > Path:/ IP:%s UA:%s METHOD:%s HTTPv:%s", c.ClientIP(), c.Request.UserAgent(), c.Request.Method, c.Request.Proto)
 		})
 	}
 
 	router.NoRoute(func(c *gin.Context) {
-		proxy.NoRouteHandler(cfg)(c)
+		proxy.NoRouteHandler(cfg, limiter)(c)
 	})
 }
 
 func main() {
-	// 启动服务器
 	err := router.Run(fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port))
 	if err != nil {
-		logError("Error starting server: %v\n", err)
+		logError("Failed to start server: %v\n", err)
 	}
 
-	fmt.Println("Program finished")
+	fmt.Println("Program Exit")
 }

pages/index.html

@@ -5,12 +5,30 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="Github文件加速">
+    <meta name="keywords" content="Github,文件加速,ghproxy">
+    <meta name="color-scheme" content="dark light">
     <title>Github文件加速</title>
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.5.3/css/bootstrap.min.css" rel="stylesheet">
     <link rel="stylesheet" href="https://font.sec.miui.com/font/css?family=MiSans:400,700:MiSans">
     <style>
+        :root {
+            --color: #dadada;
+            --fontcolor: #333;
+            --inputcolor: #a19f9f;
+        }
+
+        @media (prefers-color-scheme: dark) {
+            :root {
+                --color: #53535338;
+                --fontcolor: #b8b8b8;
+                --inputcolor: #012333;
+                --inputcolor-font: #969696d8;
+            }
+        }
+
         body {
-            background-color: #ecececf3;
+            background-color: var(--color);
+            color: var(--fontcolor);
             font-family: 'Misans', Arial, sans-serif;
             padding: 30px;
             display: flex;
@@ -22,15 +40,51 @@
             position: relative;
         }
 
+        .version {
+            width: 12.5%;
+            height: 2%;
+            background-color: #39c5bb;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            color: white;
+            font-size: 0.8rem;
+            border-radius: 0.5rem;
+            position: fixed;
+            bottom: 0%;
+            right: 0%;
+        }
+
+        .version p {
+            margin: 0px;
+            padding: 0px;
+        }
+
+        *::-webkit-scrollbar {
+            height: 10px;
+            margin-top: 0px;
+        }
+
+        *::-webkit-scrollbar-track {
+            background-color: black;
+        }
+
+        *::-webkit-scrollbar-thumb {
+            background: #39c5bb;
+            border-radius: 10px;
+        }
+
         .container {
-            max-width: 800px;
+            max-width: 80%;
             text-align: center;
-            min-height: 45vh;
+            min-height: 65%;
+            line-height: 1.25;
         }
 
         h1 {
+            color: var(--fontcolor);
             font-weight: bold;
-            margin-bottom: 85px;
+            margin-bottom: 20%;
         }
 
         .rounded-button {
@@ -40,7 +94,7 @@
             background-color: #555c5c;
             color: rgb(255, 255, 255);
             border: none;
-            margin-bottom: 10px;
+            margin-bottom: 3%;
         }
 
         .rounded-button:hover {
@@ -51,7 +105,8 @@
         .tips>p:first-child::before {
             position: sticky;
             color: #7b7b7b;
-            margin-bottom: 5px;
+            margin-bottom: 1%;
+            font-size: 60%;
         }
 
         footer {
@@ -61,14 +116,15 @@
             left: 0;
             right: 0;
             text-align: center;
+            font-size: 1rem;
         }
 
         pre {
             background: #012333;
             color: #39c5bc;
-            padding: 20px 20px;
-            margin: 10px 0;
-            border-radius: 8px;
+            padding: 15px 20px 15px 20px;
+            margin: 0px 0;
+            border-radius: 0.5rem;
             overflow-x: auto;
             position: relative;
         }
@@ -77,10 +133,10 @@
             content: " ";
             display: block;
             position: absolute;
-            top: 10px;
-            left: 10px;
-            width: 12px;
-            height: 12px;
+            top: 6px;
+            left: 6px;
+            width: 10px;
+            height: 10px;
             background: #bd3c35;
             border-radius: 50%;
             box-shadow: 20px 0 0 #d69f27, 40px 0 0 #39c5bb;
@@ -88,18 +144,92 @@
 
         code {
             font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
-            font-size: 1em;
+            font-size: 0.9em;
+            margin-bottom: 0px;
+        }
+
+        @media (max-width: 768px) {
+            footer {
+                font-size: 0.85rem;
+            }
+
+            .container {
+                max-width: 100%;
+                font-size: 0.8rem;
+            }
+
+            .tips {
+                font-size: 0.8rem;
+            }
+
+            .tips-content {
+                font-size: 0.8rem;
+            }
+
+            .status-container {
+                font-size: 0.8rem;
+            }
+        }
+
+        @media (min-width: 768px) {
+            footer {
+                font-size: 1rem;
+            }
+
+            .container {
+                max-width: 65%;
+                font-size: 1rem;
+            }
+
+            .tips {
+                font-size: 1.1rem;
+            }
+
+            .tips-content {
+                font-size: 1.1rem;
+            }
+
+            .status-container {
+                font-size: 1.05rem;
+            }
+
+            h1 {
+                margin-bottom: 10%;
+            }
+
+            .version {
+                width: 7.5%;
+            }
+        }
+
+        .form-group {
+            margin-bottom: 3%;
+        }
+
+        .form-control {
+            background-color: var(--inputcolor);
+            color: var(--inputcolor-font);
+        }
+
+        .form-control:focus {
+            background-color: var(--inputcolor);
+            color: var(--inputcolor-font);
+        }
+
+        .tips-content {
+            margin-bottom: 0px;
         }
 
         .status-container {
             display: flex;
             justify-content: center;
             align-items: center;
-            margin-bottom: 5px;
+            margin-bottom: 1px;
+            margin-top: -2%;
         }
 
         .status-container p {
-            margin: 0px 5px;
+            margin: 0px 1px;
         }
 
 
@@ -110,7 +240,7 @@
 
         .copy-button {
             position: absolute;
-            top: 5px;
+            top: 10px;
             right: 10px;
             background: rgba(0, 217, 224, 0.822);
             color: white;
@@ -120,6 +250,24 @@
             cursor: pointer;
             transition: opacity 0.3s;
             z-index: 1;
+            font-size: 0.85rem;
+            display: none;
+        }
+
+        .redir-button {
+            position: absolute;
+            top: 10px;
+            right: 65px;
+            background: rgba(0, 217, 224, 0.822);
+            color: white;
+            border: none;
+            padding: 5px 10px;
+            border-radius: 5px;
+            cursor: pointer;
+            transition: opacity 0.3s;
+            z-index: 1;
+            font-size: 0.85rem;
+            display: none;
         }
 
         pre:hover .copy-button {
@@ -141,13 +289,16 @@
             color: white;
             padding: 15px 20px;
             border-radius: 10px;
-            font-size: 16px;
+            font-size: 90%;
             z-index: 1000;
         }
     </style>
 </head>
 
 <body>
+    <div class="version">
+        <p id="version"></p>
+    </div>
     <div class="container">
         <h1>Github文件加速</h1>
         <div class="form-group">
@@ -157,10 +308,13 @@
 
         <div class="code" id="outputBlock">
             <button class="copy-button" id="copyButton">复制</button>
+            <button class="redir-button" id="redirButton">打开</button>
             <pre id="formattedLinkOutput"></pre>
         </div>
         <div class="tips">
-            <p>GitHub链接带不带协议头均可，支持release、archive以及文件，转换后链接均可使用</a>。</p>
+            <div class="tips-content">
+                <p>GitHub链接带不带协议头均可，支持release、archive以及文件，转换后链接均可使用</a>。</p><br>
+            </div>
             <div class="status-container">
                 <p id="sizeLimitDisplay">文件大小限制: ...</p>
                 <p id="whiteListStatus">白名单状态: ...</p>
@@ -181,16 +335,22 @@
 
             if (githubLinkInput.value.startsWith("https://github.com/") || githubLinkInput.value.startsWith("http://github.com/")) {
                 formattedLink = "https://" + currentHost + "/github.com" + githubLinkInput.value.substring(githubLinkInput.value.indexOf("/", 8));
+                displayButton();
             } else if (githubLinkInput.value.startsWith("github.com/")) {
                 formattedLink = "https://" + currentHost + "/" + githubLinkInput.value;
+                displayButton();
             } else if (githubLinkInput.value.startsWith("https://raw.githubusercontent.com/") || githubLinkInput.value.startsWith("http://raw.githubusercontent.com/")) {
                 formattedLink = "https://" + currentHost + githubLinkInput.value.substring(githubLinkInput.value.indexOf("/", 7));
+                displayButton();
             } else if (githubLinkInput.value.startsWith("raw.githubusercontent.com/")) {
                 formattedLink = "https://" + currentHost + "/" + githubLinkInput.value;
+                displayButton();
             } else if (githubLinkInput.value.startsWith("https://gist.githubusercontent.com/") || githubLinkInput.value.startsWith("http://gist.githubusercontent.com/")) {
                 formattedLink = "https://" + currentHost + "/gist.github.com" + githubLinkInput.value.substring(githubLinkInput.value.indexOf("/", 18));
+                displayButton();
             } else if (githubLinkInput.value.startsWith("gist.githubusercontent.com/")) {
                 formattedLink = "https://" + currentHost + "/" + githubLinkInput.value;
+                displayButton();
             } else {
                 showToast('请输入有效的GitHub链接');
             }
@@ -198,6 +358,19 @@
             formattedLinkOutput.textContent = formattedLink;
         }
 
+        function displayButton() {
+            var copyButton = document.getElementById('copyButton');
+            var redirButton = document.getElementById('redirButton');
+            copyButton.style.display = 'block';
+            redirButton.style.display = 'block';
+        }
+
+        function redirToFormattedLink() {
+            var formattedLinkOutput = document.getElementById('formattedLinkOutput');
+            console.log(formattedLinkOutput.textContent);
+            window.open(formattedLinkOutput.textContent);
+        }
+
         document.getElementById('formatButton').addEventListener('click', formatGithubLink);
         document.getElementById('copyButton').addEventListener('click', function () {
             const output = document.getElementById('formattedLinkOutput');
@@ -207,9 +380,9 @@
             window.getSelection().addRange(range);
             document.execCommand('copy');
             window.getSelection().removeAllRanges();
-            //alert('链接已复制到剪贴板');
             showToast('链接已复制到剪贴板');
         });
+        document.getElementById('redirButton').addEventListener('click', redirToFormattedLink);
 
         function showToast(message) {
             const toast = document.getElementById('toast');
@@ -267,10 +440,22 @@
                     console.error('Error fetching API:', error);
                 });
         }
+        function fetchVersion() {
+            fetch(window.location.origin + '/api/version')
+                .then(response => response.json())
+                .then(data => {
+                    const version = document.getElementById('version');
+                    version.textContent = `${data.Version}`;
+                })
+                .catch(error => {
+                    console.error('Error fetching API:', error);
+                });
+        }
         function fetchAPI() {
             fetchSizeLimit();
             fetchWhiteList();
             fetchBlackList();
+            fetchVersion();
         }
         document.addEventListener('DOMContentLoaded', fetchAPI);
     </script>
@@ -279,7 +464,7 @@
 <footer>
     <p>
         Copyright &copy; 2024 WJQSERVER-STUDIO<br>
-        GitHub仓库地址：<a href="https://github.com/WJQSERVER-STUDIO/ghproxy">https://github.com/WJQSERVER-STUDIO/ghproxy</a>
+        GitHub仓库地址：<a href="https://github.com/WJQSERVER-STUDIO/ghproxy">WJQSERVER-STUDIO/ghproxy</a>
         <br><a href="https://t.me/ghproxy_go">Telegram交流群</a>
     </p>
     <div id="visitor-info" style="text-align: center; margin-top: 15px;">

proxy/proxy.go

@@ -1,4 +1,3 @@
-// proxy/proxy.go 实验性
 package proxy
 
 import (
@@ -12,6 +11,7 @@ import (
 	"ghproxy/auth"
 	"ghproxy/config"
 	"ghproxy/logger"
+	"ghproxy/rate"
 
 	"github.com/gin-gonic/gin"
 	"github.com/imroc/req/v3"
@@ -33,15 +33,26 @@ var exps = []*regexp.Regexp{
 	regexp.MustCompile(`^(?:https?://)?gist\.github(?:usercontent|)\.com/([^/]+)/.+?/.+`),
 }
 
-func NoRouteHandler(cfg *config.Config) gin.HandlerFunc {
+func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter) gin.HandlerFunc {
 	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)
+				return
+			}
+		}
+
 		rawPath := strings.TrimPrefix(c.Request.URL.RequestURI(), "/")
 		re := regexp.MustCompile(`^(http:|https:)?/?/?(.*)`)
 		matches := re.FindStringSubmatch(rawPath)
 
 		if len(matches) < 3 {
-			logWarning("Invalid URL: %s", rawPath)
-			c.String(http.StatusForbidden, "Invalid URL.")
+			errMsg := fmt.Sprintf("%s %s %s %s %s Invalid URL", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto)
+			logWarning(errMsg)
+			c.String(http.StatusForbidden, "Invalid URL Format. Path: %s", rawPath)
 			return
 		}
 
@@ -49,34 +60,37 @@ func NoRouteHandler(cfg *config.Config) gin.HandlerFunc {
 
 		username, repo := MatchUserRepo(rawPath, cfg, c, matches)
 
-		logWarning("Blacklist Check > Username: %s, Repo: %s", username, repo)
-		fullrepo := fmt.Sprintf("%s/%s", username, repo)
+		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)
+		repouser := fmt.Sprintf("%s/%s", username, repo)
 
 		// 白名单检查
 		if cfg.Whitelist.Enabled {
-			whitelistpass := auth.CheckWhitelist(fullrepo)
-			if !whitelistpass {
-				errMsg := fmt.Sprintf("Whitelist Blocked repo: %s", fullrepo)
+			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)
 				c.JSON(http.StatusForbidden, gin.H{"error": errMsg})
-				logWarning(errMsg)
+				logWarning(logErrMsg)
 				return
 			}
 		}
 
 		// 黑名单检查
 		if cfg.Blacklist.Enabled {
-			blacklistpass := auth.CheckBlacklist(fullrepo)
-			if blacklistpass {
-				errMsg := fmt.Sprintf("Blacklist Blocked repo: %s", 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, repouser)
+				errMsg := fmt.Sprintf("Blacklist Blocked repo: %s", repouser)
 				c.JSON(http.StatusForbidden, gin.H{"error": errMsg})
-				logWarning(errMsg)
+				logWarning(logErrMsg)
 				return
 			}
 		}
 
-		matches = CheckURL(rawPath)
+		matches = CheckURL(rawPath, c)
 		if matches == nil {
 			c.AbortWithStatus(http.StatusNotFound)
+			logError("%s %s %s %s %s 404-NOMATCH", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto)
 			return
 		}
 
@@ -84,13 +98,16 @@ func NoRouteHandler(cfg *config.Config) gin.HandlerFunc {
 			rawPath = strings.Replace(rawPath, "/blob/", "/raw/", 1)
 		}
 
-		if !auth.AuthHandler(c, cfg) {
+		// 鉴权
+		authcheck, err := auth.AuthHandler(c, cfg)
+		if !authcheck {
 			c.AbortWithStatusJSON(401, gin.H{"error": "Unauthorized"})
-			logWarning("Unauthorized request: %s", rawPath)
+			logWarning("%s %s %s %s %s Auth-Error: %v", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, err)
 			return
 		}
 
-		logInfo("Matches: %v", matches)
+		// IP METHOD URL USERAGENT PROTO MATCHES
+		logInfo("%s %s %s %s %s Matches: %v", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, matches)
 
 		switch {
 		case exps[0].MatchString(rawPath), exps[1].MatchString(rawPath), exps[3].MatchString(rawPath), exps[4].MatchString(rawPath):
@@ -99,6 +116,7 @@ func NoRouteHandler(cfg *config.Config) gin.HandlerFunc {
 			ProxyRequest(c, rawPath, cfg, "git")
 		default:
 			c.String(http.StatusForbidden, "Invalid input.")
+			fmt.Println("Invalid input.")
 			return
 		}
 	}
@@ -110,24 +128,24 @@ func MatchUserRepo(rawPath string, cfg *config.Config, c *gin.Context, matches [
 	var gistmatches []string
 	if gistregex.MatchString(rawPath) {
 		gistmatches = gistregex.FindStringSubmatch(rawPath)
-		logInfo("Gist Matched > Username: %s, URL: %s", gistmatches[1], rawPath)
+		logInfo("%s %s %s %s %s Matched-Username: %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, gistmatches[1])
 		return gistmatches[1], ""
 	}
-	// 定义路径匹配的正则表达式
+	// 定义路径
 	pathRegex := regexp.MustCompile(`^([^/]+)/([^/]+)/([^/]+)/.*`)
 	if pathMatches := pathRegex.FindStringSubmatch(matches[2]); len(pathMatches) >= 4 {
 		return pathMatches[2], pathMatches[3]
 	}
 
 	// 返回错误信息
-	logWarning("Invalid path: %s", rawPath)
-	c.String(http.StatusForbidden, "Invalid path; expected username/repo.")
+	errMsg := fmt.Sprintf("%s %s %s %s %s Invalid URL", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto)
+	logWarning(errMsg)
+	c.String(http.StatusForbidden, "Invalid path; expected username/repo, Path: %s", rawPath)
 	return "", ""
 }
 
 func ProxyRequest(c *gin.Context, u string, cfg *config.Config, mode string) {
 	method := c.Request.Method
-	// 记录日志 IP 地址、请求方法、请求 URL、请求头 User-Agent 、HTTP版本
 	logInfo("%s %s %s %s %s", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto)
 
 	client := createHTTPClient(mode)
@@ -141,7 +159,7 @@ func ProxyRequest(c *gin.Context, u string, cfg *config.Config, mode string) {
 	req := client.R().SetBody(body)
 	setRequestHeaders(c, req)
 
-	resp, err := SendRequest(req, method, u)
+	resp, err := SendRequest(c, req, method, u)
 	if err != nil {
 		HandleError(c, fmt.Sprintf("Failed to send request: %v", err))
 		return
@@ -149,17 +167,18 @@ func ProxyRequest(c *gin.Context, u string, cfg *config.Config, mode string) {
 	defer resp.Body.Close()
 
 	if err := HandleResponseSize(resp, cfg, c); err != nil {
-		logWarning("Error handling response size: %v", err)
+		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
 	}
 
 	CopyResponseHeaders(resp, c, cfg)
 	c.Status(resp.StatusCode)
 	if err := copyResponseBody(c, resp.Body); err != nil {
-		logError("Failed to copy response body: %v", err)
+		logError("%s %s %s %s %s Response-Copy-Error: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err)
 	}
 }
 
+// 判断并选择TLS指纹
 func createHTTPClient(mode string) *req.Client {
 	client := req.C()
 	switch mode {
@@ -198,7 +217,7 @@ func copyResponseBody(c *gin.Context, respBody io.Reader) error {
 	return err
 }
 
-func SendRequest(req *req.Request, method, url string) (*req.Response, error) {
+func SendRequest(c *gin.Context, req *req.Request, method, url string) (*req.Response, error) {
 	switch method {
 	case "GET":
 		return req.Get(url)
@@ -209,8 +228,10 @@ func SendRequest(req *req.Request, method, url string) (*req.Response, error) {
 	case "DELETE":
 		return req.Delete(url)
 	default:
-		logInfo("Unsupported method: %s", method)
-		return nil, fmt.Errorf("unsupported method: %s", method)
+		// IP METHOD URL USERAGENT PROTO UNSUPPORTED-METHOD
+		errmsg := fmt.Sprintf("%s %s %s %s %s Unsupported method", c.ClientIP(), method, url, c.Request.Header.Get("User-Agent"), c.Request.Proto)
+		logWarning(errmsg)
+		return nil, fmt.Errorf(errmsg)
 	}
 }
 
@@ -222,8 +243,8 @@ func HandleResponseSize(resp *req.Response, cfg *config.Config, c *gin.Context)
 		if err == nil && size > sizelimit {
 			finalURL := resp.Request.URL.String()
 			c.Redirect(http.StatusMovedPermanently, finalURL)
-			logWarning("Size limit exceeded: %s, Size: %d", finalURL, size)
-			return fmt.Errorf("size limit exceeded: %d", size)
+			logWarning("%s %s %s %s %s Final-URL: %s Size-Limit-Exceeded: %d", c.ClientIP(), c.Request.Method, c.Request.URL.String(), c.Request.Header.Get("User-Agent"), c.Request.Proto, finalURL, size)
+			return fmt.Errorf("Path: %s size limit exceeded: %d", finalURL, size)
 		}
 	}
 	return nil
@@ -282,14 +303,13 @@ func HandleError(c *gin.Context, message string) {
 	logWarning(message)
 }
 
-func CheckURL(u string) []string {
+func CheckURL(u string, c *gin.Context) []string {
 	for _, exp := range exps {
 		if matches := exp.FindStringSubmatch(u); matches != nil {
-			logInfo("URL matched: %s, Matches: %v", u, matches[1:])
 			return matches[1:]
 		}
 	}
-	errMsg := fmt.Sprintf("Invalid URL: %s", u)
+	errMsg := fmt.Sprintf("%s %s %s %s %s Invalid URL", c.ClientIP(), c.Request.Method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto)
 	logWarning(errMsg)
 	return nil
 }

rate/rate.go

@@ -0,0 +1,21 @@
+package rate
+
+import (
+	"time"
+
+	"golang.org/x/time/rate"
+)
+
+type RateLimiter struct {
+	limiter *rate.Limiter
+}
+
+func New(limit int, burst int, duration time.Duration) *RateLimiter {
+	return &RateLimiter{
+		limiter: rate.NewLimiter(rate.Limit(float64(limit)/duration.Seconds()), burst),
+	}
+}
+
+func (rl *RateLimiter) Allow() bool {
+	return rl.limiter.Allow()
+}