From a92bbb7fb616acc7f49bc204db77af75572183e1 Mon Sep 17 00:00:00 2001 From: wjqserver <114663932+WJQSERVER@users.noreply.github.com> Date: Tue, 18 Mar 2025 21:53:59 +0800 Subject: [PATCH] 25w20a --- .github/workflows/build-dev.yml | 5 + .github/workflows/build.yml | 5 + .gitignore | 3 +- CHANGELOG.md | 6 + DEV-VERSION | 2 +- README.md | 11 +- api/api.go | 148 +++++++++------- auth/auth-header.go | 8 +- auth/auth-parameters.go | 6 +- auth/auth.go | 5 +- config/config.go | 8 +- go.mod | 17 +- go.sum | 46 ++++- main.go | 227 +++++++++++++++--------- middleware/loggin/loggin.go | 25 +-- proxy/authpass.go | 9 +- proxy/chunkreq.go | 67 +++---- proxy/gitreq.go | 29 ++-- proxy/handler.go | 48 +++-- proxy/matchrepo.go | 298 ++++++++++++++++++++++++++++---- proxy/proxy.go | 16 +- proxy/reqheader.go | 12 +- 22 files changed, 685 insertions(+), 316 deletions(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 40a60f6..ecee468 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -59,6 +59,11 @@ jobs: else echo "DEV-VERSION file not found!" && exit 1 fi + - name: 拉取前端 + run: | + sudo git clone https://github.com/WJQSERVER-STUDIO/GHPrxoy-Frontend.git pages + sudo rm -rf pages/.git/ + - name: 安装 Go uses: actions/setup-go@v3 with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 76306c5..76d37ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,6 +56,11 @@ jobs: else echo "VERSION file not found!" && exit 1 fi + - name: 拉取前端 + run: | + sudo git clone https://github.com/WJQSERVER-STUDIO/GHPrxoy-Frontend.git pages + sudo rm -rf pages/.git/ + - name: 安装 Go uses: actions/setup-go@v3 with: diff --git a/.gitignore b/.gitignore index c16c6b1..02838fb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ demo.toml *.log *.bak list.json -repos \ No newline at end of file +repos +pages \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 93bc519..23a8aee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # 更新日志 +25w20a - 2025-03-18 +--- +- PRE-RELEASE: 此版本是v3.0.0的预发布版本,请勿在生产环境中使用; v3.0.0会与v2.4.0及以上保证兼容关系, 可平顺升级; +- CHANGE: 使用HertZ重构 +- CHANGE: 前端在构建时加入 + 2.5.0 - 2025-03-17 --- - ADD: 加入脚本嵌套加速功能 diff --git a/DEV-VERSION b/DEV-VERSION index e33ec6f..891f1b3 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -25w19a \ No newline at end of file +25w20a \ No newline at end of file diff --git a/README.md b/README.md index 7aeec5f..9f5595f 100644 --- a/README.md +++ b/README.md @@ -17,14 +17,16 @@ ### 项目特点 - 基于Go语言实现,支持多平台 -- 使用[Gin](https://github.com/gin-gonic/gin)作为Web框架 +- 使用字节旗下的[HertZ](https://github.com/cloudwego/hertz)作为Web框架 - 使用[Touka-HTTPC](https://github.com/satomitouka/touka-httpc)作为HTTP客户端 - 支持Git clone,raw,realeases等文件拉取 +- 支持多个前端主题 +- 支持自定义黑名单/白名单 - 支持Git Clone缓存(配合组件) - 支持Docker部署 - 支持速率限制 - 支持用户鉴权 -- 支持自定义黑名单/白名单 +- 支持shell脚本嵌套加速 - 基于[WJQSERVER-STUDIO/golang-temp](https://github.com/WJQSERVER-STUDIO/golang-temp)模板构建,具有标准化的日志记录与构建流程 ### 项目开发过程 @@ -32,6 +34,7 @@ **本项目是[WJQSERVER-STUDIO/ghproxy-go](https://github.com/WJQSERVER-STUDIO/ghproxy-go)的重构版本,实现了原项目原定功能的同时,进一步优化了性能** 关于此项目的详细开发过程,请参看Commit记录与[CHANGELOG.md](https://github.com/WJQSERVER-STUDIO/ghproxy/blob/main/CHANGELOG.md) +- v3.0.0 迁移到HertZ框架, 进一步提升效率, 同时v3.0.0与v2.4.0及以上版本兼容, 可直接平顺升级 - v2.4.1 对路径匹配进行优化 - v2.0.0 对`proxy`核心模块进行了重构,大幅优化内存占用 - v1.0.0 迁移至本仓库,并再次重构内容实现 @@ -201,4 +204,6 @@ USDT(TRC20): `TNfSYG6F2vkiibd6J6mhhHNWDgWgNdF5hN` ### 捐赠列表 -虚位以待... +| 赞助人 |金额| +|--------|------| +| starry | 8 USDT (TRC20) | diff --git a/api/api.go b/api/api.go index 5a53c63..2e1663d 100644 --- a/api/api.go +++ b/api/api.go @@ -1,129 +1,143 @@ package api import ( - "encoding/json" + "context" "ghproxy/config" "github.com/WJQSERVER-STUDIO/go-utils/logger" + "github.com/cloudwego/hertz/pkg/app" + "github.com/cloudwego/hertz/pkg/app/server" "github.com/gin-gonic/gin" ) var ( router *gin.Engine - cfg *config.Config + //cfg *config.Config ) var ( logw = logger.Logw - LogDump = logger.LogDump + logDump = logger.LogDump logDebug = logger.LogDebug logInfo = logger.LogInfo logWarning = logger.LogWarning logError = logger.LogError ) -func NoCacheMiddleware() gin.HandlerFunc { - return func(c *gin.Context) { +func NoCacheMiddleware() app.HandlerFunc { + return func(ctx context.Context, c *app.RequestContext) { // 设置禁止缓存的响应头 - c.Header("Cache-Control", "no-store, no-cache, must-revalidate") - c.Header("Pragma", "no-cache") - c.Header("Expires", "0") - c.Next() // 继续处理请求 + c.Response.Header.Set("Cache-Control", "no-store, no-cache, must-revalidate") + c.Response.Header.Set("Pragma", "no-cache") + c.Response.Header.Set("Expires", "0") + c.Next(ctx) // 继续处理请求 } } -func InitHandleRouter(cfg *config.Config, router *gin.Engine, version string) { - apiRouter := router.Group("api", NoCacheMiddleware()) +func InitHandleRouter(cfg *config.Config, r *server.Hertz, version string) { + apiRouter := r.Group("/api", NoCacheMiddleware()) { - apiRouter.GET("/size_limit", func(c *gin.Context) { - SizeLimitHandler(cfg, c) + apiRouter.GET("/size_limit", func(ctx context.Context, c *app.RequestContext) { + SizeLimitHandler(cfg, c, ctx) }) - apiRouter.GET("/whitelist/status", func(c *gin.Context) { - WhiteListStatusHandler(c, cfg) + apiRouter.GET("/whitelist/status", func(ctx context.Context, c *app.RequestContext) { + WhiteListStatusHandler(cfg, c, ctx) }) - apiRouter.GET("/blacklist/status", func(c *gin.Context) { - BlackListStatusHandler(c, cfg) + apiRouter.GET("/blacklist/status", func(ctx context.Context, c *app.RequestContext) { + BlackListStatusHandler(cfg, c, ctx) }) - apiRouter.GET("/cors/status", func(c *gin.Context) { - CorsStatusHandler(c, cfg) + apiRouter.GET("/cors/status", func(ctx context.Context, c *app.RequestContext) { + CorsStatusHandler(cfg, c, ctx) }) - apiRouter.GET("/healthcheck", func(c *gin.Context) { - HealthcheckHandler(c) + apiRouter.GET("/healthcheck", func(ctx context.Context, c *app.RequestContext) { + HealthcheckHandler(c, ctx) }) - apiRouter.GET("/version", func(c *gin.Context) { - VersionHandler(c, version) + apiRouter.GET("/version", func(ctx context.Context, c *app.RequestContext) { + VersionHandler(c, ctx, version) }) - apiRouter.GET("/rate_limit/status", func(c *gin.Context) { - RateLimitStatusHandler(c, cfg) + apiRouter.GET("/rate_limit/status", func(ctx context.Context, c *app.RequestContext) { + RateLimitStatusHandler(cfg, c, ctx) }) - apiRouter.GET("/rate_limit/limit", func(c *gin.Context) { - RateLimitLimitHandler(c, cfg) + apiRouter.GET("/rate_limit/limit", func(ctx context.Context, c *app.RequestContext) { + RateLimitLimitHandler(cfg, c, ctx) }) + apiRouter.GET("/smartgit/status", func(ctx context.Context, c *app.RequestContext) { + SmartGitStatusHandler(cfg, c, ctx) + }) + } logInfo("API router Init success") } -func SizeLimitHandler(cfg *config.Config, c *gin.Context) { +func SizeLimitHandler(cfg *config.Config, c *app.RequestContext, ctx context.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{}{ + logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol()) + c.Response.Header.Set("Content-Type", "application/json") + c.JSON(200, (map[string]interface{}{ "MaxResponseBodySize": sizeLimit, - }) + })) } -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{}{ +func WhiteListStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) { + logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol()) + c.Response.Header.Set("Content-Type", "application/json") + c.JSON(200, (map[string]interface{}{ "Whitelist": cfg.Whitelist.Enabled, - }) + })) } -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{}{ +func BlackListStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) { + logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol()) + c.Response.Header.Set("Content-Type", "application/json") + c.JSON(200, (map[string]interface{}{ "Blacklist": cfg.Blacklist.Enabled, - }) + })) } -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{}{ +func CorsStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) { + logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol()) + c.Response.Header.Set("Content-Type", "application/json") + c.JSON(200, (map[string]interface{}{ "Cors": cfg.Server.Cors, - }) + })) } -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{}{ +func HealthcheckHandler(c *app.RequestContext, ctx context.Context) { + logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol()) + c.Response.Header.Set("Content-Type", "application/json") + c.JSON(200, (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{}{ +func VersionHandler(c *app.RequestContext, ctx context.Context, version string) { + logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol()) + c.Response.Header.Set("Content-Type", "application/json") + c.JSON(200, (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{}{ +func RateLimitStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) { + logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol()) + c.Response.Header.Set("Content-Type", "application/json") + c.JSON(200, (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{}{ +func RateLimitLimitHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) { + logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol()) + c.Response.Header.Set("Content-Type", "application/json") + c.JSON(200, (map[string]interface{}{ "RatePerMinute": cfg.RateLimit.RatePerMinute, - }) + })) +} + +func SmartGitStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) { + logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol()) + c.Response.Header.Set("Content-Type", "application/json") + c.JSON(200, (map[string]interface{}{ + "enabled": cfg.GitClone.Mode == "cache", + })) } diff --git a/auth/auth-header.go b/auth/auth-header.go index c29f66b..b63983d 100644 --- a/auth/auth-header.go +++ b/auth/auth-header.go @@ -4,16 +4,16 @@ import ( "fmt" "ghproxy/config" - "github.com/gin-gonic/gin" + "github.com/cloudwego/hertz/pkg/app" ) -func AuthHeaderHandler(c *gin.Context, cfg *config.Config) (isValid bool, err error) { +func AuthHeaderHandler(c *app.RequestContext, cfg *config.Config) (isValid bool, err error) { if !cfg.Auth.Enabled { return true, nil } // 获取"GH-Auth"的值 - authToken := c.GetHeader("GH-Auth") - logDebug("%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) + authToken := string(c.GetHeader("GH-Auth")) + logDebug("%s %s %s %s %s AUTH_TOKEN: %s", c.Request.Method, string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), authToken) if authToken == "" { return false, fmt.Errorf("Auth token not found") } diff --git a/auth/auth-parameters.go b/auth/auth-parameters.go index e43a1a7..2e1139d 100644 --- a/auth/auth-parameters.go +++ b/auth/auth-parameters.go @@ -4,16 +4,16 @@ import ( "fmt" "ghproxy/config" - "github.com/gin-gonic/gin" + "github.com/cloudwego/hertz/pkg/app" ) -func AuthParametersHandler(c *gin.Context, cfg *config.Config) (isValid bool, err error) { +func AuthParametersHandler(c *app.RequestContext, cfg *config.Config) (isValid bool, err error) { if !cfg.Auth.Enabled { return true, nil } authToken := c.Query("auth_token") - logDebug("%s %s %s %s %s AUTH_TOKEN: %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto, authToken) + logDebug("%s %s %s %s %s AUTH_TOKEN: %s", c.ClientIP(), c.Request.Method, string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), authToken) if authToken == "" { return false, fmt.Errorf("Auth token not found") diff --git a/auth/auth.go b/auth/auth.go index d7cad1a..d99ee3d 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -1,11 +1,12 @@ package auth import ( + "context" "fmt" "ghproxy/config" "github.com/WJQSERVER-STUDIO/go-utils/logger" - "github.com/gin-gonic/gin" + "github.com/cloudwego/hertz/pkg/app" ) var ( @@ -35,7 +36,7 @@ func Init(cfg *config.Config) { logDebug("Auth Init") } -func AuthHandler(c *gin.Context, cfg *config.Config) (isValid bool, err error) { +func AuthHandler(ctx context.Context, c *app.RequestContext, cfg *config.Config) (isValid bool, err error) { if cfg.Auth.AuthMethod == "parameters" { isValid, err = AuthParametersHandler(c, cfg) return isValid, err diff --git a/config/config.go b/config/config.go index ee2ab4a..ddeed7b 100644 --- a/config/config.go +++ b/config/config.go @@ -24,7 +24,6 @@ host = "0.0.0.0" # 监听地址 port = 8080 # 监听端口 sizeLimit = 125 # 125MB H2C = true # 是否开启H2C传输 -enableH2C = "on" # 是否开启H2C传输(latest和dev版本请开启) on/off (2.4.0弃用) */ type ServerConfig struct { @@ -33,7 +32,6 @@ type ServerConfig struct { SizeLimit int `toml:"sizeLimit"` H2C bool `toml:"H2C"` Cors string `toml:"cors"` - EnableH2C string `toml:"enableH2C"` Debug bool `toml:"debug"` } @@ -54,7 +52,7 @@ type HttpcConfig struct { /* [gitclone] mode = "bypass" # bypass / cache -smartGitAddr = ":8080" +smartGitAddr = "http://127.0.0.1:8080" ForceH2C = true */ type GitCloneConfig struct { @@ -74,13 +72,11 @@ type ShellConfig struct { /* [pages] mode = "internal" # "internal" or "external" -enabled = false -theme = "bootstrap" # "bootstrap" or "nebula" +theme = "bootstrap" # "bootstrap" or "nebula" or "design" or "classic" staticDir = "/data/www" */ type PagesConfig struct { Mode string `toml:"mode"` - Enabled bool `toml:"enabled"` Theme string `toml:"theme"` StaticDir string `toml:"staticDir"` } diff --git a/go.mod b/go.mod index 5d6971d..0272385 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,16 @@ module ghproxy go 1.24.1 require ( - github.com/BurntSushi/toml v1.4.0 - github.com/WJQSERVER-STUDIO/go-utils/copyb v0.0.4 + github.com/BurntSushi/toml v1.5.0 + github.com/WJQSERVER-STUDIO/go-utils/hwriter v0.0.2 github.com/WJQSERVER-STUDIO/go-utils/logger v1.5.0 + github.com/cloudwego/hertz v0.9.6 github.com/gin-gonic/gin v1.10.0 github.com/go-git/go-git/v5 v5.14.0 + github.com/hertz-contrib/http2 v0.1.8 github.com/pierrec/lz4 v2.6.1+incompatible github.com/satomitouka/touka-httpc v0.3.3 + github.com/valyala/bytebufferpool v1.0.0 golang.org/x/net v0.37.0 golang.org/x/time v0.11.0 ) @@ -18,14 +21,18 @@ require ( dario.cat/mergo v1.0.1 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/ProtonMail/go-crypto v1.1.6 // indirect + github.com/WJQSERVER-STUDIO/go-utils/copyb v0.0.4 // indirect github.com/WJQSERVER-STUDIO/go-utils/log v0.0.1 // indirect + github.com/bytedance/gopkg v0.1.1 // indirect github.com/bytedance/sonic v1.13.1 // indirect github.com/bytedance/sonic/loader v0.2.4 // indirect github.com/cloudflare/circl v1.6.0 // indirect github.com/cloudwego/base64x v0.1.5 // indirect + github.com/cloudwego/netpoll v0.6.5 // indirect github.com/cyphar/filepath-securejoin v0.4.1 // indirect github.com/emirpasic/gods v1.18.1 // indirect github.com/frankban/quicktest v1.14.6 // indirect + github.com/fsnotify/fsnotify v1.8.0 // indirect github.com/gabriel-vasile/mimetype v1.4.8 // indirect github.com/gin-contrib/sse v1.0.0 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect @@ -43,16 +50,20 @@ 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/nyaruka/phonenumbers v1.5.0 // indirect github.com/pelletier/go-toml/v2 v2.2.3 // indirect github.com/pjbgf/sha1cd v0.3.2 // indirect github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect github.com/skeema/knownhosts v1.3.1 // indirect + github.com/tidwall/gjson v1.18.0 // indirect + github.com/tidwall/match v1.1.1 // indirect + github.com/tidwall/pretty v1.2.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect - github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect golang.org/x/arch v0.15.0 // indirect golang.org/x/crypto v0.36.0 // indirect + golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect golang.org/x/sys v0.31.0 // indirect golang.org/x/text v0.23.0 // indirect google.golang.org/protobuf v1.36.5 // indirect diff --git a/go.sum b/go.sum index 2699522..e8829ea 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s= dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= -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/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg= +github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= @@ -9,6 +9,8 @@ github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNx github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/WJQSERVER-STUDIO/go-utils/copyb v0.0.4 h1:JLtFd00AdFg/TP+dtvIzLkdHwKUGPOAijN1sMtEYoFg= github.com/WJQSERVER-STUDIO/go-utils/copyb v0.0.4/go.mod h1:FZ6XE+4TKy4MOfX1xWKe6Rwsg0ucYFCdNh1KLvyKTfc= +github.com/WJQSERVER-STUDIO/go-utils/hwriter v0.0.2 h1:z9xSC3qkt8Qjjb+KRV0Az5klUBJ/gE3berBbjVSFVzY= +github.com/WJQSERVER-STUDIO/go-utils/hwriter v0.0.2/go.mod h1:U3dVP2MzKJfK6dPiobxmSdynibqCOn1mxQEVLylESWA= github.com/WJQSERVER-STUDIO/go-utils/log v0.0.1 h1:gJEQspQPB527Vp2FPcdOrynQEj3YYtrg1ixVSB/JvZM= github.com/WJQSERVER-STUDIO/go-utils/log v0.0.1/go.mod h1:j9Q+xnwpOfve7/uJnZ2izRQw6NNoXjvJHz7vUQAaLZE= github.com/WJQSERVER-STUDIO/go-utils/logger v1.5.0 h1:Uk4N7Sh4OPth3am3xVv17JlAm7tsna97ZLQRpQj7r5c= @@ -17,6 +19,11 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/bytedance/gopkg v0.1.0/go.mod h1:FtQG3YbQG9L/91pbKSw787yBQPutC+457AvDW77fgUQ= +github.com/bytedance/gopkg v0.1.1 h1:3azzgSkiaw79u24a+w9arfH8OfnQQ4MHUt9lJFREEaE= +github.com/bytedance/gopkg v0.1.1/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM= +github.com/bytedance/mockey v1.2.12 h1:aeszOmGw8CPX8CRx1DZ/Glzb1yXvhjDh6jdFBNZjsU4= +github.com/bytedance/mockey v1.2.12/go.mod h1:3ZA4MQasmqC87Tw0w7Ygdy7eHIc2xgpZ8Pona5rsYIk= github.com/bytedance/sonic v1.13.1 h1:Jyd5CIvdFnkOWuKXr+wm4Nyk2h0yAFsr8ucJgEasO3g= github.com/bytedance/sonic v1.13.1/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= @@ -26,7 +33,11 @@ github.com/cloudflare/circl v1.6.0 h1:cr5JKic4HI+LkINy2lg3W2jF8sHCVTBncJr5gIIq7q github.com/cloudflare/circl v1.6.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs= github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4= github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= +github.com/cloudwego/hertz v0.9.6 h1:Kj5SSPlKBC32NIN7+B/tt8O1pdDz8brMai00rqqjULQ= +github.com/cloudwego/hertz v0.9.6/go.mod h1:X5Ez52XhtszU4t+CTBGIJI4PqmcI1oSf8ULBz0SWfLo= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= +github.com/cloudwego/netpoll v0.6.5 h1:6E/BWhSzQoyLg9Kx/4xiMdIIpovzwBtXvuqSqaTUzDQ= +github.com/cloudwego/netpoll v0.6.5/go.mod h1:BtM+GjKTdwKoC8IOzD08/+8eEn2gYoiNLipFca6BVXQ= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s= github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI= @@ -39,6 +50,8 @@ github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= +github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM= github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8= github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E= @@ -71,10 +84,16 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/hertz-contrib/http2 v0.1.8 h1:kjfCGkUxJZHgfPsnRjx1FLJBG55KvtvSQD214guBQLw= +github.com/hertz-contrib/http2 v0.1.8/go.mod h1:m42hrl8fiTwE4p8c7JdRUZpkePEthvV89q3elL2GeD0= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= 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/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= @@ -97,6 +116,8 @@ 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/nyaruka/phonenumbers v1.5.0 h1:0M+Gd9zl53QC4Nl5z1Yj1O/zPk2XXBUwR/vlzdXSJv4= +github.com/nyaruka/phonenumbers v1.5.0/go.mod h1:gv+CtldaFz+G3vHHnasBSirAi3O2XLqZzVWz4V1pl2E= 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= @@ -120,9 +141,14 @@ github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8= github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= 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 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -134,6 +160,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY= +github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= +github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= +github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= +github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= +github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= 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= @@ -147,24 +180,29 @@ golang.org/x/arch v0.15.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= -golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= -golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= +golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw= +golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c= golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y= golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= diff --git a/main.go b/main.go index f8adcc2..7e15daf 100644 --- a/main.go +++ b/main.go @@ -1,10 +1,10 @@ package main import ( + "context" "embed" "flag" "fmt" - "io" "io/fs" "net/http" "time" @@ -13,32 +13,41 @@ import ( "ghproxy/auth" "ghproxy/config" "ghproxy/middleware/loggin" - "ghproxy/middleware/timing" "ghproxy/proxy" "ghproxy/rate" "github.com/WJQSERVER-STUDIO/go-utils/logger" - "github.com/gin-gonic/gin" + "github.com/cloudwego/hertz/pkg/app" + "github.com/cloudwego/hertz/pkg/app/middlewares/server/recovery" + "github.com/cloudwego/hertz/pkg/app/server" + "github.com/cloudwego/hertz/pkg/common/adaptor" + + "github.com/hertz-contrib/http2/factory" ) var ( cfg *config.Config - router *gin.Engine + r *server.Hertz configfile = "/data/ghproxy/config/config.toml" cfgfile string version string - dev string runMode string limiter *rate.RateLimiter iplimiter *rate.IPRateLimiter ) var ( - //go:embed pages/bootstrap/* + //go:embed pages/* pagesFS embed.FS - //go:embed pages/nebula/* - NebulaPagesFS embed.FS + /* + //go:embed pages/bootstrap/* + BootstrapPagesFS embed.FS + //go:embed pages/nebula/* + NebulaPagesFS embed.FS + //go:embed pages/design/* + DesignPagesFS embed.FS + */ ) var ( @@ -86,8 +95,8 @@ func loadlist(cfg *config.Config) { auth.Init(cfg) } -func setupApi(cfg *config.Config, router *gin.Engine, version string) { - api.InitHandleRouter(cfg, router, version) +func setupApi(cfg *config.Config, r *server.Hertz, version string) { + api.InitHandleRouter(cfg, r, version) } func setupRateLimit(cfg *config.Config) { @@ -110,12 +119,17 @@ func InitReq(cfg *config.Config) { func loadEmbeddedPages(cfg *config.Config) (fs.FS, error) { var pages fs.FS var err error - switch cfg.Pages.Theme { case "bootstrap": pages, err = fs.Sub(pagesFS, "pages/bootstrap") case "nebula": - pages, err = fs.Sub(NebulaPagesFS, "pages/nebula") + pages, err = fs.Sub(pagesFS, "pages/nebula") + case "design": + pages, err = fs.Sub(pagesFS, "pages/design") + case "metro": + pages, err = fs.Sub(pagesFS, "pages/metro") + case "classic": + pages, err = fs.Sub(pagesFS, "pages/classic") default: pages, err = fs.Sub(pagesFS, "pages/bootstrap") // 默认主题 logWarning("Invalid Pages Theme: %s, using default theme 'bootstrap'", cfg.Pages.Theme) @@ -128,7 +142,7 @@ func loadEmbeddedPages(cfg *config.Config) (fs.FS, error) { } // setupPages 设置页面路由 -func setupPages(cfg *config.Config, router *gin.Engine) { +func setupPages(cfg *config.Config, r *server.Hertz) { switch cfg.Pages.Mode { case "internal": // 加载嵌入式资源 @@ -139,11 +153,42 @@ func setupPages(cfg *config.Config, router *gin.Engine) { } // 设置嵌入式资源路由 - router.GET("/", gin.WrapH(http.FileServer(http.FS(pages)))) - router.GET("/favicon.ico", gin.WrapH(http.FileServer(http.FS(pages)))) - router.GET("/script.js", gin.WrapH(http.FileServer(http.FS(pages)))) - router.GET("/style.css", gin.WrapH(http.FileServer(http.FS(pages)))) - //router.GET("/bootstrap.min.css", gin.WrapH(http.FileServer(http.FS(pages)))) + r.GET("/", func(ctx context.Context, c *app.RequestContext) { + staticServer := http.FileServer(http.FS(pages)) + req, err := adaptor.GetCompatRequest(&c.Request) + if err != nil { + logError("%s", err) + return + } + staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req) + }) + r.GET("/favicon.ico", func(ctx context.Context, c *app.RequestContext) { + staticServer := http.FileServer(http.FS(pages)) + req, err := adaptor.GetCompatRequest(&c.Request) + if err != nil { + logError("%s", err) + return + } + staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req) + }) + r.GET("/script.js", func(ctx context.Context, c *app.RequestContext) { + staticServer := http.FileServer(http.FS(pages)) + req, err := adaptor.GetCompatRequest(&c.Request) + if err != nil { + logError("%s", err) + return + } + staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req) + }) + r.GET("/style.css", func(ctx context.Context, c *app.RequestContext) { + staticServer := http.FileServer(http.FS(pages)) + req, err := adaptor.GetCompatRequest(&c.Request) + if err != nil { + logError("%s", err) + return + } + staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req) + }) case "external": // 设置外部资源路径 @@ -154,13 +199,10 @@ func setupPages(cfg *config.Config, router *gin.Engine) { //bootstrapPath := fmt.Sprintf("%s/bootstrap.min.css", cfg.Pages.StaticDir) // 设置外部资源路由 - router.GET("/", func(c *gin.Context) { - c.File(indexPagePath) - logInfo("IP:%s UA:%s METHOD:%s HTTPv:%s", c.ClientIP(), c.Request.UserAgent(), c.Request.Method, c.Request.Proto) - }) - router.StaticFile("/favicon.ico", faviconPath) - router.StaticFile("/script.js", javascriptsPath) - router.StaticFile("/style.css", stylesheetsPath) + r.StaticFile("/", indexPagePath) + r.StaticFile("/favicon.ico", faviconPath) + r.StaticFile("/script.js", javascriptsPath) + r.StaticFile("/style.css", stylesheetsPath) //router.StaticFile("/bootstrap.min.css", bootstrapPath) default: @@ -174,10 +216,42 @@ func setupPages(cfg *config.Config, router *gin.Engine) { return } // 设置嵌入式资源路由 - router.GET("/", gin.WrapH(http.FileServer(http.FS(pages)))) - router.GET("/favicon.ico", gin.WrapH(http.FileServer(http.FS(pages)))) - router.GET("/script.js", gin.WrapH(http.FileServer(http.FS(pages)))) - router.GET("/style.css", gin.WrapH(http.FileServer(http.FS(pages)))) + r.GET("/", func(ctx context.Context, c *app.RequestContext) { + staticServer := http.FileServer(http.FS(pages)) + req, err := adaptor.GetCompatRequest(&c.Request) + if err != nil { + logError("%s", err) + return + } + staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req) + }) + r.GET("/favicon.ico", func(ctx context.Context, c *app.RequestContext) { + staticServer := http.FileServer(http.FS(pages)) + req, err := adaptor.GetCompatRequest(&c.Request) + if err != nil { + logError("%s", err) + return + } + staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req) + }) + r.GET("/script.js", func(ctx context.Context, c *app.RequestContext) { + staticServer := http.FileServer(http.FS(pages)) + req, err := adaptor.GetCompatRequest(&c.Request) + if err != nil { + logError("%s", err) + return + } + staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req) + }) + r.GET("/style.css", func(ctx context.Context, c *app.RequestContext) { + staticServer := http.FileServer(http.FS(pages)) + req, err := adaptor.GetCompatRequest(&c.Request) + if err != nil { + logError("%s", err) + return + } + staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req) + }) } } @@ -191,94 +265,87 @@ func init() { setupRateLimit(cfg) if cfg.Server.Debug { - dev = "true" - version = "dev" - } - if dev == "true" { - gin.SetMode(gin.DebugMode) runMode = "dev" } else { - gin.SetMode(gin.ReleaseMode) runMode = "release" } - logDebug("Run Mode: %s", runMode) - - gin.LoggerWithWriter(io.Discard) - router = gin.New() - - // 添加recovery中间件 - router.Use(gin.Recovery()) - - // 添加log中间件 - router.Use(loggin.Middleware()) - - // 添加计时中间件 - router.Use(timing.Middleware()) - - if cfg.Server.H2C { - router.UseH2C = true + if cfg.Server.Debug { + version = "Dev" } - setupApi(cfg, router, version) +} - setupPages(cfg, router) +func main() { + logDebug("Run Mode: %s", runMode) + + addr := fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port) + + r := server.New( + server.WithHostPorts(addr), + server.WithH2C(true), + ) + + r.AddProtocol("h2", factory.NewServerFactory()) + + // 添加Recovery中间件 + r.Use(recovery.Recovery()) + // 添加log中间件 + r.Use(loggin.Middleware()) + + setupApi(cfg, r, version) + + setupPages(cfg, r) // 1. GitHub Releases/Archive - Use distinct path segments for type - router.GET("/github.com/:username/:repo/releases/*filepath", func(c *gin.Context) { // Distinct path for releases - proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c) + r.GET("/github.com/:username/:repo/releases/*filepath", func(ctx context.Context, c *app.RequestContext) { // Distinct path for releases + proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(ctx, c) }) - router.GET("/github.com/:username/:repo/archive/*filepath", func(c *gin.Context) { // Distinct path for archive - proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c) + r.GET("/github.com/:username/:repo/archive/*filepath", func(ctx context.Context, c *app.RequestContext) { // Distinct path for archive + proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(ctx, c) }) // 2. GitHub Blob/Raw - Use distinct path segments for type - router.GET("/github.com/:username/:repo/blob/*filepath", func(c *gin.Context) { // Distinct path for blob - proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c) + r.GET("/github.com/:username/:repo/blob/*filepath", func(ctx context.Context, c *app.RequestContext) { // Distinct path for blob + proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(ctx, c) }) - router.GET("/github.com/:username/:repo/raw/*filepath", func(c *gin.Context) { // Distinct path for raw - proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c) + r.GET("/github.com/:username/:repo/raw/*filepath", func(ctx context.Context, c *app.RequestContext) { // Distinct path for raw + proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(ctx, c) }) - router.GET("/github.com/:username/:repo/info/*filepath", func(c *gin.Context) { // Distinct path for info - proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c) + r.GET("/github.com/:username/:repo/info/*filepath", func(ctx context.Context, c *app.RequestContext) { // Distinct path for info + proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(ctx, c) }) - router.GET("/github.com/:username/:repo/git-upload-pack", func(c *gin.Context) { - proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c) + r.GET("/github.com/:username/:repo/git-upload-pack", func(ctx context.Context, c *app.RequestContext) { + proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(ctx, c) }) // 4. Raw GitHubusercontent - Keep as is (assuming it's distinct enough) - router.GET("/raw.githubusercontent.com/:username/:repo/*filepath", func(c *gin.Context) { - proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c) + r.GET("/raw.githubusercontent.com/:username/:repo/*filepath", func(ctx context.Context, c *app.RequestContext) { + proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(ctx, c) }) // 5. Gist GitHubusercontent - Keep as is (assuming it's distinct enough) - router.GET("/gist.githubusercontent.com/:username/*filepath", func(c *gin.Context) { - proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c) + r.GET("/gist.githubusercontent.com/:username/*filepath", func(ctx context.Context, c *app.RequestContext) { + proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(ctx, c) }) // 6. GitHub API Repos - Keep as is (assuming it's distinct enough) - router.GET("/api.github.com/repos/:username/:repo/*filepath", func(c *gin.Context) { - proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c) + r.GET("/api.github.com/repos/:username/:repo/*filepath", func(ctx context.Context, c *app.RequestContext) { + proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(ctx, c) }) - router.NoRoute(func(c *gin.Context) { - logInfo(c.Request.URL.Path) - proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c) + r.NoRoute(func(ctx context.Context, c *app.RequestContext) { + proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(ctx, c) }) fmt.Printf("GHProxy Version: %s\n", version) fmt.Printf("A Go Based High-Performance Github Proxy \n") fmt.Printf("Made by WJQSERVER-STUDIO\n") -} -func main() { - err := router.Run(fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port)) - if err != nil { - logError("Failed to start server: %v\n", err) - } + r.Spin() defer logger.Close() fmt.Println("Program Exit") } diff --git a/middleware/loggin/loggin.go b/middleware/loggin/loggin.go index ca3f681..95f6668 100644 --- a/middleware/loggin/loggin.go +++ b/middleware/loggin/loggin.go @@ -1,16 +1,16 @@ package loggin import ( - "ghproxy/middleware/timing" + "context" "time" "github.com/WJQSERVER-STUDIO/go-utils/logger" - "github.com/gin-gonic/gin" + "github.com/cloudwego/hertz/pkg/app" ) var ( logw = logger.Logw - LogDump = logger.LogDump + logDump = logger.LogDump logDebug = logger.LogDebug logInfo = logger.LogInfo logWarning = logger.LogWarning @@ -18,17 +18,20 @@ var ( ) // 日志中间件 -func Middleware() gin.HandlerFunc { - return func(c *gin.Context) { - // 处理请求 - c.Next() +func Middleware() app.HandlerFunc { + return func(ctx context.Context, c *app.RequestContext) { + startTime := time.Now() // 请求开始处理前记录当前时间作为开始时间 - var timingResults time.Duration + c.Next(ctx) // 调用 Next() 执行后续的 Handler - // 获取计时结果 - timingResults, _ = timing.Get(c) + endTime := time.Now() // 请求处理完成后记录当前时间作为结束时间 + timingResults := endTime.Sub(startTime) // 计算时间差，得到请求处理耗时 (Duration 类型) // 记录日志 IP METHOD URL USERAGENT PROTOCOL STATUS TIMING - logInfo("%s %s %s %s %d %s ", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Writer.Status(), timingResults) + // %s %s %s %s %s %d %s 分别对应: ClientIP, Method, Protolcol, Path, UserAgent, StatusCode, timingResults (需要格式化) + // %v 可以通用地格式化 time.Duration 类型 + logInfo("%s %s %s %s %s %d %v ", c.ClientIP(), c.Method(), c.Request.Header.GetProtocol(), string(c.Path()), c.Request.Header.UserAgent(), c.Response.StatusCode(), timingResults) + + //logInfo("%s %s %s %s %d %v ", c.ClientIP(), c.Method(), c.Path(), c.Request.Header.UserAgent(), c.Response.StatusCode(), timingResults) } } diff --git a/proxy/authpass.go b/proxy/authpass.go index c6d77a2..c8a1095 100644 --- a/proxy/authpass.go +++ b/proxy/authpass.go @@ -4,20 +4,21 @@ import ( "ghproxy/config" "net/http" + "github.com/cloudwego/hertz/pkg/app" "github.com/gin-gonic/gin" ) -func AuthPassThrough(c *gin.Context, cfg *config.Config, req *http.Request) { +func AuthPassThrough(c *app.RequestContext, cfg *config.Config, req *http.Request) { if cfg.Auth.PassThrough { token := c.Query("token") if token != "" { - logDebug("%s %s %s %s %s Auth-PassThrough: token %s", c.ClientIP(), c.Request.Method, c.Request.URL.String(), c.Request.Header.Get("User-Agent"), c.Request.Proto, token) + logDebug("%s %s %s %s %s Auth-PassThrough: token %s", c.ClientIP(), c.Request.Method, string(c.Path()), c.GetHeader, c.Request.Header.GetProtocol(), token) switch cfg.Auth.AuthMethod { case "parameters": if !cfg.Auth.Enabled { req.Header.Set("Authorization", "token "+token) } else { - logWarning("%s %s %s %s %s Auth-Error: Conflict Auth Method", c.ClientIP(), c.Request.Method, c.Request.URL.String(), c.Request.Header.Get("User-Agent"), c.Request.Proto) + logWarning("%s %s %s %s %s Auth-Error: Conflict Auth Method", c.ClientIP(), c.Request.Method, string(c.Path()), c.GetHeader, c.Request.Header.GetProtocol()) // 500 Internal Server Error c.JSON(http.StatusInternalServerError, gin.H{"error": "Conflict Auth Method"}) return @@ -27,7 +28,7 @@ func AuthPassThrough(c *gin.Context, cfg *config.Config, req *http.Request) { req.Header.Set("Authorization", "token "+token) } default: - logWarning("%s %s %s %s %s Invalid Auth Method / Auth Method is not be set", c.ClientIP(), c.Request.Method, c.Request.URL.String(), c.Request.Header.Get("User-Agent"), c.Request.Proto) + logWarning("%s %s %s %s %s Invalid Auth Method / Auth Method is not be set", c.ClientIP(), c.Request.Method, string(c.Path()), c.GetHeader, c.Request.Header.GetProtocol()) // 500 Internal Server Error c.JSON(http.StatusInternalServerError, gin.H{"error": "Invalid Auth Method / Auth Method is not be set"}) return diff --git a/proxy/chunkreq.go b/proxy/chunkreq.go index 70af6ed..42dacfb 100644 --- a/proxy/chunkreq.go +++ b/proxy/chunkreq.go @@ -2,17 +2,21 @@ package proxy import ( "bytes" + "context" "fmt" "ghproxy/config" "io" "net/http" "strconv" - "github.com/WJQSERVER-STUDIO/go-utils/copyb" - "github.com/gin-gonic/gin" + "github.com/cloudwego/hertz/pkg/app" + //hclient "github.com/cloudwego/hertz/pkg/app/client" + //"github.com/cloudwego/hertz/pkg/protocol" + "github.com/WJQSERVER-STUDIO/go-utils/hwriter" + hresp "github.com/cloudwego/hertz/pkg/protocol/http1/resp" ) -func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, matcher string) { +func ChunkedProxyRequest(ctx context.Context, c *app.RequestContext, u string, cfg *config.Config, matcher string) { method := c.Request.Method // 发送HEAD请求, 预获取Content-Length @@ -44,21 +48,17 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, matcher s size, err := strconv.Atoi(contentLength) if err == nil && size > sizelimit { finalURL := headResp.Request.URL.String() - c.Redirect(http.StatusMovedPermanently, finalURL) - 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) + c.Redirect(http.StatusMovedPermanently, []byte(finalURL)) + logWarning("%s %s %s %s %s Final-URL: %s Size-Limit-Exceeded: %d", c.ClientIP(), c.Request.Method, c.Path(), c.Request.Header.Get("User-Agent"), c.Request.Header.GetProtocol(), finalURL, size) return } } - body, err := readRequestBody(c) - if err != nil { - HandleError(c, err.Error()) - return - } + body := c.Request.Body() bodyReader := bytes.NewBuffer(body) - req, err := client.NewRequest(method, u, bodyReader) + req, err := client.NewRequest(string(method()), u, bodyReader) if err != nil { HandleError(c, fmt.Sprintf("Failed to create request: %v", err)) return @@ -86,8 +86,8 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, matcher s size, err := strconv.Atoi(contentLength) if err == nil && size > sizelimit { finalURL := resp.Request.URL.String() - c.Redirect(http.StatusMovedPermanently, finalURL) - 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) + c.Redirect(http.StatusMovedPermanently, []byte(finalURL)) + logWarning("%s %s %s %s %s Final-URL: %s Size-Limit-Exceeded: %d", c.ClientIP(), c.Request.Method, c.Path(), c.Request.Header.Get("User-Agent"), c.Request.Header.GetProtocol(), finalURL, size) return } } @@ -108,17 +108,6 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, matcher s resp.Header.Del(header) } - //c.Header("Accept-Encoding", "gzip") - //c.Header("Content-Encoding", "gzip") - - /* - if cfg.CORS.Enabled { - c.Header("Access-Control-Allow-Origin", "*") - } else { - c.Header("Access-Control-Allow-Origin", "") - } - */ - switch cfg.Server.Cors { case "*": c.Header("Access-Control-Allow-Origin", "*") @@ -131,6 +120,7 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, matcher s } c.Status(resp.StatusCode) + c.Response.HijackWriter(hresp.NewChunkedBodyWriter(&c.Response, c.GetWriter())) if MatcherShell(u) && matchString(matcher, matchedMatchers) && cfg.Shell.Editor { // 判断body是不是gzip @@ -139,23 +129,36 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, matcher s compress = "gzip" } - logInfo("Is Shell: %s %s %s %s %s", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto) + logInfo("Is Shell: %s %s %s %s %s", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Header.GetProtocol()) c.Header("Content-Length", "") - _, err = processLinks(resp.Body, c.Writer, compress, c.Request.Host, cfg) + + ProcessLinksAndWriteChunked(resp.Body, compress, string(c.Request.Host()), cfg, c) + + /* + presp, err := processLinks(resp.Body, compress, string(c.Request.Host()), cfg) + if err != nil { + logError("Failed to process links: %v", err) + WriteChunkedBody(resp.Body, c) + return + } + defer presp.Close() + WriteChunkedBody(presp, c) + */ + if err != nil { - logError("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err) + logError("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Header.GetProtocol(), err) return } else { - c.Writer.Flush() // 确保刷入 + c.Flush() // 确保刷入 } } else { - //_, err = io.CopyBuffer(c.Writer, resp.Body, nil) - _, err = copyb.CopyBuffer(c.Writer, resp.Body, nil) + //WriteChunkedBody(resp.Body, c) + err = hwriter.Writer(resp.Body, c) if err != nil { - logError("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err) + logError("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Header.GetProtocol(), err) return } else { - c.Writer.Flush() // 确保刷入 + c.Flush() // 确保刷入 } } } diff --git a/proxy/gitreq.go b/proxy/gitreq.go index 551ab87..5098053 100644 --- a/proxy/gitreq.go +++ b/proxy/gitreq.go @@ -2,6 +2,7 @@ package proxy import ( "bytes" + "context" "fmt" "ghproxy/config" "io" @@ -10,13 +11,12 @@ import ( "strconv" "strings" - "github.com/WJQSERVER-STUDIO/go-utils/copyb" - "github.com/gin-gonic/gin" + "github.com/WJQSERVER-STUDIO/go-utils/hwriter" + "github.com/cloudwego/hertz/pkg/app" ) -func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode string) { - method := c.Request.Method - logInfo("%s %s %s %s %s", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto) +func GitReq(ctx context.Context, c *app.RequestContext, u string, cfg *config.Config, mode string, runMode string) { + method := string(c.Request.Method()) logDump("Url Before FMT:%s", u) if cfg.GitClone.Mode == "cache" { @@ -35,11 +35,7 @@ func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode s err error ) - body, err := readRequestBody(c) - if err != nil { - HandleError(c, err.Error()) - return - } + body := c.Request.Body() bodyReader := bytes.NewBuffer(body) // 创建请求 @@ -85,9 +81,9 @@ func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode s size, err := strconv.Atoi(contentLength) sizelimit := cfg.Server.SizeLimit * 1024 * 1024 if err == nil && size > sizelimit { - finalURL := resp.Request.URL.String() + finalURL := []byte(resp.Request.URL.String()) c.Redirect(http.StatusMovedPermanently, finalURL) - 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) + logWarning("%s %s %s %s %s Final-URL: %s Size-Limit-Exceeded: %d", c.ClientIP(), c.Request.Method, c.Path(), c.Request.Header.Get("User-Agent"), c.Request.Header.GetProtocol(), finalURL, size) return } } @@ -127,21 +123,22 @@ func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode s _, err = io.CopyBuffer(c.Writer, resp.Body, buffer) if err != nil { - logError("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err) + logError("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Header.GetProtocol(), err) return } else { c.Writer.Flush() // 确保刷入 } */ - _, err = copyb.CopyBuffer(c.Writer, resp.Body, nil) + //_, err = copyb.CopyBuffer(c, resp.Body, nil) + err = hwriter.Writer(resp.Body, c) if err != nil { - logError("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err) + logError("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Header.GetProtocol(), err) return } else { - c.Writer.Flush() // 确保刷入 + c.Flush() // 确保刷入 } } diff --git a/proxy/handler.go b/proxy/handler.go index 6c8af38..c585de3 100644 --- a/proxy/handler.go +++ b/proxy/handler.go @@ -1,6 +1,7 @@ package proxy import ( + "context" "errors" "fmt" "ghproxy/auth" @@ -10,23 +11,14 @@ import ( "regexp" "strings" + "github.com/cloudwego/hertz/pkg/app" "github.com/gin-gonic/gin" ) var re = regexp.MustCompile(`^(http:|https:)?/?/?(.*)`) // 匹配http://或https://开头的路径 -/* -var exps = []*regexp.Regexp{ - regexp.MustCompile(`^(?:https?://)?github\.com/([^/]+)/([^/]+)/(?:releases|archive)/.*`), // 匹配 GitHub Releases 或 Archive 链接 - regexp.MustCompile(`^(?:https?://)?github\.com/([^/]+)/([^/]+)/(?:blob|raw)/.*`), // 匹配 GitHub Blob 或 Raw 链接 - regexp.MustCompile(`^(?:https?://)?github\.com/([^/]+)/([^/]+)/(?:info|git-).*`), // 匹配 GitHub Info 或 Git 相关链接 (例如 .gitattributes, .gitignore) - regexp.MustCompile(`^(?:https?://)?raw\.github(?:usercontent|)\.com/([^/]+)/([^/]+)/.+?/.+`), // 匹配 raw.githubusercontent.com 链接 - regexp.MustCompile(`^(?:https?://)?gist\.github(?:usercontent|)\.com/([^/]+)/.+?/.+`), // 匹配 gist.githubusercontent.com 链接 - regexp.MustCompile(`^(?:https?://)?api\.github\.com/repos/([^/]+)/([^/]+)/.*`), // 匹配 api.github.com/repos 链接 (GitHub API) -} -*/ -func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *rate.IPRateLimiter, runMode string) gin.HandlerFunc { - return func(c *gin.Context) { +func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *rate.IPRateLimiter, runMode string) app.HandlerFunc { + return func(ctx context.Context, c *app.RequestContext) { // 限制访问频率 if cfg.RateLimit.Enabled { @@ -45,19 +37,19 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra 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) + logWarning("%s %s %s %s %s 429-TooManyRequests", c.ClientIP(), c.Request.Method, c.Request.RequestURI(), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol()) return } } //rawPath := strings.TrimPrefix(c.Request.URL.Path, "/") // 去掉前缀/ - rawPath := strings.TrimPrefix(c.Request.URL.RequestURI(), "/") // 去掉前缀/ - matches := re.FindStringSubmatch(rawPath) // 匹配路径 + rawPath := strings.TrimPrefix(string(c.Request.RequestURI()), "/") // 去掉前缀/ + matches := re.FindStringSubmatch(rawPath) // 匹配路径 logInfo("Matches: %v", matches) // 匹配路径错误处理 if len(matches) < 3 { - 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) + errMsg := fmt.Sprintf("%s %s %s %s %s Invalid URL", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol()) logWarning(errMsg) c.String(http.StatusForbidden, "Invalid URL Format. Path: %s", rawPath) return @@ -81,16 +73,16 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra } username := user - 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) - // dump log 记录详细信息 c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, full Header - logDump("%s %s %s %s %s %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, c.Request.Header) + logInfo("%s %s %s %s %s Matched-Username: %s, Matched-Repo: %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), username, repo) + // dump log 记录详细信息 c.ClientIP(), c.Request.Method, rawPath,c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), full Header + logDump("%s %s %s %s %s %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), c.Request.Header) repouser := fmt.Sprintf("%s/%s", username, repo) // 白名单检查 if cfg.Whitelist.Enabled { whitelist := auth.CheckWhitelist(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) + logErrMsg := fmt.Sprintf("%s %s %s %s %s Whitelist Blocked repo: %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), repouser) errMsg := fmt.Sprintf("Whitelist Blocked repo: %s", repouser) c.JSON(http.StatusForbidden, gin.H{"error": errMsg}) logWarning(logErrMsg) @@ -102,7 +94,7 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra if cfg.Blacklist.Enabled { blacklist := auth.CheckBlacklist(username, repo) if blacklist { - logErrMsg := fmt.Sprintf("%s %s %s %s %s Blacklist Blocked repo: %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, repouser) + logErrMsg := fmt.Sprintf("%s %s %s %s %s Blacklist Blocked repo: %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), repouser) errMsg := fmt.Sprintf("Blacklist Blocked repo: %s", repouser) c.JSON(http.StatusForbidden, gin.H{"error": errMsg}) logWarning(logErrMsg) @@ -114,7 +106,7 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra matches = CheckURL(rawPath, c) if matches == nil { c.AbortWithStatus(http.StatusNotFound) - logWarning("%s %s %s %s %s 404-NOMATCH", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto) + logWarning("%s %s %s %s %s 404-NOMATCH", c.ClientIP(), c.Request.Method, rawPath,c.Request.Header.UserAgent(), c.Request.Header.GetProtocol()) return } */ @@ -128,22 +120,22 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra // 鉴权 var authcheck bool - authcheck, err = auth.AuthHandler(c, cfg) + authcheck, err = auth.AuthHandler(ctx, c, cfg) if !authcheck { c.AbortWithStatusJSON(401, gin.H{"error": "Unauthorized"}) - 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) + logWarning("%s %s %s %s %s Auth-Error: %v", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), err) return } // IP METHOD URL USERAGENT PROTO MATCHES - logDebug("%s %s %s %s %s Matches: %v", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, matches) + logDebug("%s %s %s %s %s Matches: %v", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), matches) switch matcher { case "releases", "blob", "raw", "gist", "api": - ChunkedProxyRequest(c, rawPath, cfg, matcher) + ChunkedProxyRequest(ctx, c, rawPath, cfg, matcher) case "clone": //ProxyRequest(c, rawPath, cfg, "git", runMode) - GitReq(c, rawPath, cfg, "git", runMode) + GitReq(ctx, c, rawPath, cfg, "git", runMode) default: c.String(http.StatusForbidden, "Invalid input.") fmt.Println("Invalid input.") @@ -159,7 +151,7 @@ func CheckURL(u string, c *gin.Context) []string { return matches[1:] } } - 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) + errMsg := fmt.Sprintf("%s %s %s %s %s Invalid URL", c.ClientIP(), c.Request.Method, u,c.Request.Header.UserAgent(), c.Request.Header.GetProtocol()) logError(errMsg) return nil } diff --git a/proxy/matchrepo.go b/proxy/matchrepo.go index 7030ebe..1529125 100644 --- a/proxy/matchrepo.go +++ b/proxy/matchrepo.go @@ -2,12 +2,18 @@ package proxy import ( "bufio" + "bytes" "compress/gzip" "fmt" "ghproxy/config" "io" + "net/http" "regexp" "strings" + + "github.com/cloudwego/hertz/pkg/app" + hresp "github.com/cloudwego/hertz/pkg/protocol/http1/resp" + "github.com/valyala/bytebufferpool" ) // 定义错误类型, error承载描述, 便于处理 @@ -205,15 +211,136 @@ func matchString(target string, stringsToMatch []string) bool { return exists } -// processLinks 处理链接并将结果写入输出流 -func processLinks(input io.Reader, output io.Writer, compress string, host string, cfg *config.Config) (written int64, err error) { +// processLinks 处理链接并返回一个 io.ReadCloser +func processLinks(input io.Reader, compress string, host string, cfg *config.Config) (io.ReadCloser, error) { var reader *bufio.Reader if compress == "gzip" { - // 解压gzip + // 解压 gzip gzipReader, err := gzip.NewReader(input) if err != nil { - return 0, fmt.Errorf("gzip解压错误: %v", err) + return nil, fmt.Errorf("gzip 解压错误: %w", err) + } + reader = bufio.NewReader(gzipReader) + } else { + reader = bufio.NewReader(input) + } + + // 创建一个缓冲区用于存储输出 + var outputBuffer io.Writer + var gzipWriter *gzip.Writer + var output io.ReadCloser + var buf bytes.Buffer + + if compress == "gzip" { + // 创建一个管道来连接 gzipWriter 和 output + pipeReader, pipeWriter := io.Pipe() // 创建一个管道 + output = pipeReader // 将管道的读取端作为输出 + outputBuffer = pipeWriter // 将管道的写入端作为 outputBuffer + gzipWriter = gzip.NewWriter(outputBuffer) + go func() { + defer pipeWriter.Close() // 确保在 goroutine 结束时关闭 pipeWriter + writer := bufio.NewWriter(gzipWriter) + defer func() { + if err := writer.Flush(); err != nil { + logError("gzip writer 刷新失败: %v", err) + } + if err := gzipWriter.Close(); err != nil { + logError("gzipWriter 关闭失败: %v", err) + } + }() + + scanner := bufio.NewScanner(reader) + urlPattern := regexp.MustCompile(`https?://[^\s'"]+`) + for scanner.Scan() { + line := scanner.Text() + modifiedLine := urlPattern.ReplaceAllStringFunc(line, func(originalURL string) string { + return modifyURL(originalURL, host, cfg) + }) + if _, err := writer.WriteString(modifiedLine + "\n"); err != nil { + logError("写入 gzipWriter 失败: %v", err) + return // 在发生错误时退出 goroutine + } + } + if err := scanner.Err(); err != nil { + logError("读取输入错误: %v", err) + } + }() + } else { + outputBuffer = &buf + writer := bufio.NewWriter(outputBuffer) + defer func() { + if err := writer.Flush(); err != nil { + logError("writer 刷新失败: %v", err) + } + }() + + urlPattern := regexp.MustCompile(`https?://[^\s'"]+`) + scanner := bufio.NewScanner(reader) + for scanner.Scan() { + line := scanner.Text() + modifiedLine := urlPattern.ReplaceAllStringFunc(line, func(originalURL string) string { + return modifyURL(originalURL, host, cfg) + }) + if _, err := writer.WriteString(modifiedLine + "\n"); err != nil { + return nil, fmt.Errorf("写入文件错误: %w", err) // 传递错误 + } + } + if err := scanner.Err(); err != nil { + return nil, fmt.Errorf("读取行错误: %w", err) // 传递错误 + } + output = io.NopCloser(&buf) + } + + return output, nil +} + +func WriteChunkedBody(resp io.ReadCloser, c *app.RequestContext) { + defer resp.Close() + + c.Response.HijackWriter(hresp.NewChunkedBodyWriter(&c.Response, c.GetWriter())) + + bufWrapper := bytebufferpool.Get() + buf := bufWrapper.B + size := 32768 // 32KB + buf = buf[:cap(buf)] + if len(buf) < size { + buf = append(buf, make([]byte, size-len(buf))...) + } + buf = buf[:size] // 将缓冲区限制为 'size' + defer bytebufferpool.Put(bufWrapper) + + for { + n, err := resp.Read(buf) + if err != nil { + if err == io.EOF { + break // 读取到文件末尾 + } + fmt.Println("读取错误:", err) + c.String(http.StatusInternalServerError, "读取错误") + return + } + + _, err = c.Write(buf[:n]) // 写入 chunk + if err != nil { + fmt.Println("写入 chunk 错误:", err) + return + } + + c.Flush() // 刷新 chunk 到客户端 + } +} + +// processLinksAndWriteChunked 处理链接并将结果以 chunked 方式写入响应 +func ProcessLinksAndWriteChunked(input io.Reader, compress string, host string, cfg *config.Config, c *app.RequestContext) { + var reader *bufio.Reader + + if compress == "gzip" { + // 解压 gzip + gzipReader, err := gzip.NewReader(input) + if err != nil { + c.String(http.StatusInternalServerError, fmt.Sprintf("gzip 解压错误: %v", err)) + return } defer gzipReader.Close() reader = bufio.NewReader(gzipReader) @@ -221,36 +348,108 @@ func processLinks(input io.Reader, output io.Writer, compress string, host strin reader = bufio.NewReader(input) } - var writer *bufio.Writer + // 获取 chunked body writer + chunkedWriter := hresp.NewChunkedBodyWriter(&c.Response, c.GetWriter()) + + var writer io.Writer = chunkedWriter var gzipWriter *gzip.Writer - // 根据是否gzip确定 writer 的创建 if compress == "gzip" { - gzipWriter = gzip.NewWriter(output) - writer = bufio.NewWriterSize(gzipWriter, 4096) //设置缓冲区大小 - } else { - writer = bufio.NewWriterSize(output, 4096) + gzipWriter = gzip.NewWriter(writer) + writer = gzipWriter + defer func() { + if err := gzipWriter.Close(); err != nil { + logError("gzipWriter close failed: %v", err) + } + }() } - //确保writer关闭 - defer func() { - var closeErr error // 局部变量，用于保存defer中可能发生的错误 + bufWrapper := bytebufferpool.Get() + buf := bufWrapper.B + size := 32768 // 32KB + buf = buf[:cap(buf)] + if len(buf) < size { + buf = append(buf, make([]byte, size-len(buf))...) + } + buf = buf[:size] // 将缓冲区限制为 'size' + defer bytebufferpool.Put(bufWrapper) - if gzipWriter != nil { - if closeErr = gzipWriter.Close(); closeErr != nil { - logError("gzipWriter close failed %v", closeErr) - // 如果已经存在错误，则保留。否则，记录此错误。 - if err == nil { - err = closeErr - } + urlPattern := regexp.MustCompile(`https?://[^\s'"]+`) + scanner := bufio.NewScanner(reader) + for scanner.Scan() { + line := scanner.Text() + modifiedLine := urlPattern.ReplaceAllStringFunc(line, func(originalURL string) string { + return modifyURL(originalURL, host, cfg) + }) + modifiedLineWithNewline := modifiedLine + "\n" + + _, err := writer.Write([]byte(modifiedLineWithNewline)) + if err != nil { + logError("写入 chunk 错误: %v", err) + return // 发生错误时退出 + } + + if compress != "gzip" { + if fErr := chunkedWriter.Flush(); fErr != nil { + logError("chunkedWriter flush failed: %v", fErr) + return } } + } + + if err := scanner.Err(); err != nil { + logError("读取输入错误: %v", err) + c.String(http.StatusInternalServerError, fmt.Sprintf("读取输入错误: %v", err)) + return + } + + // 对于 gzip，chunkedWriter 的关闭会触发最后的 chunk + if compress != "gzip" { + if fErr := chunkedWriter.Flush(); fErr != nil { + logError("final chunkedWriter flush failed: %v", fErr) + } + } +} + +func ProcessAndWriteChunkedBody(input io.Reader, compress string, host string, cfg *config.Config, c *app.RequestContext) error { + var reader *bufio.Reader + + if compress == "gzip" { + // 解压gzip + gzipReader, err := gzip.NewReader(input) + if err != nil { + return fmt.Errorf("gzip解压错误: %v", err) + } + defer gzipReader.Close() + reader = bufio.NewReader(gzipReader) + } else { + reader = bufio.NewReader(input) + } + + // 创建一个缓冲区用于存储输出 + var outputBuffer io.Writer + var gzipWriter *gzip.Writer + var buf bytes.Buffer + + if compress == "gzip" { + // 创建一个缓冲区 + outputBuffer = &buf + gzipWriter = gzip.NewWriter(outputBuffer) + defer func() { + if gzipWriter != nil { + if closeErr := gzipWriter.Close(); closeErr != nil { + logError("gzipWriter close failed %v", closeErr) + } + } + }() + } else { + outputBuffer = &buf + } + + writer := bufio.NewWriter(outputBuffer) + defer func() { if flushErr := writer.Flush(); flushErr != nil { logError("writer flush failed %v", flushErr) - // 如果已经存在错误，则保留。否则，记录此错误。 - if err == nil { - err = flushErr - } } }() @@ -262,7 +461,7 @@ func processLinks(input io.Reader, output io.Writer, compress string, host strin if err == io.EOF { break // 文件结束 } - return written, fmt.Errorf("读取行错误: %v", err) // 传递错误 + return fmt.Errorf("读取行错误: %v", err) // 传递错误 } // 替换所有匹配的 URL @@ -270,17 +469,56 @@ func processLinks(input io.Reader, output io.Writer, compress string, host strin return modifyURL(originalURL, host, cfg) }) - n, werr := writer.WriteString(modifiedLine) - written += int64(n) // 更新写入的字节数 + _, werr := writer.WriteString(modifiedLine) if werr != nil { - return written, fmt.Errorf("写入文件错误: %v", werr) // 传递错误 + return fmt.Errorf("写入文件错误: %v", werr) // 传递错误 } } // 在返回之前，再刷新一次 if fErr := writer.Flush(); fErr != nil { - return written, fErr + return fErr } - return written, nil + if compress == "gzip" { + if err := gzipWriter.Close(); err != nil { + return fmt.Errorf("gzipWriter close failed: %v", err) + } + } + + // 将处理后的内容以分块的方式写入响应 + c.Response.HijackWriter(hresp.NewChunkedBodyWriter(&c.Response, c.GetWriter())) + + bufWrapper := bytebufferpool.Get() + bbuf := bufWrapper.B + size := 32768 // 32KB + if cap(bbuf) < size { + bbuf = make([]byte, size) + } else { + bbuf = bbuf[:size] + } + defer bytebufferpool.Put(bufWrapper) + + // 将缓冲区内容写入响应 + for { + n, err := buf.Read(bbuf) + if err != nil { + if err != io.EOF { + fmt.Println("读取错误:", err) + c.String(http.StatusInternalServerError, "读取错误") + return err + } + break // 读取到文件末尾 + } + + _, err = c.Write(bbuf[:n]) // 写入 chunk + if err != nil { + fmt.Println("写入 chunk 错误:", err) + return err + } + + c.Flush() // 刷新 chunk 到客户端 + } + + return nil } diff --git a/proxy/proxy.go b/proxy/proxy.go index cee0b87..fc6470f 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -2,11 +2,10 @@ package proxy import ( "fmt" - "io" "net/http" "github.com/WJQSERVER-STUDIO/go-utils/logger" - "github.com/gin-gonic/gin" + "github.com/cloudwego/hertz/pkg/app" ) // 日志模块 @@ -19,18 +18,7 @@ var ( logError = logger.LogError ) -// 读取请求体 -func readRequestBody(c *gin.Context) ([]byte, error) { - body, err := io.ReadAll(c.Request.Body) - if err != nil { - logError("failed to read request body: %v", err) - return nil, fmt.Errorf("failed to read request body: %v", err) - } - defer c.Request.Body.Close() - return body, nil -} - -func HandleError(c *gin.Context, message string) { +func HandleError(c *app.RequestContext, message string) { c.String(http.StatusInternalServerError, fmt.Sprintf("server error %v", message)) logError(message) } diff --git a/proxy/reqheader.go b/proxy/reqheader.go index ce62b91..86e33d4 100644 --- a/proxy/reqheader.go +++ b/proxy/reqheader.go @@ -4,16 +4,14 @@ import ( "net/http" "strings" - "github.com/gin-gonic/gin" + "github.com/cloudwego/hertz/pkg/app" ) // 设置请求头 -func setRequestHeaders(c *gin.Context, req *http.Request) { - for key, values := range c.Request.Header { - for _, value := range values { - req.Header.Set(key, value) - } - } +func setRequestHeaders(c *app.RequestContext, req *http.Request) { + c.Request.Header.VisitAll(func(key, value []byte) { + req.Header.Set(string(key), string(value)) + }) } func removeWSHeader(req *http.Request) {