diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index c1cb9d1..5906659 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -46,7 +46,7 @@ jobs: goarch: [amd64, arm64] env: OUTPUT_BINARY: ghproxy - GO_VERSION: 1.24 + GO_VERSION: 1.25 steps: - uses: actions/checkout@v4 @@ -73,7 +73,7 @@ jobs: GOOS: ${{ matrix.goos }} GOARCH: ${{ matrix.goarch }} run: | - CGO_ENABLED=0 go build -ldflags "-X main.version=${{ env.VERSION }} -X main.dev=true" -o ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./main.go + CGO_ENABLED=0 go build -ldflags "-X main.version=${{ env.VERSION }} -X main.dev=true" -o ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} . - name: 打包 run: | mkdir ghproxyd diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c8af8b..c814dfb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,7 +47,7 @@ jobs: goarch: [amd64, arm64] env: OUTPUT_BINARY: ghproxy - GO_VERSION: 1.24 + GO_VERSION: 1.25 steps: - uses: actions/checkout@v3 @@ -74,7 +74,7 @@ jobs: GOOS: ${{ matrix.goos }} GOARCH: ${{ matrix.goarch }} run: | - CGO_ENABLED=0 go build -ldflags "-s -w -X main.version=${{ env.VERSION }}" -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}} . - name: 打包 run: | mkdir ghproxyd @@ -141,4 +141,7 @@ jobs: push: true tags: | ${{ env.IMAGE_NAME }}:${{ env.VERSION }} + ${{ env.IMAGE_NAME }}:v4 ${{ env.IMAGE_NAME }}:latest + wjqserver/ghproxy-touka:latest + wjqserver/ghproxy-touka:${{ env.VERSION }} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 0ad54a9..b5c0aee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,10 @@ demo demo.toml +demo.wanf *.log *.bak list.json +iplist.json repos pages *_test \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 006230b..77c5a26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,212 @@ # 更新日志 +4.3.4 - 2025-09-14 +--- +- CHANGE: 改进嵌套加速实现, 增强稳定性 + +4.3.3 - 2025-09-10 +--- +- CHANGE: 增强对[wanf](https://github.com/WJQSERVER/wanf)的支持 +- CHANGE: 更新包括Touka框架在内的各个依赖版本 + +4.3.2 - 2025-08-20 +--- +- FIX: 修正`cfg.Pages.StaticDir`为空时的处置 + +4.3.1 - 2025-08-13 +--- +- CHANGE: 更新至[Go 1.25](https://tip.golang.org/doc/go1.25) + +4.3.0 - 2025-08-11 +--- +- CHANGE: 为OCI镜像(Docker)代理带来自动library附加功能 +- CHANGE(refactor): 改进OCI镜像(Docker)代理路径组成流程 +- ADD: 新增[WANF](https://github.com/WJQSERVER/wanf)配置文件格式支持 + +4.3.0-rc.0 - 2025-08-11 +--- +- PRE-RELEASE: v4.3.0-rc.0是v4.3.0发布版本,请勿在生产环境中使用; +- CHANGE: 为OCI镜像(Docker)代理带来自动library附加功能 +- CHANGE(refactor): 改进OCI镜像(Docker)代理路径组成流程 +- ADD: 新增[WANF](https://github.com/WJQSERVER/wanf)配置文件格式支持 + +4.2.7 - 2025-08-04 +--- +- CHANGE: 在OCI镜像(docker)代理部分增加特殊处理, 保证可用性 参看[#159](https://github.com/WJQSERVER-STUDIO/ghproxy/issues/159) +- CHANGE: 更新Touka框架, 同步解决部分日志过多问题 + +4.2.6 - 2025-08-01 +--- +- CHANGE: 修正匹配器 + +4.2.5 - 2025-07-31 +--- +- CHANGE: 进一步完善匹配器, 兼容更多情况 + +4.2.4 - 2025-07-29 +--- +- CHANGE: 改进匹配器, 防止匹配不应匹配的内容 + +4.2.4-rc.0 - 2025-07-29 +--- +- PRE-RELEASE: v4.2.4-rc.0是v4.2.4预发布版本,请勿在生产环境中使用; +- CHANGE: 改进匹配器, 防止匹配不应匹配的内容 + +4.2.3 - 2025-07-27 +--- +- CHANGE: 改进错误页面加载器, 避免在选择`external`模式时错误页面渲染回退到json输出 +- CHANGE: 完善OCI(Docker)镜像代理默认target逻辑 + +4.2.3-rc.0 - 2025-07-27 +--- +- PRE-RELEASE: v4.2.3-rc.0是v4.2.3预发布版本,请勿在生产环境中使用; +- CHANGE: 改进错误页面加载器, 避免在选择`external`模式时错误页面渲染回退到json输出 +- CHANGE: 完善OCI(Docker)镜像代理默认target逻辑 + +4.2.2 - 2025-07-25 +--- +- CHANGE: 重构OCI镜像代理部分, 完善对`ghcr`,`gcr`,`k8s.gcr`等上游源特殊处理的适配 + +4.2.2-rc.0 - 2025-07-25 +--- +- PRE-RELEASE: v4.2.2-rc.0是v4.2.2预发布版本,请勿在生产环境中使用; +- CHANGE: 重构OCI镜像代理部分, 完善对`ghcr`,`gcr`,`k8s.gcr`等上游源特殊处理的适配 + +4.2.1 - 2025-07-25 +--- +- CHANGE: 更新主题样式, 新增`free`主题, `design`与`hub`主题样式更新 + +4.2.0 - 2025-07-22 +--- +- CHANGE: 支持根据IP(CDIR)进行白名单与屏蔽 +- CHANGE: 进一步推进`json/v2`支持 + +4.2.0-rc.0 - 2025-07-22 +--- +- PRE-RELEASE: v4.2.0-rc.0是v4.2.0预发布版本,请勿在生产环境中使用; +- CHANGE: 支持根据IP(CDIR)进行白名单与屏蔽 +- CHANGE: 深化json/v2改革, 预备go1.25 json/v2 + +4.1.7 - 2025-07-20 +--- +- CHANGE: 更新相关依赖 +- CHANGE: 改进代码结构, 完善处理 + +4.1.7-rc.0 - 2025-07-20 +--- +- PRE-RELEASE: v4.1.7-rc.0是v4.1.7预发布版本,请勿在生产环境中使用; +- CHANGE: 更新相关依赖 +- CHANGE: 改进代码结构, 完善处理 + +4.1.6 - 2025-07-07 +--- +- CHANGE: 更新[Touka框架](https://github.com/infinite-iroha/touka)版本到`v0.2.9`, 提升`io`相关方式的性能并降低分配 +- CHANGE: 更新[Touka HTTPC](https://github.com/WJQSERVER-STUDIO/httpc)版本到`v0.8.0`, 使用`json/v2`的同时, 提升`io`相关操作性能并降低分配, 优化`debug`模式下打印输出性能 + +4.1.6-rc.0 - 2025-07-07 +--- +- PRE-RELEASE: v4.1.6-rc.0是v4.1.6预发布版本,请勿在生产环境中使用; +- CHANGE: 更新[Touka框架](https://github.com/infinite-iroha/touka)版本到`v0.2.9`, 提升`io`相关方式的性能并降低分配 +- CHANGE: 更新[Touka HTTPC](https://github.com/WJQSERVER-STUDIO/httpc)版本到`v0.8.0`, 使用`json/v2`的同时, 提升`io`相关操作性能并降低分配, 优化`debug`模式下打印输出性能 + +4.1.5 - 2025-07-03 +--- +- CHANGE: 更新`httpc`依赖以修正一些问题 + +4.1.5-rc.0 - 2025-07-03 +--- +- PRE-RELEASE: v4.1.5-rc.0是v4.1.5预发布版本,请勿在生产环境中使用; +- CHANGE: 更新`httpc`依赖以修正一些问题 + +4.1.4 - 2025-06-30 +--- +- CHANGE: 使用`touka`框架的内建httpc统一管理, 同时对httpc相关初始化进行改进 +- CHANGE: 更新`json/v2`版本 + +4.1.4-rc.0 - 2025-06-30 +--- +- PRE-RELEASE: v4.1.4-rc.0是v4.1.4预发布版本,请勿在生产环境中使用; +- CHANGE: 使用`touka`框架的内建httpc统一管理, 同时对httpc相关初始化进行改进 +- CHANGE: 更新`json/v2`版本 + +4.1.3 - 2025-06-25 +--- +- CHANGE: 更新`touka`版本, 使用新的方式配置slash重定向功能 + +4.1.3-rc.0 - 2025-06-25 +--- +- PRE-RELEASE: 此版本是v4.1.3预发布版本,请勿在生产环境中使用; +- CHANGE: 更新`touka`版本, 使用新的方式配置slash重定向功能 + +4.1.2 - 2025-06-18 +--- +- CHANGE: 更新`design`主题, 更新默认配置生成 + +4.1.2-rc.0 - 2025-06-18 +--- +- PRE-RELEASE: 此版本是v4.1.2预发布版本,请勿在生产环境中使用; +- CHANGE: 更新`design`主题, 更新默认配置生成 + +4.1.1 - 2025-06-18 +--- +- CHANGE: 更新touka框架到v0.2.6, 解决MidwareX的一些状态问题 + +4.1.0 - 2025-06-17 +--- +- ADD: 加入基于`basic auth`的docker鉴权支持 + +4.1.0-rc.0 - 2025-06-17 +--- +- PRE-RELEASE: 此版本是v4.1.0预发布版本,请勿在生产环境中使用; +- ADD: 加入基于`basic auth`的docker鉴权支持 + +4.1.0-beta.0 - 2025-06-17 +--- +- BETA-TEST: 此版本是v4.1.0的测试版本,请勿在生产环境中使用; +- ADD: 加入基于`basic auth`的docker鉴权支持 + +4.0.0 - 2025-06-16 +--- +- CHANGE: 移交到Touka框架 +- REMOVE: 移除req rate limit的total方式 +- CHANGE: 使用[reco](https://github.com/fenthope/reco)日志库, 异步使能 +- FIX: 更换HTTP框架以解决v3可能存在的内存分配与回收问题 + +4.0.0-rc.0 - 2025-06-16 +--- +- PRE-RELEASE: 此版本是v4.0.0预发布版本,请勿在生产环境中使用; +- CHANGE: 移交到Touka框架 +- REMOVE: 移除req rate limit的total方式 +- CHANGE: 使用[reco](https://github.com/fenthope/reco)日志库, 异步使能 + +4.0.0-beta.0 - 2025-06-15 +--- +- BETA-TEST: 此版本是v4.0.0的测试版本,请勿在生产环境中使用; +- CHANGE: 移交到Touka框架 +- REMOVE: 移除req rate limit的total方式 +- CHANGE: 使用[reco](https://github.com/fenthope/reco)日志库, 异步使能 + +3.5.6 - 2025-06-15 +--- +- FIX: 修正blob重写的生成问题 +- CHANGE: 改进302重定向逻辑 + +25w48c - 2025-06-15 +--- +- PRE-RELEASE: 此版本是v3.5.6预发布版本,请勿在生产环境中使用; +- CHANGE: 加入内部301处理 + +25w48b - 2025-06-15 +--- +- PRE-RELEASE: 此版本是v3.5.6预发布版本,请勿在生产环境中使用; +- FIX: 修正blob重写的生成问题 +- CHANGE: 验证与连接释放相关的修正 + +25w48a - 2025-06-14 +--- +- PRE-RELEASE: 此版本是v3.5.6预发布版本,请勿在生产环境中使用; +- CHANGE: 测试302重定向逻辑 + 3.5.5 - 2025-06-14 --- - CHANGE: 修正新匹配器的覆盖问题, 同时增加test的覆盖 diff --git a/DEV-VERSION b/DEV-VERSION index 55564ab..51ff7c7 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -25w47a \ No newline at end of file +4.3.0-rc.0 \ No newline at end of file diff --git a/README.md b/README.md index 3f4123d..c977c51 100644 --- a/README.md +++ b/README.md @@ -6,16 +6,15 @@ ![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/WJQSERVER-STUDIO/ghproxy) [![Go Report Card](https://goreportcard.com/badge/github.com/WJQSERVER-STUDIO/ghproxy)](https://goreportcard.com/report/github.com/WJQSERVER-STUDIO/ghproxy) - -支持 Git clone、raw、releases的 Github 加速项目, 支持自托管的同时带来卓越的性能与极低的资源占用(Golang和HertZ带来的优势), 同时支持多种额外功能 +一个基于Go的高性能Github资源代理程序, 同时支持Docker镜像代理与脚本嵌套加速等多种功能 ## 项目说明 ### 项目特点 - ⚡ **基于 Go 语言实现，跨平台的同时提供高并发性能** -- 🌐 **使用字节旗下的 [HertZ](https://github.com/cloudwego/hertz) 作为 Web 框架** -- 📡 **使用 [Touka-HTTPC](https://github.com/satomitouka/touka-httpc) 作为 HTTP 客户端** +- 🌐 **使用自有[Touka框架](https://github.com/infinite-iroha/touka)作为 HTTP服务端框架** +- 📡 **使用 [Touka-HTTPC](https://github.com/WJQSERVER-STUDIO/httpc) 作为 HTTP 客户端** - 📥 **支持 Git clone、raw、releases 等文件拉取** - 🐳 **支持反代Docker, GHCR等镜像仓库** - 🎨 **支持多个前端主题** @@ -33,10 +32,10 @@ [TG讨论群组](https://t.me/ghproxy_go) -[相关文章](https://blog.wjqserver.com/categories/my-program/) - [GHProxy项目文档](https://wjqserver-docs.pages.dev/docs/ghproxy/) 感谢 [@redbunnys](https://github.com/redbunnys)的维护 +[相关文章](https://blog.wjqserver.com/categories/my-program/) + ### 使用示例 ```bash @@ -96,16 +95,11 @@ wget -O install-dev.sh https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghprox 参看[GHProxy-Frontend](https://github.com/WJQSERVER-STUDIO/GHProxy-Frontend) -## 项目简史 +## 文档 -**本项目是[WJQSERVER-STUDIO/ghproxy-go](https://github.com/WJQSERVER-STUDIO/ghproxy-go)的重构版本,实现了原项目原定功能的同时,进一步优化了性能** -关于此项目的详细开发过程,请参看Commit记录与[CHANGELOG.md](https://github.com/WJQSERVER-STUDIO/ghproxy/blob/main/CHANGELOG.md) +* [GHProxy项目文档](https://wjqserver-docs.pages.dev/docs/ghproxy/) 感谢 [@redbunnys](https://github.com/redbunnys)的维护 -- v3.0.0 迁移到HertZ框架, 进一步提升效率 -- v2.4.1 对路径匹配进行优化 -- v2.0.0 对`proxy`核心模块进行了重构,大幅优化内存占用 -- v1.0.0 迁移至本仓库,并再次重构内容实现 -- v0.2.0 重构项目实现 +* [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/WJQSERVER-STUDIO/ghproxy) 可供参考, AI生成存在幻觉, 不完全可靠, 请注意辨别 ## LICENSE @@ -121,10 +115,6 @@ v3.5.2开始, 本项目使用 [WJQserver Studio License 2.1](https://wjqserver-s 如果您觉得本项目对您有帮助,欢迎赞助支持,您的赞助将用于Demo服务器开支及开发者时间成本支出,感谢您的支持! -为爱发电,开源不易 - -爱发电: https://afdian.com/a/wjqserver - USDT(TRC20): `TNfSYG6F2vkiibd6J6mhhHNWDgWgNdF5hN` ### 捐赠列表 diff --git a/SECURITY.MD b/SECURITY.MD index 535d84e..7696664 100644 --- a/SECURITY.MD +++ b/SECURITY.MD @@ -6,10 +6,13 @@ | 版本 | 是否支持 | | --- | --- | -| v3.x.x | :white_check_mark: 当前最新版本序列 | +| v4.x.x | :white_check_mark: 当前最新版本序列 | +| v3.x.x | :x: 这些版本已结束生命周期,不受支持 | | v2.x.x | :x: 这些版本已结束生命周期,不受支持 | | v1.x.x | :x: 这些版本已结束生命周期,不受支持 | -| 25w*a/b/c... | :warning: 此为PRE-RELEASE版本,用于开发与测试,可能存在未知的问题 | +| *-rc.x | :warning: 此为PRE-RELEASE预发布版本,用于测试问题 | +| *-beta.x | :warning: 此为Beta测试版本,用于开发与测试,可能存在未知的问题 | +| 25w*a/b/c... | :warning: 此为PRE-RELEASE版本,用于开发与测试,可能存在未知的问题 生命周期已完全结束 | | 24w*a/b/c... | :warning: 此为PRE-RELEASE版本,用于开发与测试,可能存在未知的问题 生命周期已完全结束 | | v0.x.x | :x: 这些版本不再受支持 | @@ -17,9 +20,15 @@ 本项目为开源项目,开发者不对使用本项目造成的任何损失或问题承担责任。用户需自行评估并承担使用本项目的风险。 -使用本项目,请遵循 **[WSL 2.0 (WJQSERVER-STUDIO LICENSE 2.0)](https://wjqserver-studio.github.io/LICENSE/LICENSE.html)** 协议。 +使用本项目,请遵循 **[WSL 2.1 (WJQSERVER-STUDIO LICENSE 2.1)](https://wjqserver-studio.github.io/LICENSE/LICENSE.html)** 协议 或 [Mozilla Public License Version 2.0](https://mozilla.org/MPL/2.0/) 。 -本项目所有文件均受到 WSL 2.0 (WJQSERVER-STUDIO LICENSE 2.0) 协议保护,任何人不得在任何情况下以非 WSL 2.0 (WJQSERVER-STUDIO LICENSE 2.0) 协议内规定的方式使用,复制,修改,编译,发布,分发,再许可,或者出售本项目的任何部分。 +#### 选择WSL 2.1时 + +本项目所有文件均受到 WSL 2.1 (WJQSERVER-STUDIO LICENSE 2.1) 协议保护,任何人不得在任何情况下以非 WSL 2.1 (WJQSERVER-STUDIO LICENSE 2.1) 协议内规定的方式使用,复制,修改,编译,发布,分发,再许可,或者出售本项目的任何部分。 + +#### 选择MPL 2.0时 + +本项目内文件除特别版权标注声明外, 均受到 [Mozilla Public License Version 2.0](https://mozilla.org/MPL/2.0/) 授权保护, 具体条款参看 [Mozilla Public License Version 2.0](https://mozilla.org/MPL/2.0/) ## 报告漏洞 diff --git a/VERSION b/VERSION index 1947319..a6695ff 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.5.5 \ No newline at end of file +4.3.4 \ No newline at end of file diff --git a/api/api.go b/api/api.go index 597a198..b1bb61c 100644 --- a/api/api.go +++ b/api/api.go @@ -1,95 +1,85 @@ package api import ( - "context" "ghproxy/config" "ghproxy/middleware/nocache" - "github.com/WJQSERVER-STUDIO/logger" - "github.com/cloudwego/hertz/pkg/app" - "github.com/cloudwego/hertz/pkg/app/server" + "github.com/infinite-iroha/touka" ) -var ( - logw = logger.Logw - logDump = logger.LogDump - logDebug = logger.LogDebug - logInfo = logger.LogInfo - logWarning = logger.LogWarning - logError = logger.LogError -) - -func InitHandleRouter(cfg *config.Config, r *server.Hertz, version string) { +func InitHandleRouter(cfg *config.Config, r *touka.Engine, version string) { apiRouter := r.Group("/api", nocache.NoCacheMiddleware()) { - apiRouter.GET("/size_limit", func(ctx context.Context, c *app.RequestContext) { - SizeLimitHandler(cfg, c, ctx) + apiRouter.GET("/size_limit", func(c *touka.Context) { + SizeLimitHandler(cfg, c) }) - apiRouter.GET("/whitelist/status", func(ctx context.Context, c *app.RequestContext) { - WhiteListStatusHandler(cfg, c, ctx) + apiRouter.GET("/whitelist/status", func(c *touka.Context) { + WhiteListStatusHandler(cfg, c) }) - apiRouter.GET("/blacklist/status", func(ctx context.Context, c *app.RequestContext) { - BlackListStatusHandler(cfg, c, ctx) + apiRouter.GET("/blacklist/status", func(c *touka.Context) { + BlackListStatusHandler(cfg, c) }) - apiRouter.GET("/cors/status", func(ctx context.Context, c *app.RequestContext) { - CorsStatusHandler(cfg, c, ctx) + apiRouter.GET("/cors/status", func(c *touka.Context) { + CorsStatusHandler(cfg, c) }) - apiRouter.GET("/healthcheck", func(ctx context.Context, c *app.RequestContext) { - HealthcheckHandler(c, ctx) + apiRouter.GET("/healthcheck", func(c *touka.Context) { + HealthcheckHandler(c) }) - apiRouter.GET("/version", func(ctx context.Context, c *app.RequestContext) { - VersionHandler(c, ctx, version) + apiRouter.GET("/ok", func(c *touka.Context) { + HealthcheckHandler(c) }) - apiRouter.GET("/rate_limit/status", func(ctx context.Context, c *app.RequestContext) { - RateLimitStatusHandler(cfg, c, ctx) + apiRouter.GET("/version", func(c *touka.Context) { + VersionHandler(c, version) }) - apiRouter.GET("/rate_limit/limit", func(ctx context.Context, c *app.RequestContext) { - RateLimitLimitHandler(cfg, c, ctx) + apiRouter.GET("/rate_limit/status", func(c *touka.Context) { + RateLimitStatusHandler(cfg, c) }) - apiRouter.GET("/smartgit/status", func(ctx context.Context, c *app.RequestContext) { - SmartGitStatusHandler(cfg, c, ctx) + apiRouter.GET("/rate_limit/limit", func(c *touka.Context) { + RateLimitLimitHandler(cfg, c) }) - apiRouter.GET("/shell_nest/status", func(ctx context.Context, c *app.RequestContext) { - shellNestStatusHandler(cfg, c, ctx) + apiRouter.GET("/smartgit/status", func(c *touka.Context) { + SmartGitStatusHandler(cfg, c) }) - apiRouter.GET("/oci_proxy/status", func(ctx context.Context, c *app.RequestContext) { - ociProxyStatusHandler(cfg, c, ctx) + apiRouter.GET("/shell_nest/status", func(c *touka.Context) { + shellNestStatusHandler(cfg, c) + }) + apiRouter.GET("/oci_proxy/status", func(c *touka.Context) { + ociProxyStatusHandler(cfg, c) }) } - logInfo("API router Init success") } -func SizeLimitHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) { +func SizeLimitHandler(cfg *config.Config, c *touka.Context) { sizeLimit := cfg.Server.SizeLimit - c.Response.Header.Set("Content-Type", "application/json") + c.SetHeader("Content-Type", "application/json") c.JSON(200, (map[string]interface{}{ "MaxResponseBodySize": sizeLimit, })) } -func WhiteListStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) { - c.Response.Header.Set("Content-Type", "application/json") +func WhiteListStatusHandler(cfg *config.Config, c *touka.Context) { + c.SetHeader("Content-Type", "application/json") c.JSON(200, (map[string]interface{}{ "Whitelist": cfg.Whitelist.Enabled, })) } -func BlackListStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) { - c.Response.Header.Set("Content-Type", "application/json") +func BlackListStatusHandler(cfg *config.Config, c *touka.Context) { + c.SetHeader("Content-Type", "application/json") c.JSON(200, (map[string]interface{}{ "Blacklist": cfg.Blacklist.Enabled, })) } -func CorsStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) { - c.Response.Header.Set("Content-Type", "application/json") +func CorsStatusHandler(cfg *config.Config, c *touka.Context) { + c.SetHeader("Content-Type", "application/json") c.JSON(200, (map[string]interface{}{ "Cors": cfg.Server.Cors, })) } -func HealthcheckHandler(c *app.RequestContext, ctx context.Context) { - c.Response.Header.Set("Content-Type", "application/json") +func HealthcheckHandler(c *touka.Context) { + c.SetHeader("Content-Type", "application/json") c.JSON(200, (map[string]interface{}{ "Status": "OK", "Repo": "WJQSERVER-STUDIO/GHProxy", @@ -97,8 +87,8 @@ func HealthcheckHandler(c *app.RequestContext, ctx context.Context) { })) } -func VersionHandler(c *app.RequestContext, ctx context.Context, version string) { - c.Response.Header.Set("Content-Type", "application/json") +func VersionHandler(c *touka.Context, version string) { + c.SetHeader("Content-Type", "application/json") c.JSON(200, (map[string]interface{}{ "Version": version, "Repo": "WJQSERVER-STUDIO/GHProxy", @@ -106,36 +96,36 @@ func VersionHandler(c *app.RequestContext, ctx context.Context, version string) })) } -func RateLimitStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) { - c.Response.Header.Set("Content-Type", "application/json") +func RateLimitStatusHandler(cfg *config.Config, c *touka.Context) { + c.SetHeader("Content-Type", "application/json") c.JSON(200, (map[string]interface{}{ "RateLimit": cfg.RateLimit.Enabled, })) } -func RateLimitLimitHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) { - c.Response.Header.Set("Content-Type", "application/json") +func RateLimitLimitHandler(cfg *config.Config, c *touka.Context) { + c.SetHeader("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) { - c.Response.Header.Set("Content-Type", "application/json") +func SmartGitStatusHandler(cfg *config.Config, c *touka.Context) { + c.SetHeader("Content-Type", "application/json") c.JSON(200, (map[string]interface{}{ "enabled": cfg.GitClone.Mode == "cache", })) } -func shellNestStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) { - c.Response.Header.Set("Content-Type", "application/json") +func shellNestStatusHandler(cfg *config.Config, c *touka.Context) { + c.SetHeader("Content-Type", "application/json") c.JSON(200, (map[string]interface{}{ "enabled": cfg.Shell.Editor, })) } -func ociProxyStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) { - c.Response.Header.Set("Content-Type", "application/json") +func ociProxyStatusHandler(cfg *config.Config, c *touka.Context) { + c.SetHeader("Content-Type", "application/json") c.JSON(200, (map[string]interface{}{ "enabled": cfg.Docker.Enabled, "target": cfg.Docker.Target, diff --git a/auth/auth-header.go b/auth/auth-header.go index 1457a13..5180c05 100644 --- a/auth/auth-header.go +++ b/auth/auth-header.go @@ -4,22 +4,21 @@ import ( "fmt" "ghproxy/config" - "github.com/cloudwego/hertz/pkg/app" + "github.com/infinite-iroha/touka" ) -func AuthHeaderHandler(c *app.RequestContext, cfg *config.Config) (isValid bool, err error) { +func AuthHeaderHandler(c *touka.Context, cfg *config.Config) (isValid bool, err error) { if !cfg.Auth.Enabled { return true, nil } // 获取"GH-Auth"的值 var authToken string if cfg.Auth.Key != "" { - authToken = string(c.GetHeader(cfg.Auth.Key)) + authToken = string(c.Request.Header.Get(cfg.Auth.Key)) } else { - authToken = string(c.GetHeader("GH-Auth")) + authToken = string(c.Request.Header.Get("GH-Auth")) } - logDebug("%s %s %s %s %s AUTH_TOKEN: %s", c.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 2167b24..4a4fecd 100644 --- a/auth/auth-parameters.go +++ b/auth/auth-parameters.go @@ -4,10 +4,10 @@ import ( "fmt" "ghproxy/config" - "github.com/cloudwego/hertz/pkg/app" + "github.com/infinite-iroha/touka" ) -func AuthParametersHandler(c *app.RequestContext, cfg *config.Config) (isValid bool, err error) { +func AuthParametersHandler(c *touka.Context, cfg *config.Config) (isValid bool, err error) { if !cfg.Auth.Enabled { return true, nil } @@ -19,8 +19,6 @@ func AuthParametersHandler(c *app.RequestContext, cfg *config.Config) (isValid b authToken = c.Query("auth_token") } - logDebug("%s %s %s %s %s AUTH_TOKEN: %s", c.ClientIP(), c.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 d817dc4..ad8efaf 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -4,38 +4,26 @@ import ( "fmt" "ghproxy/config" - "github.com/WJQSERVER-STUDIO/logger" - "github.com/cloudwego/hertz/pkg/app" + "github.com/infinite-iroha/touka" ) -var ( - logw = logger.Logw - logDump = logger.LogDump - logDebug = logger.LogDebug - logInfo = logger.LogInfo - logWarning = logger.LogWarning - logError = logger.LogError -) - -func Init(cfg *config.Config) { +func ListInit(cfg *config.Config) error { if cfg.Blacklist.Enabled { err := InitBlacklist(cfg) if err != nil { - logError(err.Error()) - return + return err } } if cfg.Whitelist.Enabled { err := InitWhitelist(cfg) if err != nil { - logError(err.Error()) - return + return err } } - logDebug("Auth Init") + return nil } -func AuthHandler(c *app.RequestContext, cfg *config.Config) (isValid bool, err error) { +func AuthHandler(c *touka.Context, cfg *config.Config) (isValid bool, err error) { if cfg.Auth.Method == "parameters" { isValid, err = AuthParametersHandler(c, cfg) return isValid, err @@ -43,10 +31,10 @@ func AuthHandler(c *app.RequestContext, cfg *config.Config) (isValid bool, err e isValid, err = AuthHeaderHandler(c, cfg) return isValid, err } else if cfg.Auth.Method == "" { - logError("Auth method not set") + c.Errorf("Auth method not set") return true, nil } else { - logError("Auth method not supported %s", cfg.Auth.Method) + c.Errorf("Auth method not supported %s", cfg.Auth.Method) return false, fmt.Errorf("%s", fmt.Sprintf("Auth method %s not supported", cfg.Auth.Method)) } } diff --git a/auth/blacklist.go b/auth/blacklist.go index fd6b276..014a41d 100644 --- a/auth/blacklist.go +++ b/auth/blacklist.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - json "github.com/bytedance/sonic" + "github.com/go-json-experiment/json" ) type Blacklist struct { diff --git a/auth/ipfilter.go b/auth/ipfilter.go new file mode 100644 index 0000000..45fe884 --- /dev/null +++ b/auth/ipfilter.go @@ -0,0 +1,60 @@ +package auth + +import ( + "fmt" + "ghproxy/config" + "os" + + "github.com/go-json-experiment/json" + "github.com/go-json-experiment/json/jsontext" +) + +func ReadIPFilterList(cfg *config.Config) (whitelist []string, blacklist []string, err error) { + if cfg.IPFilter.IPFilterFile == "" { + return nil, nil, nil + } + + // 检查文件是否存在, 不存在则创建空json + if _, err := os.Stat(cfg.IPFilter.IPFilterFile); os.IsNotExist(err) { + if err := CreateEmptyIPFilterFile(cfg.IPFilter.IPFilterFile); err != nil { + return nil, nil, fmt.Errorf("failed to create empty IP filter file: %w", err) + } + } + + data, err := os.ReadFile(cfg.IPFilter.IPFilterFile) + if err != nil { + return nil, nil, fmt.Errorf("failed to read IP filter file: %w", err) + } + + var ipFilterData struct { + AllowList []string `json:"allow"` + BlockList []string `json:"block"` + } + if err := json.Unmarshal(data, &ipFilterData); err != nil { + return nil, nil, fmt.Errorf("invalid IP filter file format: %w", err) + } + + return ipFilterData.AllowList, ipFilterData.BlockList, nil +} + +// 创建空列表json +func CreateEmptyIPFilterFile(filePath string) error { + emptyData := struct { + AllowList []string `json:"allow"` + BlockList []string `json:"block"` + }{ + AllowList: []string{}, + BlockList: []string{}, + } + + jsonData, err := json.Marshal(emptyData, jsontext.Multiline(true), jsontext.WithIndent(" ")) + if err != nil { + return fmt.Errorf("failed to marshal empty IP filter data: %w", err) + } + + err = os.WriteFile(filePath, jsonData, 0644) + if err != nil { + return fmt.Errorf("failed to write empty IP filter file: %w", err) + } + return nil +} diff --git a/auth/whitelist.go b/auth/whitelist.go index b4071d1..1218307 100644 --- a/auth/whitelist.go +++ b/auth/whitelist.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - json "github.com/bytedance/sonic" + "github.com/go-json-experiment/json" ) // Whitelist 用于存储白名单信息 diff --git a/config/config.go b/config/config.go index 0060b63..e098e72 100644 --- a/config/config.go +++ b/config/config.go @@ -1,48 +1,51 @@ package config import ( + "fmt" "os" + "path/filepath" + "strings" "github.com/BurntSushi/toml" + + "github.com/WJQSERVER/wanf" ) +// Config 结构体定义了整个应用程序的配置 type Config struct { - Server ServerConfig - Httpc HttpcConfig - GitClone GitCloneConfig - Shell ShellConfig - Pages PagesConfig - Log LogConfig - Auth AuthConfig - Blacklist BlacklistConfig - Whitelist WhitelistConfig - RateLimit RateLimitConfig - Outbound OutboundConfig - Docker DockerConfig + Server ServerConfig `toml:"server" wanf:"server"` + Httpc HttpcConfig `toml:"httpc" wanf:"httpc"` + GitClone GitCloneConfig `toml:"gitclone" wanf:"gitclone"` + Shell ShellConfig `toml:"shell" wanf:"shell"` + Pages PagesConfig `toml:"pages" wanf:"pages"` + Log LogConfig `toml:"log" wanf:"log"` + Auth AuthConfig `toml:"auth" wanf:"auth"` + Blacklist BlacklistConfig `toml:"blacklist" wanf:"blacklist"` + Whitelist WhitelistConfig `toml:"whitelist" wanf:"whitelist"` + IPFilter IPFilterConfig `toml:"ipFilter" wanf:"ipFilter"` + RateLimit RateLimitConfig `toml:"rateLimit" wanf:"rateLimit"` + Outbound OutboundConfig `toml:"outbound" wanf:"outbound"` + Docker DockerConfig `toml:"docker" wanf:"docker"` } /* [server] host = "0.0.0.0" port = 8080 -netlib = "netpoll" # "netpoll" / "std" "standard" "net/http" "net" sizeLimit = 125 # MB memLimit = 0 # MB -H2C = true cors = "*" # "*"/"" -> "*" ; "nil" -> "" ; debug = false */ +// ServerConfig 定义服务器相关的配置 type ServerConfig struct { - Port int `toml:"port"` - Host string `toml:"host"` - NetLib string `toml:"netlib"` - SenseClientDisconnection bool `toml:"senseClientDisconnection"` - SizeLimit int `toml:"sizeLimit"` - MemLimit int64 `toml:"memLimit"` - H2C bool `toml:"H2C"` - Cors string `toml:"cors"` - Debug bool `toml:"debug"` + Port int `toml:"port" wanf:"port"` + Host string `toml:"host" wanf:"host"` + SizeLimit int `toml:"sizeLimit" wanf:"sizeLimit"` + MemLimit int64 `toml:"memLimit" wanf:"memLimit"` + Cors string `toml:"cors" wanf:"cors"` + Debug bool `toml:"debug" wanf:"debug"` } /* @@ -53,24 +56,28 @@ maxIdleConnsPerHost = 60 # only for advanced mode maxConnsPerHost = 0 # only for advanced mode useCustomRawHeaders = false */ +// HttpcConfig 定义 HTTP 客户端相关的配置 type HttpcConfig struct { - Mode string `toml:"mode"` - MaxIdleConns int `toml:"maxIdleConns"` - MaxIdleConnsPerHost int `toml:"maxIdleConnsPerHost"` - MaxConnsPerHost int `toml:"maxConnsPerHost"` - UseCustomRawHeaders bool `toml:"useCustomRawHeaders"` + Mode string `toml:"mode" wanf:"mode"` + MaxIdleConns int `toml:"maxIdleConns" wanf:"maxIdleConns"` + MaxIdleConnsPerHost int `toml:"maxIdleConnsPerHost" wanf:"maxIdleConnsPerHost"` + MaxConnsPerHost int `toml:"maxConnsPerHost" wanf:"maxConnsPerHost"` + UseCustomRawHeaders bool `toml:"useCustomRawHeaders" wanf:"useCustomRawHeaders"` } /* [gitclone] mode = "bypass" # bypass / cache smartGitAddr = "http://127.0.0.1:8080" +//cacheTimeout = 10 ForceH2C = true */ +// GitCloneConfig 定义 Git 克隆相关的配置 type GitCloneConfig struct { - Mode string `toml:"mode"` - SmartGitAddr string `toml:"smartGitAddr"` - ForceH2C bool `toml:"ForceH2C"` + Mode string `toml:"mode" wanf:"mode"` + SmartGitAddr string `toml:"smartGitAddr" wanf:"smartGitAddr"` + //CacheTimeout int `toml:"cacheTimeout"` + ForceH2C bool `toml:"ForceH2C" wanf:"ForceH2C"` } /* @@ -78,9 +85,10 @@ type GitCloneConfig struct { editor = true rewriteAPI = false */ +// ShellConfig 定义 Shell 相关的配置 type ShellConfig struct { - Editor bool `toml:"editor"` - RewriteAPI bool `toml:"rewriteAPI"` + Editor bool `toml:"editor" wanf:"editor"` + RewriteAPI bool `toml:"rewriteAPI" wanf:"rewriteAPI"` } /* @@ -89,18 +97,18 @@ mode = "internal" # "internal" or "external" theme = "bootstrap" # "bootstrap" or "nebula" staticDir = "/data/www" */ +// PagesConfig 定义静态页面相关的配置 type PagesConfig struct { - Mode string `toml:"mode"` - Theme string `toml:"theme"` - StaticDir string `toml:"staticDir"` + Mode string `toml:"mode" wanf:"mode"` + Theme string `toml:"theme" wanf:"theme"` + StaticDir string `toml:"staticDir" wanf:"staticDir"` } +// LogConfig 定义日志相关的配置 type LogConfig struct { - LogFilePath string `toml:"logFilePath"` - MaxLogSize int `toml:"maxLogSize"` - Level string `toml:"level"` - Async bool `toml:"async"` - HertZLogPath string `toml:"hertzLogPath"` + LogFilePath string `toml:"logFilePath" wanf:"logFilePath"` + MaxLogSize int64 `toml:"maxLogSize" wanf:"maxLogSize"` + Level string `toml:"level" wanf:"level"` } /* @@ -113,30 +121,40 @@ passThrough = false ForceAllowApi = false ForceAllowApiPassList = false */ +// AuthConfig 定义认证相关的配置 type AuthConfig struct { - Enabled bool `toml:"enabled"` - Method string `toml:"method"` - Key string `toml:"key"` - Token string `toml:"token"` - PassThrough bool `toml:"passThrough"` - ForceAllowApi bool `toml:"ForceAllowApi"` - ForceAllowApiPassList bool `toml:"ForceAllowApiPassList"` + Enabled bool `toml:"enabled" wanf:"enabled"` + Method string `toml:"method" wanf:"method"` + Key string `toml:"key" wanf:"key"` + Token string `toml:"token" wanf:"token"` + PassThrough bool `toml:"passThrough" wanf:"passThrough"` + ForceAllowApi bool `toml:"ForceAllowApi" wanf:"ForceAllowApi"` + ForceAllowApiPassList bool `toml:"ForceAllowApiPassList" wanf:"ForceAllowApiPassList"` } +// BlacklistConfig 定义黑名单相关的配置 type BlacklistConfig struct { - Enabled bool `toml:"enabled"` - BlacklistFile string `toml:"blacklistFile"` + Enabled bool `toml:"enabled" wanf:"enabled"` + BlacklistFile string `toml:"blacklistFile" wanf:"blacklistFile"` } +// WhitelistConfig 定义白名单相关的配置 type WhitelistConfig struct { - Enabled bool `toml:"enabled"` - WhitelistFile string `toml:"whitelistFile"` + Enabled bool `toml:"enabled" wanf:"enabled"` + WhitelistFile string `toml:"whitelistFile" wanf:"whitelistFile"` +} + +// IPFilterConfig 定义 IP 过滤相关的配置 +type IPFilterConfig struct { + Enabled bool `toml:"enabled" wanf:"enabled"` + EnableAllowList bool `toml:"enableAllowList" wanf:"enableAllowList"` + EnableBlockList bool `toml:"enableBlockList" wanf:"enableBlockList"` + IPFilterFile string `toml:"ipFilterFile" wanf:"ipFilterFile"` } /* [rateLimit] enabled = false -rateMethod = "total" # "total" or "ip" ratePerMinute = 100 burst = 10 @@ -148,20 +166,21 @@ burst = 10 singleBurst = "10mbps" */ +// RateLimitConfig 定义限速相关的配置 type RateLimitConfig struct { - Enabled bool `toml:"enabled"` - RateMethod string `toml:"rateMethod"` - RatePerMinute int `toml:"ratePerMinute"` - Burst int `toml:"burst"` - BandwidthLimit BandwidthLimitConfig + Enabled bool `toml:"enabled" wanf:"enabled"` + RatePerMinute int `toml:"ratePerMinute" wanf:"ratePerMinute"` + Burst int `toml:"burst" wanf:"burst"` + BandwidthLimit BandwidthLimitConfig `toml:"bandwidthLimit" wanf:"bandwidthLimit"` } +// BandwidthLimitConfig 定义带宽限制相关的配置 type BandwidthLimitConfig struct { - Enabled bool `toml:"enabled"` - TotalLimit string `toml:"totalLimit"` - TotalBurst string `toml:"totalBurst"` - SingleLimit string `toml:"singleLimit"` - SingleBurst string `toml:"singleBurst"` + Enabled bool `toml:"enabled" wanf:"enabled"` + TotalLimit string `toml:"totalLimit" wanf:"totalLimit"` + TotalBurst string `toml:"totalBurst" wanf:"totalBurst"` + SingleLimit string `toml:"singleLimit" wanf:"singleLimit"` + SingleBurst string `toml:"singleBurst" wanf:"singleBurst"` } /* @@ -169,24 +188,34 @@ type BandwidthLimitConfig struct { enabled = false url = "socks5://127.0.0.1:1080" # "http://127.0.0.1:7890" */ +// OutboundConfig 定义出站代理相关的配置 type OutboundConfig struct { - Enabled bool `toml:"enabled"` - Url string `toml:"url"` + Enabled bool `toml:"enabled" wanf:"enabled"` + Url string `toml:"url" wanf:"url"` } /* [docker] enabled = false target = "ghcr" # ghcr/dockerhub +auth = false +[docker.credentials] +user1 = "testpass" +test = "test123" */ +// DockerConfig 定义 Docker 相关的配置 type DockerConfig struct { - Enabled bool `toml:"enabled"` - Target string `toml:"target"` + Enabled bool `toml:"enabled" wanf:"enabled"` + Target string `toml:"target" wanf:"target"` + Auth bool `toml:"auth" wanf:"auth"` + Credentials map[string]string `toml:"credentials" wanf:"credentials"` + AuthPassThrough bool `toml:"authPassThrough" wanf:"authPassThrough"` } -// LoadConfig 从 TOML 配置文件加载配置 +// LoadConfig 从配置文件加载配置 func LoadConfig(filePath string) (*Config, error) { - if !FileExists(filePath) { + exist, filePath2read := FileExists(filePath) + if !exist { // 楔入配置文件 err := DefaultConfig().WriteConfig(filePath) if err != nil { @@ -194,15 +223,22 @@ func LoadConfig(filePath string) (*Config, error) { } return DefaultConfig(), nil } - var config Config - if _, err := toml.DecodeFile(filePath, &config); err != nil { + ext := filepath.Ext(filePath2read) + if ext == ".wanf" { + if err := wanf.DecodeFile(filePath2read, &config); err != nil { + return nil, err + } + return &config, nil + } + + if _, err := toml.DecodeFile(filePath2read, &config); err != nil { return nil, err } return &config, nil } -// 写入配置文件 +// WriteConfig 写入配置文件 func (c *Config) WriteConfig(filePath string) error { file, err := os.Create(filePath) if err != nil { @@ -210,26 +246,61 @@ func (c *Config) WriteConfig(filePath string) error { } defer file.Close() + ext := filepath.Ext(filePath) + if ext == ".wanf" { + err := wanf.NewStreamEncoder(file).Encode(c) + if err != nil { + return err + } + return nil + } + encoder := toml.NewEncoder(file) return encoder.Encode(c) } -// 检测文件是否存在 -func FileExists(filename string) bool { +// FileExists 检测文件是否存在 +func FileExists(filename string) (bool, string) { _, err := os.Stat(filename) - return !os.IsNotExist(err) + if err == nil { + return true, filename + } + if os.IsNotExist(err) { + // 获取文件名（不包含路径） + base := filepath.Base(filename) + dir := filepath.Dir(filename) + + // 获取扩展名 + fileNameBody := strings.TrimSuffix(base, filepath.Ext(base)) + + // 重新组合路径, 扩展名改为.wanf, 确认是否存在 + wanfFilename := filepath.Join(dir, fileNameBody+".wanf") + + _, err = os.Stat(wanfFilename) + if err == nil { + // .wanf 文件存在 + fmt.Printf("\n Found .wanf file: %s\n", wanfFilename) + return true, wanfFilename + } else if os.IsNotExist(err) { + // .wanf 文件不存在 + return false, "" + } else { + // 其他错误 + return false, "" + } + } else { + return false, filename + } } -// 默认配置结构体 +// DefaultConfig 返回默认配置结构体 func DefaultConfig() *Config { return &Config{ Server: ServerConfig{ Port: 8080, Host: "0.0.0.0", - NetLib: "netpoll", SizeLimit: 125, MemLimit: 0, - H2C: true, Cors: "*", Debug: false, }, @@ -250,14 +321,13 @@ func DefaultConfig() *Config { }, Pages: PagesConfig{ Mode: "internal", - Theme: "bootstrap", + Theme: "hub", StaticDir: "/data/www", }, Log: LogConfig{ - LogFilePath: "/data/ghproxy/log/ghproxy.log", - MaxLogSize: 10, - Level: "info", - HertZLogPath: "/data/ghproxy/log/hertz.log", + LogFilePath: "/data/ghproxy/log/ghproxy.log", + MaxLogSize: 10, + Level: "info", }, Auth: AuthConfig{ Enabled: false, @@ -276,9 +346,14 @@ func DefaultConfig() *Config { Enabled: false, WhitelistFile: "/data/ghproxy/config/whitelist.json", }, + IPFilter: IPFilterConfig{ + Enabled: false, + IPFilterFile: "/data/ghproxy/config/ipfilter.json", + EnableAllowList: false, + EnableBlockList: false, + }, RateLimit: RateLimitConfig{ Enabled: false, - RateMethod: "total", RatePerMinute: 100, Burst: 10, BandwidthLimit: BandwidthLimitConfig{ @@ -295,7 +370,11 @@ func DefaultConfig() *Config { }, Docker: DockerConfig{ Enabled: false, - Target: "ghcr", + Target: "dockerhub", + Auth: false, + Credentials: map[string]string{ + "testpass": "test123", + }, }, } } diff --git a/config/config.toml b/config/config.toml index 9ef2662..ce490ca 100644 --- a/config/config.toml +++ b/config/config.toml @@ -1,11 +1,8 @@ [server] host = "0.0.0.0" port = 8080 -netlib = "netpoll" # "netpoll" / "std" "standard" "net/http" "net" -senseClientDisconnection = false sizeLimit = 125 # MB memLimit = 0 # MB -H2C = true cors = "*" # "*"/"" -> "*" ; "nil" -> "" ; debug = false @@ -33,9 +30,7 @@ staticDir = "/data/www" [log] logFilePath = "/data/ghproxy/log/ghproxy.log" maxLogSize = 5 # MB -level = "info" # dump, debug, info, warn, error, none -async = false -hertzLogPath = "/data/ghproxy/log/hertz.log" +level = "info" # debug, info, warn, error, none [auth] method = "parameters" # "header" or "parameters" @@ -54,9 +49,14 @@ enabled = false enabled = false whitelistFile = "/data/ghproxy/config/whitelist.json" +[ipFilter] +enabled = false +enableAllowList = false +enableBlockList = false +ipFilterFile = "/data/ghproxy/config/ipfilter.json" + [rateLimit] enabled = false -rateMethod = "total" # "ip" or "total" ratePerMinute = 180 burst = 5 @@ -73,4 +73,8 @@ url = "socks5://127.0.0.1:1080" # "http://127.0.0.1:7890" [docker] enabled = false -target = "ghcr" # ghcr/dockerhub \ No newline at end of file +target = "dockerhub" # ghcr/dockerhub/ custom +auth = false +[docker.credentials] +user1 = "testpass" +test = "test123" \ No newline at end of file diff --git a/config/ipfilter.json b/config/ipfilter.json new file mode 100644 index 0000000..283bbd8 --- /dev/null +++ b/config/ipfilter.json @@ -0,0 +1,11 @@ +{ + "allow": [ + "127.0.0.1", + "192.168.1.0/24", + "::1" + ], + "block": [ + "10.0.0.0/8", + "192.168.1.0/24" + ] +} \ No newline at end of file diff --git a/docs/config.md b/docs/config.md deleted file mode 100644 index a01f762..0000000 --- a/docs/config.md +++ /dev/null @@ -1,398 +0,0 @@ -# ghproxy 用户配置文档 - -> 弃用, 请转到 [GHProxy项目文档](https://wjqserver-docs.pages.dev/docs/ghproxy/) - -`ghproxy` 的配置主要通过修改 `config` 目录下的 `config.toml`、`blacklist.json` 和 `whitelist.json` 文件来实现。本文档将详细介绍这些配置文件的作用以及用户可以自定义的配置选项。 - -## `config.toml` - 主配置文件 - -`config.toml` 是 `ghproxy` 的主配置文件，采用 TOML 格式。您可以通过修改此文件来定制 `ghproxy` 的各项功能，例如服务器端口、连接设置、Git 克隆模式、日志级别、认证方式、黑白名单以及限速策略等。 - -以下是 `config.toml` 文件的详细配置项说明： - -```toml name=config/config.toml -[server] -host = "0.0.0.0" -port = 8080 -netlib = "netpoll" # "netpoll" / "std" "standard" "net/http" "net" -sizeLimit = 125 # MB -memLimit = 0 # MB -H2C = true -cors = "*" # "*"/"" -> "*" ; "nil" -> "" ; -debug = false - -[httpc] -mode = "auto" # "auto" or "advanced" -maxIdleConns = 100 # only for advanced mode -maxIdleConnsPerHost = 60 # only for advanced mode -maxConnsPerHost = 0 # only for advanced mode -useCustomRawHeaders = false - -[gitclone] -mode = "bypass" # bypass / cache -smartGitAddr = "http://127.0.0.1:8080" -ForceH2C = false - -[shell] -editor = false -rewriteAPI = false - -[pages] -mode = "internal" # "internal" or "external" -theme = "bootstrap" # "bootstrap" or "nebula" -staticDir = "/data/www" - -[log] -logFilePath = "/data/ghproxy/log/ghproxy.log" -maxLogSize = 5 # MB -level = "info" # dump, debug, info, warn, error, none -hertzLogPath = "/data/ghproxy/log/hertz.log" - -[auth] -method = "parameters" # "header" or "parameters" -token = "token" -key = "" -enabled = false -passThrough = false -ForceAllowApi = false - -[blacklist] -blacklistFile = "/data/ghproxy/config/blacklist.json" -enabled = false - -[whitelist] -enabled = false -whitelistFile = "/data/ghproxy/config/whitelist.json" - -[rateLimit] -enabled = false -rateMethod = "total" # "ip" or "total" -ratePerMinute = 180 -burst = 5 - -[rateLimit.bandwidthLimit] - enabled = false - totalLimit = "100mbps" - totalBurst = "100mbps" - singleLimit = "10mbps" - singleBurst = "10mbps" - -[outbound] -enabled = false -url = "socks5://127.0.0.1:1080" # "http://127.0.0.1:7890" - -[docker] -enabled = false -target = "ghcr" # ghcr/dockerhub or "xx.example.com" -``` - -### 配置项详细说明 - -* **`[server]` - 服务器配置** - - * `host`: 监听地址。 - * 类型: 字符串 (`string`) - * 默认值: `"0.0.0.0"` (监听所有) - * 说明: 设置 `ghproxy` 监听的网络地址。通常设置为 `"0.0.0.0"` 以监听所有可用的网络接口。 - * `port`: 监听端口。 - * 类型: 整数 (`int`) - * 默认值: `8080` - * 说明: 设置 `ghproxy` 监听的端口号。 - * `netlib`: 底层网络库。 - * 类型: 字符串 (`string`) - * 默认值: `""` (HertZ默认处置) - * 说明: `"std"` `"standard"` `"net/http"` `"net"` 均会被设置为go标准库`net/http`, 设置为`"netpoll"`或`""`会由`HertZ`默认逻辑处理 - * `sizeLimit`: 请求体大小限制。 - * 类型: 整数 (`int`) - * 默认值: `125` (MB) - * 说明: 限制允许接收的请求体最大大小，单位为 MB。用于防止过大的请求导致服务压力过大。 - * `memLimit`: `runtime`内存限制 - * 类型: 整数 (`int64`) - * 默认值: `0` (不传入) - * 说明: 给`runtime`的指标, 让gc行为更高效 - * `H2C`: 是否启用 H2C (HTTP/2 Cleartext) 传输。 - * 类型: 布尔值 (`bool`) - * 默认值: `true` (启用) - * 说明: 启用后，允许客户端使用 HTTP/2 协议进行无加密传输，提升性能。 - * `cors`: CORS (跨域资源共享) 设置。 - * 类型: 字符串 (`string`) - * 默认值: `"*"` (允许所有来源) - * 可选值: - * `""` 或`"*"`: 允许所有来源跨域访问。 - * `"nil"`: 禁用 CORS。 - * 具体的域名: 例如 `"https://example.com"`，只允许来自指定域名的跨域请求。 - * 说明: 配置 CORS 策略，用于控制哪些域名可以跨域访问 `ghproxy` 服务。 - * `debug`: 是否启用调试模式。 - * 类型: 布尔值 (`bool`) - * 默认值: `false` (禁用) - * 说明: 启用后，`ghproxy` 会输出更详细的日志信息，用于开发和调试。 - -* **`[httpc]` - HTTP 客户端配置** - - * `mode`: HTTP 客户端模式。 - * 类型: 字符串 (`string`) - * 默认值: `"auto"` (自动模式) - * 可选值: - * `"auto"`: 自动模式，使用默认的 HTTP 客户端配置，适用于大多数场景。 - * `"advanced"`: 高级模式，允许自定义连接池参数，可以更精细地控制 HTTP 客户端的行为。 - * 说明: 选择 HTTP 客户端的运行模式。 - * `maxIdleConns`: 最大空闲连接数 (仅在高级模式下生效)。 - * 类型: 整数 (`int`) - * 默认值: `100` - * 说明: 设置 HTTP 客户端连接池中保持的最大空闲连接数。 - * `maxIdleConnsPerHost`: 每个主机最大空闲连接数 (仅在高级模式下生效)。 - * 类型: 整数 (`int`) - * 默认值: `60` - * 说明: 设置 HTTP 客户端连接池中，每个主机允许保持的最大空闲连接数。 - * `maxConnsPerHost`: 每个主机最大连接数 (仅在高级模式下生效)。 - * 类型: 整数 (`int`) - * 默认值: `0` (不限制) - * 说明: 设置 HTTP 客户端连接池中，每个主机允许建立的最大连接数。设置为 `0` 表示不限制。 - * `useCustomRawHeaders`: 使用预定义header避免github waf对应zh-CN的封锁 - * 类型: 布尔值(`bool`) - * 默认值: `false`(停用) - * 说明: 启用后, 拉取raw文件会使用程序预定义的固定headers, 而不是原先的复制行为 - -* **`[gitclone]` - Git 克隆配置** - - * `mode`: Git 克隆模式。 - * 类型: 字符串 (`string`) - * 默认值: `"bypass"` (绕过模式) - * 可选值: - * `"bypass"`: 绕过模式，直接克隆 GitHub 仓库，不使用任何缓存加速。 - * `"cache"`: 缓存模式，使用智能 Git 服务加速克隆，需要配置 `smartGitAddr`。 - * 说明: 选择 Git 克隆的模式。 - * `smartGitAddr`: 智能 Git 服务地址 (仅在缓存模式下生效)。 - * 类型: 字符串 (`string`) - * 默认值: `"http://127.0.0.1:8080"` - * 说明: 当 `mode` 设置为 `"cache"` 时，需要配置智能 Git 服务的地址，用于加速 Git 克隆。 - * `ForceH2C`: 是否强制使用 H2C 连接到智能 Git 服务。 - * 类型: 布尔值 (`bool`) - * 默认值: `false` (不强制) - * 说明: 如果智能 Git 服务支持 H2C，可以设置为 `true` 以强制使用 H2C 连接，提升性能。 - -* **`[shell]` - Shell 嵌套加速功能配置** - - * `editor`: 是否启用编辑(嵌套加速)功能。 - * 类型: 布尔值 (`bool`) - * 默认值: `false` (禁用) - * 说明: 启用后, 会修改`.sh`文件内容以实现嵌套加速 - * `rewriteAPI`: 是否重写 API 地址。 - * 类型: 布尔值 (`bool`) - * 默认值: `false` (禁用) - * 说明: 启用后，`ghproxy` 会重写脚本内的Github API地址。 - -* **`[pages]` - Pages 服务配置** - - * `mode`: Pages 服务模式。 - * 类型: 字符串 (`string`) - * 默认值: `"internal"` (内置 Pages 服务) - * 可选值: - * `"internal"`: 使用 `ghproxy` 内置的 Pages 服务。 - * `"external"`: 使用外部 Pages 位置。 - * 说明: 选择 Pages 服务的运行模式。 - * `theme`: Pages 主题。 - * 类型: 字符串 (`string`) - * 默认值: `"bootstrap"` - * 可选值: 参看[GHProxy项目前端仓库](https://github.com/WJQSERVER-STUDIO/GHProxy-Frontend) - * 说明: 设置内置 Pages 服务使用的主题。 - * `staticDir`: 静态文件目录。 - * 类型: 字符串 (`string`) - * 默认值: `"/data/www"` - * 说明: 指定外置 Pages 服务使用的静态文件目录。 - -* **`[log]` - 日志配置** - - * `logFilePath`: 日志文件路径。 - * 类型: 字符串 (`string`) - * 默认值: `"/data/ghproxy/log/ghproxy.log"` - * 说明: 设置 `ghproxy` 日志文件的存储路径。 - * `maxLogSize`: 最大日志文件大小。 - * 类型: 整数 (`int`) - * 默认值: `5` (MB) - * 说明: 设置单个日志文件的最大大小，单位为 MB。当日志文件大小超过此限制时，会进行日志轮转。 - * `level`: 日志级别。 - * 类型: 字符串 (`string`) - * 默认值: `"info"` - * 可选值: `"dump"`, `"debug"`, `"info"`, `"warn"`, `"error"`, `"none"` - * 说明: 设置日志输出的级别。级别越高，输出的日志信息越少。 - * `"dump"`: 输出所有日志，包括最详细的调试信息。 - * `"debug"`: 输出调试信息、信息、警告和错误日志。 - * `"info"`: 输出信息、警告和错误日志。 - * `"warn"`: 输出警告和错误日志。 - * `"error"`: 仅输出错误日志。 - * `"none"`: 禁用所有日志输出。 - * `hertzLogPath`: `HertZ`日志文件路径。 - * 类型: 字符串 (`string`) - * 默认值: `"/data/ghproxy/log/hertz.log"` - * 说明: 设置 `HertZ` 日志文件的存储路径。 - -* **`[auth]` - 认证配置** - - * `enabled`: 是否启用认证。 - * 类型: 布尔值 (`bool`) - * 默认值: `false` (禁用) - * 说明: 启用后，需要提供正确的认证信息才能访问 `ghproxy` 服务。 - * `method`: 认证方法。 - * 类型: 字符串 (`string`) - * 默认值: `"parameters"` (URL 参数) - * 可选值: `"header"` 或 `"parameters"` - * `"header"`: 通过请求头 `GH-Auth` 或自定义请求头 (通过 `key` 配置) 传递认证 Token。 - * `"parameters"`: 通过 URL 参数 `auth_token` 或自定义 URL 参数名 (通过 `Key` 配置) 传递认证 Token。 - * 说明: 选择认证信息传递的方式。 - * `key`: 自定义认证 Key。 - * 类型: 字符串 (`string`) - * 默认值: `""` (空字符串，使用默认的 `GH-Auth` 请求头或 `auth_token` URL 参数名) - * 说明: 可以自定义认证时使用的请求头名称或 URL 参数名。如果为空，则使用默认的 `GH-Auth` 请求头或 `auth_token` URL 参数名。 - * `token`: 认证 Token。 - * 类型: 字符串 (`string`) - * 默认值: `"token"` - * 说明: 设置认证时需要提供的 Token 值。 - * `passThrough`: 是否认证参数透穿到Github。 - * 类型: 布尔值 (`bool`) - * 默认值: `false` (不允许) - * 说明: 如果设置为 `true`，相关参数会被透穿到Github。 - * `ForceAllowApi`: 是否强制允许 API 访问。 - * 类型: 布尔值 (`bool`) - * 默认值: `false` (不强制允许) - * 说明: 如果设置为 `true`，则强制允许对 GitHub API 的访问，即使未启用认证或认证失败。 - -* **`[blacklist]` - 黑名单配置** - - * `enabled`: 是否启用黑名单。 - * 类型: 布尔值 (`bool`) - * 默认值: `false` (禁用) - * 说明: 启用后，`ghproxy` 将根据 `blacklist.json` 文件中的规则阻止对特定用户或仓库的访问。 - * `blacklistFile`: 黑名单文件路径。 - * 类型: 字符串 (`string`) - * 默认值: `"/data/ghproxy/config/blacklist.json"` - * 说明: 指定黑名单配置文件的路径。 - -* **`[whitelist]` - 白名单配置** - - * `enabled`: 是否启用白名单。 - * 类型: 布尔值 (`bool`) - * 默认值: `false` (禁用) - * 说明: 启用后，`ghproxy` 将只允许访问 `whitelist.json` 文件中规则指定的用户或仓库。白名单的优先级高于黑名单。 - * `whitelistFile`: 白名单文件路径。 - * 类型: 字符串 (`string`) - * 默认值: `"/data/ghproxy/config/whitelist.json"` - * 说明: 指定白名单配置文件的路径。 - -* **`[rateLimit]` - 限速配置** - - * `enabled`: 是否启用限速。 - * 类型: 布尔值 (`bool`) - * 默认值: `false` (禁用) - * 说明: 启用后，`ghproxy` 将根据配置的策略限制请求速率，防止服务被滥用。 - * `rateMethod`: 限速方法。 - * 类型: 字符串 (`string`) - * 默认值: `"total"` (全局限速) - * 可选值: `"ip"` 或 `"total"` - * `"ip"`: 基于客户端 IP 地址进行限速，每个 IP 地址都有独立的速率限制。 - * `"total"`: 全局限速，所有客户端共享同一个速率限制。 - * 说明: 选择限速的策略。 - * `ratePerMinute`: 每分钟允许的请求数。 - * 类型: 整数 (`int`) - * 默认值: `180` - * 说明: 设置每分钟允许通过的最大请求数。 - * `burst`: 突发请求数。 - * 类型: 整数 (`int`) - * 默认值: `5` - * 说明: 允许在短时间内超过 `ratePerMinute` 的突发请求数。 - * **`[rateLimit.bandwidthLimit]` 带宽速率限制** - * `enabled`: 是否启用带宽速率限制。 - * 类型: 布尔值 (`bool`) - * 默认值: `false` (禁用) - * 说明: 启用后，`ghproxy` 将根据配置的策略限制带宽使用，防止服务被滥用。 - * `totalLimit`: 全局带宽限制。 - * 类型: 字符串 (`string`) - * 默认值: `"100mbps"` - * 说明: 设置全局最大带宽使用量。支持的单位有 "kbps", "mbps", "gbps"。 - * `totalBurst`: 全局突发带宽。 - * 类型: 字符串 (`string`) - * 默认值: `"100mbps"` - * 说明: 设置全局突发带宽使用量。支持的单位有 "kbps", "mbps", "gbps"。 - * `singleLimit`: 单个连接带宽限制。 - * 类型: 字符串 (`string`) - * 默认值: `"10mbps"` - * 说明: 设置单个连接的最大带宽使用量。支持的单位有 "kbps", "mbps", "gbps"。 - * `singleBurst`: 单个连接突发带宽。 - * 类型: 字符串 (`string`) - * 默认值: `"10mbps"` - * 说明: 设置单个连接的突发带宽使用量。支持的单位有 "kbps", "mbps", "gbps"。 - -* **`[outbound]` - 出站代理配置** - - * `enabled`: 是否启用出站代理。 - * 类型: 布尔值 (`bool`) - * 默认值: `false` (禁用) - * 说明: 启用后，`ghproxy` 将通过配置的代理服务器转发所有出站请求。 - * `url`: 出站代理 URL。 - * 类型: 字符串 (`string`) - * 默认值: `"socks5://127.0.0.1:1080"` - * 支持协议: `socks5://` 和 `http://` - * 说明: 设置出站代理服务器的 URL。支持 SOCKS5 和 HTTP 代理协议。 - -* **`[docker]` - Docker 镜像代理配置** - - * `enabled`: 是否启用 Docker 镜像代理功能。 - * 类型: 布尔值 (`bool`) - * 默认值: `false` (禁用) - * 说明: 当设置为 `true` 时，`ghproxy` 将尝试代理 Docker 镜像的下载请求，以加速从 GitHub Container Registry (GHCR) 或 Docker Hub 下载镜像。 - - * `target`: 代理的目标 Docker 注册表。 - * 类型: 字符串 (`string`) - * 默认值: `"ghcr"` (代理 GHCR) - * 可选值: `"ghcr"` 或 `"dockerhub"` - * 说明: 指定要代理的 Docker 注册表。 - * `"ghcr"`: 代理 GitHub Container Registry (ghcr.io)。 - * `"dockerhub"`: 代理 Docker Hub (docker.io)。 - * 自定义, 支持传入自定义target, 例如`"docker.example.com"` - -## `blacklist.json` - 黑名单配置 - -`blacklist.json` 文件用于配置黑名单规则，阻止对特定用户或仓库的访问。 - -```json name=config/blacklist.json -{ - "blacklist": [ - "eviluser", - "spamuser/bad-repo", - "malwareuser/*" - ] -} -``` - -### 黑名单规则说明 - -* `blacklist`: 一个 JSON 数组，包含黑名单规则，每条规则为一个字符串。 - * **用户名**: 例如 `"eviluser"`，阻止所有名为 `eviluser` 的用户的访问。 - * **仓库名**: 例如 `"spamuser/bad-repo"`，阻止访问 `spamuser` 用户下的 `bad-repo` 仓库。 - * **通配符**: 例如 `"malwareuser/*"`，使用 `*` 通配符，阻止访问 `malwareuser` 用户下的所有仓库。 - * **缩略写法**: 例如 `"example"`, 等同于 `"example/*"`， 允许访问 `example` 用户下的所有仓库。 - -## `whitelist.json` - 白名单配置 - -`whitelist.json` 文件用于配置白名单规则，只允许访问白名单中指定的用户或仓库。白名单的优先级高于黑名单，如果一个请求同时匹配黑名单和白名单，则白名单生效，请求将被允许。 - -```json name=config/whitelist.json -{ - "whitelist": [ - "white/list", - "white/test1", - "example/*", - "example" - ] -} -``` - -### 白名单规则说明 - -* `whitelist`: 一个 JSON 数组，包含白名单规则，每条规则为一个字符串。 - * **仓库名**: 例如 `"white/list"`，允许访问 `white` 用户下的 `list` 仓库。 - * **仓库名**: 例如 `"white/test1"`，允许访问 `white` 用户下的 `test1` 仓库。 - * **通配符**: 例如 `"example/*"`，使用 `*` 通配符，允许访问 `example` 用户下的所有仓库。 - * **缩略写法**: 例如 `"example"`, 等同于 `"example/*"`， 允许访问 `example` 用户下的所有仓库。 - ---- \ No newline at end of file diff --git a/docs/flag.md b/docs/flag.md deleted file mode 100644 index c3aa0b7..0000000 --- a/docs/flag.md +++ /dev/null @@ -1,26 +0,0 @@ -# Flag - -> 弃用, 请转到 [GHProxy项目文档](https://wjqserver-docs.pages.dev/docs/ghproxy/) - -GHProxy接受以下flag传入 - -```bash -root@root:/data/ghproxy$ ghproxy -h - -c string - config file path (default "/data/ghproxy/config/config.toml") - -cfg value - exit - -h show help message and exit - -v show version and exit -``` - -- `-c` - 类型: `string` - 默认值: `/data/ghproxy/config/config.toml` - 示例: `ghproxy -c /data/ghproxy/demo.toml` -- `-cfg` - 已弃用, 被`-c`替代 -- `-h` - 显示帮助信息 -- `-v` - 显示版本号 diff --git a/docs/menu.md b/docs/menu.md deleted file mode 100644 index 7e2c0ed..0000000 --- a/docs/menu.md +++ /dev/null @@ -1,19 +0,0 @@ -## GHProxy 文档 - -> 弃用, 请转到 [GHProxy项目文档](https://wjqserver-docs.pages.dev/docs/ghproxy/) - -### 配置文件 - -https://github.com/WJQSERVER-STUDIO/ghproxy/blob/main/docs/config.md - -### Flag - -https://github.com/WJQSERVER-STUDIO/ghproxy/blob/main/docs/flag.md - -### 部署 - -参看 https://blog.wjqserver.com/post/ghproxy-deploy-with-smart-git/ - -### 前端 - -https://github.com/WJQSERVER-STUDIO/GHProxy-Frontend \ No newline at end of file diff --git a/go.mod b/go.mod index ba6d974..d43cb00 100644 --- a/go.mod +++ b/go.mod @@ -1,49 +1,27 @@ module ghproxy -go 1.24.3 +go 1.25.1 require ( github.com/BurntSushi/toml v1.5.0 - github.com/WJQSERVER-STUDIO/httpc v0.7.0 - github.com/WJQSERVER-STUDIO/logger v1.8.0 - github.com/cloudwego/hertz v0.10.0 - github.com/hertz-contrib/http2 v0.1.8 - golang.org/x/net v0.41.0 - golang.org/x/time v0.12.0 + github.com/WJQSERVER-STUDIO/httpc v0.8.2 + golang.org/x/net v0.44.0 + golang.org/x/time v0.13.0 ) require ( + github.com/WJQSERVER-STUDIO/go-utils/iox v0.0.2 github.com/WJQSERVER-STUDIO/go-utils/limitreader v0.0.2 - github.com/bytedance/sonic v1.13.3 + github.com/WJQSERVER/wanf v0.0.0-20250810023226-e51d9d0737ee + github.com/fenthope/bauth v0.0.1 + github.com/fenthope/ikumi v0.0.2 + github.com/fenthope/ipfilter v0.0.1 + github.com/fenthope/reco v0.0.4 + github.com/fenthope/record v0.0.4 + github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b github.com/hashicorp/golang-lru/v2 v2.0.7 + github.com/infinite-iroha/touka v0.3.7 github.com/wjqserver/modembed v0.0.1 ) -require ( - github.com/WJQSERVER-STUDIO/go-utils/copyb v0.0.4 // indirect - github.com/WJQSERVER-STUDIO/go-utils/log v0.0.3 // indirect - github.com/bytedance/gopkg v0.1.2 // indirect - github.com/bytedance/sonic/loader v0.2.4 // indirect - github.com/cloudwego/base64x v0.1.5 // indirect - github.com/cloudwego/gopkg v0.1.4 // indirect - github.com/cloudwego/netpoll v0.7.0 // indirect - github.com/fsnotify/fsnotify v1.9.0 // indirect - github.com/google/go-cmp v0.7.0 // indirect - github.com/klauspost/cpuid/v2 v2.2.10 // indirect - github.com/nyaruka/phonenumbers v1.6.3 // 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/valyala/bytebufferpool v1.0.0 // indirect - golang.org/x/arch v0.18.0 // indirect - golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476 // indirect - golang.org/x/sys v0.33.0 // indirect - golang.org/x/text v0.26.0 // indirect - google.golang.org/protobuf v1.36.6 // indirect -) - -replace github.com/nyaruka/phonenumbers => github.com/nyaruka/phonenumbers v1.6.1 // 1.6.3 has reflect leaking - -//replace github.com/WJQSERVER-STUDIO/httpc v0.5.1 => /data/github/WJQSERVER-STUDIO/httpc -//replace github.com/WJQSERVER-STUDIO/logger v1.6.0 => /data/github/WJQSERVER-STUDIO/logger +require github.com/valyala/bytebufferpool v1.0.0 // indirect diff --git a/go.sum b/go.sum index d8d7e39..97337f6 100644 --- a/go.sum +++ b/go.sum @@ -1,152 +1,34 @@ 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/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/iox v0.0.2 h1:AiIHXP21LpK7pFfqUlUstgQEWzjbekZgxOuvVwiMfyM= +github.com/WJQSERVER-STUDIO/go-utils/iox v0.0.2/go.mod h1:mCLqYU32bTmEE6dpj37MKKiZgz70Jh/xyK9vVbq6pok= github.com/WJQSERVER-STUDIO/go-utils/limitreader v0.0.2 h1:8bBkKk6E2Zr+I5szL7gyc5f0DK8N9agIJCpM1Cqw2NE= github.com/WJQSERVER-STUDIO/go-utils/limitreader v0.0.2/go.mod h1:yPX8xuZH+py7eLJwOYj3VVI/4/Yuy5+x8Mhq8qezcPg= -github.com/WJQSERVER-STUDIO/go-utils/log v0.0.3 h1:t6nyLhmo9pSfVHm1Wu1WyLsTpXFSjSpQtVKqEDpiZ5Q= -github.com/WJQSERVER-STUDIO/go-utils/log v0.0.3/go.mod h1:j9Q+xnwpOfve7/uJnZ2izRQw6NNoXjvJHz7vUQAaLZE= -github.com/WJQSERVER-STUDIO/httpc v0.7.0 h1:iHhqlxppJBjlmvsIjvLZKRbWXqSdbeSGGofjHGmqGJc= -github.com/WJQSERVER-STUDIO/httpc v0.7.0/go.mod h1:M7KNUZjjhCkzzcg9lBPs9YfkImI+7vqjAyjdA19+joE= -github.com/WJQSERVER-STUDIO/logger v1.8.0 h1:AQ3Qe2kxiqpuOoDlRzseGP6u4LAaJc+ng4l8P+CK7Co= -github.com/WJQSERVER-STUDIO/logger v1.8.0/go.mod h1:yzXPtot0OvR1gzx4+rlFrv/sccUpz0gIXVBwUx3H7fM= -github.com/bytedance/gopkg v0.1.1/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM= -github.com/bytedance/gopkg v0.1.2 h1:8o2feYuxknDpN+O7kPwvSXfMEKfYvJYiA2K7aonoMEQ= -github.com/bytedance/gopkg v0.1.2/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.3 h1:MS8gmaH16Gtirygw7jV91pDCN33NyMrPbN7qiYhEsF0= -github.com/bytedance/sonic v1.13.3/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4= -github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= -github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY= -github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= -github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4= -github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= -github.com/cloudwego/gopkg v0.1.4 h1:EoQiCG4sTonTPHxOGE0VlQs+sQR+Hsi2uN0qqwu8O50= -github.com/cloudwego/gopkg v0.1.4/go.mod h1:FQuXsRWRsSqJLsMVd5SYzp8/Z1y5gXKnVvRrWUOsCMI= -github.com/cloudwego/hertz v0.10.0 h1:V0vmBaLdQPlgL6w2TA6PZL1g6SGgQznFx6vqxWdCcKw= -github.com/cloudwego/hertz v0.10.0/go.mod h1:lRBohmcDkGx5TLK6QKFGdzJ6n3IXqGueHsOiXcYgXA4= -github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= -github.com/cloudwego/netpoll v0.7.0 h1:bDrxQaNfijRI1zyGgXHQoE/nYegL0nr+ijO1Norelc4= -github.com/cloudwego/netpoll v0.7.0/go.mod h1:PI+YrmyS7cIr0+SD4seJz3Eo3ckkXdu2ZVKBLhURLNU= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= -github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= -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/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/WJQSERVER-STUDIO/httpc v0.8.2 h1:PFPLodV0QAfGEP6915J57vIqoKu9cGuuiXG/7C9TNUk= +github.com/WJQSERVER-STUDIO/httpc v0.8.2/go.mod h1:8WhHVRO+olDFBSvL5PC/bdMkb6U3vRdPJ4p4pnguV5Y= +github.com/WJQSERVER/wanf v0.0.0-20250810023226-e51d9d0737ee h1:tJ31DNBn6UhWkk8fiikAQWqULODM+yBcGAEar1tzdZc= +github.com/WJQSERVER/wanf v0.0.0-20250810023226-e51d9d0737ee/go.mod h1:q2Pyg+G+s1acMWxrbI4CwS/Yk76/BzLREEdZ8iFwUNE= +github.com/fenthope/bauth v0.0.1 h1:+4UIQshGx3mYD4L3f2S4MLZOi5PWU7fU5GK3wsZvwzE= +github.com/fenthope/bauth v0.0.1/go.mod h1:1fveTpgfR1p+WXQ8MXm9BfBCeNYi55j23jxCOGOvBSA= +github.com/fenthope/ikumi v0.0.2 h1:5oaSTf/Msp7M2O3o/X20omKWEQbFhX4KV0CVF21oCdk= +github.com/fenthope/ikumi v0.0.2/go.mod h1:IYbxzOGndZv/yRrbVMyV6dxh06X2wXCbfxrTRM1IruU= +github.com/fenthope/ipfilter v0.0.1 h1:HrYAyixCMvsDAz36GRyFfyCNtrgYwzrhMcY0XV7fGcM= +github.com/fenthope/ipfilter v0.0.1/go.mod h1:QfY0GrpG0D82HROgdH4c9eog4js42ghLIfl/iM4MvvY= +github.com/fenthope/reco v0.0.4 h1:yo2g3aWwdoMpaZWZX4SdZOW7mCK82RQIU/YI8ZUQThM= +github.com/fenthope/reco v0.0.4/go.mod h1:eMyS8HpdMVdJ/2WJt6Cvt8P1EH9Igzj5lSJrgc+0jeg= +github.com/fenthope/record v0.0.4 h1:/1JHNCxiXGLL/qCh4LEGaAvhj4CcKsb6siTxjLmjdO4= +github.com/fenthope/record v0.0.4/go.mod h1:G0a6KCiCDyX2SsC3nfzSN651fJKxH482AyJvzlnvAJU= +github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b h1:6Q4zRHXS/YLOl9Ng1b1OOOBWMidAQZR3Gel0UKPC/KU= +github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= -github.com/hertz-contrib/http2 v0.1.8 h1:kjfCGkUxJZHgfPsnRjx1FLJBG55KvtvSQD214guBQLw= -github.com/hertz-contrib/http2 v0.1.8/go.mod h1:m42hrl8fiTwE4p8c7JdRUZpkePEthvV89q3elL2GeD0= -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/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE= -github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= -github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/nyaruka/phonenumbers v1.6.1 h1:XAJcTdYow16VrVKfglznMpJZz8KMJoMjx/91sX+K940= -github.com/nyaruka/phonenumbers v1.6.1/go.mod h1:7gjs+Lchqm49adhAKB5cdcng5ZXgt6x7Jgvi0ZorUtU= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/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.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -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/infinite-iroha/touka v0.3.7 h1:bIIZW5Weh7lVpyOWh4FmyR9UOfb5FOt+cR9yQ30FJLA= +github.com/infinite-iroha/touka v0.3.7/go.mod h1:uwkF1gTrNEgQ4P/Gwtk6WLbERehq3lzB8x1FMedyrfE= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/wjqserver/modembed v0.0.1 h1:8ZDz7t9M5DLrUFlYgBUUmrMzxWsZPmHvOazkr/T2jEs= github.com/wjqserver/modembed v0.0.1/go.mod h1:sYbQJMAjSBsdYQrUsuHY380XXE1CuRh8g9yyCztTXOQ= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/arch v0.18.0 h1:WN9poc33zL4AzGxqf8VtpKUnGvMi8O9lhNyBMF/85qc= -golang.org/x/arch v0.18.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= -golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476 h1:bsqhLWFR6G6xiQcb+JoGqdKdRU6WzPWmK8E0jxTjzo4= -golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= -golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= -golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= -golang.org/x/sys v0.33.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.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= -golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= -golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE= -golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= -google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= +golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I= +golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= +golang.org/x/time v0.13.0 h1:eUlYslOIt32DgYD6utsuUeHs4d7AsEYLuIAdg7FlYgI= +golang.org/x/time v0.13.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= diff --git a/main.go b/main.go index 7d6fb0e..5f5b3ed 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,6 @@ package main import ( - "context" "embed" "flag" "fmt" @@ -9,40 +8,38 @@ import ( "net/http" "os" "runtime/debug" + "strings" "time" "ghproxy/api" "ghproxy/auth" "ghproxy/config" - "ghproxy/middleware/loggin" "ghproxy/proxy" - "ghproxy/rate" + + "github.com/WJQSERVER-STUDIO/httpc" + "github.com/fenthope/bauth" + "ghproxy/weakcache" - "github.com/WJQSERVER-STUDIO/logger" - "github.com/hertz-contrib/http2/factory" + "github.com/fenthope/ikumi" + "github.com/fenthope/ipfilter" + "github.com/fenthope/reco" + "github.com/fenthope/record" + "github.com/infinite-iroha/touka" "github.com/wjqserver/modembed" - - "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/cloudwego/hertz/pkg/common/hlog" - "github.com/cloudwego/hertz/pkg/network/standard" + "golang.org/x/time/rate" _ "net/http/pprof" ) var ( cfg *config.Config - r *server.Hertz + r *touka.Engine configfile = "/data/ghproxy/config/config.toml" - hertZfile *os.File + httpClient *httpc.Client cfgfile string version string runMode string - limiter *rate.RateLimiter - iplimiter *rate.IPRateLimiter showVersion bool showHelp bool ) @@ -57,12 +54,21 @@ var ( ) var ( - logw = logger.Logw - logDump = logger.LogDump - logDebug = logger.LogDebug - logInfo = logger.LogInfo - logWarning = logger.LogWarning - logError = logger.LogError + // supportedThemes 定义了所有支持的主题, 用于验证配置和动态加载 + supportedThemes = map[string]struct{}{ + "bootstrap": {}, + "nebula": {}, + "design": {}, + "metro": {}, + "classic": {}, + "mino": {}, + "hub": {}, + "free": {}, + } +) + +var ( + logger *reco.Logger ) func readFlag() { @@ -115,7 +121,7 @@ func loadConfig() { cfg, err = config.LoadConfig(cfgfile) if err != nil { fmt.Printf("Failed to load config: %v\n", err) - // 如果配置文件加载失败，也显示帮助信息并退出 + // 如果配置文件加载失败, 也显示帮助信息并退出 flag.Usage() os.Exit(1) } @@ -127,238 +133,162 @@ func loadConfig() { func setupLogger(cfg *config.Config) { var err error - - err = logger.Init(cfg.Log.LogFilePath, cfg.Log.MaxLogSize) + if cfg.Log.Level == "" { + cfg.Log.Level = "info" + } + recoLevel := reco.ParseLevel(cfg.Log.Level) + logger, err = reco.New(reco.Config{ + Level: recoLevel, + Mode: reco.ModeText, + FilePath: cfg.Log.LogFilePath, + MaxFileSizeMB: cfg.Log.MaxLogSize, + EnableRotation: true, + Async: true, + }) if err != nil { fmt.Printf("Failed to initialize logger: %v\n", err) os.Exit(1) } - err = logger.SetLogLevel(cfg.Log.Level) - if err != nil { - fmt.Printf("Logger Level Error: %v\n", err) - os.Exit(1) - } - logger.SetAsync(cfg.Log.Async) + logger.SetLevel(recoLevel) fmt.Printf("Log Level: %s\n", cfg.Log.Level) - logDebug("Config File Path: ", cfgfile) - logDebug("Loaded config: %v\n", cfg) - logInfo("Logger Initialized Successfully") -} - -func setupHertZLogger(cfg *config.Config) { - var err error - - if cfg.Log.HertZLogPath != "" { - hertZfile, err = os.OpenFile(cfg.Log.HertZLogPath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644) - if err != nil { - hlog.SetOutput(os.Stdout) - logWarning("Failed to open hertz log file: %v", err) - } else { - hlog.SetOutput(hertZfile) - } - hlog.SetLevel(hlog.LevelInfo) - } - + logger.Debugf("Config File Path: %s", cfgfile) + logger.Debugf("Loaded config: %v", cfg) + logger.Infof("Logger Initialized Successfully") } func setMemLimit(cfg *config.Config) { if cfg.Server.MemLimit > 0 { debug.SetMemoryLimit((cfg.Server.MemLimit) * 1024 * 1024) - logInfo("Set Memory Limit to %d MB", cfg.Server.MemLimit) + logger.Infof("Set Memory Limit to %d MB", cfg.Server.MemLimit) } } func loadlist(cfg *config.Config) { - auth.Init(cfg) + err := auth.ListInit(cfg) + if err != nil { + logger.Errorf("Failed to initialize list: %v", err) + } + } -func setupApi(cfg *config.Config, r *server.Hertz, version string) { +func setupApi(cfg *config.Config, r *touka.Engine, version string) { api.InitHandleRouter(cfg, r, version) } -func setupRateLimit(cfg *config.Config) { - if cfg.RateLimit.Enabled { - if cfg.RateLimit.RateMethod == "ip" { - iplimiter = rate.NewIPRateLimiter(cfg.RateLimit.RatePerMinute, cfg.RateLimit.Burst, 1*time.Minute) - } else if cfg.RateLimit.RateMethod == "total" { - limiter = rate.New(cfg.RateLimit.RatePerMinute, cfg.RateLimit.Burst, 1*time.Minute) - } else { - logError("Invalid RateLimit Method: %s", cfg.RateLimit.RateMethod) - } - } -} - func InitReq(cfg *config.Config) { - err := proxy.InitReq(cfg) + var err error + httpClient, err = proxy.InitReq(cfg) if err != nil { fmt.Printf("Failed to initialize request: %v\n", err) os.Exit(1) } } -// loadEmbeddedPages 加载嵌入式页面资源 +// initializeErrorPages 初始化嵌入的错误页面资源 +// 无论页面模式(internal/external)如何, 都应执行此操作, 以确保统一的错误页面处理 +func initializeErrorPages() { + pageFS := modembed.NewModTimeFS(pagesFS, time.Now()) + if err := proxy.InitErrPagesFS(pageFS); err != nil { + // 这是一个警告而不是致命错误, 因为即使没有自定义错误页面, 服务器也能运行 + logger.Warnf("failed to initialize embedded error pages: %v", err) + } +} + +// loadEmbeddedPages 使用 map 替代 switch, 动态加载嵌入式页面和资源文件系统 func loadEmbeddedPages(cfg *config.Config) (fs.FS, fs.FS, error) { pageFS := modembed.NewModTimeFS(pagesFS, time.Now()) - var pages fs.FS - var err error - switch cfg.Pages.Theme { - case "bootstrap": - pages, err = fs.Sub(pageFS, "pages/bootstrap") - case "nebula": - pages, err = fs.Sub(pageFS, "pages/nebula") - case "design": - pages, err = fs.Sub(pageFS, "pages/design") - case "metro": - pages, err = fs.Sub(pageFS, "pages/metro") - case "classic": - pages, err = fs.Sub(pageFS, "pages/classic") - case "mino": - pages, err = fs.Sub(pageFS, "pages/mino") - case "hub": - pages, err = fs.Sub(pageFS, "pages/hub") - default: - pages, err = fs.Sub(pageFS, "pages/design") // 默认主题 - logWarning("Invalid Pages Theme: %s, using default theme 'design'", cfg.Pages.Theme) + theme := cfg.Pages.Theme + + // 检查主题是否受支持, 如果不支持则使用默认主题 + if _, ok := supportedThemes[theme]; !ok { + logger.Warnf("Invalid Pages Theme: %s, using default theme 'design'", theme) + theme = "design" // 默认主题 } + // 从嵌入式文件系统中获取主题子目录 + themePath := fmt.Sprintf("pages/%s", theme) + pages, err := fs.Sub(pageFS, themePath) if err != nil { - return nil, nil, fmt.Errorf("failed to load embedded pages: %w", err) + return nil, nil, fmt.Errorf("failed to load embedded theme '%s': %w", theme, err) } - // 初始化errPagesFs - errPagesInitErr := proxy.InitErrPagesFS(pageFS) - if errPagesInitErr != nil { - logWarning("errPagesInitErr: %s", errPagesInitErr) - } - - var assets fs.FS - assets, err = fs.Sub(pageFS, "pages/assets") + // 加载共享资源文件 + assets, err := fs.Sub(pageFS, "pages/assets") if err != nil { return nil, nil, fmt.Errorf("failed to load embedded assets: %w", err) } + return pages, assets, nil } -// setupPages 设置页面路由 -func setupPages(cfg *config.Config, r *server.Hertz) { +// setupPages 设置页面路由, 增强了错误处理 +func setupPages(cfg *config.Config, r *touka.Engine) { switch cfg.Pages.Mode { case "internal": err := setInternalRoute(cfg, r) if err != nil { - logError("Failed when processing internal pages: %s", err) - fmt.Println(err.Error()) - return + logger.Errorf("Failed to set up internal pages, server cannot start: %s", err) + fmt.Printf("Failed to set up internal pages, server cannot start: %s", err) + os.Exit(1) } case "external": - // 设置外部资源路径 - indexPagePath := fmt.Sprintf("%s/index.html", cfg.Pages.StaticDir) - faviconPath := fmt.Sprintf("%s/favicon.ico", cfg.Pages.StaticDir) - javascriptsPath := fmt.Sprintf("%s/script.js", cfg.Pages.StaticDir) - stylesheetsPath := fmt.Sprintf("%s/style.css", cfg.Pages.StaticDir) - bootstrapPath := fmt.Sprintf("%s/bootstrap.min.css", cfg.Pages.StaticDir) - bootstrapBundlePath := fmt.Sprintf("%s/bootstrap.bundle.min.js", cfg.Pages.StaticDir) - - // 设置外部资源路由 - r.StaticFile("/", indexPagePath) - r.StaticFile("/favicon.ico", faviconPath) - r.StaticFile("/script.js", javascriptsPath) - r.StaticFile("/style.css", stylesheetsPath) - r.StaticFile("/bootstrap.min.css", bootstrapPath) - r.StaticFile("/bootstrap.bundle.min.js", bootstrapBundlePath) - + if cfg.Pages.StaticDir == "" { + logger.Errorf("Pages Mode is 'external' but StaticDir is empty. Using embedded pages instead.") + err := setInternalRoute(cfg, r) + if err != nil { + logger.Errorf("Failed to load embedded pages: %s", err) + fmt.Printf("Failed to load embedded pages: %s", err) + os.Exit(1) + } + } else { + extPageFS := os.DirFS(cfg.Pages.StaticDir) + r.SetUnMatchFS(http.FS(extPageFS)) + } default: // 处理无效的Pages Mode - logWarning("Invalid Pages Mode: %s, using default embedded theme", cfg.Pages.Mode) - + logger.Warnf("Invalid Pages Mode: %s, using default embedded theme", cfg.Pages.Mode) err := setInternalRoute(cfg, r) if err != nil { - logError("Failed when processing internal pages: %s", err) - fmt.Println(err.Error()) - return + logger.Errorf("Failed to set up internal pages, server cannot start: %s", err) + fmt.Printf("Failed to set up internal pages, server cannot start: %s", err) + os.Exit(1) } - } } -func pageCacheHeader() func(ctx context.Context, c *app.RequestContext) { - return func(ctx context.Context, c *app.RequestContext) { - c.Header("Cache-Control", "public, max-age=3600, must-revalidate") +var viaString string = "WJQSERVER-STUDIO/GHProxy" + +func pageCacheHeader() func(c *touka.Context) { + return func(c *touka.Context) { + c.AddHeader("Cache-Control", "public, max-age=3600, must-revalidate") + c.Next() } } -func setInternalRoute(cfg *config.Config, r *server.Hertz) error { +func viaHeader() func(c *touka.Context) { + return func(c *touka.Context) { + protoVersion := fmt.Sprintf("%d.%d", c.Request.ProtoMajor, c.Request.ProtoMinor) + c.AddHeader("Via", protoVersion+" "+viaString) + c.Next() + } +} +func setInternalRoute(cfg *config.Config, r *touka.Engine) error { // 加载嵌入式资源 pages, assets, err := loadEmbeddedPages(cfg) if err != nil { - logError("Failed when processing pages: %s", err) return err } - /* - // 设置嵌入式资源路由 - 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(assets)) - 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) - }) - r.GET("/bootstrap.min.css", func(ctx context.Context, c *app.RequestContext) { - staticServer := http.FileServer(http.FS(assets)) - req, err := adaptor.GetCompatRequest(&c.Request) - if err != nil { - logError("%s", err) - return - } - staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req) - }) - r.GET("/bootstrap.bundle.min.js", func(ctx context.Context, c *app.RequestContext) { - staticServer := http.FileServer(http.FS(assets)) - req, err := adaptor.GetCompatRequest(&c.Request) - if err != nil { - logError("%s", err) - return - } - staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req) - }) - */ - r.GET("/", pageCacheHeader(), adaptor.HertzHandler(http.FileServer(http.FS(pages)))) - r.GET("/favicon.ico", pageCacheHeader(), adaptor.HertzHandler(http.FileServer(http.FS(assets)))) - r.GET("/script.js", pageCacheHeader(), adaptor.HertzHandler(http.FileServer(http.FS(pages)))) - r.GET("/style.css", pageCacheHeader(), adaptor.HertzHandler(http.FileServer(http.FS(pages)))) - r.GET("/bootstrap.min.css", pageCacheHeader(), adaptor.HertzHandler(http.FileServer(http.FS(assets)))) - r.GET("/bootstrap.bundle.min.js", pageCacheHeader(), adaptor.HertzHandler(http.FileServer(http.FS(assets)))) + + r.HandleFunc([]string{"GET"}, "/favicon.ico", pageCacheHeader(), touka.FileServer(http.FS(assets))) + r.HandleFunc([]string{"GET"}, "/", pageCacheHeader(), touka.FileServer(http.FS(pages))) + r.HandleFunc([]string{"GET"}, "/script.js", pageCacheHeader(), touka.FileServer(http.FS(pages))) + r.HandleFunc([]string{"GET"}, "/style.css", pageCacheHeader(), touka.FileServer(http.FS(pages))) + r.HandleFunc([]string{"GET"}, "/bootstrap.min.css", pageCacheHeader(), touka.FileServer(http.FS(assets))) + r.HandleFunc([]string{"GET"}, "/bootstrap.bundle.min.js", pageCacheHeader(), touka.FileServer(http.FS(assets))) + return nil } @@ -366,13 +296,13 @@ func init() { readFlag() flag.Parse() - // 如果设置了 -h，则显示帮助信息并退出 + // 如果设置了 -h, 则显示帮助信息并退出 if showHelp { flag.Usage() os.Exit(0) } - // 如果设置了 -v，则显示版本号并退出 + // 如果设置了 -v, 则显示版本号并退出 if showVersion { fmt.Printf("GHProxy Version: %s \n", version) os.Exit(0) @@ -381,11 +311,10 @@ func init() { loadConfig() if cfg != nil { // 在setupLogger前添加空值检查 setupLogger(cfg) - setupHertZLogger(cfg) + initializeErrorPages() InitReq(cfg) setMemLimit(cfg) loadlist(cfg) - setupRateLimit(cfg) if cfg.Docker.Enabled { wcache = proxy.InitWeakCache() } @@ -397,149 +326,184 @@ func init() { } if cfg.Server.Debug { - version = "Dev" // 如果是Debug模式，版本设置为"Dev" + version = "Dev" // 如果是Debug模式, 版本设置为"Dev" } } } -var viaString string = "WJQSERVER-STUDIO/GHProxy" - -func viaHeader() app.HandlerFunc { - return func(ctx context.Context, c *app.RequestContext) { - protoVersion := "1.1" - c.Header("Via", protoVersion+" "+viaString) - c.Next(ctx) - } -} - func main() { if showVersion || showHelp { return } - logDebug("Run Mode: %s Netlib: %s", runMode, cfg.Server.NetLib) if cfg == nil { fmt.Println("Config not loaded, exiting.") return } - addr := fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port) - if cfg.Server.NetLib == "std" || cfg.Server.NetLib == "standard" || cfg.Server.NetLib == "net" || cfg.Server.NetLib == "net/http" { - if cfg.Server.H2C { - r = server.New( - server.WithH2C(true), - server.WithHostPorts(addr), - server.WithTransport(standard.NewTransporter), - server.WithStreamBody(true), - ) - r.AddProtocol("h2", factory.NewServerFactory()) - } else { - r = server.New( - server.WithHostPorts(addr), - server.WithTransport(standard.NewTransporter), - server.WithStreamBody(true), - ) - } - } else if cfg.Server.NetLib == "netpoll" || cfg.Server.NetLib == "" { - if cfg.Server.H2C { - r = server.New( - server.WithH2C(true), - server.WithHostPorts(addr), - server.WithSenseClientDisconnection(cfg.Server.SenseClientDisconnection), - server.WithStreamBody(true), - ) - r.AddProtocol("h2", factory.NewServerFactory()) - } else { - r = server.New( - server.WithHostPorts(addr), - server.WithSenseClientDisconnection(cfg.Server.SenseClientDisconnection), - server.WithStreamBody(true), - ) - } - } else { - logError("Invalid NetLib: %s", cfg.Server.NetLib) - fmt.Printf("Invalid NetLib: %s\n", cfg.Server.NetLib) - os.Exit(1) - } + r := touka.Default() + r.SetProtocols(&touka.ProtocolsConfig{ + Http1: true, + Http2_Cleartext: true, + }) - r.Use(recovery.Recovery()) // Recovery中间件 - r.Use(loggin.Middleware()) // log中间件 + r.Use(touka.Recovery()) // Recovery中间件 + r.SetLogger(logger) + r.SetErrorHandler(proxy.UnifiedToukaErrorHandler) + r.SetHTTPClient(httpClient) + r.Use(record.Middleware()) // log中间件 r.Use(viaHeader()) - setupApi(cfg, r, version) - setupPages(cfg, r) - - r.GET("/github.com/:user/:repo/releases/*filepath", func(ctx context.Context, c *app.RequestContext) { - c.Set("matcher", "releases") - proxy.RoutingHandler(cfg, limiter, iplimiter)(ctx, c) - }) - - r.GET("/github.com/:user/:repo/archive/*filepath", func(ctx context.Context, c *app.RequestContext) { - c.Set("matcher", "releases") - proxy.RoutingHandler(cfg, limiter, iplimiter)(ctx, c) - }) - - r.GET("/github.com/:user/:repo/blob/*filepath", func(ctx context.Context, c *app.RequestContext) { - c.Set("matcher", "blob") - proxy.RoutingHandler(cfg, limiter, iplimiter)(ctx, c) - }) - - r.GET("/github.com/:user/:repo/raw/*filepath", func(ctx context.Context, c *app.RequestContext) { - c.Set("matcher", "raw") - proxy.RoutingHandler(cfg, limiter, iplimiter)(ctx, c) - }) - - r.GET("/github.com/:user/:repo/info/*filepath", func(ctx context.Context, c *app.RequestContext) { - c.Set("matcher", "clone") - proxy.RoutingHandler(cfg, limiter, iplimiter)(ctx, c) - }) - r.GET("/github.com/:user/:repo/git-upload-pack", func(ctx context.Context, c *app.RequestContext) { - c.Set("matcher", "clone") - proxy.RoutingHandler(cfg, limiter, iplimiter)(ctx, c) - }) - - r.GET("/raw.githubusercontent.com/:user/:repo/*filepath", func(ctx context.Context, c *app.RequestContext) { - c.Set("matcher", "raw") - proxy.RoutingHandler(cfg, limiter, iplimiter)(ctx, c) - }) - - r.GET("/gist.githubusercontent.com/:user/*filepath", func(ctx context.Context, c *app.RequestContext) { - c.Set("matcher", "gist") - proxy.NoRouteHandler(cfg, limiter, iplimiter)(ctx, c) - }) - - r.Any("/api.github.com/repos/:user/:repo/*filepath", func(ctx context.Context, c *app.RequestContext) { - c.Set("matcher", "api") - proxy.RoutingHandler(cfg, limiter, iplimiter)(ctx, c) - }) - - r.GET("/v2/", func(ctx context.Context, c *app.RequestContext) { - emptyJSON := "{}" - c.Header("Content-Type", "application/json") - c.Header("Content-Length", fmt.Sprint(len(emptyJSON))) - - c.Header("Docker-Distribution-API-Version", "registry/2.0") - - c.Status(200) - c.Write([]byte(emptyJSON)) - }) - - r.Any("/v2/:target/:user/:repo/*filepath", func(ctx context.Context, c *app.RequestContext) { - proxy.GhcrWithImageRouting(cfg)(ctx, c) - }) - /* - r.Any("/v2/:target/*filepath", func(ctx context.Context, c *app.RequestContext) { - proxy.GhcrRouting(cfg)(ctx, c) - }) + r.Use(compress.Compression(compress.CompressOptions{ + Algorithms: map[string]compress.AlgorithmConfig{ + compress.EncodingGzip: { + Level: gzip.BestCompression, // Gzip最高压缩比 + PoolEnabled: true, // 启用Gzip压缩器的对象池 + }, + compress.EncodingDeflate: { + Level: flate.DefaultCompression, // Deflate默认压缩比 + PoolEnabled: false, // Deflate不启用对象池 + }, + compress.EncodingZstd: { + Level: int(zstd.SpeedBestCompression), // Zstandard最佳压缩比 + PoolEnabled: true, // 启用Zstandard压缩器的对象池 + }, + }, + })) */ - r.NoRoute(func(ctx context.Context, c *app.RequestContext) { - proxy.NoRouteHandler(cfg, limiter, iplimiter)(ctx, c) + if cfg.RateLimit.Enabled { + r.Use(ikumi.TokenRateLimit(ikumi.TokenRateLimiterOptions{ + Limit: rate.Limit(cfg.RateLimit.RatePerMinute), + Burst: cfg.RateLimit.Burst, + })) + } + + if cfg.IPFilter.Enabled { + var err error + ipAllowList, ipBlockList, err := auth.ReadIPFilterList(cfg) + if err != nil { + fmt.Printf("Failed to read IP filter list: %v\n", err) + logger.Errorf("Failed to read IP filter list: %v", err) + os.Exit(1) + } + ipBlockFilter, err := ipfilter.NewIPFilter(ipfilter.IPFilterConfig{ + EnableAllowList: cfg.IPFilter.EnableAllowList, + EnableBlockList: cfg.IPFilter.EnableBlockList, + AllowList: ipAllowList, + BlockList: ipBlockList, + }) + if err != nil { + fmt.Printf("Failed to initialize IP filter: %v\n", err) + logger.Errorf("Failed to initialize IP filter: %v", err) + os.Exit(1) + } else { + r.Use(ipBlockFilter) + } + } + setupApi(cfg, r, version) + setupPages(cfg, r) + r.SetRedirectTrailingSlash(false) + + r.GET("/github.com/:user/:repo/releases/*filepath", func(c *touka.Context) { + // 规范化路径: 移除前导斜杠, 简化后续处理 + filepath := c.Param("filepath") + if len(filepath) > 0 && filepath[0] == '/' { + filepath = filepath[1:] + } + + isValidDownload := false + + // 检查两种合法的下载链接格式 + // 情况 A: "download/..." + if strings.HasPrefix(filepath, "download/") { + isValidDownload = true + } else { + // 情况 B: ":tag/download/..." + slashIndex := strings.IndexByte(filepath, '/') + // 确保 tag 部分存在 (slashIndex > 0) + if slashIndex > 0 { + pathAfterTag := filepath[slashIndex+1:] + if strings.HasPrefix(pathAfterTag, "download/") { + isValidDownload = true + } + } + } + + // 根据匹配结果执行最终操作 + if isValidDownload { + c.Set("matcher", "releases") + proxy.RoutingHandler(cfg)(c) + } else { + // 任何不符合下载链接格式的 'releases' 路径都被视为浏览页面并拒绝 + proxy.ErrorPage(c, proxy.NewErrorWithStatusLookup(400, "unsupported releases page, only download links are allowed")) + return + } + }) + + r.GET("/github.com/:user/:repo/archive/*filepath", func(c *touka.Context) { + c.Set("matcher", "releases") + proxy.RoutingHandler(cfg)(c) + }) + + r.GET("/github.com/:user/:repo/blob/*filepath", func(c *touka.Context) { + c.Set("matcher", "blob") + proxy.RoutingHandler(cfg)(c) + }) + + r.GET("/github.com/:user/:repo/raw/*filepath", func(c *touka.Context) { + c.Set("matcher", "raw") + proxy.RoutingHandler(cfg)(c) + }) + + r.GET("/github.com/:user/:repo/info/*filepath", func(c *touka.Context) { + c.Set("matcher", "clone") + proxy.RoutingHandler(cfg)(c) + }) + r.GET("/github.com/:user/:repo/git-upload-pack", func(c *touka.Context) { + c.Set("matcher", "clone") + proxy.RoutingHandler(cfg)(c) + }) + r.POST("/github.com/:user/:repo/git-upload-pack", func(c *touka.Context) { + c.Set("matcher", "clone") + proxy.RoutingHandler(cfg)(c) + }) + + r.GET("/raw.githubusercontent.com/:user/:repo/*filepath", func(c *touka.Context) { + c.Set("matcher", "raw") + proxy.RoutingHandler(cfg)(c) + }) + + r.GET("/gist.githubusercontent.com/:user/*filepath", func(c *touka.Context) { + c.Set("matcher", "gist") + proxy.NoRouteHandler(cfg)(c) + }) + + r.ANY("/api.github.com/repos/:user/:repo/*filepath", func(c *touka.Context) { + c.Set("matcher", "api") + proxy.RoutingHandler(cfg)(c) + }) + + r.ANY("/v2/*path", + r.UseIf(cfg.Docker.Auth, func() touka.HandlerFunc { + return bauth.BasicAuthForStatic(cfg.Docker.Credentials, "GHProxy Docker Proxy") + }), + proxy.OciWithImageRouting(cfg), + ) + + r.GET("/v2", func(c *touka.Context) { + // 重定向到 /v2/ + c.Redirect(http.StatusMovedPermanently, "/v2/") + }) + + r.NoRoute(func(c *touka.Context) { + proxy.NoRouteHandler(cfg)(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") + fmt.Printf("Power by Touka\n") if cfg.Server.Debug { go func() { @@ -551,16 +515,13 @@ func main() { } defer logger.Close() - defer func() { - if hertZfile != nil { - err := hertZfile.Close() - if err != nil { - logError("Failed to close hertz log file: %v", err) - } - } - }() - r.Spin() + addr := fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port) + err := r.RunShutdown(addr) + if err != nil { + logger.Errorf("Server Run Error: %v", err) + fmt.Printf("Server Run Error: %v\n", err) + } fmt.Println("Program Exit") } diff --git a/middleware/loggin/loggin.go b/middleware/loggin/loggin.go deleted file mode 100644 index 62dccc0..0000000 --- a/middleware/loggin/loggin.go +++ /dev/null @@ -1,32 +0,0 @@ -package loggin - -import ( - "context" - "time" - - "github.com/WJQSERVER-STUDIO/logger" - "github.com/cloudwego/hertz/pkg/app" -) - -var ( - logw = logger.Logw - logDump = logger.LogDump - logDebug = logger.LogDebug - logInfo = logger.LogInfo - logWarning = logger.LogWarning - logError = logger.LogError -) - -// 日志中间件 -func Middleware() app.HandlerFunc { - return func(ctx context.Context, c *app.RequestContext) { - startTime := time.Now() - - c.Next(ctx) - - endTime := time.Now() - timingResults := endTime.Sub(startTime) - - 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) - } -} diff --git a/middleware/nocache/nocache.go b/middleware/nocache/nocache.go index 4e8f0d3..ba3b900 100644 --- a/middleware/nocache/nocache.go +++ b/middleware/nocache/nocache.go @@ -1,17 +1,15 @@ package nocache import ( - "context" - - "github.com/cloudwego/hertz/pkg/app" + "github.com/infinite-iroha/touka" ) -func NoCacheMiddleware() app.HandlerFunc { - return func(ctx context.Context, c *app.RequestContext) { +func NoCacheMiddleware() touka.HandlerFunc { + return func(c *touka.Context) { // 设置禁止缓存的响应头 - 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) // 继续处理请求 + c.SetHeader("Cache-Control", "no-store, no-cache, must-revalidate") + c.SetHeader("Pragma", "no-cache") + c.SetHeader("Expires", "0") + c.Next() // 继续处理请求 } } diff --git a/proxy/authparse.go b/proxy/authparse.go index f353db9..5116365 100644 --- a/proxy/authparse.go +++ b/proxy/authparse.go @@ -34,7 +34,7 @@ func parseBearerWWWAuthenticateHeader(headerValue string) (*BearerAuthParams, er trimmedPair := strings.TrimSpace(pair) keyValue := strings.SplitN(trimmedPair, "=", 2) if len(keyValue) != 2 { - logWarning("Skipping malformed parameter '%s' in Www-Authenticate header: %s", pair, headerValue) + //logWarning("Skipping malformed parameter '%s' in Www-Authenticate header: %s", pair, headerValue) continue } key := strings.TrimSpace(keyValue[0]) diff --git a/proxy/authpass.go b/proxy/authpass.go index 16887c7..f46b8ff 100644 --- a/proxy/authpass.go +++ b/proxy/authpass.go @@ -4,20 +4,19 @@ import ( "ghproxy/config" "net/http" - "github.com/cloudwego/hertz/pkg/app" + "github.com/infinite-iroha/touka" ) -func AuthPassThrough(c *app.RequestContext, cfg *config.Config, req *http.Request) { +func AuthPassThrough(c *touka.Context, 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.Method(), string(c.Path()), c.UserAgent(), c.Request.Header.GetProtocol(), token) switch cfg.Auth.Method { 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.Method(), string(c.Path()), c.UserAgent(), c.Request.Header.GetProtocol()) + c.Warnf("%s %s %s %s %s Auth-Error: Conflict Auth Method", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.UserAgent(), c.Request.Proto) ErrorPage(c, NewErrorWithStatusLookup(500, "Conflict Auth Method")) return } @@ -26,7 +25,7 @@ func AuthPassThrough(c *app.RequestContext, cfg *config.Config, req *http.Reques 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.Method(), string(c.Path()), c.UserAgent(), c.Request.Header.GetProtocol()) + c.Warnf("%s %s %s %s %s Invalid Auth Method / Auth Method is not be set", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.UserAgent(), c.Request.Proto) ErrorPage(c, NewErrorWithStatusLookup(500, "Invalid Auth Method / Auth Method is not be set")) return } diff --git a/proxy/bandwidth.go b/proxy/bandwidth.go index a7591c2..3733e15 100644 --- a/proxy/bandwidth.go +++ b/proxy/bandwidth.go @@ -15,7 +15,6 @@ var ( func UnDefiendRateStringErrHandle(err error) error { if errors.Is(err, &limitreader.UnDefiendRateStringErr{}) { - logWarning("UnDefiendRateStringErr: %s", err) return nil } return err @@ -28,18 +27,15 @@ func SetGlobalRateLimit(cfg *config.Config) error { var totalBurst rate.Limit totalLimit, err = limitreader.ParseRate(cfg.RateLimit.BandwidthLimit.TotalLimit) if UnDefiendRateStringErrHandle(err) != nil { - logError("Failed to parse total bandwidth limit: %v", err) return err } totalBurst, err = limitreader.ParseRate(cfg.RateLimit.BandwidthLimit.TotalBurst) if UnDefiendRateStringErrHandle(err) != nil { - logError("Failed to parse total bandwidth burst: %v", err) return err } limitreader.SetGlobalRateLimit(totalLimit, int(totalBurst)) err = SetBandwidthLimit(cfg) if UnDefiendRateStringErrHandle(err) != nil { - logError("Failed to set bandwidth limit: %v", err) return err } } else { @@ -52,12 +48,10 @@ func SetBandwidthLimit(cfg *config.Config) error { var err error bandwidthLimit, err = limitreader.ParseRate(cfg.RateLimit.BandwidthLimit.SingleLimit) if UnDefiendRateStringErrHandle(err) != nil { - logError("Failed to parse bandwidth limit: %v", err) return err } bandwidthBurst, err = limitreader.ParseRate(cfg.RateLimit.BandwidthLimit.SingleBurst) if UnDefiendRateStringErrHandle(err) != nil { - logError("Failed to parse bandwidth burst: %v", err) return err } return nil diff --git a/proxy/chunkreq.go b/proxy/chunkreq.go index 35461c9..7e3725e 100644 --- a/proxy/chunkreq.go +++ b/proxy/chunkreq.go @@ -9,10 +9,10 @@ import ( "strconv" "github.com/WJQSERVER-STUDIO/go-utils/limitreader" - "github.com/cloudwego/hertz/pkg/app" + "github.com/infinite-iroha/touka" ) -func ChunkedProxyRequest(ctx context.Context, c *app.RequestContext, u string, cfg *config.Config, matcher string) { +func ChunkedProxyRequest(ctx context.Context, c *touka.Context, u string, cfg *config.Config, matcher string) { var ( req *http.Request @@ -23,17 +23,16 @@ func ChunkedProxyRequest(ctx context.Context, c *app.RequestContext, u string, c go func() { <-ctx.Done() if resp != nil && resp.Body != nil { - err := resp.Body.Close() - if err != nil { - logError("Failed to close response body: %v", err) - } + resp.Body.Close() + } + if req != nil && req.Body != nil { + req.Body.Close() } }() - rb := client.NewRequestBuilder(string(c.Request.Method()), u) + rb := client.NewRequestBuilder(c.Request.Method, u) rb.NoDefaultHeaders() - //rb.SetBody(bytes.NewBuffer(c.Request.Body())) - rb.SetBody(c.RequestBodyStream()) + rb.SetBody(c.Request.Body) rb.WithContext(ctx) req, err = rb.Build() @@ -58,19 +57,22 @@ func ChunkedProxyRequest(ctx context.Context, c *app.RequestContext, u string, c } // 处理302情况 - if resp.StatusCode == 302 { + if resp.StatusCode == 302 || resp.StatusCode == 301 { + //c.Debugf("resp header %s", resp.Header) finalURL := resp.Header.Get("Location") if finalURL != "" { err = resp.Body.Close() if err != nil { - logError("Failed to close response body: %v", err) + c.Errorf("Failed to close response body: %v", err) } - c.Request.Header.Del("Referer") - logInfo("Internal Redirecting to %s", finalURL) + c.Infof("Internal Redirecting to %s", finalURL) ChunkedProxyRequest(ctx, c, finalURL, cfg, matcher) + return } } + // 处理响应体大小限制 + var ( bodySize int contentLength string @@ -82,28 +84,25 @@ func ChunkedProxyRequest(ctx context.Context, c *app.RequestContext, u string, c var err error bodySize, err = strconv.Atoi(contentLength) if err != nil { - logWarning("%s %s %s %s %s Content-Length header is not a valid integer: %v", c.ClientIP(), c.Method(), c.Path(), c.UserAgent(), c.Request.Header.GetProtocol(), err) + c.Warnf("%s %s %s %s %s Content-Length header is not a valid integer: %v", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.UserAgent(), c.Request.Proto, err) bodySize = -1 } if err == nil && bodySize > sizelimit { finalURL := resp.Request.URL.String() err = resp.Body.Close() if err != nil { - logError("Failed to close response body: %v", err) + c.Errorf("Failed to close response body: %v", err) } - c.Redirect(301, []byte(finalURL)) - logWarning("%s %s %s %s %s Final-URL: %s Size-Limit-Exceeded: %d", c.ClientIP(), c.Method(), c.Path(), c.UserAgent(), c.Request.Header.GetProtocol(), finalURL, bodySize) + c.Redirect(301, finalURL) + c.Warnf("%s %s %s %s %s Final-URL: %s Size-Limit-Exceeded: %d", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.UserAgent(), c.Request.Proto, finalURL, bodySize) return } } // 复制响应头，排除需要移除的 header - for key, values := range resp.Header { - if _, shouldRemove := respHeadersToRemove[key]; !shouldRemove { - for _, value := range values { - c.Header(key, value) - } - } + c.SetHeaders(resp.Header) + for key := range respHeadersToRemove { + c.DelHeader(key) } switch cfg.Server.Cors { @@ -125,32 +124,30 @@ func ChunkedProxyRequest(ctx context.Context, c *app.RequestContext, u string, c bodyReader = limitreader.NewRateLimitedReader(bodyReader, bandwidthLimit, int(bandwidthBurst), ctx) } - if MatcherShell(u) && matchString(matcher) && cfg.Shell.Editor { - // 判断body是不是gzip - var compress string - if resp.Header.Get("Content-Encoding") == "gzip" { - compress = "gzip" - } + defer bodyReader.Close() - logDebug("Use Shell Editor: %s %s %s %s %s", c.ClientIP(), c.Request.Method(), u, c.Request.Header.Get("User-Agent"), c.Request.Header.GetProtocol()) - c.Header("Content-Length", "") + if MatcherShell(u) && matchString(matcher) && cfg.Shell.Editor { + + c.Debugf("Use Shell Editor: %s %s %s %s %s", c.ClientIP(), c.Request.Method, u, c.UserAgent(), c.Request.Proto) + c.DelHeader("Content-Length") + c.DelHeader("Content-Encoding") var reader io.Reader - reader, _, err = processLinks(bodyReader, compress, string(c.Request.Host()), cfg) - c.SetBodyStream(reader, -1) + reader, _, err = processLinks(bodyReader, c.Request.Host, cfg, c) + c.WriteStream(reader) if err != nil { - logError("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), c.Request.Method(), u, c.Request.Header.Get("User-Agent"), c.Request.Header.GetProtocol(), err) + c.Errorf("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), c.Request.Method, u, c.UserAgent(), c.Request.Proto, err) ErrorPage(c, NewErrorWithStatusLookup(500, fmt.Sprintf("Failed to copy response body: %v", err))) return } } else { - if contentLength != "" { - c.SetBodyStream(bodyReader, bodySize) + c.SetHeader("Content-Length", contentLength) + c.WriteStream(bodyReader) return } - c.SetBodyStream(bodyReader, -1) + c.WriteStream(bodyReader) } } diff --git a/proxy/dial.go b/proxy/dial.go index 075603e..ddf5028 100644 --- a/proxy/dial.go +++ b/proxy/dial.go @@ -7,6 +7,7 @@ package proxy import ( "ghproxy/config" + "log" "net/http" "net/url" "strings" @@ -24,7 +25,8 @@ func initTransport(cfg *config.Config, transport *http.Transport) { // 如果代理 URL 未设置，使用环境变量中的代理配置 if cfg.Outbound.Url == "" { transport.Proxy = http.ProxyFromEnvironment - logWarning("Outbound proxy is not set, using environment variables") + //logWarning("Outbound proxy is not set, using environment variables") + log.Printf("Outbound proxy is not set, using environment variables") return } @@ -32,7 +34,7 @@ func initTransport(cfg *config.Config, transport *http.Transport) { proxyInfo, err := url.Parse(cfg.Outbound.Url) if err != nil { // 如果解析失败，记录错误日志并使用环境变量中的代理配置 - logError("Failed to parse outbound proxy URL %v", err) + log.Printf("Failed to parse outbound proxy URL %v", err) transport.Proxy = http.ProxyFromEnvironment return } @@ -41,7 +43,7 @@ func initTransport(cfg *config.Config, transport *http.Transport) { switch strings.ToLower(proxyInfo.Scheme) { case "http", "https": // 如果是 HTTP/HTTPS 代理 transport.Proxy = http.ProxyURL(proxyInfo) // 设置 HTTP(S) 代理 - logInfo("Using HTTP(S) proxy: %s", proxyInfo.Redacted()) + log.Printf("Using HTTP(S) proxy: %s", cfg.Outbound.Url) case "socks5": // 如果是 SOCKS5 代理 // 调用 newProxyDial 创建 SOCKS5 代理拨号器 proxyDialer := newProxyDial(cfg.Outbound.Url) @@ -53,11 +55,14 @@ func initTransport(cfg *config.Config, transport *http.Transport) { } else { // 如果不支持 ContextDialer，则回退到传统的 Dial 方法 transport.Dial = proxyDialer.Dial - logWarning("SOCKS5 dialer does not support ContextDialer, using legacy Dial") + //logWarning("SOCKS5 dialer does not support ContextDialer, using legacy Dial") + log.Printf("SOCKS5 dialer does not support ContextDialer, using legacy Dial") } - logInfo("Using SOCKS5 proxy chain: %s", cfg.Outbound.Url) + //logInfo("Using SOCKS5 proxy chain: %s", cfg.Outbound.Url) + log.Printf("Using SOCKS5 proxy chain: %s", cfg.Outbound.Url) default: // 如果代理协议不支持 - logError("Unsupported proxy scheme: %s", proxyInfo.Scheme) + //logError("Unsupported proxy scheme: %s", proxyInfo.Scheme) + log.Printf("Unsupported proxy scheme: %s", proxyInfo.Scheme) transport.Proxy = http.ProxyFromEnvironment // 回退到环境变量代理 } } @@ -77,13 +82,15 @@ func newProxyDial(proxyUrls string) proxy.Dialer { urlInfo, err := url.Parse(proxyUrl) if err != nil { // 如果 URL 解析失败，记录错误日志并跳过 - logError("Failed to parse proxy URL %q: %v", proxyUrl, err) + //logError("Failed to parse proxy URL %q: %v", proxyUrl, err) + log.Printf("Failed to parse proxy URL %q: %v", proxyUrl, err) continue } // 检查代理协议是否为 SOCKS5 if urlInfo.Scheme != "socks5" { - logWarning("Skipping non-SOCKS5 proxy: %s", urlInfo.Scheme) + // logWarning("Skipping non-SOCKS5 proxy: %s", urlInfo.Scheme) + log.Printf("Skipping non-SOCKS5 proxy: %s", urlInfo.Scheme) continue } @@ -94,7 +101,8 @@ func newProxyDial(proxyUrls string) proxy.Dialer { dialer, err := createSocksDialer(urlInfo.Host, auth, proxyDialer) if err != nil { // 如果创建失败，记录错误日志并跳过 - logError("Failed to create SOCKS5 dialer for %q: %v", proxyUrl, err) + //logError("Failed to create SOCKS5 dialer for %q: %v", proxyUrl, err) + log.Printf("Failed to create SOCKS5 dialer for %q: %v", proxyUrl, err) continue } diff --git a/proxy/docker.go b/proxy/docker.go index 615041e..fb0c309 100644 --- a/proxy/docker.go +++ b/proxy/docker.go @@ -1,20 +1,21 @@ package proxy import ( + "bytes" "context" "fmt" - - json "github.com/bytedance/sonic" - - "ghproxy/config" - "ghproxy/weakcache" - "io" "net/http" + "net/url" "strconv" "strings" + "ghproxy/config" + "ghproxy/weakcache" + + "github.com/WJQSERVER-STUDIO/go-utils/iox" "github.com/WJQSERVER-STUDIO/go-utils/limitreader" - "github.com/cloudwego/hertz/pkg/app" + "github.com/go-json-experiment/json" + "github.com/infinite-iroha/touka" ) var ( @@ -22,107 +23,206 @@ var ( ghcrTarget = "ghcr.io" ) +// cache 用于存储认证令牌, 避免重复获取 var cache *weakcache.Cache[string] +// imageInfo 结构体用于存储镜像的相关信息 type imageInfo struct { User string Repo string Image string } +// InitWeakCache 初始化弱引用缓存 func InitWeakCache() *weakcache.Cache[string] { + // 使用默认过期时间和容量为100创建一个新的弱引用缓存 cache = weakcache.NewCache[string](weakcache.DefaultExpiration, 100) return cache } -func GhcrWithImageRouting(cfg *config.Config) app.HandlerFunc { - return func(ctx context.Context, c *app.RequestContext) { +var ( + authEndpoint = "/" + passTypeMap = map[string]struct{}{ + "manifests": {}, + "blobs": {}, + "tags": {}, + "index": {}, + } +) - charToFind := '.' - reqTarget := c.Param("target") - reqImageUser := c.Param("user") - reqImageName := c.Param("repo") - reqFilePath := c.Param("filepath") +// 处理路径各种情况 +func OciWithImageRouting(cfg *config.Config) touka.HandlerFunc { + return func(c *touka.Context) { + if !cfg.Docker.Enabled { + ErrorPage(c, NewErrorWithStatusLookup(403, "Docker proxy is not enabled")) + return + } + var ( + p1 string + p2 string + p3 string + p4 string + target string + user string + repo string + extpath string + p1IsTarget bool + ignorep3 bool + imageNameForAuth string + finalreqUrl string + iInfo *imageInfo + ) + ociPath := c.Param("path") + if ociPath == authEndpoint { + emptyJSON := "{}" + c.Header("Content-Type", "application/json") + c.Header("Content-Length", fmt.Sprint(len(emptyJSON))) - path := fmt.Sprintf("%s/%s/%s", reqImageUser, reqImageName, reqFilePath) - target := "" + c.Header("Docker-Distribution-API-Version", "registry/2.0") - if strings.ContainsRune(reqTarget, charToFind) { + c.Status(200) + c.Writer.Write([]byte(emptyJSON)) + return + } - if reqTarget == "docker.io" { + // 根据/分割 /:target/:user/:repo/*ext + ociPath = ociPath[1:] + i := strings.IndexByte(ociPath, '/') + if i <= 0 { + ErrorPage(c, NewErrorWithStatusLookup(404, "Not Found")) + return + } + p1 = ociPath[:i] + + // 开始判断p1是否为target + if strings.Contains(p1, ".") || strings.Contains(p1, ":") { + p1IsTarget = true + if p1 == "docker.io" { target = dockerhubTarget - } else if reqTarget == "ghcr.io" { - target = ghcrTarget } else { - target = reqTarget + target = p1 } } else { - path = string(c.Request.RequestURI()) - reqImageUser = c.Param("target") - reqImageName = c.Param("user") - } - image := &imageInfo{ - User: reqImageUser, - Repo: reqImageName, - Image: fmt.Sprintf("%s/%s", reqImageUser, reqImageName), + switch cfg.Docker.Target { + case "ghcr": + target = ghcrTarget + case "dockerhub": + target = dockerhubTarget + case "": + ErrorPage(c, NewErrorWithStatusLookup(500, "Default Docker Target is not configured in config file")) + return + default: + target = cfg.Docker.Target + } } - GhcrToTarget(ctx, c, cfg, target, path, image) + ociPath = ociPath[i+1:] + i = strings.IndexByte(ociPath, '/') + if i <= 0 { + ErrorPage(c, NewErrorWithStatusLookup(404, "Not Found")) + return + } + p2 = ociPath[:i] + ociPath = ociPath[i+1:] - } + // 若p2和passTypeMap匹配 + if !p1IsTarget { + if _, ok := passTypeMap[p2]; ok { + ignorep3 = true + switch cfg.Docker.Target { + case "ghcr": + target = ghcrTarget + case "dockerhub": + target = dockerhubTarget + case "": + ErrorPage(c, NewErrorWithStatusLookup(500, "Default Docker Target is not configured in config file")) + return + default: + target = cfg.Docker.Target + } + user = "library" + repo = p1 + extpath = "/" + p2 + "/" + ociPath + } + } -} - -func GhcrToTarget(ctx context.Context, c *app.RequestContext, cfg *config.Config, target string, path string, image *imageInfo) { - if cfg.Docker.Enabled { - if target != "" { - GhcrRequest(ctx, c, "https://"+target+"/v2/"+path+"?"+string(c.Request.QueryString()), image, cfg, target) - } else { - if cfg.Docker.Target == "ghcr" { - GhcrRequest(ctx, c, "https://"+ghcrTarget+string(c.Request.RequestURI()), image, cfg, ghcrTarget) - } else if cfg.Docker.Target == "dockerhub" { - GhcrRequest(ctx, c, "https://"+dockerhubTarget+string(c.Request.RequestURI()), image, cfg, dockerhubTarget) - } else if cfg.Docker.Target != "" { - // 自定义taget - GhcrRequest(ctx, c, "https://"+cfg.Docker.Target+string(c.Request.RequestURI()), image, cfg, cfg.Docker.Target) - } else { - // 配置为空 - ErrorPage(c, NewErrorWithStatusLookup(403, "Docker Target is not set")) + if !ignorep3 { + i = strings.IndexByte(ociPath, '/') + if i <= 0 { + ErrorPage(c, NewErrorWithStatusLookup(404, "Not Found")) return } + p3 = ociPath[:i] + + ociPath = ociPath[i+1:] + p4 = ociPath + + if p1IsTarget { + if _, ok := passTypeMap[p3]; ok { + user = "library" + repo = p2 + extpath = "/" + p3 + "/" + p4 + } else { + user = p2 + repo = p3 + extpath = "/" + p4 + } + } else { + switch cfg.Docker.Target { + case "ghcr": + target = ghcrTarget + case "dockerhub": + target = dockerhubTarget + case "": + ErrorPage(c, NewErrorWithStatusLookup(500, "Default Docker Target is not configured in config file")) + return + default: + target = cfg.Docker.Target + } + user = p1 + repo = p2 + extpath = "/" + p3 + "/" + p4 + } } - } else { - ErrorPage(c, NewErrorWithStatusLookup(403, "Docker is not Allowed")) - return + imageNameForAuth = user + "/" + repo + finalreqUrl = "https://" + target + "/v2/" + imageNameForAuth + extpath + if query := c.GetReqQueryString(); query != "" { + finalreqUrl += "?" + query + } + + iInfo = &imageInfo{ + User: user, + Repo: repo, + Image: imageNameForAuth, + } + + GhcrRequest(c.Request.Context(), c, finalreqUrl, iInfo, cfg, target) } } -func GhcrRequest(ctx context.Context, c *app.RequestContext, u string, image *imageInfo, cfg *config.Config, target string) { - +// GhcrRequest 执行对Docker注册表的HTTP请求, 处理认证和重定向 +func GhcrRequest(ctx context.Context, c *touka.Context, u string, image *imageInfo, cfg *config.Config, target string) { var ( - method []byte + method string req *http.Request resp *http.Response err error ) - go func() { - <-ctx.Done() - if resp != nil && resp.Body != nil { - resp.Body.Close() - } - if req != nil { - req.Body.Close() - } - }() + method = c.Request.Method + ghcrclient := c.GetHTTPC() + bodyByte, err := c.GetReqBodyFull() + if err != nil { + HandleError(c, fmt.Sprintf("Failed to read request body: %v", err)) + return + } - method = c.Request.Method() - - rb := ghcrclient.NewRequestBuilder(string(method), u) - rb.NoDefaultHeaders() - rb.SetBody(c.Request.BodyStream()) - rb.WithContext(ctx) + // 构建初始请求 + rb := ghcrclient.NewRequestBuilder(method, u) + rb.NoDefaultHeaders() // 不使用默认头部, 以便完全控制 + rb.SetBody(bytes.NewBuffer(bodyByte)) // 设置请求体 + rb.WithContext(ctx) // 设置请求上下文 req, err = rb.Build() if err != nil { @@ -130,75 +230,146 @@ func GhcrRequest(ctx context.Context, c *app.RequestContext, u string, image *im return } - c.Request.Header.VisitAll(func(key, value []byte) { - headerKey := string(key) - headerValue := string(value) - req.Header.Add(headerKey, headerValue) - }) + // 复制客户端请求的头部到代理请求 + copyHeader(c.Request.Header, req.Header) + // 确保 Accept 头部被正确设置 + if acceptHeader, ok := c.Request.Header["Accept"]; ok { + req.Header["Accept"] = acceptHeader + } + + // 设置 Host 头部为上游目标 req.Header.Set("Host", target) - if image != nil { + + // 尝试从缓存中获取并使用认证令牌 + if image != nil && image.Image != "" { token, exist := cache.Get(image.Image) if exist { - logDebug("Use Cache Token: %s", token) req.Header.Set("Authorization", "Bearer "+token) } } + // 发送初始请求 resp, err = ghcrclient.Do(req) if err != nil { HandleError(c, fmt.Sprintf("Failed to send request: %v", err)) return } - // 处理状态码 - if resp.StatusCode == 401 { - // 请求target /v2/路径 - if string(c.Request.URI().Path()) != "/v2/" { - resp.Body.Close() - if image == nil { - ErrorPage(c, NewErrorWithStatusLookup(401, "Unauthorized")) + // 处理 401 Unauthorized 或 404 Not Found 响应, 尝试重新认证并重试 + if resp.StatusCode == 401 || resp.StatusCode == 404 { + // 对于 /v2/ 的请求不进行重试, 因为它通常用于发现认证端点 + shouldRetry := string(c.GetRequestURIPath()) != "/v2/" + originalStatusCode := resp.StatusCode + c.Debugf("Initial request failed with status %d. Retry eligibility: %t", originalStatusCode, shouldRetry) + + if shouldRetry { + if image == nil || image.Image == "" { + _ = resp.Body.Close() // 终止流程, 关闭当前响应体 + ErrorPage(c, NewErrorWithStatusLookup(originalStatusCode, "Unauthorized")) return } + // 获取新的认证令牌 token := ChallengeReq(target, image, ctx, c) - // 更新kv if token != "" { - logDump("Update Cache Token: %s", token) + c.Debugf("Successfully obtained auth token. Retrying request.") + _ = resp.Body.Close() // 在发起重试请求前, 关闭旧的响应体 + + // 更新kv + c.Debugf("Update Cache Token: %s", token) cache.Put(image.Image, token) - } - rb := ghcrclient.NewRequestBuilder(string(method), u) - rb.NoDefaultHeaders() - rb.SetBody(c.Request.BodyStream()) - rb.WithContext(ctx) + // 重新构建并发送请求 + rb_retry := ghcrclient.NewRequestBuilder(method, u) + rb_retry.NoDefaultHeaders() + rb_retry.SetBody(bytes.NewBuffer(bodyByte)) + rb_retry.WithContext(ctx) - req, err = rb.Build() - if err != nil { - HandleError(c, fmt.Sprintf("Failed to create request: %v", err)) - return - } + req_retry, err_retry := rb_retry.Build() + if err_retry != nil { + HandleError(c, fmt.Sprintf("Failed to create retry request: %v", err_retry)) + return + } - c.Request.Header.VisitAll(func(key, value []byte) { - headerKey := string(key) - headerValue := string(value) - req.Header.Add(headerKey, headerValue) - }) + copyHeader(c.Request.Header, req_retry.Header) // 复制原始头部 + if acceptHeader, ok := c.Request.Header["Accept"]; ok { + req_retry.Header["Accept"] = acceptHeader + } - req.Header.Set("Host", target) - if token != "" { - req.Header.Set("Authorization", "Bearer "+token) - } + req_retry.Header.Set("Host", target) // 设置 Host 头部 + req_retry.Header.Set("Authorization", "Bearer "+token) // 使用新令牌 - resp, err = ghcrclient.Do(req) - if err != nil { - HandleError(c, fmt.Sprintf("Failed to send request: %v", err)) - return + c.Debugf("Executing retry request. Method: %s, URL: %s", req_retry.Method, req_retry.URL.String()) + + resp_retry, err_retry := ghcrclient.Do(req_retry) + if err_retry != nil { + HandleError(c, fmt.Sprintf("Failed to send retry request: %v", err_retry)) + return + } + c.Debugf("Retry request completed with status code: %d", resp_retry.StatusCode) + resp = resp_retry // 更新响应为重试后的响应 + } else { + c.Warnf("Failed to obtain auth token. Cannot retry.") + // 获取令牌失败, 将继续处理原始的401/404响应, 其响应体仍然打开 } } + } - } else if resp.StatusCode == 404 { // 错误处理(404) - ErrorPage(c, NewErrorWithStatusLookup(404, "Page Not Found (From Github)")) + // 透明地处理 302 Found 或 307 Temporary Redirect 重定向 + if resp.StatusCode == http.StatusFound || resp.StatusCode == http.StatusTemporaryRedirect { + location := resp.Header.Get("Location") + if location == "" { + _ = resp.Body.Close() // 终止流程, 关闭当前响应体 + HandleError(c, "Redirect response missing Location header") + return + } + + redirectURL, err := url.Parse(location) + if err != nil { + _ = resp.Body.Close() // 终止流程, 关闭当前响应体 + HandleError(c, fmt.Sprintf("Failed to parse redirect location: %v", err)) + return + } + + // 如果 Location 是相对路径, 则根据原始请求的 URL 解析为绝对路径 + if !redirectURL.IsAbs() { + originalURL := resp.Request.URL + redirectURL = originalURL.ResolveReference(redirectURL) + c.Debugf("Resolved relative redirect to absolute URL: %s", redirectURL.String()) + } + + c.Debugf("Handling redirect. Status: %d, Final Location: %s", resp.StatusCode, redirectURL.String()) + _ = resp.Body.Close() // 明确关闭重定向响应的响应体, 因为我们将发起新请求 + + // 创建并发送重定向请求, 通常使用 GET 方法 + redirectReq, err := http.NewRequestWithContext(ctx, "GET", redirectURL.String(), nil) + if err != nil { + HandleError(c, fmt.Sprintf("Failed to create redirect request: %v", err)) + return + } + redirectReq.Header.Set("User-Agent", c.Request.UserAgent()) // 复制 User-Agent + + c.Debugf("Executing redirect request to: %s", redirectURL.String()) + redirectResp, err := ghcrclient.Do(redirectReq) + if err != nil { + HandleError(c, fmt.Sprintf("Failed to execute redirect request to %s: %v", redirectURL.String(), err)) + return + } + c.Debugf("Redirect request to %s completed with status %d", redirectURL.String(), redirectResp.StatusCode) + resp = redirectResp // 更新响应为重定向后的响应 + } + + // 如果最终响应是 404, 则读取响应体并返回自定义错误页面 + if resp.StatusCode == 404 { + defer resp.Body.Close() // 使用defer确保在函数返回前关闭响应体 + bodyBytes, err := iox.ReadAll(resp.Body) + if err != nil { + c.Warnf("Failed to read upstream 404 response body: %v", err) + } else { + c.Warnf("Upstream 404 response body: %s", string(bodyBytes)) + } + ErrorPage(c, NewErrorWithStatusLookup(404, "Page Not Found (From Upstream)")) return } @@ -208,121 +379,122 @@ func GhcrRequest(ctx context.Context, c *app.RequestContext, u string, image *im sizelimit int ) + // 获取配置中的大小限制并转换单位 (MB -> Byte) sizelimit = cfg.Server.SizeLimit * 1024 * 1024 contentLength = resp.Header.Get("Content-Length") if contentLength != "" { var err error bodySize, err = strconv.Atoi(contentLength) if err != nil { - logWarning("%s %s %s %s %s Content-Length header is not a valid integer: %v", c.ClientIP(), c.Method(), c.Path(), c.UserAgent(), c.Request.Header.GetProtocol(), err) - bodySize = -1 + c.Warnf("%s %s %s %s %s Content-Length header is not a valid integer: %v", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.UserAgent(), c.Request.Proto, err) + bodySize = -1 // 无法解析则设置为 -1 } + // 如果内容大小超出限制, 返回 301 重定向到原始上游URL if err == nil && bodySize > sizelimit { finalURL := resp.Request.URL.String() - err = resp.Body.Close() - if err != nil { - logError("Failed to close response body: %v", err) - } - c.Redirect(301, []byte(finalURL)) - logWarning("%s %s %s %s %s Final-URL: %s Size-Limit-Exceeded: %d", c.ClientIP(), c.Method(), c.Path(), c.UserAgent(), c.Request.Header.GetProtocol(), finalURL, bodySize) + _ = resp.Body.Close() // 明确关闭响应体, 因为我们将重定向而不是流式传输 + c.Redirect(301, finalURL) + c.Warnf("%s %s %s %s %s Final-URL: %s Size-Limit-Exceeded: %d", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.UserAgent(), c.Request.Proto, finalURL, bodySize) return } } - // 复制响应头，排除需要移除的 header - for key, values := range resp.Header { - for _, value := range values { - c.Response.Header.Add(key, value) - } - } - + // 将上游响应头部复制到客户端响应 + c.SetHeaders(resp.Header) + // 设置客户端响应状态码 c.Status(resp.StatusCode) - + // bodyReader 的所有权将转移给 SetBodyStream, 不再由此函数管理关闭 bodyReader := resp.Body + // 如果启用了带宽限制, 则使用限速读取器 if cfg.RateLimit.BandwidthLimit.Enabled { bodyReader = limitreader.NewRateLimitedReader(bodyReader, bandwidthLimit, int(bandwidthBurst), ctx) } + // 根据 Content-Length 设置响应体流 if contentLength != "" { c.SetBodyStream(bodyReader, bodySize) return } c.SetBodyStream(bodyReader, -1) - } +// AuthToken 用于解析认证响应中的令牌 type AuthToken struct { Token string `json:"token"` } -func ChallengeReq(target string, image *imageInfo, ctx context.Context, c *app.RequestContext) (token string) { +// ChallengeReq 执行认证挑战流程, 获取新的认证令牌 +func ChallengeReq(target string, image *imageInfo, ctx context.Context, c *touka.Context) (token string) { var resp401 *http.Response var req401 *http.Request var err error + ghcrclient := c.GetHTTPC() + // 对 /v2/ 端点发送 GET 请求以触发认证挑战 rb401 := ghcrclient.NewRequestBuilder("GET", "https://"+target+"/v2/") rb401.NoDefaultHeaders() rb401.WithContext(ctx) - rb401.AddHeader("User-Agent", "docker/28.1.1 go/go1.23.8 git-commit/01f442b kernel/6.12.25-amd64 os/linux arch/amd64 UpstreamClient(Docker-Client/28.1.1 ") req401, err = rb401.Build() if err != nil { HandleError(c, fmt.Sprintf("Failed to create request: %v", err)) return } - req401.Header.Set("Host", target) + req401.Header.Set("Host", target) // 设置 Host 头部 resp401, err = ghcrclient.Do(req401) if err != nil { HandleError(c, fmt.Sprintf("Failed to send request: %v", err)) return } - defer resp401.Body.Close() + defer resp401.Body.Close() // 确保响应体关闭 + + // 解析 Www-Authenticate 头部, 获取认证领域和参数 bearer, err := parseBearerWWWAuthenticateHeader(resp401.Header.Get("Www-Authenticate")) if err != nil { - logError("Failed to parse Www-Authenticate header: %v", err) + c.Errorf("Failed to parse Www-Authenticate header: %v", err) return } + // 构建认证范围 (scope), 通常是 repository::pull scope := fmt.Sprintf("repository:%s:pull", image.Image) + // 使用解析到的 Realm 和 Service, 以及 scope 请求认证令牌 getAuthRB := ghcrclient.NewRequestBuilder("GET", bearer.Realm). NoDefaultHeaders(). WithContext(ctx). - AddHeader("User-Agent", "docker/28.1.1 go/go1.23.8 git-commit/01f442b kernel/6.12.25-amd64 os/linux arch/amd64 UpstreamClient(Docker-Client/28.1.1 "). SetHeader("Host", bearer.Service). AddQueryParam("service", bearer.Service). AddQueryParam("scope", scope) getAuthReq, err := getAuthRB.Build() if err != nil { - logError("Failed to create request: %v", err) + c.Errorf("Failed to create request: %v", err) return } authResp, err := ghcrclient.Do(getAuthReq) if err != nil { - logError("Failed to send request: %v", err) + c.Errorf("Failed to send request: %v", err) return } + defer authResp.Body.Close() // 确保响应体关闭 - defer authResp.Body.Close() - - bodyBytes, err := io.ReadAll(authResp.Body) + // 读取认证响应体 + bodyBytes, err := iox.ReadAll(authResp.Body) if err != nil { - logError("Failed to read auth response body: %v", err) + c.Errorf("Failed to read auth response body: %v", err) return } - // 解码json + // 解码 JSON 响应以获取令牌 var authToken AuthToken err = json.Unmarshal(bodyBytes, &authToken) if err != nil { - logError("Failed to decode auth response body: %v", err) + c.Errorf("Failed to decode auth response body: %v", err) return } - token = authToken.Token + token = authToken.Token // 提取令牌 return token - } diff --git a/proxy/error.go b/proxy/error.go index 1820259..79f38ab 100644 --- a/proxy/error.go +++ b/proxy/error.go @@ -11,24 +11,25 @@ import ( "html/template" "io/fs" - "github.com/WJQSERVER-STUDIO/logger" - "github.com/cloudwego/hertz/pkg/app" lru "github.com/hashicorp/golang-lru/v2" + "github.com/infinite-iroha/touka" ) -// 日志模块 -var ( - logw = logger.Logw - logDump = logger.LogDump - logDebug = logger.LogDebug - logInfo = logger.LogInfo - logWarning = logger.LogWarning - logError = logger.LogError -) - -func HandleError(c *app.RequestContext, message string) { +func HandleError(c *touka.Context, message string) { ErrorPage(c, NewErrorWithStatusLookup(500, message)) - logError("Error handled: %s", message) + c.Errorf("%s %s %s %s %s Error: %v", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.UserAgent(), c.Request.Proto, message) +} + +func UnifiedToukaErrorHandler(c *touka.Context, code int, err error) { + errMsg := "" + if err != nil { + errMsg = err.Error() + } + c.Errorf("%s %s %s %s %s Error: %v", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.UserAgent(), c.Request.Proto, errMsg) + + constructedGHErr := NewErrorWithStatusLookup(code, errMsg) + + ErrorPage(c, constructedGHErr) } type GHProxyErrors struct { @@ -76,6 +77,25 @@ var ( StatusText: "服务器内部错误", HelpInfo: "服务器处理您的请求时发生错误，请稍后重试或联系管理员。", } + // 502 + ErrBadGateway = &GHProxyErrors{ + StatusCode: 502, + StatusDesc: "Bad Gateway", + StatusText: "网关错误", + HelpInfo: "代理服务器从上游服务器接收到无效响应。", + } + ErrServiceUnavailable = &GHProxyErrors{ + StatusCode: 503, + StatusDesc: "Service Unavailable", + StatusText: "服务不可用", + HelpInfo: "服务器目前无法处理请求，通常是由于服务器过载或停机维护。", + } + ErrGatewayTimeout = &GHProxyErrors{ + StatusCode: 504, + StatusDesc: "Gateway Timeout", + StatusText: "网关超时", + HelpInfo: "代理服务器未能及时从上游服务器接收到响应。", + } ) var statusErrorMap map[int]*GHProxyErrors @@ -88,6 +108,9 @@ func init() { ErrNotFound.StatusCode: ErrNotFound, ErrTooManyRequests.StatusCode: ErrTooManyRequests, ErrInternalServerError.StatusCode: ErrInternalServerError, + ErrBadGateway.StatusCode: ErrBadGateway, + ErrServiceUnavailable.StatusCode: ErrServiceUnavailable, + ErrGatewayTimeout.StatusCode: ErrGatewayTimeout, } } @@ -131,18 +154,18 @@ type ErrorPageData struct { // ToCacheKey 为 ErrorPageData 生成一个唯一的 SHA256 字符串键。 // 使用 gob 序列化来确保结构体内容到字节序列的顺序一致性，然后计算哈希。 -func (d ErrorPageData) ToCacheKey() string { +func (d ErrorPageData) ToCacheKey() (string, error) { var buf bytes.Buffer enc := gob.NewEncoder(&buf) err := enc.Encode(d) if err != nil { - logError("Failed to gob encode ErrorPageData for cache key: %v", err) - return "" + //logError("Failed to gob encode ErrorPageData for cache key: %v", err) + return "", fmt.Errorf("failed to gob encode ErrorPageData for cache key: %w", err) } hasher := sha256.New() hasher.Write(buf.Bytes()) - return hex.EncodeToString(hasher.Sum(nil)) + return hex.EncodeToString(hasher.Sum(nil)), nil } func ErrPageUnwarper(errInfo *GHProxyErrors) ErrorPageData { @@ -180,11 +203,11 @@ func NewSizedLRUCache(maxBytes int64) (*SizedLRUCache, error) { // 当内部 LRU 缓存因其自身的条目容量限制或 RemoveOldest 方法被调用而逐出条目时， // 此回调函数会被执行，从而更新 currentBytes。 var err error - c.cache, err = lru.NewWithEvict[string, []byte](10000, func(key string, value []byte) { + //c.cache, err = lru.NewWithEvict[string, []byte](10000, func(key string, value []byte) { + c.cache, err = lru.NewWithEvict(10000, func(key string, value []byte) { c.mu.Lock() defer c.mu.Unlock() c.currentBytes -= int64(len(value)) - logDebug("LRU evicted key: %s, size: %d, current total: %d", key, len(value), c.currentBytes) }) if err != nil { return nil, err @@ -206,7 +229,6 @@ func (c *SizedLRUCache) Add(key string, value []byte) { // 如果待添加的条目本身就大于缓存的最大容量，则不进行缓存。 if itemSize > c.maxBytes { - logWarning("Item key %s (size %d) larger than cache max capacity %d. Not caching.", key, itemSize, c.maxBytes) return } @@ -214,23 +236,19 @@ func (c *SizedLRUCache) Add(key string, value []byte) { if oldVal, ok := c.cache.Get(key); ok { c.currentBytes -= int64(len(oldVal)) c.cache.Remove(key) - logDebug("Key %s exists, removed old size %d. Current total: %d", key, len(oldVal), c.currentBytes) } // 主动逐出最旧的条目，直到有足够的空间容纳新条目。 for c.currentBytes+itemSize > c.maxBytes && c.cache.Len() > 0 { - _, oldVal, existed := c.cache.RemoveOldest() + _, _, existed := c.cache.RemoveOldest() if !existed { - logWarning("Attempted to remove oldest, but item not found.") break } - logDebug("Proactively evicted item (size %d) to free space. Current total: %d", len(oldVal), c.currentBytes) } // 添加新条目到内部 LRU 缓存。 c.cache.Add(key, value) c.currentBytes += itemSize // 手动增加新条目的大小到 currentBytes。 - logDebug("Item added: key %s, size: %d, current total: %d", key, itemSize, c.currentBytes) } const maxErrorPageCacheBytes = 512 * 1024 // 错误页面缓存的最大容量：512KB @@ -242,7 +260,6 @@ func init() { var err error errorPageCache, err = NewSizedLRUCache(maxErrorPageCacheBytes) if err != nil { - logError("Failed to initialize error page LRU cache: %v", err) panic(err) } } @@ -293,37 +310,60 @@ func htmlTemplateRender(data interface{}) ([]byte, error) { return buf.Bytes(), nil } -func ErrorPage(c *app.RequestContext, errInfo *GHProxyErrors) { +func ErrorPage(c *touka.Context, errInfo *GHProxyErrors) { + + select { + case <-c.Request.Context().Done(): + return + default: + if c.Writer.Written() { + return + } + } + // 将 errInfo 转换为 ErrorPageData 结构体 + var err error + var cacheKey string pageDataStruct := ErrPageUnwarper(errInfo) // 使用 ErrorPageData 生成一个唯一的 SHA256 缓存键 - cacheKey := pageDataStruct.ToCacheKey() + cacheKey, err = pageDataStruct.ToCacheKey() + if err != nil { + c.Warnf("Failed to generate cache key for error page: %v", err) + fallbackErrorJson(c, errInfo) + return + } + + // 检查生成的缓存键是否为空，这可能表示序列化或哈希计算失败 + if cacheKey == "" { c.JSON(errInfo.StatusCode, map[string]string{"error": errInfo.ErrorMessage}) - logWarning("Failed to generate cache key for error page: %v", errInfo) + c.Warnf("Failed to generate cache key for error page: %v", errInfo) return } var pageData []byte - var err error // 尝试从缓存中获取页面数据 if cachedPage, found := errorPageCache.Get(cacheKey); found { pageData = cachedPage - logDebug("Serving error page from cache (Key: %s)", cacheKey) + c.Debugf("Serving error page from cache (Key: %s)", cacheKey) } else { // 如果不在缓存中，则渲染页面 pageData, err = htmlTemplateRender(pageDataStruct) if err != nil { c.JSON(errInfo.StatusCode, map[string]string{"error": errInfo.ErrorMessage}) - logWarning("Failed to render error page for status %d (Key: %s): %v", errInfo.StatusCode, cacheKey, err) + c.Warnf("Failed to render error page for status %d (Key: %s): %v", errInfo.StatusCode, cacheKey, err) return } // 将渲染结果存入缓存 errorPageCache.Add(cacheKey, pageData) - logDebug("Cached error page (Key: %s, Size: %d bytes)", cacheKey, len(pageData)) + c.Debugf("Cached error page (Key: %s, Size: %d bytes)", cacheKey, len(pageData)) } - c.Data(errInfo.StatusCode, "text/html; charset=utf-8", pageData) + c.Raw(errInfo.StatusCode, "text/html; charset=utf-8", pageData) +} + +func fallbackErrorJson(c *touka.Context, errInfo *GHProxyErrors) { + c.JSON(errInfo.StatusCode, map[string]string{"error": errInfo.ErrorMessage}) } diff --git a/proxy/gitreq.go b/proxy/gitreq.go index de6bff7..af8e6bc 100644 --- a/proxy/gitreq.go +++ b/proxy/gitreq.go @@ -1,7 +1,6 @@ package proxy import ( - "bytes" "context" "fmt" "ghproxy/config" @@ -9,32 +8,20 @@ import ( "strconv" "github.com/WJQSERVER-STUDIO/go-utils/limitreader" - "github.com/cloudwego/hertz/pkg/app" + "github.com/infinite-iroha/touka" ) -func GitReq(ctx context.Context, c *app.RequestContext, u string, cfg *config.Config, mode string) { +func GitReq(ctx context.Context, c *touka.Context, u string, cfg *config.Config, mode string) { var ( - req *http.Request resp *http.Response - err error ) - go func() { - <-ctx.Done() - if resp != nil && resp.Body != nil { - err = resp.Body.Close() - if err != nil { - logError("Failed to close response body: %v", err) - } - } - }() - - method := string(c.Request.Method()) - - reqBodyReader := bytes.NewBuffer(c.Request.Body()) - - //bodyReader := c.Request.BodyStream() // 不可替换为此实现 + reqBodyReader, err := c.GetReqBodyBuffer() + if err != nil { + HandleError(c, fmt.Sprintf("Failed to read request body: %v", err)) + return + } if cfg.GitClone.Mode == "cache" { userPath, repoPath, remainingPath, queryParams, err := extractParts(u) @@ -43,16 +30,20 @@ func GitReq(ctx context.Context, c *app.RequestContext, u string, cfg *config.Co return } // 构建新url - u = cfg.GitClone.SmartGitAddr + userPath + repoPath + remainingPath + "?" + queryParams.Encode() + var paramStr string + if len(queryParams) > 0 { + paramStr = "?" + queryParams.Encode() + } + u = cfg.GitClone.SmartGitAddr + userPath + repoPath + remainingPath + paramStr } if cfg.GitClone.Mode == "cache" { - rb := gitclient.NewRequestBuilder(method, u) + rb := gitclient.NewRequestBuilder(c.Request.Method, u) rb.NoDefaultHeaders() rb.SetBody(reqBodyReader) rb.WithContext(ctx) - req, err = rb.Build() + req, err := rb.Build() if err != nil { HandleError(c, fmt.Sprintf("Failed to create request: %v", err)) return @@ -66,8 +57,9 @@ func GitReq(ctx context.Context, c *app.RequestContext, u string, cfg *config.Co HandleError(c, fmt.Sprintf("Failed to send request: %v", err)) return } + defer resp.Body.Close() } else { - rb := client.NewRequestBuilder(string(c.Request.Method()), u) + rb := client.NewRequestBuilder(c.Request.Method, u) rb.NoDefaultHeaders() rb.SetBody(reqBodyReader) rb.WithContext(ctx) @@ -86,6 +78,7 @@ func GitReq(ctx context.Context, c *app.RequestContext, u string, cfg *config.Co HandleError(c, fmt.Sprintf("Failed to send request: %v", err)) return } + defer resp.Body.Close() } contentLength := resp.Header.Get("Content-Length") @@ -93,21 +86,17 @@ func GitReq(ctx context.Context, c *app.RequestContext, u string, cfg *config.Co size, err := strconv.Atoi(contentLength) sizelimit := cfg.Server.SizeLimit * 1024 * 1024 if err != nil { - logWarning("%s %s %s %s %s Content-Length header is not a valid integer: %v", c.ClientIP(), c.Method(), c.Path(), c.UserAgent(), c.Request.Header.GetProtocol(), err) + c.Warnf("%s %s %s %s %s Content-Length header is not a valid integer: %v", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.UserAgent(), c.Request.Proto, err) } if err == nil && size > sizelimit { - finalURL := []byte(resp.Request.URL.String()) + 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.Method(), c.Path(), c.Request.Header.Get("User-Agent"), c.Request.Header.GetProtocol(), finalURL, size) + c.Warnf("%s %s %s %s %s Final-URL: %s Size-Limit-Exceeded: %d", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.UserAgent(), c.Request.Proto, finalURL, size) return } } - for key, values := range resp.Header { - for _, value := range values { - c.Response.Header.Add(key, value) - } - } + c.SetHeaders(resp.Header) headersToRemove := map[string]struct{}{ "Content-Security-Policy": {}, @@ -132,9 +121,9 @@ func GitReq(ctx context.Context, c *app.RequestContext, u string, cfg *config.Co c.Status(resp.StatusCode) if cfg.GitClone.Mode == "cache" { - 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.SetHeader("Cache-Control", "no-store, no-cache, must-revalidate") + c.SetHeader("Pragma", "no-cache") + c.SetHeader("Expires", "0") } bodyReader := resp.Body diff --git a/proxy/handler.go b/proxy/handler.go index 80a5892..b15f1b5 100644 --- a/proxy/handler.go +++ b/proxy/handler.go @@ -1,39 +1,33 @@ package proxy import ( - "context" "fmt" "ghproxy/config" - "ghproxy/rate" "regexp" "strings" - "github.com/cloudwego/hertz/pkg/app" + "github.com/infinite-iroha/touka" ) var re = regexp.MustCompile(`^(http:|https:)?/?/?(.*)`) // 匹配http://或https://开头的路径 -func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *rate.IPRateLimiter) app.HandlerFunc { - return func(ctx context.Context, c *app.RequestContext) { - +func NoRouteHandler(cfg *config.Config) touka.HandlerFunc { + return func(c *touka.Context) { + var ctx = c.Request.Context() var shoudBreak bool - shoudBreak = rateCheck(cfg, c, limiter, iplimiter) - if shoudBreak { - return - } var ( rawPath string matches []string ) - rawPath = strings.TrimPrefix(string(c.Request.RequestURI()), "/") // 去掉前缀/ - matches = re.FindStringSubmatch(rawPath) // 匹配路径 + rawPath = strings.TrimPrefix(c.GetRequestURI(), "/") // 去掉前缀/ + matches = re.FindStringSubmatch(rawPath) // 匹配路径 // 匹配路径错误处理 if len(matches) < 3 { - logWarning("%s %s %s %s %s Invalid URL", c.ClientIP(), c.Method(), c.Path(), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol()) - ErrorPage(c, NewErrorWithStatusLookup(400, fmt.Sprintf("Invalid URL Format: %s", c.Path()))) + c.Warnf("%s %s %s %s %s Invalid URL", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.UserAgent(), c.Request.Proto) + ErrorPage(c, NewErrorWithStatusLookup(400, fmt.Sprintf("Invalid URL Format: %s", c.GetRequestURI()))) return } @@ -53,9 +47,6 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra return } - logDump("%s %s %s %s %s Matched-Username: %s, Matched-Repo: %s", c.ClientIP(), c.Method(), rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), user, repo) - logDump("%s", c.Request.Header.Header()) - shoudBreak = listCheck(cfg, c, user, repo, rawPath) if shoudBreak { return @@ -68,14 +59,12 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra // 处理blob/raw路径 if matcher == "blob" { - rawPath = rawPath[10:] - rawPath = "raw.githubusercontent.com" + rawPath + rawPath = rawPath[18:] + rawPath = "https://raw.githubusercontent.com" + rawPath rawPath = strings.Replace(rawPath, "/blob/", "/", 1) matcher = "raw" } - logDebug("Matched: %v", matcher) - switch matcher { case "releases", "blob", "raw", "gist", "api": ChunkedProxyRequest(ctx, c, rawPath, cfg, matcher) @@ -83,7 +72,7 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra GitReq(ctx, c, rawPath, cfg, "git") default: ErrorPage(c, NewErrorWithStatusLookup(500, "Matched But Not Matched")) - logError("Matched But Not Matched Path: %s rawPath: %s matcher: %s", c.Path(), rawPath, matcher) + c.Errorf("Matched But Not Matched Path: %s rawPath: %s matcher: %s", c.GetRequestURIPath(), rawPath, matcher) return } } diff --git a/proxy/httpc.go b/proxy/httpc.go index 4d8bc4c..857f3f0 100644 --- a/proxy/httpc.go +++ b/proxy/httpc.go @@ -1,7 +1,6 @@ package proxy import ( - "fmt" "ghproxy/config" "net/http" "time" @@ -12,42 +11,40 @@ import ( var BufferSize int = 32 * 1024 // 32KB var ( - tr *http.Transport - gittr *http.Transport - client *httpc.Client - gitclient *httpc.Client - ghcrtr *http.Transport - ghcrclient *httpc.Client + tr *http.Transport + gittr *http.Transport + client *httpc.Client + gitclient *httpc.Client ) -func InitReq(cfg *config.Config) error { - initHTTPClient(cfg) +func InitReq(cfg *config.Config) (*httpc.Client, error) { + client := initHTTPClient(cfg) if cfg.GitClone.Mode == "cache" { initGitHTTPClient(cfg) } - initGhcrHTTPClient(cfg) err := SetGlobalRateLimit(cfg) if err != nil { - return err + return nil, err } - return nil + return client, nil } -func initHTTPClient(cfg *config.Config) { +func initHTTPClient(cfg *config.Config) *httpc.Client { var proTolcols = new(http.Protocols) proTolcols.SetHTTP1(true) proTolcols.SetHTTP2(true) proTolcols.SetUnencryptedHTTP2(true) - if cfg.Httpc.Mode == "auto" { + switch cfg.Httpc.Mode { + case "auto", "": tr = &http.Transport{ IdleConnTimeout: 30 * time.Second, WriteBufferSize: 32 * 1024, // 32KB ReadBufferSize: 32 * 1024, // 32KB Protocols: proTolcols, } - } else if cfg.Httpc.Mode == "advanced" { + case "advanced": tr = &http.Transport{ MaxIdleConns: cfg.Httpc.MaxIdleConns, MaxConnsPerHost: cfg.Httpc.MaxConnsPerHost, @@ -56,18 +53,10 @@ func initHTTPClient(cfg *config.Config) { ReadBufferSize: 32 * 1024, // 32KB Protocols: proTolcols, } - } else { - // 错误的模式 - logError("unknown httpc mode: %s", cfg.Httpc.Mode) - fmt.Println("unknown httpc mode: ", cfg.Httpc.Mode) - logWarning("use Auto to Run HTTP Client") - fmt.Println("use Auto to Run HTTP Client") - tr = &http.Transport{ - IdleConnTimeout: 30 * time.Second, - WriteBufferSize: 32 * 1024, // 32KB - ReadBufferSize: 32 * 1024, // 32KB - } + default: + panic("unknown httpc mode: " + cfg.Httpc.Mode) } + if cfg.Outbound.Enabled { initTransport(cfg, tr) } @@ -81,18 +70,18 @@ func initHTTPClient(cfg *config.Config) { httpc.WithTransport(tr), ) } - + return client } func initGitHTTPClient(cfg *config.Config) { - - if cfg.Httpc.Mode == "auto" { + switch cfg.Httpc.Mode { + case "auto", "": gittr = &http.Transport{ IdleConnTimeout: 30 * time.Second, WriteBufferSize: 32 * 1024, // 32KB ReadBufferSize: 32 * 1024, // 32KB } - } else if cfg.Httpc.Mode == "advanced" { + case "advanced": gittr = &http.Transport{ MaxIdleConns: cfg.Httpc.MaxIdleConns, MaxConnsPerHost: cfg.Httpc.MaxConnsPerHost, @@ -100,103 +89,30 @@ func initGitHTTPClient(cfg *config.Config) { WriteBufferSize: 32 * 1024, // 32KB ReadBufferSize: 32 * 1024, // 32KB } - } else { - // 错误的模式 - logError("unknown httpc mode: %s", cfg.Httpc.Mode) - fmt.Println("unknown httpc mode: ", cfg.Httpc.Mode) - logWarning("use Auto to Run HTTP Client") - fmt.Println("use Auto to Run HTTP Client") - gittr = &http.Transport{ - //MaxIdleConns: 160, - IdleConnTimeout: 30 * time.Second, - WriteBufferSize: 32 * 1024, // 32KB - ReadBufferSize: 32 * 1024, // 32KB - } + default: + panic("unknown httpc mode: " + cfg.Httpc.Mode) } + if cfg.Outbound.Enabled { initTransport(cfg, gittr) } - if cfg.Server.Debug && cfg.GitClone.ForceH2C { - gitclient = httpc.New( - httpc.WithTransport(gittr), - httpc.WithDumpLog(), - httpc.WithProtocols(httpc.ProtocolsConfig{ - ForceH2C: true, - }), - ) - } else if !cfg.Server.Debug && cfg.GitClone.ForceH2C { - gitclient = httpc.New( - httpc.WithTransport(gittr), - httpc.WithProtocols(httpc.ProtocolsConfig{ - ForceH2C: true, - }), - ) - } else if cfg.Server.Debug && !cfg.GitClone.ForceH2C { - gitclient = httpc.New( - httpc.WithTransport(gittr), - httpc.WithDumpLog(), - httpc.WithProtocols(httpc.ProtocolsConfig{ - Http1: true, - Http2: true, - Http2_Cleartext: true, - }), - ) - } else { - gitclient = httpc.New( - httpc.WithTransport(gittr), - httpc.WithProtocols(httpc.ProtocolsConfig{ - Http1: true, - Http2: true, - Http2_Cleartext: true, - }), - ) - } -} -func initGhcrHTTPClient(cfg *config.Config) { - var proTolcols = new(http.Protocols) - proTolcols.SetHTTP1(true) - proTolcols.SetHTTP2(true) - if cfg.Httpc.Mode == "auto" { + var opts []httpc.Option // 使用切片来收集选项 + opts = append(opts, httpc.WithTransport(gittr)) + var protocolsConfig httpc.ProtocolsConfig - ghcrtr = &http.Transport{ - IdleConnTimeout: 30 * time.Second, - WriteBufferSize: 32 * 1024, // 32KB - ReadBufferSize: 32 * 1024, // 32KB - Protocols: proTolcols, - } - } else if cfg.Httpc.Mode == "advanced" { - ghcrtr = &http.Transport{ - MaxIdleConns: cfg.Httpc.MaxIdleConns, - MaxConnsPerHost: cfg.Httpc.MaxConnsPerHost, - MaxIdleConnsPerHost: cfg.Httpc.MaxIdleConnsPerHost, - WriteBufferSize: 32 * 1024, // 32KB - ReadBufferSize: 32 * 1024, // 32KB - Protocols: proTolcols, - } + if cfg.GitClone.ForceH2C { + protocolsConfig.ForceH2C = true } else { - // 错误的模式 - logError("unknown httpc mode: %s", cfg.Httpc.Mode) - fmt.Println("unknown httpc mode: ", cfg.Httpc.Mode) - logWarning("use Auto to Run HTTP Client") - fmt.Println("use Auto to Run HTTP Client") - ghcrtr = &http.Transport{ - IdleConnTimeout: 30 * time.Second, - WriteBufferSize: 32 * 1024, // 32KB - ReadBufferSize: 32 * 1024, // 32KB - } - } - if cfg.Outbound.Enabled { - initTransport(cfg, ghcrtr) + protocolsConfig.Http1 = true + protocolsConfig.Http2 = true + protocolsConfig.Http2_Cleartext = true } + opts = append(opts, httpc.WithProtocols(protocolsConfig)) + if cfg.Server.Debug { - ghcrclient = httpc.New( - httpc.WithTransport(ghcrtr), - httpc.WithDumpLog(), - ) - } else { - ghcrclient = httpc.New( - httpc.WithTransport(ghcrtr), - ) + opts = append(opts, httpc.WithDumpLog()) } + + gitclient = httpc.New(opts...) } diff --git a/proxy/match.go b/proxy/match.go index f526461..9353c8b 100644 --- a/proxy/match.go +++ b/proxy/match.go @@ -10,11 +10,6 @@ import ( ) var ( - githubPrefix = "https://github.com/" - rawPrefix = "https://raw.githubusercontent.com/" - gistPrefix = "https://gist.github.com/" - gistContentPrefix = "https://gist.githubusercontent.com/" - apiPrefix = "https://api.github.com/" githubPrefixLen int rawPrefixLen int gistPrefixLen int @@ -22,48 +17,90 @@ var ( apiPrefixLen int ) +const ( + githubPrefix = "https://github.com/" + rawPrefix = "https://raw.githubusercontent.com/" + gistPrefix = "https://gist.github.com/" + gistContentPrefix = "https://gist.githubusercontent.com/" + apiPrefix = "https://api.github.com/" + ociv2Prefix = "https://v2/" + releasesDownloadSnippet = "releases/download/" +) + func init() { githubPrefixLen = len(githubPrefix) rawPrefixLen = len(rawPrefix) gistPrefixLen = len(gistPrefix) - apiPrefixLen = len(apiPrefix) gistContentPrefixLen = len(gistContentPrefix) - //log.Printf("githubPrefixLen: %d, rawPrefixLen: %d, gistPrefixLen: %d, apiPrefixLen: %d", githubPrefixLen, rawPrefixLen, gistPrefixLen, apiPrefixLen) + apiPrefixLen = len(apiPrefix) } // Matcher 从原始URL路径中高效地解析并匹配代理规则. func Matcher(rawPath string, cfg *config.Config) (string, string, string, *GHProxyErrors) { - if len(rawPath) < 18 { - return "", "", "", NewErrorWithStatusLookup(404, "path too short") - } + /* + if len(rawPath) < 18 { + return "", "", "", NewErrorWithStatusLookup(404, "path too short") + } + */ // 匹配 "https://github.com/" if strings.HasPrefix(rawPath, githubPrefix) { - remaining := rawPath[githubPrefixLen:] - i := strings.IndexByte(remaining, '/') + pathAfterDomain := rawPath[githubPrefixLen:] + + // 解析 user + i := strings.IndexByte(pathAfterDomain, '/') if i <= 0 { return "", "", "", NewErrorWithStatusLookup(400, "malformed github path: missing user") } - user := remaining[:i] - remaining = remaining[i+1:] - i = strings.IndexByte(remaining, '/') + user := pathAfterDomain[:i] + pathAfterUser := pathAfterDomain[i+1:] + + // 解析 repo + i = strings.IndexByte(pathAfterUser, '/') if i <= 0 { - return "", "", "", NewErrorWithStatusLookup(400, "malformed github path: missing repo") - } - repo := remaining[:i] - remaining = remaining[i+1:] - if len(remaining) == 0 { return "", "", "", NewErrorWithStatusLookup(400, "malformed github path: missing action") } - i = strings.IndexByte(remaining, '/') - action := remaining - if i != -1 { - action = remaining[:i] + repo := pathAfterUser[:i] + pathAfterRepo := pathAfterUser[i+1:] + + if len(pathAfterRepo) == 0 { + return "", "", "", NewErrorWithStatusLookup(400, "malformed github path: missing action") } + + // 优先处理所有 "releases" 相关的下载路径 + if strings.HasPrefix(pathAfterRepo, "releases/") { + // 情况 A: "releases/download/..." + if strings.HasPrefix(pathAfterRepo, "releases/download/") { + return user, repo, "releases", nil + } + // 情况 B: "releases/:tag/download/..." + pathAfterReleases := pathAfterRepo[len("releases/"):] + slashIndex := strings.IndexByte(pathAfterReleases, '/') + if slashIndex > 0 { // 确保tag不为空 + pathAfterTag := pathAfterReleases[slashIndex+1:] + if strings.HasPrefix(pathAfterTag, "download/") { + return user, repo, "releases", nil + } + } + // 如果不满足上述下载链接的结构, 则为网页浏览路径, 予以拒绝 + return "", "", "", NewErrorWithStatusLookup(400, "unsupported releases page, only download links are allowed") + } + + // 检查 "archive/" 路径 + if strings.HasPrefix(pathAfterRepo, "archive/") { + // 根据测试用例, archive路径的matcher也应为releases + return user, repo, "releases", nil + } + + // 如果不是下载路径, 则解析action并进行分类 + i = strings.IndexByte(pathAfterRepo, '/') + action := pathAfterRepo + if i != -1 { + action = pathAfterRepo[:i] + } + var matcher string switch action { - case "releases", "archive": - matcher = "releases" case "blob": matcher = "blob" case "raw": @@ -79,59 +116,27 @@ func Matcher(rawPath string, cfg *config.Config) (string, string, string, *GHPro // 匹配 "https://raw.githubusercontent.com/" if strings.HasPrefix(rawPath, rawPrefix) { remaining := rawPath[rawPrefixLen:] - // 这里的逻辑与 github.com 的类似, 需要提取 user, repo, branch, file... - // 我们只需要 user 和 repo - i := strings.IndexByte(remaining, '/') - if i <= 0 { - return "", "", "", NewErrorWithStatusLookup(400, "malformed raw url: missing user") + parts := strings.SplitN(remaining, "/", 3) + if len(parts) < 3 { + return "", "", "", NewErrorWithStatusLookup(400, "malformed raw url: path too short") } - user := remaining[:i] - remaining = remaining[i+1:] - i = strings.IndexByte(remaining, '/') - if i <= 0 { - return "", "", "", NewErrorWithStatusLookup(400, "malformed raw url: missing repo") - } - repo := remaining[:i] - // raw 链接至少需要 user/repo/branch 三部分 - remaining = remaining[i+1:] - if len(remaining) == 0 { - return "", "", "", NewErrorWithStatusLookup(400, "malformed raw url: missing branch/commit") - } - return user, repo, "raw", nil + return parts[0], parts[1], "raw", nil } - // 匹配 "https://gist.github.com/" - if strings.HasPrefix(rawPath, gistPrefix) { - remaining := rawPath[gistPrefixLen:] - i := strings.IndexByte(remaining, '/') - if i <= 0 { - // case: https://gist.github.com/user - // 这种情况下, gist_id 缺失, 但我们仍然可以认为 user 是有效的 - if len(remaining) > 0 { - return remaining, "", "gist", nil - } + // 匹配 "https://gist.github.com/" 或 "https://gist.githubusercontent.com/" + isGist := strings.HasPrefix(rawPath, gistPrefix) + if isGist || strings.HasPrefix(rawPath, gistContentPrefix) { + var remaining string + if isGist { + remaining = rawPath[gistPrefixLen:] + } else { + remaining = rawPath[gistContentPrefixLen:] + } + parts := strings.SplitN(remaining, "/", 2) + if len(parts) == 0 || parts[0] == "" { return "", "", "", NewErrorWithStatusLookup(400, "malformed gist url: missing user") } - // case: https://gist.github.com/user/gist_id... - user := remaining[:i] - return user, "", "gist", nil - } - - // 匹配 "https://gist.githubusercontent.com/" - if strings.HasPrefix(rawPath, gistContentPrefix) { - remaining := rawPath[gistContentPrefixLen:] - i := strings.IndexByte(remaining, '/') - if i <= 0 { - // case: https://gist.githubusercontent.com/user - // 这种情况下, gist_id 缺失, 但我们仍然可以认为 user 是有效的 - if len(remaining) > 0 { - return remaining, "", "gist", nil - } - return "", "", "", NewErrorWithStatusLookup(400, "malformed gist url: missing user") - } - // case: https://gist.githubusercontent.com/user/gist_id... - user := remaining[:i] - return user, "", "gist", nil + return parts[0], "", "gist", nil } // 匹配 "https://api.github.com/" @@ -159,105 +164,6 @@ func Matcher(rawPath string, cfg *config.Config) (string, string, string, *GHPro return "", "", "", NewErrorWithStatusLookup(404, "no matcher found for the given path") } -// 原实现 -/* -func Matcher(rawPath string, cfg *config.Config) (string, string, string, *GHProxyErrors) { - var ( - user string - repo string - matcher string - ) - // 匹配 "https://github.com"开头的链接 - if strings.HasPrefix(rawPath, "https://github.com") { - remainingPath := strings.TrimPrefix(rawPath, "https://github.com") - - //if strings.HasPrefix(remainingPath, "/") { - // remainingPath = strings.TrimPrefix(remainingPath, "/") - //} - - remainingPath = strings.TrimPrefix(remainingPath, "/") - // 预期格式/user/repo/more... - // 取出user和repo和最后部分 - parts := strings.Split(remainingPath, "/") - if len(parts) <= 2 { - errMsg := "Not enough parts in path after matching 'https://github.com*'" - return "", "", "", NewErrorWithStatusLookup(400, errMsg) - } - user = parts[0] - repo = parts[1] - // 匹配 "https://github.com"开头的链接 - if len(parts) >= 3 { - switch parts[2] { - case "releases", "archive": - matcher = "releases" - case "blob": - matcher = "blob" - case "raw": - matcher = "raw" - case "info", "git-upload-pack": - matcher = "clone" - default: - errMsg := "Url Matched 'https://github.com*', but didn't match the next matcher" - return "", "", "", NewErrorWithStatusLookup(400, errMsg) - } - } - return user, repo, matcher, nil - } - // 匹配 "https://raw"开头的链接 - if strings.HasPrefix(rawPath, "https://raw") { - remainingPath := strings.TrimPrefix(rawPath, "https://") - parts := strings.Split(remainingPath, "/") - if len(parts) <= 3 { - errMsg := "URL after matched 'https://raw*' should have at least 4 parts (user/repo/branch/file)." - return "", "", "", NewErrorWithStatusLookup(400, errMsg) - } - user = parts[1] - repo = parts[2] - matcher = "raw" - - return user, repo, matcher, nil - } - // 匹配 "https://gist"开头的链接 - if strings.HasPrefix(rawPath, "https://gist") { - remainingPath := strings.TrimPrefix(rawPath, "https://") - parts := strings.Split(remainingPath, "/") - if len(parts) <= 3 { - errMsg := "URL after matched 'https://gist*' should have at least 4 parts (user/gist_id)." - return "", "", "", NewErrorWithStatusLookup(400, errMsg) - } - user = parts[1] - repo = "" - matcher = "gist" - return user, repo, matcher, nil - } - // 匹配 "https://api.github.com/"开头的链接 - if strings.HasPrefix(rawPath, "https://api.github.com/") { - matcher = "api" - remainingPath := strings.TrimPrefix(rawPath, "https://api.github.com/") - - parts := strings.Split(remainingPath, "/") - if parts[0] == "repos" { - user = parts[1] - repo = parts[2] - } - if parts[0] == "users" { - user = parts[1] - } - if !cfg.Auth.ForceAllowApi { - if cfg.Auth.Method != "header" || !cfg.Auth.Enabled { - //return "", "", "", ErrAuthHeaderUnavailable - errMsg := "AuthHeader Unavailable, Need to open header auth to enable api proxy" - return "", "", "", NewErrorWithStatusLookup(403, errMsg) - } - } - return user, repo, matcher, nil - } - //return "", "", "", ErrNotFound - errMsg := "Didn't match any matcher" - return "", "", "", NewErrorWithStatusLookup(404, errMsg) -} -*/ - var ( proxyableMatchersMap map[string]struct{} initMatchersOnce sync.Once diff --git a/proxy/matcher_test.go b/proxy/matcher_test.go index 0c35381..07f3e4a 100644 --- a/proxy/matcher_test.go +++ b/proxy/matcher_test.go @@ -33,11 +33,29 @@ func TestMatcher_Compatibility(t *testing.T) { expectedErrCode int }{ { - name: "GH Releases Path", + name: "GH Releases Path 1", rawPath: "https://github.com/owner/repo/releases/download/v1.0/asset.zip", config: cfgWithAuth, expectedUser: "owner", expectedRepo: "repo", expectedMatcher: "releases", }, + { + name: "GH Releases Path 2", + rawPath: "https://github.com/owner/repo/releases/v1.0/download/asset.zip", + config: cfgWithAuth, + expectedUser: "owner", expectedRepo: "repo", expectedMatcher: "releases", + }, + { + name: "GH Releases Path Page", + rawPath: "https://github.com/owner/repo/releases", + config: cfgWithAuth, + expectError: true, expectedErrCode: 400, + }, + { + name: "GH Releases Path Tag Page", + rawPath: "https://github.com/owner/repo/releases/tag/v0.0.1", + config: cfgWithAuth, + expectError: true, expectedErrCode: 400, + }, { name: "GH Archive Path", rawPath: "https://github.com/owner/repo.git/archive/main.zip", diff --git a/proxy/nest.go b/proxy/nest.go index 2748ca6..675e4a3 100644 --- a/proxy/nest.go +++ b/proxy/nest.go @@ -2,11 +2,12 @@ package proxy import ( "bufio" - "compress/gzip" "fmt" "ghproxy/config" "io" "strings" + + "github.com/infinite-iroha/touka" ) func EditorMatcher(rawPath string, cfg *config.Config) (bool, error) { @@ -52,21 +53,19 @@ func modifyURL(url string, host string, cfg *config.Config) string { // 去除url内的https://或http:// matched, err := EditorMatcher(url, cfg) if err != nil { - logDump("Invalid URL: %s", url) return url } if matched { var u = url u = strings.TrimPrefix(u, "https://") u = strings.TrimPrefix(u, "http://") - logDump("Modified URL: %s", "https://"+host+"/"+u) return "https://" + host + "/" + u } return url } // processLinks 处理链接，返回包含处理后数据的 io.Reader -func processLinks(input io.ReadCloser, compress string, host string, cfg *config.Config) (readerOut io.Reader, written int64, err error) { +func processLinks(input io.ReadCloser, host string, cfg *config.Config, c *touka.Context) (readerOut io.Reader, written int64, err error) { pipeReader, pipeWriter := io.Pipe() // 创建 io.Pipe readerOut = pipeReader @@ -75,11 +74,11 @@ func processLinks(input io.ReadCloser, compress string, host string, cfg *config if pipeWriter != nil { // 确保 pipeWriter 关闭，即使发生错误 if err != nil { if closeErr := pipeWriter.CloseWithError(err); closeErr != nil { // 如果有错误，传递错误给 reader - logError("pipeWriter close with error failed: %v, original error: %v", closeErr, err) + c.Errorf("pipeWriter close with error failed: %v, original error: %v", closeErr, err) } } else { if closeErr := pipeWriter.Close(); closeErr != nil { // 没有错误，正常关闭 - logError("pipeWriter close failed: %v", closeErr) + c.Errorf("pipeWriter close failed: %v", closeErr) if err == nil { // 如果之前没有错误，记录关闭错误 err = closeErr } @@ -90,52 +89,23 @@ func processLinks(input io.ReadCloser, compress string, host string, cfg *config defer func() { if err := input.Close(); err != nil { - logError("input close failed: %v", err) + c.Errorf("input close failed: %v", err) } }() var bufReader *bufio.Reader - if compress == "gzip" { - // 解压gzip - gzipReader, gzipErr := gzip.NewReader(input) - if gzipErr != nil { - err = fmt.Errorf("gzip解压错误: %v", gzipErr) - return // Goroutine 中使用 return 返回错误 - } - defer gzipReader.Close() - bufReader = bufio.NewReader(gzipReader) - } else { - bufReader = bufio.NewReader(input) - } + bufReader = bufio.NewReader(input) var bufWriter *bufio.Writer - var gzipWriter *gzip.Writer - // 根据是否gzip确定 writer 的创建 - if compress == "gzip" { - gzipWriter = gzip.NewWriter(pipeWriter) // 使用 pipeWriter - bufWriter = bufio.NewWriterSize(gzipWriter, 4096) //设置缓冲区大小 - } else { - bufWriter = bufio.NewWriterSize(pipeWriter, 4096) // 使用 pipeWriter - } + bufWriter = bufio.NewWriterSize(pipeWriter, 4096) // 使用 pipeWriter //确保writer关闭 defer func() { - var closeErr error // 局部变量，用于保存defer中可能发生的错误 - - if gzipWriter != nil { - if closeErr = gzipWriter.Close(); closeErr != nil { - logError("gzipWriter close failed %v", closeErr) - // 如果已经存在错误，则保留。否则，记录此错误。 - if err == nil { - err = closeErr - } - } - } if flushErr := bufWriter.Flush(); flushErr != nil { - logError("writer flush failed %v", flushErr) + c.Errorf("writer flush failed %v", flushErr) // 如果已经存在错误，则保留。否则，记录此错误。 if err == nil { err = flushErr @@ -156,7 +126,6 @@ func processLinks(input io.ReadCloser, compress string, host string, cfg *config // 替换所有匹配的 URL modifiedLine := urlPattern.ReplaceAllStringFunc(line, func(originalURL string) string { - logDump("originalURL: %s", originalURL) return modifyURL(originalURL, host, cfg) // 假设 modifyURL 函数已定义 }) diff --git a/proxy/reqheader.go b/proxy/reqheader.go index 8400821..57d8542 100644 --- a/proxy/reqheader.go +++ b/proxy/reqheader.go @@ -4,7 +4,7 @@ import ( "ghproxy/config" "net/http" - "github.com/cloudwego/hertz/pkg/app" + "github.com/infinite-iroha/touka" ) var ( @@ -27,6 +27,7 @@ var ( "CDN-Loop": {}, "Upgrade": {}, "Connection": {}, + "Accept-Encoding": {}, } cloneHeadersToRemove = map[string]struct{}{ @@ -43,33 +44,37 @@ var ( var ( defaultHeaders = map[string]string{ "Accept": "*/*", - "Accept-Encoding": "gzip", + "Accept-Encoding": "", "Transfer-Encoding": "chunked", "User-Agent": "GHProxy/1.0", } ) -func setRequestHeaders(c *app.RequestContext, req *http.Request, cfg *config.Config, matcher string) { +// copyHeader 将所有头部从 src 复制到 dst。 +// 对于多值头部，它会为每个值调用 Add，从而保留所有值。 +func copyHeader(dst, src http.Header) { + for k, vv := range src { + for _, v := range vv { + dst.Add(k, v) + } + } +} + +func setRequestHeaders(c *touka.Context, req *http.Request, cfg *config.Config, matcher string) { if matcher == "raw" && cfg.Httpc.UseCustomRawHeaders { // 使用预定义Header for key, value := range defaultHeaders { req.Header.Set(key, value) } } else if matcher == "clone" { - c.Request.Header.VisitAll(func(key, value []byte) { - headerKey := string(key) - headerValue := string(value) - if _, shouldRemove := cloneHeadersToRemove[headerKey]; !shouldRemove { - req.Header.Set(headerKey, headerValue) - } - }) + copyHeader(req.Header, c.Request.Header) + for key := range cloneHeadersToRemove { + req.Header.Del(key) + } } else { - c.Request.Header.VisitAll(func(key, value []byte) { - headerKey := string(key) - headerValue := string(value) - if _, shouldRemove := reqHeadersToRemove[headerKey]; !shouldRemove { - req.Header.Set(headerKey, headerValue) - } - }) + copyHeader(req.Header, c.Request.Header) + for key := range reqHeadersToRemove { + req.Header.Del(key) + } } } diff --git a/proxy/routing.go b/proxy/routing.go index 9d68ca7..7a5748f 100644 --- a/proxy/routing.go +++ b/proxy/routing.go @@ -1,42 +1,38 @@ package proxy import ( - "context" "ghproxy/config" - "ghproxy/rate" "strings" - "github.com/cloudwego/hertz/pkg/app" + "github.com/infinite-iroha/touka" ) -func RoutingHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *rate.IPRateLimiter) app.HandlerFunc { - return func(ctx context.Context, c *app.RequestContext) { +func RoutingHandler(cfg *config.Config) touka.HandlerFunc { + return func(c *touka.Context) { var shoudBreak bool - shoudBreak = rateCheck(cfg, c, limiter, iplimiter) - if shoudBreak { - return - } - var ( rawPath string ) - rawPath = strings.TrimPrefix(string(c.Request.RequestURI()), "/") // 去掉前缀/ + rawPath = strings.TrimPrefix(c.GetRequestURI(), "/") // 去掉前缀/ var ( - user string - repo string - matcher string + user string + repo string ) user = c.Param("user") repo = c.Param("repo") - matcher = c.GetString("matcher") + matcher, exists := c.GetString("matcher") + if !exists { + ErrorPage(c, NewErrorWithStatusLookup(500, "Matcher Not Found in Context")) + c.Errorf("Matcher Not Found in Context Path: %s", c.GetRequestURIPath()) + return + } - logDump("%s %s %s %s %s Matched-Username: %s, Matched-Repo: %s", c.ClientIP(), c.Method(), rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), user, repo) - logDump("%s", c.Request.Header.Header()) + ctx := c.Request.Context() shoudBreak = listCheck(cfg, c, user, repo, rawPath) if shoudBreak { @@ -48,7 +44,6 @@ func RoutingHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra return } - // 处理blob/raw路径 // 处理blob/raw路径 if matcher == "blob" { rawPath = rawPath[10:] @@ -60,8 +55,6 @@ func RoutingHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra // 为rawpath加入https:// 头 rawPath = "https://" + rawPath - logDebug("Matched: %v", matcher) - switch matcher { case "releases", "blob", "raw", "gist", "api": ChunkedProxyRequest(ctx, c, rawPath, cfg, matcher) @@ -69,7 +62,7 @@ func RoutingHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra GitReq(ctx, c, rawPath, cfg, "git") default: ErrorPage(c, NewErrorWithStatusLookup(500, "Matched But Not Matched")) - logError("Matched But Not Matched Path: %s rawPath: %s matcher: %s", c.Path(), rawPath, matcher) + c.Errorf("Matched But Not Matched Path: %s rawPath: %s matcher: %s", c.GetRequestURIPath(), rawPath, matcher) return } } diff --git a/proxy/utils.go b/proxy/utils.go index e770c2b..e923742 100644 --- a/proxy/utils.go +++ b/proxy/utils.go @@ -4,12 +4,11 @@ import ( "fmt" "ghproxy/auth" "ghproxy/config" - "ghproxy/rate" - "github.com/cloudwego/hertz/pkg/app" + "github.com/infinite-iroha/touka" ) -func listCheck(cfg *config.Config, c *app.RequestContext, user string, repo string, rawPath string) bool { +func listCheck(cfg *config.Config, c *touka.Context, user string, repo string, rawPath string) bool { if cfg.Auth.ForceAllowApi && cfg.Auth.ForceAllowApiPassList { return false } @@ -18,7 +17,7 @@ func listCheck(cfg *config.Config, c *app.RequestContext, user string, repo stri whitelist := auth.CheckWhitelist(user, repo) if !whitelist { ErrorPage(c, NewErrorWithStatusLookup(403, fmt.Sprintf("Whitelist Blocked repo: %s/%s", user, repo))) - logInfo("%s %s %s %s %s Whitelist Blocked repo: %s/%s", c.ClientIP(), c.Method(), rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), user, repo) + c.Infof("%s %s %s %s %s Whitelist Blocked repo: %s/%s", c.ClientIP(), c.Request.Method, rawPath, c.UserAgent(), c.Request.Proto, user, repo) return true } } @@ -28,7 +27,7 @@ func listCheck(cfg *config.Config, c *app.RequestContext, user string, repo stri blacklist := auth.CheckBlacklist(user, repo) if blacklist { ErrorPage(c, NewErrorWithStatusLookup(403, fmt.Sprintf("Blacklist Blocked repo: %s/%s", user, repo))) - logInfo("%s %s %s %s %s Blacklist Blocked repo: %s/%s", c.ClientIP(), c.Method(), rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), user, repo) + c.Infof("%s %s %s %s %s Blacklist Blocked repo: %s/%s", c.ClientIP(), c.Request.Method, rawPath, c.UserAgent(), c.Request.Proto, user, repo) return true } } @@ -37,13 +36,13 @@ func listCheck(cfg *config.Config, c *app.RequestContext, user string, repo stri } // 鉴权 -func authCheck(c *app.RequestContext, cfg *config.Config, matcher string, rawPath string) bool { +func authCheck(c *touka.Context, cfg *config.Config, matcher string, rawPath string) bool { var err error if matcher == "api" && !cfg.Auth.ForceAllowApi { if cfg.Auth.Method != "header" || !cfg.Auth.Enabled { ErrorPage(c, NewErrorWithStatusLookup(403, "Github API Req without AuthHeader is Not Allowed")) - logInfo("%s %s %s AuthHeader Unavailable", c.ClientIP(), c.Method(), rawPath) + c.Infof("%s %s %s AuthHeader Unavailable", c.ClientIP(), c.Request.Method, rawPath) return true } } @@ -54,34 +53,7 @@ func authCheck(c *app.RequestContext, cfg *config.Config, matcher string, rawPat authcheck, err = auth.AuthHandler(c, cfg) if !authcheck { ErrorPage(c, NewErrorWithStatusLookup(401, fmt.Sprintf("Unauthorized: %v", err))) - logInfo("%s %s %s %s %s Auth-Error: %v", c.ClientIP(), c.Method(), rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), err) - return true - } - } - - return false -} - -func rateCheck(cfg *config.Config, c *app.RequestContext, limiter *rate.RateLimiter, iplimiter *rate.IPRateLimiter) bool { - // 限制访问频率 - if cfg.RateLimit.Enabled { - - var allowed bool - - switch cfg.RateLimit.RateMethod { - case "ip": - allowed = iplimiter.Allow(c.ClientIP()) - case "total": - allowed = limiter.Allow() - default: - logWarning("Invalid RateLimit Method") - ErrorPage(c, NewErrorWithStatusLookup(500, "Invalid RateLimit Method")) - return true - } - - if !allowed { - ErrorPage(c, NewErrorWithStatusLookup(429, fmt.Sprintf("Too Many Requests; Rate Limit is %d per minute", cfg.RateLimit.RatePerMinute))) - logInfo("%s %s %s %s %s 429-TooManyRequests", c.ClientIP(), c.Method(), c.Request.RequestURI(), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol()) + c.Infof("%s %s %s %s %s Auth-Error: %v", c.ClientIP(), c.Request.Method, rawPath, c.UserAgent(), c.Request.Proto, err) return true } } diff --git a/rate/rate.go b/rate/rate.go deleted file mode 100644 index 390b8da..0000000 --- a/rate/rate.go +++ /dev/null @@ -1,107 +0,0 @@ -package rate - -import ( - "sync" - "time" - - "github.com/WJQSERVER-STUDIO/logger" - "golang.org/x/time/rate" -) - -// 日志模块 -var ( - logw = logger.Logw - logDump = logger.LogDump - logDebug = logger.LogDebug - logInfo = logger.LogInfo - logWarning = logger.LogWarning - logError = logger.LogError -) - -// RateLimiter 总体限流器 -type RateLimiter struct { - limiter *rate.Limiter -} - -// New 创建一个总体限流器 -func New(limit int, burst int, duration time.Duration) *RateLimiter { - if limit <= 0 { - limit = 1 - logWarning("rate limit per minute must be positive, setting to 1") - } - if burst <= 0 { - burst = 1 - logWarning("rate limit burst must be positive, setting to 1") - } - - rateLimit := rate.Limit(float64(limit) / duration.Seconds()) - - return &RateLimiter{ - limiter: rate.NewLimiter(rateLimit, burst), - } -} - -// Allow 检查是否允许请求通过 -func (rl *RateLimiter) Allow() bool { - return rl.limiter.Allow() -} - -// IPRateLimiter 基于IP的限流器 -type IPRateLimiter struct { - limiters map[string]*RateLimiter // 用户级限流器 map - mu sync.RWMutex // 保护 limiters map - limit int // 每 duration 时间段内允许的请求数 - burst int // 突发请求数 - duration time.Duration // 限流周期 -} - -// NewIPRateLimiter 创建一个基于IP的限流器 -func NewIPRateLimiter(ipLimit int, ipBurst int, duration time.Duration) *IPRateLimiter { - if ipLimit <= 0 { - ipLimit = 1 - logWarning("IP rate limit per minute must be positive, setting to 1") - } - if ipBurst <= 0 { - ipBurst = 1 - logWarning("IP rate limit burst must be positive, setting to 1") - } - - logInfo("IP Rate Limiter initialized with limit: %d, burst: %d, duration: %v", ipLimit, ipBurst, duration) - - return &IPRateLimiter{ - limiters: make(map[string]*RateLimiter), - limit: ipLimit, - burst: ipBurst, - duration: duration, - } -} - -// Allow 检查给定IP的请求是否允许通过 -func (rl *IPRateLimiter) Allow(ip string) bool { - if ip == "" { - logWarning("empty ip for rate limiting") - return false - } - - // 使用读锁快速查找 - rl.mu.RLock() - limiter, found := rl.limiters[ip] - rl.mu.RUnlock() - - if found { - return limiter.Allow() - } - - // 未找到，获取写锁来创建和添加 - rl.mu.Lock() - // 双重检查 - limiter, found = rl.limiters[ip] - if !found { - newL := New(rl.limit, rl.burst, rl.duration) - rl.limiters[ip] = newL - limiter = newL - } - rl.mu.Unlock() - - return limiter.Allow() -}