Compare commits

..

20 Commits

Author SHA1 Message Date
WJQSERVER
905a88a86d Merge pull request #162 from WJQSERVER-STUDIO/dev
4.3.0
2025-08-11 18:40:11 +08:00
WJQSERVER
abecddc8bf Merge pull request #160 from WJQSERVER-STUDIO/dev
4.2.7
2025-08-04 12:17:18 +08:00
WJQSERVER
e027ec0080 Merge pull request #157 from WJQSERVER-STUDIO/dev
fix matcher(4.2.6)
2025-08-01 08:43:06 +08:00
WJQSERVER
b0388e6abc Merge pull request #156 from WJQSERVER-STUDIO/dev
4.2.5
2025-07-31 20:01:31 +08:00
WJQSERVER
4b3f8e1018 Merge pull request #155 from WJQSERVER-STUDIO/dev
remove test
2025-07-29 23:45:49 +08:00
WJQSERVER
078e556584 Merge pull request #154 from WJQSERVER-STUDIO/dev
4.2.4
2025-07-29 23:42:33 +08:00
WJQSERVER
3841bab164 Merge pull request #149 from WJQSERVER-STUDIO/dev
4.2.3
2025-07-27 15:46:42 +08:00
WJQSERVER
c6325fed3f Merge pull request #148 from WJQSERVER-STUDIO/dev
4.2.2
2025-07-25 18:23:06 +08:00
WJQSERVER
f89fc53046 Merge pull request #146 from WJQSERVER-STUDIO/dev
4.2.1
2025-07-25 16:31:09 +08:00
WJQSERVER
88d84d0703 Merge pull request #143 from WJQSERVER-STUDIO/dev
4.2.0
2025-07-22 17:32:27 +08:00
WJQSERVER
80f52dda3c Merge pull request #141 from WJQSERVER-STUDIO/dev
4.1.7
2025-07-20 22:34:43 +08:00
WJQSERVER
799a4895e5 Merge pull request #140 from WJQSERVER-STUDIO/dev
update deps
2025-07-07 15:45:41 +08:00
WJQSERVER
a391895e7f Merge pull request #139 from WJQSERVER-STUDIO/dev
4.1.6
2025-07-07 15:35:30 +08:00
里見 灯花
4e469a4896 Merge pull request #138 from WJQSERVER-STUDIO/dev
4.1.5
2025-07-03 11:42:00 +08:00
WJQSERVER
7adab36c68 Merge pull request #136 from WJQSERVER-STUDIO/dev
4.1.4
2025-06-30 15:37:46 +08:00
WJQSERVER
f0902c1da3 Merge pull request #135 from WJQSERVER-STUDIO/dev
4.1.3
2025-06-25 17:59:16 +08:00
WJQSERVER
402308d620 Merge pull request #134 from WJQSERVER-STUDIO/dev 2025-06-18 17:21:17 +08:00
WJQSERVER
b701a89b98 Merge pull request #133 from WJQSERVER-STUDIO/dev
4.1.1
2025-06-18 09:06:11 +08:00
WJQSERVER
3812b029cf Merge pull request #131 from WJQSERVER-STUDIO/dev
4.1.0
2025-06-17 17:05:42 +08:00
里見 灯花
8ea741aec8 Merge pull request #130 from WJQSERVER-STUDIO/dev
remove HertZ, Touka ready (v4)
2025-06-16 09:44:31 +08:00
15 changed files with 36 additions and 265 deletions

View File

@@ -46,7 +46,7 @@ jobs:
goarch: [amd64, arm64]
env:
OUTPUT_BINARY: ghproxy
GO_VERSION: 1.25
GO_VERSION: 1.24
steps:
- uses: actions/checkout@v4

View File

@@ -47,7 +47,7 @@ jobs:
goarch: [amd64, arm64]
env:
OUTPUT_BINARY: ghproxy
GO_VERSION: 1.25
GO_VERSION: 1.24
steps:
- uses: actions/checkout@v3

View File

@@ -1,18 +1,5 @@
# 更新日志
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附加功能

View File

@@ -1 +1 @@
4.3.3
4.3.0

View File

@@ -3,7 +3,6 @@ package api
import (
"ghproxy/config"
"ghproxy/middleware/nocache"
"ghproxy/stats"
"github.com/infinite-iroha/touka"
)
@@ -47,17 +46,9 @@ func InitHandleRouter(cfg *config.Config, r *touka.Engine, version string) {
apiRouter.GET("/oci_proxy/status", func(c *touka.Context) {
ociProxyStatusHandler(cfg, c)
})
apiRouter.GET("/stats", func(c *touka.Context) {
StatsHandler(c)
})
}
}
func StatsHandler(c *touka.Context) {
c.SetHeader("Content-Type", "application/json")
c.JSON(200, stats.GetStats())
}
func SizeLimitHandler(cfg *config.Config, c *touka.Context) {
sizeLimit := cfg.Server.SizeLimit
c.SetHeader("Content-Type", "application/json")

View File

@@ -1,28 +0,0 @@
<!DOCTYPE html>
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>后台统计</title>
<link rel="stylesheet" href="/bootstrap.min.css">
</head>
<body>
<div class="container mt-5">
<h1>IP 代理使用情况统计</h1>
<table class="table table-striped table-bordered mt-4">
<thead>
<tr>
<th>IP 地址</th>
<th>调用次数</th>
<th>总流量 (bytes)</th>
<th>最后调用时间</th>
</tr>
</thead>
<tbody id="stats-table-body">
<!-- 数据将由 script.js 动态填充 -->
</tbody>
</table>
</div>
<script src="script.js"></script>
</body>
</html>

View File

@@ -1,36 +0,0 @@
document.addEventListener('DOMContentLoaded', function() {
fetch('/api/stats')
.then(response => response.json())
.then(data => {
const tableBody = document.getElementById('stats-table-body');
tableBody.innerHTML = ''; // 清空现有内容
for (const ip in data) {
const stats = data[ip];
const row = document.createElement('tr');
const ipCell = document.createElement('td');
ipCell.textContent = stats.ip;
row.appendChild(ipCell);
const callCountCell = document.createElement('td');
callCountCell.textContent = stats.call_count;
row.appendChild(callCountCell);
const transferredCell = document.createElement('td');
transferredCell.textContent = stats.total_transferred;
row.appendChild(transferredCell);
const lastCalledCell = document.createElement('td');
lastCalledCell.textContent = new Date(stats.last_called).toLocaleString();
row.appendChild(lastCalledCell);
tableBody.appendChild(row);
}
})
.catch(error => {
console.error('获取统计数据时出错:', error);
const tableBody = document.getElementById('stats-table-body');
tableBody.innerHTML = '<tr><td colspan="4" class="text-center">加载统计数据失败</td></tr>';
});
});

View File

@@ -1,10 +1,8 @@
package config
import (
"fmt"
"os"
"path/filepath"
"strings"
"github.com/BurntSushi/toml"
@@ -214,8 +212,7 @@ type DockerConfig struct {
// LoadConfig 从配置文件加载配置
func LoadConfig(filePath string) (*Config, error) {
exist, filePath2read := FileExists(filePath)
if !exist {
if !FileExists(filePath) {
// 楔入配置文件
err := DefaultConfig().WriteConfig(filePath)
if err != nil {
@@ -224,15 +221,15 @@ func LoadConfig(filePath string) (*Config, error) {
return DefaultConfig(), nil
}
var config Config
ext := filepath.Ext(filePath2read)
ext := filepath.Ext(filePath)
if ext == ".wanf" {
if err := wanf.DecodeFile(filePath2read, &config); err != nil {
if err := wanf.DecodeFile(filePath, &config); err != nil {
return nil, err
}
return &config, nil
}
if _, err := toml.DecodeFile(filePath2read, &config); err != nil {
if _, err := toml.DecodeFile(filePath, &config); err != nil {
return nil, err
}
return &config, nil
@@ -260,37 +257,9 @@ func (c *Config) WriteConfig(filePath string) error {
}
// FileExists 检测文件是否存在
func FileExists(filename string) (bool, string) {
func FileExists(filename string) bool {
_, err := os.Stat(filename)
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
}
return !os.IsNotExist(err)
}
// DefaultConfig 返回默认配置结构体

View File

@@ -25,10 +25,10 @@ rewriteAPI = false
[pages]
mode = "internal" # "internal" or "external"
theme = "bootstrap" # "bootstrap" or "nebula"
staticDir = "pages"
staticDir = "/data/www"
[log]
logFilePath = "ghproxy.log"
logFilePath = "/data/ghproxy/log/ghproxy.log"
maxLogSize = 5 # MB
level = "info" # debug, info, warn, error, none
@@ -42,18 +42,18 @@ ForceAllowApi = false
ForceAllowApiPassList = false
[blacklist]
blacklistFile = "blacklist.json"
blacklistFile = "/data/ghproxy/config/blacklist.json"
enabled = false
[whitelist]
enabled = false
whitelistFile = "whitelist.json"
whitelistFile = "/data/ghproxy/config/whitelist.json"
[ipFilter]
enabled = false
enableAllowList = false
enableBlockList = false
ipFilterFile = "ipfilter.json"
ipFilterFile = "/data/ghproxy/config/ipfilter.json"
[rateLimit]
enabled = false

10
go.mod
View File

@@ -1,12 +1,12 @@
module ghproxy
go 1.25.1
go 1.24.6
require (
github.com/BurntSushi/toml v1.5.0
github.com/WJQSERVER-STUDIO/httpc v0.8.2
golang.org/x/net v0.44.0
golang.org/x/time v0.13.0
golang.org/x/net v0.43.0
golang.org/x/time v0.12.0
)
require (
@@ -18,9 +18,9 @@ require (
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/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2
github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/infinite-iroha/touka v0.3.8
github.com/infinite-iroha/touka v0.3.6
github.com/wjqserver/modembed v0.0.1
)

16
go.sum
View File

@@ -18,17 +18,17 @@ 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/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2 h1:iizUGZ9pEquQS5jTGkh4AqeeHCMbfbjeb0zMt0aEFzs=
github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2/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/infinite-iroha/touka v0.3.8 h1:BK7+hwk5s5SpRFjFKIPe5CzZNzjP36kLHkM/HX6SU38=
github.com/infinite-iroha/touka v0.3.8/go.mod h1:uwkF1gTrNEgQ4P/Gwtk6WLbERehq3lzB8x1FMedyrfE=
github.com/infinite-iroha/touka v0.3.6 h1:SkpM/VFGCWOFQP3RRuoWdX/Q4zafPngG1VMwkrLwtkw=
github.com/infinite-iroha/touka v0.3.6/go.mod h1:XW7a3fpLAjJfylSmdNuDQ8wGKkKmLVi9V/89sT1d7uw=
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=
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=
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=

36
main.go
View File

@@ -47,8 +47,6 @@ var (
var (
//go:embed pages/*
pagesFS embed.FS
//go:embed backend/*
backendFS embed.FS
)
var (
@@ -236,18 +234,8 @@ func setupPages(cfg *config.Config, r *touka.Engine) {
}
case "external":
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))
}
r.SetUnMatchFS(http.Dir(cfg.Pages.StaticDir))
default:
// 处理无效的Pages Mode
logger.Warnf("Invalid Pages Mode: %s, using default embedded theme", cfg.Pages.Mode)
@@ -344,7 +332,6 @@ func main() {
}
r := touka.Default()
var err error
r.SetProtocols(&touka.ProtocolsConfig{
Http1: true,
Http2_Cleartext: true,
@@ -383,8 +370,8 @@ func main() {
}
if cfg.IPFilter.Enabled {
var ipAllowList, ipBlockList []string
ipAllowList, ipBlockList, err = auth.ReadIPFilterList(cfg)
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)
@@ -406,7 +393,6 @@ func main() {
}
setupApi(cfg, r, version)
setupPages(cfg, r)
setBackendRoute(r)
r.SetRedirectTrailingSlash(false)
r.GET("/github.com/:user/:repo/releases/*filepath", func(c *touka.Context) {
@@ -521,7 +507,7 @@ func main() {
defer logger.Close()
addr := fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port)
err = r.RunShutdown(addr)
err := r.RunShutdown(addr)
if err != nil {
logger.Errorf("Server Run Error: %v", err)
fmt.Printf("Server Run Error: %v\n", err)
@@ -529,15 +515,3 @@ func main() {
fmt.Println("Program Exit")
}
func setBackendRoute(r *touka.Engine) {
backend, err := fs.Sub(backendFS, "backend")
if err != nil {
logger.Errorf("Failed to load embedded backend pages: %s", err)
fmt.Printf("Failed to load embedded backend pages: %s", err)
os.Exit(1)
}
r.StaticFS("/backend", http.FS(backend))
}

View File

@@ -4,7 +4,6 @@ import (
"context"
"fmt"
"ghproxy/config"
"ghproxy/stats"
"io"
"net/http"
"strconv"
@@ -125,11 +124,7 @@ func ChunkedProxyRequest(ctx context.Context, c *touka.Context, u string, cfg *c
bodyReader = limitreader.NewRateLimitedReader(bodyReader, bandwidthLimit, int(bandwidthBurst), ctx)
}
countingReader := NewCountingReader(bodyReader)
defer countingReader.Close()
defer func() {
stats.Record(c.ClientIP(), countingReader.BytesRead())
}()
defer bodyReader.Close()
if MatcherShell(u) && matchString(matcher) && cfg.Shell.Editor {
// 判断body是不是gzip
@@ -143,7 +138,7 @@ func ChunkedProxyRequest(ctx context.Context, c *touka.Context, u string, cfg *c
var reader io.Reader
reader, _, err = processLinks(countingReader, compress, c.Request.Host, cfg, c)
reader, _, err = processLinks(bodyReader, compress, c.Request.Host, cfg, c)
c.WriteStream(reader)
if err != nil {
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)
@@ -154,10 +149,10 @@ func ChunkedProxyRequest(ctx context.Context, c *touka.Context, u string, cfg *c
if contentLength != "" {
c.SetHeader("Content-Length", contentLength)
c.WriteStream(countingReader)
c.WriteStream(bodyReader)
return
}
c.WriteStream(countingReader)
c.WriteStream(bodyReader)
}
}

View File

@@ -4,47 +4,10 @@ import (
"fmt"
"ghproxy/auth"
"ghproxy/config"
"io"
"github.com/infinite-iroha/touka"
)
// CountingReader is a reader that counts the number of bytes read.
// CountingReader 是一个计算已读字节数的读取器.
type CountingReader struct {
reader io.Reader
bytesRead int64
}
// NewCountingReader creates a new CountingReader.
// NewCountingReader 创建一个新的 CountingReader.
func NewCountingReader(reader io.Reader) *CountingReader {
return &CountingReader{
reader: reader,
}
}
func (cr *CountingReader) Read(p []byte) (n int, err error) {
n, err = cr.reader.Read(p)
cr.bytesRead += int64(n)
return n, err
}
// BytesRead returns the number of bytes read.
// BytesRead 返回已读字节数.
func (cr *CountingReader) BytesRead() int64 {
return cr.bytesRead
}
// Close closes the underlying reader if it implements io.Closer.
// 如果底层读取器实现了 io.Closer, 则关闭它.
func (cr *CountingReader) Close() error {
if closer, ok := cr.reader.(io.Closer); ok {
return closer.Close()
}
return nil
}
func listCheck(cfg *config.Config, c *touka.Context, user string, repo string, rawPath string) bool {
if cfg.Auth.ForceAllowApi && cfg.Auth.ForceAllowApiPassList {
return false

View File

@@ -1,44 +0,0 @@
package stats
import (
"sync"
"time"
)
// ProxyStats store one ip's proxy stats
// ProxyStats 存储一个IP的代理统计信息
type ProxyStats struct {
IP string `json:"ip"`
LastCalled time.Time `json:"last_called"`
CallCount int64 `json:"call_count"`
TotalTransferred int64 `json:"total_transferred"`
}
var (
statsMap = &sync.Map{}
)
// Record update a ip's proxy stats
// Record 更新一个IP的代理统计信息
func Record(ip string, transferred int64) {
s, _ := statsMap.LoadOrStore(ip, &ProxyStats{
IP: ip,
})
ps := s.(*ProxyStats)
ps.LastCalled = time.Now()
ps.CallCount++
ps.TotalTransferred += transferred
statsMap.Store(ip, ps)
}
// GetStats return all proxy stats
// GetStats 返回所有的代理统计信息
func GetStats() map[string]*ProxyStats {
data := make(map[string]*ProxyStats)
statsMap.Range(func(key, value interface{}) bool {
data[key.(string)] = value.(*ProxyStats)
return true
})
return data
}