mirror of
https://github.com/Sagit-chu/flvx.git
synced 2026-11-16 09:34:22 +08:00
Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0f1c5c8387 | |||
| 24d0b1e864 | |||
| 799bb66fe5 | |||
| 3f374df724 | |||
| 9b923a2d0b | |||
| d9f28f53c7 | |||
| 1d08a1ccfc | |||
| db25ba2cbe | |||
| a498067261 | |||
| b5922dccf2 | |||
| c259645227 | |||
| bdc2c4ecbb | |||
| a070d0f4d3 |
@@ -0,0 +1,482 @@
|
|||||||
|
# 最大连接数限制实现计划
|
||||||
|
|
||||||
|
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`[x]`) syntax for tracking.
|
||||||
|
|
||||||
|
**Goal:** 在 FLVX 中实现基于用户的全局最大连接数限制和基于单条规则的独立最大连接数限制功能。前端输入框为 0 或空时表示不限制。
|
||||||
|
|
||||||
|
**Architecture:** 采用“覆盖逻辑”(方案二)。
|
||||||
|
1. 数据库层面:在 `user` 和 `forward` 表中各增加一个整型字段 `max_conn`,默认值为 0(表示不限制)。
|
||||||
|
2. 后端接口层面:提供 API 更新该字段,在组装下发给 GOST 的配置时,判断规则的 `max_conn` 是否大于 0:
|
||||||
|
- 如果规则 `max_conn > 0`,则为此规则动态生成一个唯一的连接限制器配置,并在下发服务的 `climiter` 字段中引用该限制器。
|
||||||
|
- 如果规则 `max_conn == 0`,则检查该规则所属用户的 `max_conn`。
|
||||||
|
- 如果用户 `max_conn > 0`,则引用以用户维度的连接限制器配置(如 `user_conn_limit_<user_id>`)。
|
||||||
|
- 否则不下发 `climiter`。
|
||||||
|
3. 后端服务控制平面:需要在下发服务前,将需要的连接限制器(Rule 或 User 维度)推送到节点上。
|
||||||
|
- **重要发现:** 当前 `go-gost` 的 WebSocket Reporter (`go-gost/x/socket/websocket_reporter.go`) 仅支持 `TrafficLimiter` 的动态增删(如 `AddLimiters` 等),**不支持** `ConnLimiter`(即 `CLimiters`)。
|
||||||
|
- **计划修改:** 我们需要先在 `go-gost` 侧(`go-gost/x/socket`)添加针对 `CLimiters` 的 WebSocket 指令(`AddCLimiters`, `UpdateCLimiters`, `DeleteCLimiters`)以及对应的处理函数(参考 `AddLimiters` 等的实现,调用现有的针对 `ConnLimiterRegistry` 的相关接口和配置存储逻辑,具体需要实现类似 `createLimiter` 到 `createConnLimiter` 的逻辑)。
|
||||||
|
- 完成底层修改后,`go-backend` 再通过这些新增加的 WebSocket 指令,在 `ensureLimiterOnNode` 时下发最大连接数限制规则。
|
||||||
|
4. 前端层面:在用户管理和规则管理页面增加输入框组件。
|
||||||
|
|
||||||
|
**Tech Stack:** Go, GORM, SQLite/PostgreSQL, React, Vite, TypeScript, TailwindCSS.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 1: 扩展 go-gost WebSocket 接口以支持 CLimiters
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `go-gost/x/socket/limiter.go`
|
||||||
|
- Modify: `go-gost/x/socket/websocket_reporter.go`
|
||||||
|
|
||||||
|
[x] **Step 1: 实现 `createConnLimiter` 等功能**
|
||||||
|
|
||||||
|
在 `go-gost/x/socket/limiter.go` 中参考现有 `createLimiter` 添加对 `CLimiters` 的支持:
|
||||||
|
|
||||||
|
```go
|
||||||
|
func createConnLimiter(req createLimiterRequest) error {
|
||||||
|
name := strings.TrimSpace(req.Data.Name)
|
||||||
|
if name == "" {
|
||||||
|
return errors.New("limiter name is required")
|
||||||
|
}
|
||||||
|
req.Data.Name = name
|
||||||
|
|
||||||
|
if registry.ConnLimiterRegistry().IsRegistered(name) {
|
||||||
|
return errors.New("conn limiter " + name + " already exists")
|
||||||
|
}
|
||||||
|
|
||||||
|
v := parser.ParseConnLimiter(&req.Data)
|
||||||
|
|
||||||
|
if err := registry.ConnLimiterRegistry().Register(name, v); err != nil {
|
||||||
|
return errors.New("conn limiter " + name + " already exists")
|
||||||
|
}
|
||||||
|
|
||||||
|
if c := config.Global(); c != nil {
|
||||||
|
c.CLimiters = append(c.CLimiters, &req.Data)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func updateConnLimiter(req updateLimiterRequest) error {
|
||||||
|
name := strings.TrimSpace(req.Limiter)
|
||||||
|
req.Data.Name = name
|
||||||
|
if registry.ConnLimiterRegistry().IsRegistered(name) {
|
||||||
|
registry.ConnLimiterRegistry().Unregister(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
v := parser.ParseConnLimiter(&req.Data)
|
||||||
|
|
||||||
|
if err := registry.ConnLimiterRegistry().Register(name, v); err != nil {
|
||||||
|
return errors.New("conn limiter " + name + " already exists")
|
||||||
|
}
|
||||||
|
|
||||||
|
if c := config.Global(); c != nil {
|
||||||
|
for i := range c.CLimiters {
|
||||||
|
if c.CLimiters[i].Name == name {
|
||||||
|
c.CLimiters[i] = &req.Data
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
c.CLimiters = append(c.CLimiters, &req.Data)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func deleteConnLimiter(req deleteLimiterRequest) error {
|
||||||
|
name := strings.TrimSpace(req.Limiter)
|
||||||
|
|
||||||
|
if registry.ConnLimiterRegistry().IsRegistered(name) {
|
||||||
|
registry.ConnLimiterRegistry().Unregister(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
if c := config.Global(); c != nil {
|
||||||
|
limiteres := c.CLimiters
|
||||||
|
c.CLimiters = nil
|
||||||
|
for _, s := range limiteres {
|
||||||
|
if s.Name == name {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
c.CLimiters = append(c.CLimiters, s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
[x] **Step 2: 在 `WebSocketReporter` 注册命令**
|
||||||
|
|
||||||
|
在 `go-gost/x/socket/websocket_reporter.go` 的 `ProcessCommand` 中添加 case:
|
||||||
|
|
||||||
|
```go
|
||||||
|
case "AddCLimiters":
|
||||||
|
err = w.handleAddCLimiter(cmd.Data)
|
||||||
|
response.Type = "AddCLimitersResponse"
|
||||||
|
needSaveConfig = true
|
||||||
|
case "UpdateCLimiters":
|
||||||
|
err = w.handleUpdateCLimiter(cmd.Data)
|
||||||
|
response.Type = "UpdateCLimitersResponse"
|
||||||
|
needSaveConfig = true
|
||||||
|
case "DeleteCLimiters":
|
||||||
|
err = w.handleDeleteCLimiter(cmd.Data)
|
||||||
|
response.Type = "DeleteCLimitersResponse"
|
||||||
|
needSaveConfig = true
|
||||||
|
```
|
||||||
|
|
||||||
|
[x] **Step 3: 实现 Handler 方法**
|
||||||
|
|
||||||
|
在 `go-gost/x/socket/websocket_reporter.go` 中添加:
|
||||||
|
|
||||||
|
```go
|
||||||
|
func (w *WebSocketReporter) handleAddCLimiter(data interface{}) error {
|
||||||
|
jsonData, err := json.Marshal(data)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("序列化数据失败: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var limiterConfig config.LimiterConfig
|
||||||
|
if err := json.Unmarshal(jsonData, &limiterConfig); err != nil {
|
||||||
|
return fmt.Errorf("解析限流器配置失败: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
req := createLimiterRequest{Data: limiterConfig}
|
||||||
|
return createConnLimiter(req)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *WebSocketReporter) handleUpdateCLimiter(data interface{}) error {
|
||||||
|
jsonData, err := json.Marshal(data)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("序列化数据失败: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var updateReq struct {
|
||||||
|
Limiter string `json:"limiter"`
|
||||||
|
Data config.LimiterConfig `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := json.Unmarshal(jsonData, &updateReq); err != nil {
|
||||||
|
var limiterConfig config.LimiterConfig
|
||||||
|
if err := json.Unmarshal(jsonData, &limiterConfig); err != nil {
|
||||||
|
return fmt.Errorf("解析更新请求失败: %v", err)
|
||||||
|
}
|
||||||
|
updateReq.Limiter = limiterConfig.Name
|
||||||
|
updateReq.Data = limiterConfig
|
||||||
|
}
|
||||||
|
|
||||||
|
req := updateLimiterRequest{
|
||||||
|
Limiter: updateReq.Limiter,
|
||||||
|
Data: updateReq.Data,
|
||||||
|
}
|
||||||
|
return updateConnLimiter(req)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *WebSocketReporter) handleDeleteCLimiter(data interface{}) error {
|
||||||
|
jsonData, err := json.Marshal(data)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("序列化数据失败: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var deleteReq deleteLimiterRequest
|
||||||
|
|
||||||
|
if err := json.Unmarshal(jsonData, &deleteReq); err != nil {
|
||||||
|
var limiterName string
|
||||||
|
if err := json.Unmarshal(jsonData, &limiterName); err != nil {
|
||||||
|
return fmt.Errorf("解析删除请求失败: %v", err)
|
||||||
|
}
|
||||||
|
deleteReq.Limiter = limiterName
|
||||||
|
}
|
||||||
|
|
||||||
|
return deleteConnLimiter(deleteReq)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
[x] **Step 4: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd go-gost
|
||||||
|
git add x/socket/limiter.go x/socket/websocket_reporter.go
|
||||||
|
git commit -m "feat: add CLimiters support for websocket reporter"
|
||||||
|
cd ..
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 2: 数据库迁移与模型更新
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `go-backend/internal/store/model/model.go`
|
||||||
|
- Modify: `go-backend/internal/store/repo/repository.go`
|
||||||
|
|
||||||
|
[x] **Step 1: 更新数据库模型**
|
||||||
|
|
||||||
|
在 `go-backend/internal/store/model/model.go` 的 `User` 和 `Forward` 结构体中添加 `MaxConn` 字段。
|
||||||
|
|
||||||
|
```go
|
||||||
|
// 在 User 结构体中
|
||||||
|
type User struct {
|
||||||
|
// ...
|
||||||
|
MaxConn int `gorm:"column:max_conn;not null;default:0"`
|
||||||
|
// ...
|
||||||
|
}
|
||||||
|
|
||||||
|
// 在 Forward 结构体中
|
||||||
|
type Forward struct {
|
||||||
|
// ...
|
||||||
|
MaxConn int `gorm:"column:max_conn;not null;default:0"`
|
||||||
|
// ...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
[x] **Step 2: 编写数据库迁移**
|
||||||
|
|
||||||
|
在 `go-backend/internal/store/repo/repository.go` 的 `AutoMigrate` 逻辑前(如果有自定义迁移)或利用 gorm 自动迁移机制,由于这是 autoMigrate,添加字段只要 `db.AutoMigrate(&model.User{}, &model.Forward{})` 被调用就能自动加上。确认已执行迁移。由于 `FLVX` 通常会自动执行迁移,只需修改模型即可。我们需要处理默认值,由于使用了 `default:0`,GORM 会处理新增字段的默认值,但为了安全起见,如果在旧环境中,可能直接 alter table。
|
||||||
|
|
||||||
|
```go
|
||||||
|
// 无需手动编写 SQL,依赖现有的 gorm AutoMigrate 即可。
|
||||||
|
```
|
||||||
|
|
||||||
|
[x] **Step 3: 运行并验证迁移通过**
|
||||||
|
|
||||||
|
Run: `make build` (在 go-backend 中),或者运行一个相关的存储单元测试。
|
||||||
|
|
||||||
|
[x] **Step 4: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd go-backend
|
||||||
|
git add internal/store/model/model.go
|
||||||
|
git commit -m "feat: add max_conn field to user and forward models"
|
||||||
|
cd ..
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 3: 后端控制平面 - 连接数限制器的组装与下发
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `go-backend/internal/http/handler/control_plane.go`
|
||||||
|
- Modify: `go-backend/internal/store/repo/repository_control.go`
|
||||||
|
|
||||||
|
[x] **Step 1: 更新存储层以获取 User 的 MaxConn**
|
||||||
|
|
||||||
|
在 `go-backend/internal/store/repo/repository_control.go` 中:
|
||||||
|
|
||||||
|
需要一个方法获取 User,或者如果已经有,确保可以拿到 `MaxConn`。
|
||||||
|
|
||||||
|
[x] **Step 2: 编写下发 CLimiter 到节点的辅助函数**
|
||||||
|
|
||||||
|
在 `go-backend/internal/http/handler/control_plane.go`,参考 `ensureLimiterOnNode` 和 `upsertLimiterOnNode`:
|
||||||
|
|
||||||
|
```go
|
||||||
|
func (h *Handler) ensureConnLimiterOnNode(nodeID int64, limiterName string, maxConn int) error {
|
||||||
|
limitStr := fmt.Sprintf("$ %d", maxConn)
|
||||||
|
|
||||||
|
payload := map[string]interface{}{
|
||||||
|
"name": limiterName,
|
||||||
|
"limits": []string{limitStr},
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := h.sendNodeCommand(nodeID, "AddCLimiters", payload, false, false); err != nil {
|
||||||
|
if !isAlreadyExistsMessage(err.Error()) {
|
||||||
|
return fmt.Errorf("连接限制器下发失败: %w", err)
|
||||||
|
}
|
||||||
|
updatePayload := map[string]interface{}{
|
||||||
|
"limiter": limiterName,
|
||||||
|
"data": payload,
|
||||||
|
}
|
||||||
|
if _, updateErr := h.sendNodeCommand(nodeID, "UpdateCLimiters", updatePayload, false, false); updateErr != nil {
|
||||||
|
return fmt.Errorf("连接限制器更新失败: %w", updateErr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
[x] **Step 3: 更新组装配置逻辑以绑定 `climiter`**
|
||||||
|
|
||||||
|
在 `control_plane.go` 的 `syncForwardServicesWithWarnings` 及其辅助函数 `buildForwardServiceConfigs` 附近:
|
||||||
|
|
||||||
|
修改 `buildForwardServiceConfigs` 的签名,传入 `maxConn int` 和对应的 `cLimiterName string`。
|
||||||
|
|
||||||
|
```go
|
||||||
|
func buildForwardServiceConfigs(baseName string, forward *model.Forward, tunnel *model.Tunnel, node *model.Node, port int, bindIP string, limiterID *int64, cLimiterName string) []map[string]interface{} {
|
||||||
|
// ... 现有逻辑
|
||||||
|
// 在服务配置生成的部分增加:
|
||||||
|
if cLimiterName != "" {
|
||||||
|
service["climiter"] = cLimiterName
|
||||||
|
}
|
||||||
|
// ...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
[x] **Step 4: 在转发服务同步主流程中决定并下发 `climiter`**
|
||||||
|
|
||||||
|
在 `syncForwardServicesWithWarnings` (可能在多个重载/处理入口处,如 `ensureForwardServices`),查出转发所属 user 的 `MaxConn`,以及转发本身的 `MaxConn`。
|
||||||
|
|
||||||
|
```go
|
||||||
|
// 获取 User
|
||||||
|
user, err := h.repo.GetUser(forward.UserID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var cLimiterName string
|
||||||
|
var maxConnToSet int
|
||||||
|
|
||||||
|
if forward.MaxConn > 0 {
|
||||||
|
maxConnToSet = forward.MaxConn
|
||||||
|
cLimiterName = fmt.Sprintf("rule_conn_limit_%d", forward.ID)
|
||||||
|
} else if user != nil && user.MaxConn > 0 {
|
||||||
|
maxConnToSet = user.MaxConn
|
||||||
|
cLimiterName = fmt.Sprintf("user_conn_limit_%d", user.ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
if cLimiterName != "" {
|
||||||
|
for _, fp := range ports {
|
||||||
|
if err := h.ensureConnLimiterOnNode(fp.NodeID, cLimiterName, maxConnToSet); err != nil {
|
||||||
|
warnings = append(warnings, fmt.Sprintf("节点 %d 连接限制器下发失败: %v", fp.NodeID, err))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 传递给 buildForwardServiceConfigs
|
||||||
|
// ...
|
||||||
|
```
|
||||||
|
*(注意:需要确保更新涉及 `buildForwardServiceConfigs` 的所有调用点)*
|
||||||
|
|
||||||
|
[x] **Step 5: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd go-backend
|
||||||
|
git add internal/http/handler/control_plane.go internal/store/repo/repository_control.go
|
||||||
|
git commit -m "feat: implement max conn limiter dispatching"
|
||||||
|
cd ..
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 4: 后端接口 - 用户和规则的 CRUD 支持
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `go-backend/internal/http/handler/admin_user.go`
|
||||||
|
- Modify: `go-backend/internal/http/handler/forward.go`
|
||||||
|
|
||||||
|
[x] **Step 1: 用户接口更新**
|
||||||
|
|
||||||
|
在 `go-backend/internal/http/handler/admin_user.go`,修改用户创建和更新请求的结构体(如果有),接收 `MaxConn`,并在保存到数据库时赋值。
|
||||||
|
|
||||||
|
```go
|
||||||
|
type CreateUserReq struct {
|
||||||
|
// ...
|
||||||
|
MaxConn *int `json:"maxConn"`
|
||||||
|
}
|
||||||
|
// 接收后:
|
||||||
|
if req.MaxConn != nil {
|
||||||
|
user.MaxConn = *req.MaxConn
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
在获取用户列表时,确保 `MaxConn` 返回给前端。
|
||||||
|
|
||||||
|
[x] **Step 2: 规则接口更新**
|
||||||
|
|
||||||
|
在 `go-backend/internal/http/handler/forward.go` 中,更新 `CreateForwardReq` 和 `UpdateForwardReq` 结构体,增加 `MaxConn`,并在创建/更新 Forward 时保存到数据库。
|
||||||
|
|
||||||
|
如果转发规则的 `MaxConn` 或相关信息改变,触发节点上的规则重载(重新下发服务)。这一步由于更改了数据库,复用现有的 `syncForwardServices` 就会带上最新的配置。
|
||||||
|
|
||||||
|
[x] **Step 3: 测试接口**
|
||||||
|
|
||||||
|
Run: 可以启动后使用 curl 测试。
|
||||||
|
|
||||||
|
[x] **Step 4: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd go-backend
|
||||||
|
git add internal/http/handler/admin_user.go internal/http/handler/forward.go
|
||||||
|
git commit -m "feat: add maxConn to user and forward CRUD API"
|
||||||
|
cd ..
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 5: 前端 - 用户管理页面集成
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `vite-frontend/src/api/types.ts`
|
||||||
|
- Modify: `vite-frontend/src/api/index.ts`
|
||||||
|
- Modify: `vite-frontend/src/pages/users.tsx` (或者对应的用户管理页面文件)
|
||||||
|
|
||||||
|
[x] **Step 1: 类型更新**
|
||||||
|
|
||||||
|
在 `vite-frontend/src/api/types.ts` 中:
|
||||||
|
为 `UserApiItem` 和相关的 mutation payload 增加 `maxConn?: number` 属性。
|
||||||
|
|
||||||
|
[x] **Step 2: UI 修改**
|
||||||
|
|
||||||
|
在用户创建/编辑弹窗中,增加“最大连接数”输入框:
|
||||||
|
(假设使用 `@nextui-org/react` 的 `Input`)
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
<Input
|
||||||
|
type="number"
|
||||||
|
label="最大并发连接数"
|
||||||
|
placeholder="0 或空表示不限制"
|
||||||
|
value={formData.maxConn === 0 ? "" : String(formData.maxConn || "")}
|
||||||
|
onValueChange={(val) => {
|
||||||
|
const num = parseInt(val, 10);
|
||||||
|
setFormData({ ...formData, maxConn: isNaN(num) ? 0 : num });
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
```
|
||||||
|
并在用户的表格列中展示 `最大连接数`(值为 0 显示“不限制”)。
|
||||||
|
|
||||||
|
[x] **Step 3: 运行 Vite 进行验证**
|
||||||
|
|
||||||
|
[x] **Step 4: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd vite-frontend
|
||||||
|
git add src/api/types.ts src/api/index.ts src/pages/users.tsx
|
||||||
|
git commit -m "feat: add max conn UI to user management"
|
||||||
|
cd ..
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 6: 前端 - 转发规则页面集成
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `vite-frontend/src/pages/forward.tsx`
|
||||||
|
|
||||||
|
[x] **Step 1: 类型更新**
|
||||||
|
|
||||||
|
在 `api/types.ts` 中 `ForwardMutationPayload` 和 `ForwardApiItem` 中增加 `maxConn?: number`。
|
||||||
|
|
||||||
|
[x] **Step 2: UI 修改**
|
||||||
|
|
||||||
|
在 `vite-frontend/src/pages/forward.tsx` 的创建/编辑规则弹窗(在 "规则限速" 附近)增加“最大连接数”输入框:
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
<Input
|
||||||
|
type="number"
|
||||||
|
label="最大并发连接数"
|
||||||
|
placeholder="0 或空表示不限制"
|
||||||
|
value={formData.maxConn === 0 ? "" : String(formData.maxConn || "")}
|
||||||
|
onValueChange={(val) => {
|
||||||
|
const num = parseInt(val, 10);
|
||||||
|
setFormData({ ...formData, maxConn: isNaN(num) ? 0 : num });
|
||||||
|
}}
|
||||||
|
description="此设置优先于用户的全局连接数限制。0 表示不限制(或使用用户的全局限制)。"
|
||||||
|
/>
|
||||||
|
```
|
||||||
|
|
||||||
|
如果是在列表/卡片中展示,可以增加一个小标签或者 Tooltip 显示其最大连接数设置。
|
||||||
|
|
||||||
|
[x] **Step 3: 验证**
|
||||||
|
|
||||||
|
在前端验证该功能能正确读写规则的连接限制字段。
|
||||||
|
|
||||||
|
[x] **Step 4: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd vite-frontend
|
||||||
|
git add src/pages/forward.tsx src/api/types.ts
|
||||||
|
git commit -m "feat: add max conn UI to forward rules"
|
||||||
|
cd ..
|
||||||
|
```
|
||||||
@@ -0,0 +1,171 @@
|
|||||||
|
# Allow Local Remote Address Implementation Plan
|
||||||
|
|
||||||
|
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||||
|
|
||||||
|
**Goal:** Add a global settings toggle that allows non-admin forward rules to target local/private addresses when explicitly enabled.
|
||||||
|
|
||||||
|
**Architecture:** Keep the existing remote-address safety validator as the default path for non-admin rule changes, but gate its use behind a single backend config lookup in forward create/update handlers. Surface the toggle through the existing `vite_config` settings page and prove behavior with backend contract tests first.
|
||||||
|
|
||||||
|
**Tech Stack:** Go `net/http` + GORM backend, React + TypeScript frontend settings page, Go contract tests.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 1: Backend Contract Coverage
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `go-backend/tests/contract/forward_contract_test.go`
|
||||||
|
|
||||||
|
- [ ] **Step 1: Write the failing tests**
|
||||||
|
|
||||||
|
Add contract tests that prove the desired behavior:
|
||||||
|
|
||||||
|
```go
|
||||||
|
t.Run("local remote address is rejected when toggle is off", func(t *testing.T) {
|
||||||
|
createPayload := map[string]interface{}{
|
||||||
|
"name": "deny-local-remote",
|
||||||
|
"tunnelId": tunnelID,
|
||||||
|
"remoteAddr": "127.0.0.1:8080",
|
||||||
|
"strategy": "fifo",
|
||||||
|
}
|
||||||
|
createBody, _ := json.Marshal(createPayload)
|
||||||
|
createReq := httptest.NewRequest(http.MethodPost, "/api/v1/forward/create", bytes.NewReader(createBody))
|
||||||
|
createReq.Header.Set("Authorization", adminToken)
|
||||||
|
createReq.Header.Set("Content-Type", "application/json")
|
||||||
|
createRes := httptest.NewRecorder()
|
||||||
|
router.ServeHTTP(createRes, createReq)
|
||||||
|
|
||||||
|
var out response.R
|
||||||
|
_ = json.NewDecoder(createRes.Body).Decode(&out)
|
||||||
|
if out.Code == 0 {
|
||||||
|
t.Fatalf("expected local remote address to be rejected when toggle is off")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("local remote address is allowed when toggle is on", func(t *testing.T) {
|
||||||
|
if err := repo.DB().Exec(`
|
||||||
|
INSERT INTO vite_config(name, value, time)
|
||||||
|
VALUES(?, ?, ?)
|
||||||
|
ON CONFLICT(name) DO UPDATE SET value = excluded.value, time = excluded.time
|
||||||
|
`, "allow_local_remote_addr", "1", time.Now().UnixMilli()).Error; err != nil {
|
||||||
|
t.Fatalf("enable allow_local_remote_addr: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
createPayload := map[string]interface{}{
|
||||||
|
"name": "allow-local-remote",
|
||||||
|
"tunnelId": tunnelID,
|
||||||
|
"remoteAddr": "127.0.0.1:8080",
|
||||||
|
"strategy": "fifo",
|
||||||
|
}
|
||||||
|
createBody, _ := json.Marshal(createPayload)
|
||||||
|
createReq := httptest.NewRequest(http.MethodPost, "/api/v1/forward/create", bytes.NewReader(createBody))
|
||||||
|
createReq.Header.Set("Authorization", adminToken)
|
||||||
|
createReq.Header.Set("Content-Type", "application/json")
|
||||||
|
createRes := httptest.NewRecorder()
|
||||||
|
router.ServeHTTP(createRes, createReq)
|
||||||
|
assertCode(t, createRes, 0)
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 2: Run tests to verify they fail**
|
||||||
|
|
||||||
|
Run: `go test ./tests/contract/... -run 'TestForwardContracts|local remote address'`
|
||||||
|
Expected: FAIL because backend still rejects local/private addresses unconditionally.
|
||||||
|
|
||||||
|
- [ ] **Step 3: Commit**
|
||||||
|
|
||||||
|
Do not commit yet; combine with Task 2 after implementation passes.
|
||||||
|
|
||||||
|
### Task 2: Backend Toggle Implementation
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `go-backend/internal/http/handler/mutations.go`
|
||||||
|
|
||||||
|
- [ ] **Step 1: Add a tiny config helper**
|
||||||
|
|
||||||
|
Add a helper near other handler helpers:
|
||||||
|
|
||||||
|
```go
|
||||||
|
func (h *Handler) allowLocalRemoteAddr() bool {
|
||||||
|
if h == nil || h.repo == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
cfg, err := h.repo.GetConfigByName("allow_local_remote_addr")
|
||||||
|
if err != nil || cfg == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(cfg.Value) == "1"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 2: Gate create/update validation behind the helper**
|
||||||
|
|
||||||
|
Replace the unconditional checks with:
|
||||||
|
|
||||||
|
```go
|
||||||
|
if !h.allowLocalRemoteAddr() {
|
||||||
|
if err := IsSafeRemoteAddr(remoteAddr); err != nil {
|
||||||
|
response.WriteJSON(w, response.Err(403, err.Error()))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 3: Run contract tests to verify they pass**
|
||||||
|
|
||||||
|
Run: `go test ./tests/contract/... -run 'TestForwardContracts|local remote address'`
|
||||||
|
Expected: PASS
|
||||||
|
|
||||||
|
- [ ] **Step 4: Run full backend tests**
|
||||||
|
|
||||||
|
Run: `go test ./...`
|
||||||
|
Expected: PASS
|
||||||
|
|
||||||
|
### Task 3: Settings Page Toggle
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `vite-frontend/src/pages/config.tsx`
|
||||||
|
|
||||||
|
- [ ] **Step 1: Add the config item to the settings schema**
|
||||||
|
|
||||||
|
Add a switch-style item for `allow_local_remote_addr` with warning copy about reduced safety.
|
||||||
|
|
||||||
|
- [ ] **Step 2: Ensure the key is included in config loading/saving paths**
|
||||||
|
|
||||||
|
Add `allow_local_remote_addr` anywhere the page enumerates config keys or groups persisted config values.
|
||||||
|
|
||||||
|
- [ ] **Step 3: Run frontend build**
|
||||||
|
|
||||||
|
Run: `pnpm run build`
|
||||||
|
Expected: PASS
|
||||||
|
|
||||||
|
- [ ] **Step 4: Run frontend lint**
|
||||||
|
|
||||||
|
Run: `pnpm run lint`
|
||||||
|
Expected: 0 errors; existing warnings may remain.
|
||||||
|
|
||||||
|
### Task 4: Final Verification
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Verify only
|
||||||
|
|
||||||
|
- [ ] **Step 1: Re-run backend contracts for the toggle**
|
||||||
|
|
||||||
|
Run: `go test ./tests/contract/... -run 'TestForwardContracts|local remote address'`
|
||||||
|
Expected: PASS
|
||||||
|
|
||||||
|
- [ ] **Step 2: Re-run full backend tests**
|
||||||
|
|
||||||
|
Run: `go test ./...`
|
||||||
|
Expected: PASS
|
||||||
|
|
||||||
|
- [ ] **Step 3: Re-run frontend build/lint**
|
||||||
|
|
||||||
|
Run: `pnpm run build && pnpm run lint`
|
||||||
|
Expected: Build passes, lint has no errors.
|
||||||
|
|
||||||
|
- [ ] **Step 4: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add go-backend/internal/http/handler/mutations.go go-backend/tests/contract/forward_contract_test.go vite-frontend/src/pages/config.tsx docs/superpowers/specs/2026-04-26-allow-local-remote-addr-design.md docs/superpowers/plans/2026-04-26-allow-local-remote-addr.md
|
||||||
|
git commit -m "feat: add allow-local-remote-address toggle"
|
||||||
|
```
|
||||||
@@ -90,7 +90,7 @@
|
|||||||
| 表名 | Model | 特殊处理 |
|
| 表名 | Model | 特殊处理 |
|
||||||
|------|-------|----------|
|
|------|-------|----------|
|
||||||
| `user` | `User` | `TableName()` 返回 `"user"` (PG 保留字) |
|
| `user` | `User` | `TableName()` 返回 `"user"` (PG 保留字) |
|
||||||
| `forward` | `Forward` | |
|
| `forward` | `Forward` | 增加 `proxy_protocol` 字段 |
|
||||||
| `forward_port` | `ForwardPort` | |
|
| `forward_port` | `ForwardPort` | |
|
||||||
| `node` | `Node` | |
|
| `node` | `Node` | |
|
||||||
| `speed_limit` | `SpeedLimit` | |
|
| `speed_limit` | `SpeedLimit` | |
|
||||||
|
|||||||
@@ -266,6 +266,22 @@ func (h *Handler) syncForwardServicesWithWarnings(forward *forwardRecord, method
|
|||||||
|
|
||||||
serviceBase := buildForwardServiceBaseWithResolvedUserTunnel(forward.ID, forward.UserID, userTunnelID)
|
serviceBase := buildForwardServiceBaseWithResolvedUserTunnel(forward.ID, forward.UserID, userTunnelID)
|
||||||
|
|
||||||
|
user, err := h.repo.GetUserByID(forward.UserID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var cLimiterName string
|
||||||
|
var maxConnToSet int
|
||||||
|
|
||||||
|
if forward.MaxConn > 0 {
|
||||||
|
maxConnToSet = forward.MaxConn
|
||||||
|
cLimiterName = fmt.Sprintf("rule_conn_limit_%d", forward.ID)
|
||||||
|
} else if user != nil && user.MaxConn > 0 {
|
||||||
|
maxConnToSet = user.MaxConn
|
||||||
|
cLimiterName = fmt.Sprintf("user_conn_limit_%d", user.ID)
|
||||||
|
}
|
||||||
|
|
||||||
for _, fp := range ports {
|
for _, fp := range ports {
|
||||||
if limiterID != nil && speed != nil {
|
if limiterID != nil && speed != nil {
|
||||||
if err := h.ensureLimiterOnNode(fp.NodeID, *limiterID, *speed); err != nil {
|
if err := h.ensureLimiterOnNode(fp.NodeID, *limiterID, *speed); err != nil {
|
||||||
@@ -283,11 +299,17 @@ func (h *Handler) syncForwardServicesWithWarnings(forward *forwardRecord, method
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if cLimiterName != "" {
|
||||||
|
if err := h.ensureConnLimiterOnNode(fp.NodeID, cLimiterName, maxConnToSet); err != nil {
|
||||||
|
warnings = append(warnings, fmt.Sprintf("节点 %d 连接限制器下发失败: %v", fp.NodeID, err))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
node, err := h.getNodeRecord(fp.NodeID)
|
node, err := h.getNodeRecord(fp.NodeID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
services := buildForwardServiceConfigs(serviceBase, forward, tunnel, node, fp.Port, strings.TrimSpace(fp.InIP), limiterID)
|
services := buildForwardServiceConfigs(serviceBase, forward, tunnel, node, fp.Port, strings.TrimSpace(fp.InIP), limiterID, cLimiterName)
|
||||||
_, err = h.sendNodeCommand(node.ID, method, services, true, false)
|
_, err = h.sendNodeCommand(node.ID, method, services, true, false)
|
||||||
if err != nil && allowFallbackAdd && method == "UpdateService" {
|
if err != nil && allowFallbackAdd && method == "UpdateService" {
|
||||||
if isNotFoundError(err) {
|
if isNotFoundError(err) {
|
||||||
@@ -302,7 +324,7 @@ func (h *Handler) syncForwardServicesWithWarnings(forward *forwardRecord, method
|
|||||||
}
|
}
|
||||||
if err != nil && strings.EqualFold(strings.TrimSpace(method), "UpdateService") && isCannotAssignRequestedAddressError(err) {
|
if err != nil && strings.EqualFold(strings.TrimSpace(method), "UpdateService") && isCannotAssignRequestedAddressError(err) {
|
||||||
var warning string
|
var warning string
|
||||||
warning, err = h.fallbackForwardPortToDefaultBind(forward, tunnel, node, fp, serviceBase, limiterID)
|
warning, err = h.fallbackForwardPortToDefaultBind(forward, tunnel, node, fp, serviceBase, limiterID, cLimiterName)
|
||||||
if err == nil && warning != "" {
|
if err == nil && warning != "" {
|
||||||
warnings = append(warnings, warning)
|
warnings = append(warnings, warning)
|
||||||
}
|
}
|
||||||
@@ -328,7 +350,7 @@ func (h *Handler) syncForwardServicesWithWarnings(forward *forwardRecord, method
|
|||||||
return warnings, nil
|
return warnings, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handler) fallbackForwardPortToDefaultBind(forward *forwardRecord, tunnel *tunnelRecord, node *nodeRecord, fp forwardPortRecord, serviceBase string, limiterID *int64) (string, error) {
|
func (h *Handler) fallbackForwardPortToDefaultBind(forward *forwardRecord, tunnel *tunnelRecord, node *nodeRecord, fp forwardPortRecord, serviceBase string, limiterID *int64, cLimiterName string) (string, error) {
|
||||||
if h == nil || forward == nil || tunnel == nil || node == nil {
|
if h == nil || forward == nil || tunnel == nil || node == nil {
|
||||||
return "", errors.New("invalid bind fallback context")
|
return "", errors.New("invalid bind fallback context")
|
||||||
}
|
}
|
||||||
@@ -345,7 +367,7 @@ func (h *Handler) fallbackForwardPortToDefaultBind(forward *forwardRecord, tunne
|
|||||||
}
|
}
|
||||||
|
|
||||||
time.Sleep(150 * time.Millisecond)
|
time.Sleep(150 * time.Millisecond)
|
||||||
defaultServices := buildForwardServiceConfigs(serviceBase, forward, tunnel, node, fp.Port, "", limiterID)
|
defaultServices := buildForwardServiceConfigs(serviceBase, forward, tunnel, node, fp.Port, "", limiterID, cLimiterName)
|
||||||
if _, err := h.sendNodeCommand(node.ID, "AddService", defaultServices, true, false); err != nil {
|
if _, err := h.sendNodeCommand(node.ID, "AddService", defaultServices, true, false); err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
@@ -1637,7 +1659,7 @@ func compactErrorMessage(msg string) string {
|
|||||||
return strings.Join(strings.Fields(strings.ToLower(msg)), "")
|
return strings.Join(strings.Fields(strings.ToLower(msg)), "")
|
||||||
}
|
}
|
||||||
|
|
||||||
func buildForwardServiceConfigs(baseName string, forward *forwardRecord, tunnel *tunnelRecord, node *nodeRecord, port int, bindIP string, limiterID *int64) []map[string]interface{} {
|
func buildForwardServiceConfigs(baseName string, forward *forwardRecord, tunnel *tunnelRecord, node *nodeRecord, port int, bindIP string, limiterID *int64, cLimiterName string) []map[string]interface{} {
|
||||||
protocols := []string{"tcp", "udp"}
|
protocols := []string{"tcp", "udp"}
|
||||||
services := make([]map[string]interface{}, 0, 2)
|
services := make([]map[string]interface{}, 0, 2)
|
||||||
targets := splitRemoteTargets(forward.RemoteAddr)
|
targets := splitRemoteTargets(forward.RemoteAddr)
|
||||||
@@ -1680,6 +1702,15 @@ func buildForwardServiceConfigs(baseName string, forward *forwardRecord, tunnel
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
if cLimiterName != "" {
|
||||||
|
service["climiter"] = cLimiterName
|
||||||
|
}
|
||||||
|
if forward.ProxyProtocol > 0 {
|
||||||
|
if service["metadata"] == nil {
|
||||||
|
service["metadata"] = map[string]interface{}{}
|
||||||
|
}
|
||||||
|
service["metadata"].(map[string]interface{})["proxyProtocol"] = forward.ProxyProtocol
|
||||||
|
}
|
||||||
if protocol == "udp" {
|
if protocol == "udp" {
|
||||||
listenerMetadata := map[string]interface{}{
|
listenerMetadata := map[string]interface{}{
|
||||||
"keepAlive": true,
|
"keepAlive": true,
|
||||||
@@ -1691,7 +1722,10 @@ func buildForwardServiceConfigs(baseName string, forward *forwardRecord, tunnel
|
|||||||
service["handler"].(map[string]interface{})["chain"] = fmt.Sprintf("chains_%d", forward.TunnelID)
|
service["handler"].(map[string]interface{})["chain"] = fmt.Sprintf("chains_%d", forward.TunnelID)
|
||||||
}
|
}
|
||||||
if tunnel != nil && tunnel.Type == 1 && strings.TrimSpace(node.InterfaceName) != "" {
|
if tunnel != nil && tunnel.Type == 1 && strings.TrimSpace(node.InterfaceName) != "" {
|
||||||
service["metadata"] = map[string]interface{}{"interface": node.InterfaceName}
|
if service["metadata"] == nil {
|
||||||
|
service["metadata"] = map[string]interface{}{}
|
||||||
|
}
|
||||||
|
service["metadata"].(map[string]interface{})["interface"] = node.InterfaceName
|
||||||
}
|
}
|
||||||
if limiterID != nil && *limiterID > 0 {
|
if limiterID != nil && *limiterID > 0 {
|
||||||
service["limiter"] = strconv.FormatInt(*limiterID, 10)
|
service["limiter"] = strconv.FormatInt(*limiterID, 10)
|
||||||
@@ -1795,6 +1829,30 @@ func (h *Handler) ensureLimiterOnNode(nodeID int64, limiterID int64, speed int)
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *Handler) ensureConnLimiterOnNode(nodeID int64, limiterName string, maxConn int) error {
|
||||||
|
limitStr := fmt.Sprintf("$ %d", maxConn)
|
||||||
|
|
||||||
|
payload := map[string]interface{}{
|
||||||
|
"name": limiterName,
|
||||||
|
"limits": []string{limitStr},
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := h.sendNodeCommand(nodeID, "AddCLimiters", payload, false, false); err != nil {
|
||||||
|
if !isAlreadyExistsMessage(err.Error()) {
|
||||||
|
return fmt.Errorf("连接限制器下发失败: %w", err)
|
||||||
|
}
|
||||||
|
updatePayload := map[string]interface{}{
|
||||||
|
"limiter": limiterName,
|
||||||
|
"data": payload,
|
||||||
|
}
|
||||||
|
if _, updateErr := h.sendNodeCommand(nodeID, "UpdateCLimiters", updatePayload, false, false); updateErr != nil {
|
||||||
|
return fmt.Errorf("连接限制器更新失败: %w", updateErr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
func buildLimiterAddPayload(limiterID int64, speed int) (string, map[string]interface{}) {
|
func buildLimiterAddPayload(limiterID int64, speed int) (string, map[string]interface{}) {
|
||||||
rate := float64(speed) / 8.0
|
rate := float64(speed) / 8.0
|
||||||
limitStr := fmt.Sprintf("$ %.1fMB %.1fMB", rate, rate)
|
limitStr := fmt.Sprintf("$ %.1fMB %.1fMB", rate, rate)
|
||||||
|
|||||||
@@ -378,7 +378,7 @@ func TestRetryTunnelServiceAddWithCleanupReturnsCleanupError(t *testing.T) {
|
|||||||
func TestBuildForwardServiceConfigs_UsesBindIPForListen(t *testing.T) {
|
func TestBuildForwardServiceConfigs_UsesBindIPForListen(t *testing.T) {
|
||||||
forward := &forwardRecord{RemoteAddr: "1.2.3.4:80", Strategy: "fifo", TunnelID: 7}
|
forward := &forwardRecord{RemoteAddr: "1.2.3.4:80", Strategy: "fifo", TunnelID: 7}
|
||||||
node := &nodeRecord{TCPListenAddr: "[::]", UDPListenAddr: "[::]"}
|
node := &nodeRecord{TCPListenAddr: "[::]", UDPListenAddr: "[::]"}
|
||||||
services := buildForwardServiceConfigs("1_2_0", forward, nil, node, 22000, "10.9.8.7", nil)
|
services := buildForwardServiceConfigs("1_2_0", forward, nil, node, 22000, "10.9.8.7", nil, "")
|
||||||
if len(services) != 2 {
|
if len(services) != 2 {
|
||||||
t.Fatalf("expected 2 services, got %d", len(services))
|
t.Fatalf("expected 2 services, got %d", len(services))
|
||||||
}
|
}
|
||||||
@@ -393,7 +393,7 @@ func TestBuildForwardServiceConfigs_UsesBindIPForListen(t *testing.T) {
|
|||||||
func TestBuildForwardServiceConfigs_DefaultListenAddrWhenBindIPEmpty(t *testing.T) {
|
func TestBuildForwardServiceConfigs_DefaultListenAddrWhenBindIPEmpty(t *testing.T) {
|
||||||
forward := &forwardRecord{RemoteAddr: "1.2.3.4:80", Strategy: "fifo", TunnelID: 7}
|
forward := &forwardRecord{RemoteAddr: "1.2.3.4:80", Strategy: "fifo", TunnelID: 7}
|
||||||
node := &nodeRecord{TCPListenAddr: "0.0.0.0", UDPListenAddr: "[::]"}
|
node := &nodeRecord{TCPListenAddr: "0.0.0.0", UDPListenAddr: "[::]"}
|
||||||
services := buildForwardServiceConfigs("1_2_0", forward, nil, node, 22001, "", nil)
|
services := buildForwardServiceConfigs("1_2_0", forward, nil, node, 22001, "", nil, "")
|
||||||
if len(services) != 2 {
|
if len(services) != 2 {
|
||||||
t.Fatalf("expected 2 services, got %d", len(services))
|
t.Fatalf("expected 2 services, got %d", len(services))
|
||||||
}
|
}
|
||||||
@@ -409,7 +409,7 @@ func TestBuildForwardServiceConfigs_DefaultListenAddrWhenBindIPEmpty(t *testing.
|
|||||||
func TestBuildForwardServiceConfigs_BindIPAlreadyContainsPort(t *testing.T) {
|
func TestBuildForwardServiceConfigs_BindIPAlreadyContainsPort(t *testing.T) {
|
||||||
forward := &forwardRecord{RemoteAddr: "1.2.3.4:80", Strategy: "fifo", TunnelID: 7}
|
forward := &forwardRecord{RemoteAddr: "1.2.3.4:80", Strategy: "fifo", TunnelID: 7}
|
||||||
node := &nodeRecord{TCPListenAddr: "[::]", UDPListenAddr: "[::]"}
|
node := &nodeRecord{TCPListenAddr: "[::]", UDPListenAddr: "[::]"}
|
||||||
services := buildForwardServiceConfigs("1_2_0", forward, nil, node, 55555, "3.3.3.3:12345", nil)
|
services := buildForwardServiceConfigs("1_2_0", forward, nil, node, 55555, "3.3.3.3:12345", nil, "")
|
||||||
if len(services) != 2 {
|
if len(services) != 2 {
|
||||||
t.Fatalf("expected 2 services, got %d", len(services))
|
t.Fatalf("expected 2 services, got %d", len(services))
|
||||||
}
|
}
|
||||||
@@ -464,7 +464,7 @@ func TestBuildForwardServiceConfigs_IPv6BindIP(t *testing.T) {
|
|||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
forward := &forwardRecord{RemoteAddr: "1.2.3.4:80", Strategy: "fifo", TunnelID: 7}
|
forward := &forwardRecord{RemoteAddr: "1.2.3.4:80", Strategy: "fifo", TunnelID: 7}
|
||||||
node := &nodeRecord{TCPListenAddr: "[::]", UDPListenAddr: "[::]"}
|
node := &nodeRecord{TCPListenAddr: "[::]", UDPListenAddr: "[::]"}
|
||||||
services := buildForwardServiceConfigs("1_2_0", forward, nil, node, tt.port, tt.bindIP, nil)
|
services := buildForwardServiceConfigs("1_2_0", forward, nil, node, tt.port, tt.bindIP, nil, "")
|
||||||
if len(services) != 2 {
|
if len(services) != 2 {
|
||||||
t.Fatalf("expected 2 services, got %d", len(services))
|
t.Fatalf("expected 2 services, got %d", len(services))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -650,7 +650,7 @@ func (h *Handler) nodeImport(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err := IsSafeRemoteAddr(rURL.Host); err != nil {
|
if err := IsSafeRemoteAddr(rURL.Host); err != nil {
|
||||||
response.WriteJSON(w, response.Err(403, "禁止将远程节点地址设置为内部网络或保留地址"))
|
response.WriteJSON(w, response.Err(403, "禁止将远程节点地址设置为内部网络"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,98 @@
|
|||||||
|
package handler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"go-backend/internal/store/model"
|
||||||
|
"go-backend/internal/store/repo"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestBuildForwardServiceConfigsPreservesProxyProtocolWithInterfaceMetadata(t *testing.T) {
|
||||||
|
forward := &forwardRecord{
|
||||||
|
ID: 1,
|
||||||
|
UserID: 2,
|
||||||
|
TunnelID: 3,
|
||||||
|
RemoteAddr: "1.1.1.1:443",
|
||||||
|
Strategy: "fifo",
|
||||||
|
ProxyProtocol: 2,
|
||||||
|
}
|
||||||
|
tunnel := &tunnelRecord{Type: 1}
|
||||||
|
node := &nodeRecord{
|
||||||
|
InterfaceName: "eth0",
|
||||||
|
TCPListenAddr: "0.0.0.0",
|
||||||
|
UDPListenAddr: "0.0.0.0",
|
||||||
|
}
|
||||||
|
|
||||||
|
services := buildForwardServiceConfigs("1_2_3", forward, tunnel, node, 4001, "", nil, "")
|
||||||
|
if len(services) != 2 {
|
||||||
|
t.Fatalf("expected 2 services, got %d", len(services))
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, service := range services {
|
||||||
|
metadata, ok := service["metadata"].(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
t.Fatalf("expected metadata map, got %T", service["metadata"])
|
||||||
|
}
|
||||||
|
if metadata["interface"] != "eth0" {
|
||||||
|
t.Fatalf("expected interface metadata eth0, got %v", metadata["interface"])
|
||||||
|
}
|
||||||
|
if metadata["proxyProtocol"] != 2 {
|
||||||
|
t.Fatalf("expected proxyProtocol 2, got %v", metadata["proxyProtocol"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRollbackForwardMutationRestoresProxyProtocol(t *testing.T) {
|
||||||
|
r, err := repo.Open(":memory:")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("open repo: %v", err)
|
||||||
|
}
|
||||||
|
defer r.Close()
|
||||||
|
|
||||||
|
now := time.Now().UnixMilli()
|
||||||
|
if err := r.DB().Create(&model.Forward{
|
||||||
|
UserID: 2,
|
||||||
|
UserName: "rollback-user",
|
||||||
|
Name: "rollback-forward",
|
||||||
|
TunnelID: 3,
|
||||||
|
RemoteAddr: "9.9.9.9:443",
|
||||||
|
Strategy: "fifo",
|
||||||
|
CreatedTime: now,
|
||||||
|
UpdatedTime: now,
|
||||||
|
Status: 1,
|
||||||
|
ProxyProtocol: 2,
|
||||||
|
}).Error; err != nil {
|
||||||
|
t.Fatalf("create forward: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
forwardID := mustLastInsertID(t, r, "rollback-forward")
|
||||||
|
if err := r.DB().Model(&model.Forward{}).Where("id = ?", forwardID).Updates(map[string]interface{}{
|
||||||
|
"name": "changed-forward",
|
||||||
|
"proxy_protocol": 0,
|
||||||
|
"updated_time": now + 1,
|
||||||
|
}).Error; err != nil {
|
||||||
|
t.Fatalf("mutate forward: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
h := &Handler{repo: r}
|
||||||
|
h.rollbackForwardMutation(&forwardRecord{
|
||||||
|
ID: forwardID,
|
||||||
|
UserID: 2,
|
||||||
|
UserName: "rollback-user",
|
||||||
|
Name: "rollback-forward",
|
||||||
|
TunnelID: 3,
|
||||||
|
RemoteAddr: "9.9.9.9:443",
|
||||||
|
Strategy: "fifo",
|
||||||
|
Status: 1,
|
||||||
|
ProxyProtocol: 2,
|
||||||
|
}, nil)
|
||||||
|
|
||||||
|
var proxyProtocol int
|
||||||
|
if err := r.DB().Raw("SELECT proxy_protocol FROM forward WHERE id = ?", forwardID).Row().Scan(&proxyProtocol); err != nil {
|
||||||
|
t.Fatalf("query proxy_protocol: %v", err)
|
||||||
|
}
|
||||||
|
if proxyProtocol != 2 {
|
||||||
|
t.Fatalf("expected proxyProtocol restored to 2, got %d", proxyProtocol)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -50,6 +50,7 @@ type Handler struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const monitorTunnelQualityEnabledConfigKey = "monitor_tunnel_quality_enabled"
|
const monitorTunnelQualityEnabledConfigKey = "monitor_tunnel_quality_enabled"
|
||||||
|
const allowLocalRemoteAddrConfigKey = "allow_local_remote_addr"
|
||||||
|
|
||||||
type loginRequest struct {
|
type loginRequest struct {
|
||||||
Username string `json:"username"`
|
Username string `json:"username"`
|
||||||
@@ -1041,6 +1042,19 @@ func (h *Handler) isTunnelQualityMonitoringEnabled() bool {
|
|||||||
return strings.TrimSpace(strings.ToLower(cfg.Value)) != "false"
|
return strings.TrimSpace(strings.ToLower(cfg.Value)) != "false"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *Handler) allowLocalRemoteAddr() bool {
|
||||||
|
if h == nil || h.repo == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg, err := h.repo.GetConfigByName(allowLocalRemoteAddrConfigKey)
|
||||||
|
if err != nil || cfg == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
return strings.TrimSpace(strings.ToLower(cfg.Value)) == "true"
|
||||||
|
}
|
||||||
|
|
||||||
func (h *Handler) userPackage(w http.ResponseWriter, r *http.Request) {
|
func (h *Handler) userPackage(w http.ResponseWriter, r *http.Request) {
|
||||||
if r.Method != http.MethodPost {
|
if r.Method != http.MethodPost {
|
||||||
response.WriteJSON(w, response.ErrDefault("请求失败"))
|
response.WriteJSON(w, response.ErrDefault("请求失败"))
|
||||||
|
|||||||
@@ -121,7 +121,7 @@ func (h *Handler) runHealthChecks(ctx context.Context) {
|
|||||||
|
|
||||||
func (h *Handler) runTunnelQualityProber(ctx context.Context) {
|
func (h *Handler) runTunnelQualityProber(ctx context.Context) {
|
||||||
defer h.jobsWG.Done()
|
defer h.jobsWG.Done()
|
||||||
if h == nil || h.qualityProber == nil || !h.isTunnelQualityMonitoringEnabled() {
|
if h == nil || h.qualityProber == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -68,8 +68,9 @@ func (h *Handler) userCreate(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
roleID := 1
|
roleID := 1
|
||||||
now := time.Now().UnixMilli()
|
now := time.Now().UnixMilli()
|
||||||
|
maxConn := asInt(req["maxConn"], 0)
|
||||||
|
|
||||||
userID, err := h.repo.CreateUser(username, security.MD5(pwd), roleID, expTime, flow, flowResetTime, num, status, now)
|
userID, err := h.repo.CreateUser(username, security.MD5(pwd), roleID, expTime, flow, flowResetTime, num, status, maxConn, now)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
response.WriteJSON(w, response.Err(-2, err.Error()))
|
response.WriteJSON(w, response.Err(-2, err.Error()))
|
||||||
return
|
return
|
||||||
@@ -156,15 +157,16 @@ func (h *Handler) userUpdate(w http.ResponseWriter, r *http.Request) {
|
|||||||
_, hasDailyQuota := req["dailyQuotaGB"]
|
_, hasDailyQuota := req["dailyQuotaGB"]
|
||||||
_, hasMonthlyQuota := req["monthlyQuotaGB"]
|
_, hasMonthlyQuota := req["monthlyQuotaGB"]
|
||||||
now := time.Now().UnixMilli()
|
now := time.Now().UnixMilli()
|
||||||
|
maxConn := asInt(req["maxConn"], 0)
|
||||||
|
|
||||||
pwd := asString(req["pwd"])
|
pwd := asString(req["pwd"])
|
||||||
if strings.TrimSpace(pwd) == "" {
|
if strings.TrimSpace(pwd) == "" {
|
||||||
if err := h.repo.UpdateUserWithoutPassword(id, username, flow, num, expTime, flowResetTime, status, now); err != nil {
|
if err := h.repo.UpdateUserWithoutPassword(id, username, flow, num, expTime, flowResetTime, status, maxConn, now); err != nil {
|
||||||
response.WriteJSON(w, response.Err(-2, err.Error()))
|
response.WriteJSON(w, response.Err(-2, err.Error()))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if err := h.repo.UpdateUserWithPassword(id, username, security.MD5(pwd), flow, num, expTime, flowResetTime, status, now); err != nil {
|
if err := h.repo.UpdateUserWithPassword(id, username, security.MD5(pwd), flow, num, expTime, flowResetTime, status, maxConn, now); err != nil {
|
||||||
response.WriteJSON(w, response.Err(-2, err.Error()))
|
response.WriteJSON(w, response.Err(-2, err.Error()))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -1724,11 +1726,13 @@ func (h *Handler) forwardCreate(w http.ResponseWriter, r *http.Request) {
|
|||||||
response.WriteJSON(w, response.ErrDefault("转发名称和目标地址不能为空"))
|
response.WriteJSON(w, response.ErrDefault("转发名称和目标地址不能为空"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if roleID != 0 {
|
if roleID != 0 && !h.allowLocalRemoteAddr() {
|
||||||
if err := IsSafeRemoteAddr(remoteAddr); err != nil {
|
if err := IsSafeRemoteAddr(remoteAddr); err != nil {
|
||||||
response.WriteJSON(w, response.Err(403, "禁止将目标地址设置为内部网络或保留地址"))
|
response.WriteJSON(w, response.Err(403, err.Error()))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
if roleID != 0 {
|
||||||
if speedIDVal, ok := req["speedId"]; ok && speedIDVal != nil {
|
if speedIDVal, ok := req["speedId"]; ok && speedIDVal != nil {
|
||||||
response.WriteJSON(w, response.Err(-1, "普通用户无法设置限速规则"))
|
response.WriteJSON(w, response.Err(-1, "普通用户无法设置限速规则"))
|
||||||
return
|
return
|
||||||
@@ -1777,7 +1781,10 @@ func (h *Handler) forwardCreate(w http.ResponseWriter, r *http.Request) {
|
|||||||
if userName == "" {
|
if userName == "" {
|
||||||
userName = "user"
|
userName = "user"
|
||||||
}
|
}
|
||||||
forwardID, err := h.repo.CreateForwardTx(userID, userName, name, tunnelID, remoteAddr, defaultString(asString(req["strategy"]), "fifo"), now, inx, entryNodes, port, inIp, nullableInt(speedID))
|
maxConn := asInt(req["maxConn"], 0)
|
||||||
|
proxyProtocol := asInt(req["proxyProtocol"], 0)
|
||||||
|
|
||||||
|
forwardID, err := h.repo.CreateForwardTx(userID, userName, name, tunnelID, remoteAddr, defaultString(asString(req["strategy"]), "fifo"), now, inx, entryNodes, port, inIp, nullableInt(speedID), maxConn, proxyProtocol)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
response.WriteJSON(w, response.Err(-2, err.Error()))
|
response.WriteJSON(w, response.Err(-2, err.Error()))
|
||||||
return
|
return
|
||||||
@@ -1848,9 +1855,9 @@ func (h *Handler) forwardUpdate(w http.ResponseWriter, r *http.Request) {
|
|||||||
if remoteAddr == "" {
|
if remoteAddr == "" {
|
||||||
remoteAddr = forward.RemoteAddr
|
remoteAddr = forward.RemoteAddr
|
||||||
}
|
}
|
||||||
if actorRole != 0 {
|
if actorRole != 0 && !h.allowLocalRemoteAddr() {
|
||||||
if err := IsSafeRemoteAddr(remoteAddr); err != nil {
|
if err := IsSafeRemoteAddr(remoteAddr); err != nil {
|
||||||
response.WriteJSON(w, response.Err(403, "禁止将目标地址设置为内部网络或保留地址"))
|
response.WriteJSON(w, response.Err(403, err.Error()))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1928,7 +1935,10 @@ func (h *Handler) forwardUpdate(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
now := time.Now().UnixMilli()
|
now := time.Now().UnixMilli()
|
||||||
if err := h.repo.UpdateForward(id, name, tunnelID, remoteAddr, strategy, now, newSpeedID); err != nil {
|
maxConn := asInt(req["maxConn"], forward.MaxConn)
|
||||||
|
proxyProtocol := asInt(req["proxyProtocol"], forward.ProxyProtocol)
|
||||||
|
|
||||||
|
if err := h.repo.UpdateForward(id, name, tunnelID, remoteAddr, strategy, now, newSpeedID, maxConn, proxyProtocol); err != nil {
|
||||||
response.WriteJSON(w, response.Err(-2, err.Error()))
|
response.WriteJSON(w, response.Err(-2, err.Error()))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -4080,7 +4090,7 @@ func (h *Handler) rollbackForwardMutation(oldForward *forwardRecord, oldPorts []
|
|||||||
h.repo.RollbackForwardFields(
|
h.repo.RollbackForwardFields(
|
||||||
oldForward.ID, oldForward.UserID, oldForward.UserName, oldForward.Name,
|
oldForward.ID, oldForward.UserID, oldForward.UserName, oldForward.Name,
|
||||||
oldForward.TunnelID, oldForward.RemoteAddr, oldForward.Strategy, oldForward.Status,
|
oldForward.TunnelID, oldForward.RemoteAddr, oldForward.Strategy, oldForward.Status,
|
||||||
oldForward.SpeedID,
|
oldForward.SpeedID, oldForward.MaxConn, oldForward.ProxyProtocol,
|
||||||
time.Now().UnixMilli(),
|
time.Now().UnixMilli(),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -11,11 +11,37 @@ var DisableSafeRemoteAddrCheckForTesting = false
|
|||||||
|
|
||||||
// IsSafeRemoteAddr checks if a given address is safe to connect to (prevents SSRF/Open Proxy).
|
// IsSafeRemoteAddr checks if a given address is safe to connect to (prevents SSRF/Open Proxy).
|
||||||
// It resolves domains to IPs to prevent DNS rebinding attacks pointing to internal networks.
|
// It resolves domains to IPs to prevent DNS rebinding attacks pointing to internal networks.
|
||||||
|
// Supports multiple addresses separated by commas or newlines (one per line).
|
||||||
func IsSafeRemoteAddr(addr string) error {
|
func IsSafeRemoteAddr(addr string) error {
|
||||||
if DisableSafeRemoteAddrCheckForTesting {
|
if DisableSafeRemoteAddrCheckForTesting {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for _, part := range splitRemoteParts(addr) {
|
||||||
|
if err := checkSingleRemoteAddr(part); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// splitRemoteParts splits a multi-address string by commas and newlines.
|
||||||
|
func splitRemoteParts(addr string) []string {
|
||||||
|
addr = strings.ReplaceAll(addr, "\n", ",")
|
||||||
|
addr = strings.ReplaceAll(addr, "\r", ",")
|
||||||
|
parts := strings.Split(addr, ",")
|
||||||
|
out := make([]string, 0, len(parts))
|
||||||
|
for _, part := range parts {
|
||||||
|
part = strings.TrimSpace(part)
|
||||||
|
if part != "" {
|
||||||
|
out = append(out, part)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// checkSingleRemoteAddr validates a single address.
|
||||||
|
func checkSingleRemoteAddr(addr string) error {
|
||||||
host, _, err := net.SplitHostPort(addr)
|
host, _, err := net.SplitHostPort(addr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if strings.Contains(err.Error(), "missing port in address") {
|
if strings.Contains(err.Error(), "missing port in address") {
|
||||||
@@ -27,12 +53,12 @@ func IsSafeRemoteAddr(addr string) error {
|
|||||||
|
|
||||||
ips, err := net.LookupIP(host)
|
ips, err := net.LookupIP(host)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("could not resolve address: %v", err)
|
return fmt.Errorf("could not resolve address %q: %v", addr, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, ip := range ips {
|
for _, ip := range ips {
|
||||||
if ip.IsLoopback() || ip.IsPrivate() || ip.IsLinkLocalUnicast() || ip.IsLinkLocalMulticast() || ip.IsUnspecified() || ip.IsMulticast() {
|
if ip.IsLoopback() || ip.IsPrivate() {
|
||||||
return fmt.Errorf("address resolves to internal or reserved IP: %s", ip.String())
|
return fmt.Errorf("address %q resolves to internal IP: %s", addr, ip.String())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,13 @@ import (
|
|||||||
"go-backend/internal/http/response"
|
"go-backend/internal/http/response"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// failedForward tracks a forward that failed redeployment, for retry.
|
||||||
|
type failedForward struct {
|
||||||
|
id int64
|
||||||
|
forward *forwardRecord
|
||||||
|
err error
|
||||||
|
}
|
||||||
|
|
||||||
const (
|
const (
|
||||||
githubRepo = "Sagit-chu/flvx"
|
githubRepo = "Sagit-chu/flvx"
|
||||||
githubAPIBase = "https://api.github.com"
|
githubAPIBase = "https://api.github.com"
|
||||||
@@ -390,6 +397,9 @@ func (h *Handler) consumeNodePendingUpgradeRedeploy(nodeID int64) bool {
|
|||||||
|
|
||||||
func (h *Handler) onNodeOnline(nodeID int64) {
|
func (h *Handler) onNodeOnline(nodeID int64) {
|
||||||
h.consumeNodePendingUpgradeRedeploy(nodeID)
|
h.consumeNodePendingUpgradeRedeploy(nodeID)
|
||||||
|
// Always redeploy rules on reconnection, not just for pending upgrade nodes.
|
||||||
|
// This handles cases where the node restarted and lost its in-memory config
|
||||||
|
// before persistence had time to flush, or if the panel also restarted.
|
||||||
h.redeployNodeRuntimeAfterUpgrade(nodeID)
|
h.redeployNodeRuntimeAfterUpgrade(nodeID)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -405,6 +415,7 @@ func (h *Handler) redeployNodeRuntimeAfterUpgrade(nodeID int64) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// First pass: deploy everything
|
||||||
tunnelFailed := make(map[int64]struct{})
|
tunnelFailed := make(map[int64]struct{})
|
||||||
for _, tunnelID := range tunnelIDs {
|
for _, tunnelID := range tunnelIDs {
|
||||||
if err := h.redeployTunnelAndForwards(tunnelID); err != nil {
|
if err := h.redeployTunnelAndForwards(tunnelID); err != nil {
|
||||||
@@ -413,6 +424,9 @@ func (h *Handler) redeployNodeRuntimeAfterUpgrade(nodeID int64) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Collect forwards that failed independently (not skipped due to tunnel failure)
|
||||||
|
var failedForwards []failedForward
|
||||||
|
|
||||||
for _, forwardID := range forwardIDs {
|
for _, forwardID := range forwardIDs {
|
||||||
forward, getErr := h.getForwardRecord(forwardID)
|
forward, getErr := h.getForwardRecord(forwardID)
|
||||||
if getErr != nil || forward == nil {
|
if getErr != nil || forward == nil {
|
||||||
@@ -422,7 +436,86 @@ func (h *Handler) redeployNodeRuntimeAfterUpgrade(nodeID int64) {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if err := h.syncForwardServices(forward, "UpdateService", true); err != nil {
|
if err := h.syncForwardServices(forward, "UpdateService", true); err != nil {
|
||||||
|
failedForwards = append(failedForwards, failedForward{id: forwardID, forward: forward, err: err})
|
||||||
fmt.Printf("post-upgrade redeploy: forward %d failed on node %d: %v\n", forwardID, nodeID, err)
|
fmt.Printf("post-upgrade redeploy: forward %d failed on node %d: %v\n", forwardID, nodeID, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Retry failed items with exponential backoff (max 3 attempts)
|
||||||
|
h.retryFailedRedeploys(nodeID, tunnelFailed, failedForwards)
|
||||||
|
}
|
||||||
|
|
||||||
|
// isRetryableError returns true if the error looks transient and worth retrying.
|
||||||
|
func isRetryableError(err error) bool {
|
||||||
|
if err == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
msg := strings.ToLower(err.Error())
|
||||||
|
// Skip non-retryable errors: not-found, already-exists, validation errors
|
||||||
|
if strings.Contains(msg, "not found") || strings.Contains(msg, "不存在") {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if strings.Contains(msg, "already exists") || strings.Contains(msg, "已存在") {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
// Everything else (timeout, connection lost, port in use, etc.) is retryable
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// retryFailedRedeploys retries failed tunnels and forwards with exponential backoff.
|
||||||
|
func (h *Handler) retryFailedRedeploys(nodeID int64, tunnelFailed map[int64]struct{}, failedForwards []failedForward) {
|
||||||
|
if len(tunnelFailed) == 0 && len(failedForwards) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const maxRetries = 3
|
||||||
|
baseDelay := time.Second
|
||||||
|
|
||||||
|
for attempt := 1; attempt <= maxRetries; attempt++ {
|
||||||
|
delay := baseDelay * time.Duration(1<<uint(attempt-1)) // 1s, 2s, 4s
|
||||||
|
time.Sleep(delay)
|
||||||
|
|
||||||
|
// Retry failed tunnels
|
||||||
|
for tunnelID := range tunnelFailed {
|
||||||
|
if err := h.redeployTunnelAndForwards(tunnelID); err == nil {
|
||||||
|
delete(tunnelFailed, tunnelID)
|
||||||
|
fmt.Printf("post-upgrade redeploy retry: tunnel %d succeeded on node %d (attempt %d)\n", tunnelID, nodeID, attempt)
|
||||||
|
} else if !isRetryableError(err) {
|
||||||
|
delete(tunnelFailed, tunnelID) // Non-retryable, don't retry again
|
||||||
|
} else {
|
||||||
|
fmt.Printf("post-upgrade redeploy retry: tunnel %d still failing on node %d (attempt %d): %v\n", tunnelID, nodeID, attempt, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Retry failed forwards
|
||||||
|
var stillFailed []failedForward
|
||||||
|
for _, ff := range failedForwards {
|
||||||
|
if _, skipped := tunnelFailed[ff.forward.TunnelID]; skipped {
|
||||||
|
stillFailed = append(stillFailed, ff) // Tunnel still failed, skip forward
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if err := h.syncForwardServices(ff.forward, "UpdateService", true); err == nil {
|
||||||
|
fmt.Printf("post-upgrade redeploy retry: forward %d succeeded on node %d (attempt %d)\n", ff.id, nodeID, attempt)
|
||||||
|
} else if !isRetryableError(err) {
|
||||||
|
// Non-retryable, drop it
|
||||||
|
} else {
|
||||||
|
stillFailed = append(stillFailed, ff)
|
||||||
|
fmt.Printf("post-upgrade redeploy retry: forward %d still failing on node %d (attempt %d): %v\n", ff.id, nodeID, attempt, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
failedForwards = stillFailed
|
||||||
|
|
||||||
|
if len(tunnelFailed) == 0 && len(failedForwards) == 0 {
|
||||||
|
fmt.Printf("post-upgrade redeploy retry: all items recovered on node %d\n", nodeID)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Final summary
|
||||||
|
for tunnelID := range tunnelFailed {
|
||||||
|
fmt.Printf("post-upgrade redeploy: tunnel %d permanently failed on node %d after retries\n", tunnelID, nodeID)
|
||||||
|
}
|
||||||
|
for _, ff := range failedForwards {
|
||||||
|
fmt.Printf("post-upgrade redeploy: forward %d permanently failed on node %d after retries\n", ff.id, nodeID)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,26 +23,29 @@ type User struct {
|
|||||||
CreatedTime int64 `gorm:"column:created_time;not null"`
|
CreatedTime int64 `gorm:"column:created_time;not null"`
|
||||||
UpdatedTime sql.NullInt64 `gorm:"column:updated_time"`
|
UpdatedTime sql.NullInt64 `gorm:"column:updated_time"`
|
||||||
Status int `gorm:"not null"`
|
Status int `gorm:"not null"`
|
||||||
|
MaxConn int `gorm:"column:max_conn;not null;default:0"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (User) TableName() string { return "user" }
|
func (User) TableName() string { return "user" }
|
||||||
|
|
||||||
// Forward maps to the "forward" table.
|
// Forward maps to the "forward" table.
|
||||||
type Forward struct {
|
type Forward struct {
|
||||||
ID int64 `gorm:"primaryKey;autoIncrement"`
|
ID int64 `gorm:"primaryKey;autoIncrement"`
|
||||||
UserID int64 `gorm:"column:user_id;not null"`
|
UserID int64 `gorm:"column:user_id;not null"`
|
||||||
UserName string `gorm:"column:user_name;type:varchar(100);not null"`
|
UserName string `gorm:"column:user_name;type:varchar(100);not null"`
|
||||||
Name string `gorm:"type:varchar(100);not null"`
|
Name string `gorm:"type:varchar(100);not null"`
|
||||||
TunnelID int64 `gorm:"column:tunnel_id;not null"`
|
TunnelID int64 `gorm:"column:tunnel_id;not null"`
|
||||||
RemoteAddr string `gorm:"column:remote_addr;type:text;not null"`
|
RemoteAddr string `gorm:"column:remote_addr;type:text;not null"`
|
||||||
Strategy string `gorm:"type:varchar(100);not null;default:'fifo'"`
|
Strategy string `gorm:"type:varchar(100);not null;default:'fifo'"`
|
||||||
InFlow int64 `gorm:"not null;default:0"`
|
InFlow int64 `gorm:"not null;default:0"`
|
||||||
OutFlow int64 `gorm:"column:out_flow;not null;default:0"`
|
OutFlow int64 `gorm:"column:out_flow;not null;default:0"`
|
||||||
CreatedTime int64 `gorm:"column:created_time;not null"`
|
CreatedTime int64 `gorm:"column:created_time;not null"`
|
||||||
UpdatedTime int64 `gorm:"column:updated_time;not null"`
|
UpdatedTime int64 `gorm:"column:updated_time;not null"`
|
||||||
Status int `gorm:"not null"`
|
Status int `gorm:"not null"`
|
||||||
Inx int `gorm:"not null;default:0"`
|
Inx int `gorm:"not null;default:0"`
|
||||||
SpeedID sql.NullInt64 `gorm:"column:speed_id"`
|
SpeedID sql.NullInt64 `gorm:"column:speed_id"`
|
||||||
|
MaxConn int `gorm:"column:max_conn;not null;default:0"`
|
||||||
|
ProxyProtocol int `gorm:"column:proxy_protocol;not null;default:0"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (Forward) TableName() string { return "forward" }
|
func (Forward) TableName() string { return "forward" }
|
||||||
@@ -437,9 +440,10 @@ type ForwardBackup struct {
|
|||||||
CreatedTime int64 `json:"createdTime"`
|
CreatedTime int64 `json:"createdTime"`
|
||||||
UpdatedTime int64 `json:"updatedTime"`
|
UpdatedTime int64 `json:"updatedTime"`
|
||||||
Status int `json:"status"`
|
Status int `json:"status"`
|
||||||
Inx int `json:"inx"`
|
Inx int `json:"inx"`
|
||||||
SpeedID *int64 `json:"speedId,omitempty"`
|
SpeedID *int64 `json:"speedId,omitempty"`
|
||||||
ForwardPorts *[]ForwardPortBackup `json:"forwardPorts,omitempty"`
|
ForwardPorts *[]ForwardPortBackup `json:"forwardPorts,omitempty"`
|
||||||
|
ProxyProtocol int `json:"proxyProtocol"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ForwardPortBackup struct {
|
type ForwardPortBackup struct {
|
||||||
@@ -535,8 +539,10 @@ type ForwardRecord struct {
|
|||||||
TunnelID int64
|
TunnelID int64
|
||||||
RemoteAddr string
|
RemoteAddr string
|
||||||
Strategy string
|
Strategy string
|
||||||
Status int
|
Status int
|
||||||
SpeedID sql.NullInt64
|
SpeedID sql.NullInt64
|
||||||
|
MaxConn int
|
||||||
|
ProxyProtocol int
|
||||||
}
|
}
|
||||||
|
|
||||||
// TunnelRecord is a minimal tunnel view used by control plane.
|
// TunnelRecord is a minimal tunnel view used by control plane.
|
||||||
|
|||||||
@@ -295,6 +295,17 @@ func prepareSQLiteLegacyColumns(db *gorm.DB) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if m.HasTable(&model.Forward{}) {
|
||||||
|
for _, field := range []string{"ProxyProtocol"} {
|
||||||
|
if m.HasColumn(&model.Forward{}, field) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if err := m.AddColumn(&model.Forward{}, field); err != nil {
|
||||||
|
return fmt.Errorf("add forward.%s: %w", field, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -714,6 +725,7 @@ func (r *Repository) ListUsers() ([]map[string]interface{}, error) {
|
|||||||
"flowResetTime": u.FlowResetTime, "createdTime": u.CreatedTime,
|
"flowResetTime": u.FlowResetTime, "createdTime": u.CreatedTime,
|
||||||
"updatedTime": nullableInt64(u.UpdatedTime),
|
"updatedTime": nullableInt64(u.UpdatedTime),
|
||||||
"inFlow": u.InFlow, "outFlow": u.OutFlow,
|
"inFlow": u.InFlow, "outFlow": u.OutFlow,
|
||||||
|
"maxConn": u.MaxConn,
|
||||||
}
|
}
|
||||||
if quota := quotaMap[u.ID]; quota != nil {
|
if quota := quotaMap[u.ID]; quota != nil {
|
||||||
item["dailyQuotaGB"] = quota.DailyLimitGB
|
item["dailyQuotaGB"] = quota.DailyLimitGB
|
||||||
@@ -769,11 +781,13 @@ func (r *Repository) ListForwards() ([]map[string]interface{}, error) {
|
|||||||
Status int
|
Status int
|
||||||
Inx int
|
Inx int
|
||||||
SpeedID sql.NullInt64
|
SpeedID sql.NullInt64
|
||||||
|
MaxConn int
|
||||||
|
ProxyProtocol int
|
||||||
}
|
}
|
||||||
|
|
||||||
var rows []fwdRow
|
var rows []fwdRow
|
||||||
err := r.db.Model(&model.Forward{}).
|
err := r.db.Model(&model.Forward{}).
|
||||||
Select("forward.id, forward.user_id, forward.user_name, forward.name, forward.tunnel_id, COALESCE(tunnel.name, '') AS tunnel_name, COALESCE(tunnel.traffic_ratio, 1.0) AS traffic_ratio, forward.remote_addr, COALESCE(forward.strategy, 'fifo') AS strategy, forward.in_flow, forward.out_flow, forward.created_time, forward.status, forward.inx, forward.speed_id").
|
Select("forward.id, forward.user_id, forward.user_name, forward.name, forward.tunnel_id, COALESCE(tunnel.name, '') AS tunnel_name, COALESCE(tunnel.traffic_ratio, 1.0) AS traffic_ratio, forward.remote_addr, COALESCE(forward.strategy, 'fifo') AS strategy, forward.in_flow, forward.out_flow, forward.created_time, forward.status, forward.inx, forward.speed_id, forward.max_conn, forward.proxy_protocol").
|
||||||
Joins("LEFT JOIN tunnel ON tunnel.id = forward.tunnel_id").
|
Joins("LEFT JOIN tunnel ON tunnel.id = forward.tunnel_id").
|
||||||
Order("forward.inx ASC, forward.id ASC").
|
Order("forward.inx ASC, forward.id ASC").
|
||||||
Find(&rows).Error
|
Find(&rows).Error
|
||||||
@@ -795,6 +809,8 @@ func (r *Repository) ListForwards() ([]map[string]interface{}, error) {
|
|||||||
"remoteAddr": row.RemoteAddr, "strategy": row.Strategy,
|
"remoteAddr": row.RemoteAddr, "strategy": row.Strategy,
|
||||||
"inFlow": row.InFlow, "outFlow": row.OutFlow,
|
"inFlow": row.InFlow, "outFlow": row.OutFlow,
|
||||||
"createdTime": row.CreatedTime, "status": row.Status, "inx": int64(row.Inx),
|
"createdTime": row.CreatedTime, "status": row.Status, "inx": int64(row.Inx),
|
||||||
|
"maxConn": row.MaxConn,
|
||||||
|
"proxyProtocol": row.ProxyProtocol,
|
||||||
}
|
}
|
||||||
if row.SpeedID.Valid {
|
if row.SpeedID.Valid {
|
||||||
item["speedId"] = row.SpeedID.Int64
|
item["speedId"] = row.SpeedID.Int64
|
||||||
@@ -1987,6 +2003,7 @@ func (r *Repository) exportForwards() ([]model.ForwardBackup, error) {
|
|||||||
TunnelID: f.TunnelID, RemoteAddr: f.RemoteAddr, Strategy: f.Strategy,
|
TunnelID: f.TunnelID, RemoteAddr: f.RemoteAddr, Strategy: f.Strategy,
|
||||||
InFlow: f.InFlow, OutFlow: f.OutFlow, CreatedTime: f.CreatedTime,
|
InFlow: f.InFlow, OutFlow: f.OutFlow, CreatedTime: f.CreatedTime,
|
||||||
UpdatedTime: f.UpdatedTime, Status: f.Status, Inx: f.Inx,
|
UpdatedTime: f.UpdatedTime, Status: f.Status, Inx: f.Inx,
|
||||||
|
ProxyProtocol: f.ProxyProtocol,
|
||||||
}
|
}
|
||||||
ports, err := r.exportForwardPorts(f.ID)
|
ports, err := r.exportForwardPorts(f.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -2384,12 +2401,13 @@ func importForwards(tx *gorm.DB, forwards []model.ForwardBackup, now int64) (int
|
|||||||
UpdatedTime: now,
|
UpdatedTime: now,
|
||||||
Status: f.Status,
|
Status: f.Status,
|
||||||
Inx: f.Inx,
|
Inx: f.Inx,
|
||||||
|
ProxyProtocol: f.ProxyProtocol,
|
||||||
}
|
}
|
||||||
err := tx.Clauses(clause.OnConflict{
|
err := tx.Clauses(clause.OnConflict{
|
||||||
Columns: []clause.Column{{Name: "id"}},
|
Columns: []clause.Column{{Name: "id"}},
|
||||||
DoUpdates: clause.AssignmentColumns([]string{
|
DoUpdates: clause.AssignmentColumns([]string{
|
||||||
"user_id", "user_name", "name", "tunnel_id", "remote_addr", "strategy",
|
"user_id", "user_name", "name", "tunnel_id", "remote_addr", "strategy",
|
||||||
"in_flow", "out_flow", "updated_time", "status", "inx",
|
"in_flow", "out_flow", "updated_time", "status", "inx", "proxy_protocol",
|
||||||
}),
|
}),
|
||||||
}).Create(&item).Error
|
}).Create(&item).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -124,15 +124,17 @@ func (r *Repository) GetForwardRecord(forwardID int64) (*model.ForwardRecord, er
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
fr := model.ForwardRecord{
|
fr := model.ForwardRecord{
|
||||||
ID: f.ID,
|
ID: f.ID,
|
||||||
UserID: f.UserID,
|
UserID: f.UserID,
|
||||||
UserName: f.UserName,
|
UserName: f.UserName,
|
||||||
Name: f.Name,
|
Name: f.Name,
|
||||||
TunnelID: f.TunnelID,
|
TunnelID: f.TunnelID,
|
||||||
RemoteAddr: f.RemoteAddr,
|
RemoteAddr: f.RemoteAddr,
|
||||||
Strategy: f.Strategy,
|
Strategy: f.Strategy,
|
||||||
Status: f.Status,
|
Status: f.Status,
|
||||||
SpeedID: f.SpeedID,
|
SpeedID: f.SpeedID,
|
||||||
|
MaxConn: f.MaxConn,
|
||||||
|
ProxyProtocol: f.ProxyProtocol,
|
||||||
}
|
}
|
||||||
if strings.TrimSpace(fr.Strategy) == "" {
|
if strings.TrimSpace(fr.Strategy) == "" {
|
||||||
fr.Strategy = "fifo"
|
fr.Strategy = "fifo"
|
||||||
|
|||||||
@@ -0,0 +1,59 @@
|
|||||||
|
package repo
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"go-backend/internal/store/model"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestGetForwardRecordIncludesProxyProtocol(t *testing.T) {
|
||||||
|
r, err := Open(":memory:")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("open repo: %v", err)
|
||||||
|
}
|
||||||
|
defer r.Close()
|
||||||
|
|
||||||
|
now := time.Now().UnixMilli()
|
||||||
|
if err := r.DB().Create(&model.Forward{
|
||||||
|
UserID: 1,
|
||||||
|
UserName: "admin",
|
||||||
|
Name: "proxy-forward",
|
||||||
|
TunnelID: 1,
|
||||||
|
RemoteAddr: "1.1.1.1:443",
|
||||||
|
Strategy: "fifo",
|
||||||
|
CreatedTime: now,
|
||||||
|
UpdatedTime: now,
|
||||||
|
Status: 1,
|
||||||
|
ProxyProtocol: 2,
|
||||||
|
}).Error; err != nil {
|
||||||
|
t.Fatalf("create forward: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
forwardID := mustRepoLastInsertID(t, r)
|
||||||
|
record, err := r.GetForwardRecord(forwardID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GetForwardRecord: %v", err)
|
||||||
|
}
|
||||||
|
if record == nil {
|
||||||
|
t.Fatalf("expected forward record")
|
||||||
|
}
|
||||||
|
if record.ProxyProtocol != 2 {
|
||||||
|
t.Fatalf("expected proxyProtocol 2, got %d", record.ProxyProtocol)
|
||||||
|
}
|
||||||
|
if record.MaxConn != 0 {
|
||||||
|
t.Fatalf("expected default maxConn 0, got %d", record.MaxConn)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func mustRepoLastInsertID(t *testing.T, r *Repository) int64 {
|
||||||
|
t.Helper()
|
||||||
|
var id int64
|
||||||
|
if err := r.DB().Raw("SELECT last_insert_rowid()").Row().Scan(&id); err != nil {
|
||||||
|
t.Fatalf("last_insert_rowid: %v", err)
|
||||||
|
}
|
||||||
|
if id <= 0 {
|
||||||
|
t.Fatalf("invalid last_insert_rowid %d", id)
|
||||||
|
}
|
||||||
|
return id
|
||||||
|
}
|
||||||
@@ -37,7 +37,7 @@ func (r *Repository) UserExistsExcluding(username string, excludeID int64) (bool
|
|||||||
return cnt > 0, err
|
return cnt > 0, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Repository) CreateUser(username, pwdHash string, roleID int, expTime, flow, flowResetTime int64, num, status int, now int64) (int64, error) {
|
func (r *Repository) CreateUser(username, pwdHash string, roleID int, expTime, flow, flowResetTime int64, num, status, maxConn int, now int64) (int64, error) {
|
||||||
if r == nil || r.db == nil {
|
if r == nil || r.db == nil {
|
||||||
return 0, errors.New("repository not initialized")
|
return 0, errors.New("repository not initialized")
|
||||||
}
|
}
|
||||||
@@ -51,6 +51,7 @@ func (r *Repository) CreateUser(username, pwdHash string, roleID int, expTime, f
|
|||||||
OutFlow: 0,
|
OutFlow: 0,
|
||||||
FlowResetTime: flowResetTime,
|
FlowResetTime: flowResetTime,
|
||||||
Num: num,
|
Num: num,
|
||||||
|
MaxConn: maxConn,
|
||||||
CreatedTime: now,
|
CreatedTime: now,
|
||||||
UpdatedTime: sql.NullInt64{Int64: now, Valid: true},
|
UpdatedTime: sql.NullInt64{Int64: now, Valid: true},
|
||||||
Status: status,
|
Status: status,
|
||||||
@@ -73,7 +74,7 @@ func (r *Repository) GetUserRoleID(userID int64) (int, error) {
|
|||||||
return user.RoleID, nil
|
return user.RoleID, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Repository) UpdateUserWithPassword(id int64, username, pwdHash string, flow int64, num int, expTime, flowResetTime int64, status int, now int64) error {
|
func (r *Repository) UpdateUserWithPassword(id int64, username, pwdHash string, flow int64, num int, expTime, flowResetTime int64, status, maxConn int, now int64) error {
|
||||||
if r == nil || r.db == nil {
|
if r == nil || r.db == nil {
|
||||||
return errors.New("repository not initialized")
|
return errors.New("repository not initialized")
|
||||||
}
|
}
|
||||||
@@ -87,11 +88,12 @@ func (r *Repository) UpdateUserWithPassword(id int64, username, pwdHash string,
|
|||||||
"exp_time": expTime,
|
"exp_time": expTime,
|
||||||
"flow_reset_time": flowResetTime,
|
"flow_reset_time": flowResetTime,
|
||||||
"status": status,
|
"status": status,
|
||||||
|
"max_conn": maxConn,
|
||||||
"updated_time": sql.NullInt64{Int64: now, Valid: true},
|
"updated_time": sql.NullInt64{Int64: now, Valid: true},
|
||||||
}).Error
|
}).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Repository) UpdateUserWithoutPassword(id int64, username string, flow int64, num int, expTime, flowResetTime int64, status int, now int64) error {
|
func (r *Repository) UpdateUserWithoutPassword(id int64, username string, flow int64, num int, expTime, flowResetTime int64, status, maxConn int, now int64) error {
|
||||||
if r == nil || r.db == nil {
|
if r == nil || r.db == nil {
|
||||||
return errors.New("repository not initialized")
|
return errors.New("repository not initialized")
|
||||||
}
|
}
|
||||||
@@ -104,6 +106,7 @@ func (r *Repository) UpdateUserWithoutPassword(id int64, username string, flow i
|
|||||||
"exp_time": expTime,
|
"exp_time": expTime,
|
||||||
"flow_reset_time": flowResetTime,
|
"flow_reset_time": flowResetTime,
|
||||||
"status": status,
|
"status": status,
|
||||||
|
"max_conn": maxConn,
|
||||||
"updated_time": sql.NullInt64{Int64: now, Valid: true},
|
"updated_time": sql.NullInt64{Int64: now, Valid: true},
|
||||||
}).Error
|
}).Error
|
||||||
}
|
}
|
||||||
@@ -692,19 +695,21 @@ func (r *Repository) GetMinForwardPort(forwardID int64) sql.NullInt64 {
|
|||||||
return p
|
return p
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Repository) UpdateForward(id int64, name string, tunnelID int64, remoteAddr, strategy string, now int64, speedID interface{}) error {
|
func (r *Repository) UpdateForward(id int64, name string, tunnelID int64, remoteAddr, strategy string, now int64, speedID interface{}, maxConn int, proxyProtocol int) error {
|
||||||
if r == nil || r.db == nil {
|
if r == nil || r.db == nil {
|
||||||
return errors.New("repository not initialized")
|
return errors.New("repository not initialized")
|
||||||
}
|
}
|
||||||
return r.db.Model(&model.Forward{}).
|
return r.db.Model(&model.Forward{}).
|
||||||
Where("id = ?", id).
|
Where("id = ?", id).
|
||||||
Updates(map[string]interface{}{
|
Updates(map[string]interface{}{
|
||||||
"name": name,
|
"name": name,
|
||||||
"tunnel_id": tunnelID,
|
"tunnel_id": tunnelID,
|
||||||
"remote_addr": remoteAddr,
|
"remote_addr": remoteAddr,
|
||||||
"strategy": strategy,
|
"strategy": strategy,
|
||||||
"speed_id": nullInt64FromInterface(speedID),
|
"speed_id": nullInt64FromInterface(speedID),
|
||||||
"updated_time": now,
|
"max_conn": maxConn,
|
||||||
|
"proxy_protocol": proxyProtocol,
|
||||||
|
"updated_time": now,
|
||||||
}).Error
|
}).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -778,7 +783,7 @@ func (r *Repository) UpdateForwardPortBindIP(forwardID, nodeID int64, port int,
|
|||||||
Update("in_ip", sql.NullString{String: inIP, Valid: strings.TrimSpace(inIP) != ""}).Error
|
Update("in_ip", sql.NullString{String: inIP, Valid: strings.TrimSpace(inIP) != ""}).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Repository) RollbackForwardFields(id, userID int64, userName, name string, tunnelID int64, remoteAddr, strategy string, status int, speedID interface{}, now int64) {
|
func (r *Repository) RollbackForwardFields(id, userID int64, userName, name string, tunnelID int64, remoteAddr, strategy string, status int, speedID interface{}, maxConn int, proxyProtocol int, now int64) {
|
||||||
if r == nil || r.db == nil {
|
if r == nil || r.db == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -793,6 +798,8 @@ func (r *Repository) RollbackForwardFields(id, userID int64, userName, name stri
|
|||||||
"strategy": strategy,
|
"strategy": strategy,
|
||||||
"status": status,
|
"status": status,
|
||||||
"speed_id": nullInt64FromInterface(speedID),
|
"speed_id": nullInt64FromInterface(speedID),
|
||||||
|
"max_conn": maxConn,
|
||||||
|
"proxy_protocol": proxyProtocol,
|
||||||
"updated_time": now,
|
"updated_time": now,
|
||||||
}).Error
|
}).Error
|
||||||
}
|
}
|
||||||
@@ -1253,26 +1260,28 @@ func (r *Repository) EnsureUserTunnelGrant(userID, tunnelID int64) (int64, bool,
|
|||||||
return ut.ID, true, nil
|
return ut.ID, true, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Repository) CreateForwardTx(userID int64, userName, name string, tunnelID int64, remoteAddr, strategy string, now int64, inx int, entryNodeIDs []int64, port int, inIp string, speedID interface{}) (int64, error) {
|
func (r *Repository) CreateForwardTx(userID int64, userName, name string, tunnelID int64, remoteAddr, strategy string, now int64, inx int, entryNodeIDs []int64, port int, inIp string, speedID interface{}, maxConn int, proxyProtocol int) (int64, error) {
|
||||||
if r == nil || r.db == nil {
|
if r == nil || r.db == nil {
|
||||||
return 0, errors.New("repository not initialized")
|
return 0, errors.New("repository not initialized")
|
||||||
}
|
}
|
||||||
var forwardID int64
|
var forwardID int64
|
||||||
err := r.db.Transaction(func(tx *gorm.DB) error {
|
err := r.db.Transaction(func(tx *gorm.DB) error {
|
||||||
fwd := model.Forward{
|
fwd := model.Forward{
|
||||||
UserID: userID,
|
UserID: userID,
|
||||||
UserName: userName,
|
UserName: userName,
|
||||||
Name: name,
|
Name: name,
|
||||||
TunnelID: tunnelID,
|
TunnelID: tunnelID,
|
||||||
RemoteAddr: remoteAddr,
|
RemoteAddr: remoteAddr,
|
||||||
Strategy: strategy,
|
Strategy: strategy,
|
||||||
InFlow: 0,
|
InFlow: 0,
|
||||||
OutFlow: 0,
|
OutFlow: 0,
|
||||||
CreatedTime: now,
|
CreatedTime: now,
|
||||||
UpdatedTime: now,
|
UpdatedTime: now,
|
||||||
Status: 1,
|
Status: 1,
|
||||||
Inx: inx,
|
Inx: inx,
|
||||||
SpeedID: nullInt64FromInterface(speedID),
|
MaxConn: maxConn,
|
||||||
|
SpeedID: nullInt64FromInterface(speedID),
|
||||||
|
ProxyProtocol: proxyProtocol,
|
||||||
}
|
}
|
||||||
if err := tx.Create(&fwd).Error; err != nil {
|
if err := tx.Create(&fwd).Error; err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -0,0 +1,163 @@
|
|||||||
|
import re
|
||||||
|
|
||||||
|
with open('internal/http/handler/control_plane.go', 'r') as f:
|
||||||
|
content = f.read()
|
||||||
|
|
||||||
|
# 1. Update ensureLimiterOnNode and add ensureConnLimiterOnNode
|
||||||
|
ensure_conn_limiter = """
|
||||||
|
func (h *Handler) ensureConnLimiterOnNode(nodeID int64, limiterName string, maxConn int) error {
|
||||||
|
\tlimitStr := fmt.Sprintf("$ %d", maxConn)
|
||||||
|
\t
|
||||||
|
\tpayload := map[string]interface{}{
|
||||||
|
\t\t"name": limiterName,
|
||||||
|
\t\t"limits": []string{limitStr},
|
||||||
|
\t}
|
||||||
|
\t
|
||||||
|
\tif _, err := h.sendNodeCommand(nodeID, "AddCLimiters", payload, false, false); err != nil {
|
||||||
|
\t\tif !isAlreadyExistsMessage(err.Error()) {
|
||||||
|
\t\t\treturn fmt.Errorf("连接限制器下发失败: %w", err)
|
||||||
|
\t\t}
|
||||||
|
\t\tupdatePayload := map[string]interface{}{
|
||||||
|
\t\t\t"limiter": limiterName,
|
||||||
|
\t\t\t"data": payload,
|
||||||
|
\t\t}
|
||||||
|
\t\tif _, updateErr := h.sendNodeCommand(nodeID, "UpdateCLimiters", updatePayload, false, false); updateErr != nil {
|
||||||
|
\t\t\treturn fmt.Errorf("连接限制器更新失败: %w", updateErr)
|
||||||
|
\t\t}
|
||||||
|
\t}
|
||||||
|
\treturn nil
|
||||||
|
}
|
||||||
|
"""
|
||||||
|
|
||||||
|
content = content.replace('func (h *Handler) ensureLimiterOnNode(nodeID int64, limiterID int64, speed int) error {\n\tif err := h.upsertLimiterOnNode(nodeID, limiterID, speed); err != nil {\n\t\treturn fmt.Errorf("限速规则下发失败: %w", err)\n\t}\n\n\treturn nil\n}',
|
||||||
|
'func (h *Handler) ensureLimiterOnNode(nodeID int64, limiterID int64, speed int) error {\n\tif err := h.upsertLimiterOnNode(nodeID, limiterID, speed); err != nil {\n\t\treturn fmt.Errorf("限速规则下发失败: %w", err)\n\t}\n\n\treturn nil\n}\n' + ensure_conn_limiter)
|
||||||
|
|
||||||
|
|
||||||
|
# 2. Update buildForwardServiceConfigs declaration
|
||||||
|
content = content.replace(
|
||||||
|
'func buildForwardServiceConfigs(baseName string, forward *forwardRecord, tunnel *tunnelRecord, node *nodeRecord, port int, bindIP string, limiterID *int64) []map[string]interface{} {',
|
||||||
|
'func buildForwardServiceConfigs(baseName string, forward *forwardRecord, tunnel *tunnelRecord, node *nodeRecord, port int, bindIP string, limiterID *int64, cLimiterName string) []map[string]interface{} {'
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
# 3. Inject climiter into generated service
|
||||||
|
service_map_end = """ }
|
||||||
|
if protocol == "udp" {"""
|
||||||
|
service_map_end_new = """ }
|
||||||
|
if cLimiterName != "" {
|
||||||
|
service["climiter"] = cLimiterName
|
||||||
|
}
|
||||||
|
if protocol == "udp" {"""
|
||||||
|
content = content.replace(service_map_end, service_map_end_new)
|
||||||
|
|
||||||
|
|
||||||
|
# 4. Update syncForwardServicesWithWarnings
|
||||||
|
# Find user tunnel resolution
|
||||||
|
resolution = """ serviceBase := buildForwardServiceBaseWithResolvedUserTunnel(forward.ID, forward.UserID, userTunnelID)
|
||||||
|
|
||||||
|
for _, fp := range ports {"""
|
||||||
|
|
||||||
|
resolution_new = """ serviceBase := buildForwardServiceBaseWithResolvedUserTunnel(forward.ID, forward.UserID, userTunnelID)
|
||||||
|
|
||||||
|
user, err := h.repo.GetUserByID(forward.UserID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var cLimiterName string
|
||||||
|
var maxConnToSet int
|
||||||
|
|
||||||
|
if forward.MaxConn > 0 {
|
||||||
|
maxConnToSet = forward.MaxConn
|
||||||
|
cLimiterName = fmt.Sprintf("rule_conn_limit_%d", forward.ID)
|
||||||
|
} else if user != nil && user.MaxConn > 0 {
|
||||||
|
maxConnToSet = user.MaxConn
|
||||||
|
cLimiterName = fmt.Sprintf("user_conn_limit_%d", user.ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, fp := range ports {"""
|
||||||
|
content = content.replace(resolution, resolution_new)
|
||||||
|
|
||||||
|
# Inject ensureConnLimiterOnNode inside loop
|
||||||
|
loop_inner = """ if limiterID != nil && speed != nil {
|
||||||
|
if err := h.ensureLimiterOnNode(fp.NodeID, *limiterID, *speed); err != nil {
|
||||||
|
// If the limiter push fails because the node is offline, skip it with a warning
|
||||||
|
if isNodeOfflineOrTimeoutError(err) {
|
||||||
|
node, _ := h.getNodeRecord(fp.NodeID)
|
||||||
|
nodeName := fmt.Sprintf("%d", fp.NodeID)
|
||||||
|
if node != nil && strings.TrimSpace(node.Name) != "" {
|
||||||
|
nodeName = strings.TrimSpace(node.Name)
|
||||||
|
}
|
||||||
|
warnings = append(warnings, fmt.Sprintf("节点 %s 不在线,已跳过下发", nodeName))
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
node, err := h.getNodeRecord(fp.NodeID)"""
|
||||||
|
|
||||||
|
loop_inner_new = """ if limiterID != nil && speed != nil {
|
||||||
|
if err := h.ensureLimiterOnNode(fp.NodeID, *limiterID, *speed); err != nil {
|
||||||
|
// If the limiter push fails because the node is offline, skip it with a warning
|
||||||
|
if isNodeOfflineOrTimeoutError(err) {
|
||||||
|
node, _ := h.getNodeRecord(fp.NodeID)
|
||||||
|
nodeName := fmt.Sprintf("%d", fp.NodeID)
|
||||||
|
if node != nil && strings.TrimSpace(node.Name) != "" {
|
||||||
|
nodeName = strings.TrimSpace(node.Name)
|
||||||
|
}
|
||||||
|
warnings = append(warnings, fmt.Sprintf("节点 %s 不在线,已跳过下发", nodeName))
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if cLimiterName != "" {
|
||||||
|
if err := h.ensureConnLimiterOnNode(fp.NodeID, cLimiterName, maxConnToSet); err != nil {
|
||||||
|
warnings = append(warnings, fmt.Sprintf("节点 %d 连接限制器下发失败: %v", fp.NodeID, err))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
node, err := h.getNodeRecord(fp.NodeID)"""
|
||||||
|
content = content.replace(loop_inner, loop_inner_new)
|
||||||
|
|
||||||
|
# Update buildForwardServiceConfigs call in syncForwardServicesWithWarnings
|
||||||
|
content = content.replace(
|
||||||
|
'services := buildForwardServiceConfigs(serviceBase, forward, tunnel, node, fp.Port, strings.TrimSpace(fp.InIP), limiterID)',
|
||||||
|
'services := buildForwardServiceConfigs(serviceBase, forward, tunnel, node, fp.Port, strings.TrimSpace(fp.InIP), limiterID, cLimiterName)'
|
||||||
|
)
|
||||||
|
|
||||||
|
# Update fallbackForwardPortToDefaultBind call
|
||||||
|
content = content.replace(
|
||||||
|
'warning, err = h.fallbackForwardPortToDefaultBind(forward, tunnel, node, fp, serviceBase, limiterID)',
|
||||||
|
'warning, err = h.fallbackForwardPortToDefaultBind(forward, tunnel, node, fp, serviceBase, limiterID, cLimiterName)'
|
||||||
|
)
|
||||||
|
|
||||||
|
# 5. Update fallbackForwardPortToDefaultBind declaration and logic
|
||||||
|
content = content.replace(
|
||||||
|
'func (h *Handler) fallbackForwardPortToDefaultBind(forward *forwardRecord, tunnel *tunnelRecord, node *nodeRecord, fp forwardPortRecord, serviceBase string, limiterID *int64) (string, error) {',
|
||||||
|
'func (h *Handler) fallbackForwardPortToDefaultBind(forward *forwardRecord, tunnel *tunnelRecord, node *nodeRecord, fp forwardPortRecord, serviceBase string, limiterID *int64, cLimiterName string) (string, error) {'
|
||||||
|
)
|
||||||
|
|
||||||
|
content = content.replace(
|
||||||
|
'defaultServices := buildForwardServiceConfigs(serviceBase, forward, tunnel, node, fp.Port, "", limiterID)',
|
||||||
|
'defaultServices := buildForwardServiceConfigs(serviceBase, forward, tunnel, node, fp.Port, "", limiterID, cLimiterName)'
|
||||||
|
)
|
||||||
|
|
||||||
|
with open('internal/http/handler/control_plane.go', 'w') as f:
|
||||||
|
f.write(content)
|
||||||
|
|
||||||
|
|
||||||
|
# Update control_plane_test.go
|
||||||
|
with open('internal/http/handler/control_plane_test.go', 'r') as f:
|
||||||
|
test_content = f.read()
|
||||||
|
|
||||||
|
test_content = re.sub(
|
||||||
|
r'buildForwardServiceConfigs\((.*?),(.*?),(.*?),(.*?),(.*?),(.*?),(.*?)\)',
|
||||||
|
r'buildForwardServiceConfigs(\1,\2,\3,\4,\5,\6,\7, "")',
|
||||||
|
test_content
|
||||||
|
)
|
||||||
|
|
||||||
|
with open('internal/http/handler/control_plane_test.go', 'w') as f:
|
||||||
|
f.write(test_content)
|
||||||
@@ -0,0 +1,219 @@
|
|||||||
|
package contract_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"go-backend/internal/auth"
|
||||||
|
"go-backend/internal/http/handler"
|
||||||
|
"go-backend/internal/http/response"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestForwardLocalRemoteAddrToggleContracts(t *testing.T) {
|
||||||
|
handler.DisableSafeRemoteAddrCheckForTesting = false
|
||||||
|
t.Cleanup(func() {
|
||||||
|
handler.DisableSafeRemoteAddrCheckForTesting = true
|
||||||
|
})
|
||||||
|
|
||||||
|
secret := "contract-jwt-secret"
|
||||||
|
router, repo := setupContractRouter(t, secret)
|
||||||
|
server := httptest.NewServer(router)
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
now := time.Now().UnixMilli()
|
||||||
|
if err := repo.DB().Exec(`
|
||||||
|
INSERT INTO user(id, user, pwd, role_id, exp_time, flow, in_flow, out_flow, flow_reset_time, num, created_time, updated_time, status)
|
||||||
|
VALUES(2, 'local_remote_user', 'pwd', 1, 2727251700000, 99999, 0, 0, 1, 99999, ?, ?, 1)
|
||||||
|
`, now, now).Error; err != nil {
|
||||||
|
t.Fatalf("insert user: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := repo.DB().Exec(`
|
||||||
|
INSERT INTO tunnel(name, traffic_ratio, type, protocol, flow, created_time, updated_time, status, in_ip, inx)
|
||||||
|
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
|
`, "local-remote-tunnel", 1.0, 1, "tls", 99999, now, now, 1, nil, 0).Error; err != nil {
|
||||||
|
t.Fatalf("insert tunnel: %v", err)
|
||||||
|
}
|
||||||
|
tunnelID := mustLastInsertID(t, repo, "local-remote-tunnel")
|
||||||
|
|
||||||
|
if err := repo.DB().Exec(`
|
||||||
|
INSERT INTO node(name, secret, server_ip, server_ip_v4, server_ip_v6, port, interface_name, version, http, tls, socks, created_time, updated_time, status, tcp_listen_addr, udp_listen_addr, inx)
|
||||||
|
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
|
`, "local-remote-entry", "local-remote-secret", "10.60.0.1", "10.60.0.1", "", "31000-31010", "", "v1", 1, 1, 1, now, now, 1, "[::]", "[::]", 0).Error; err != nil {
|
||||||
|
t.Fatalf("insert node: %v", err)
|
||||||
|
}
|
||||||
|
entryNodeID := mustLastInsertID(t, repo, "local-remote-entry")
|
||||||
|
|
||||||
|
if err := repo.DB().Exec(`
|
||||||
|
INSERT INTO chain_tunnel(tunnel_id, chain_type, node_id, port, strategy, inx, protocol)
|
||||||
|
VALUES(?, 1, ?, 31001, 'round', 1, 'tls')
|
||||||
|
`, tunnelID, entryNodeID).Error; err != nil {
|
||||||
|
t.Fatalf("insert chain_tunnel: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := repo.DB().Exec(`
|
||||||
|
INSERT INTO user_tunnel(id, user_id, tunnel_id, speed_id, num, flow, in_flow, out_flow, flow_reset_time, exp_time, status)
|
||||||
|
VALUES(601, 2, ?, NULL, 999, 99999, 0, 0, 1, 2727251700000, 1)
|
||||||
|
`, tunnelID).Error; err != nil {
|
||||||
|
t.Fatalf("insert user_tunnel: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
userToken, err := auth.GenerateToken(2, "local_remote_user", 1, secret)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("generate user token: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
stopNode := startMockNodeSession(t, server.URL, "local-remote-secret")
|
||||||
|
defer stopNode()
|
||||||
|
waitNodeStatus(t, repo, entryNodeID, 1)
|
||||||
|
|
||||||
|
t.Run("local remote address is rejected on create when toggle is off", func(t *testing.T) {
|
||||||
|
createPayload := map[string]interface{}{
|
||||||
|
"name": "deny-local-create",
|
||||||
|
"tunnelId": tunnelID,
|
||||||
|
"remoteAddr": "127.0.0.1:8080",
|
||||||
|
"strategy": "fifo",
|
||||||
|
}
|
||||||
|
createBody, err := json.Marshal(createPayload)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("marshal create payload: %v", err)
|
||||||
|
}
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/api/v1/forward/create", bytes.NewReader(createBody))
|
||||||
|
req.Header.Set("Authorization", userToken)
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
res := httptest.NewRecorder()
|
||||||
|
router.ServeHTTP(res, req)
|
||||||
|
|
||||||
|
var out response.R
|
||||||
|
if err := json.NewDecoder(res.Body).Decode(&out); err != nil {
|
||||||
|
t.Fatalf("decode response: %v", err)
|
||||||
|
}
|
||||||
|
if out.Code == 0 {
|
||||||
|
t.Fatalf("expected local remote address to be rejected when toggle is off")
|
||||||
|
}
|
||||||
|
if !strings.Contains(out.Msg, "internal IP") && !strings.Contains(out.Msg, "内部") {
|
||||||
|
t.Fatalf("expected internal IP error, got code=%d msg=%q", out.Code, out.Msg)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("local remote address is allowed on create when toggle is on", func(t *testing.T) {
|
||||||
|
if err := repo.DB().Exec(`
|
||||||
|
INSERT INTO vite_config(name, value, time)
|
||||||
|
VALUES(?, ?, ?)
|
||||||
|
ON CONFLICT(name) DO UPDATE SET value = excluded.value, time = excluded.time
|
||||||
|
`, "allow_local_remote_addr", "true", time.Now().UnixMilli()).Error; err != nil {
|
||||||
|
t.Fatalf("enable allow_local_remote_addr: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
createPayload := map[string]interface{}{
|
||||||
|
"name": "allow-local-create",
|
||||||
|
"tunnelId": tunnelID,
|
||||||
|
"remoteAddr": "127.0.0.1:8080",
|
||||||
|
"strategy": "fifo",
|
||||||
|
}
|
||||||
|
createBody, err := json.Marshal(createPayload)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("marshal create payload: %v", err)
|
||||||
|
}
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/api/v1/forward/create", bytes.NewReader(createBody))
|
||||||
|
req.Header.Set("Authorization", userToken)
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
res := httptest.NewRecorder()
|
||||||
|
router.ServeHTTP(res, req)
|
||||||
|
assertCode(t, res, 0)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("local remote address is rejected on update when toggle is off", func(t *testing.T) {
|
||||||
|
if err := repo.DB().Exec(`
|
||||||
|
INSERT INTO vite_config(name, value, time)
|
||||||
|
VALUES(?, ?, ?)
|
||||||
|
ON CONFLICT(name) DO UPDATE SET value = excluded.value, time = excluded.time
|
||||||
|
`, "allow_local_remote_addr", "false", time.Now().UnixMilli()).Error; err != nil {
|
||||||
|
t.Fatalf("disable allow_local_remote_addr: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
createPayload := map[string]interface{}{
|
||||||
|
"name": "safe-remote-before-update",
|
||||||
|
"tunnelId": tunnelID,
|
||||||
|
"remoteAddr": "8.8.8.8:53",
|
||||||
|
"strategy": "fifo",
|
||||||
|
}
|
||||||
|
createBody, err := json.Marshal(createPayload)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("marshal safe create payload: %v", err)
|
||||||
|
}
|
||||||
|
createReq := httptest.NewRequest(http.MethodPost, "/api/v1/forward/create", bytes.NewReader(createBody))
|
||||||
|
createReq.Header.Set("Authorization", userToken)
|
||||||
|
createReq.Header.Set("Content-Type", "application/json")
|
||||||
|
createRes := httptest.NewRecorder()
|
||||||
|
router.ServeHTTP(createRes, createReq)
|
||||||
|
assertCode(t, createRes, 0)
|
||||||
|
|
||||||
|
forwardID := mustLastInsertID(t, repo, "safe-remote-before-update")
|
||||||
|
updatePayload := map[string]interface{}{
|
||||||
|
"id": forwardID,
|
||||||
|
"name": "safe-remote-before-update",
|
||||||
|
"tunnelId": tunnelID,
|
||||||
|
"remoteAddr": "127.0.0.1:8081",
|
||||||
|
"strategy": "fifo",
|
||||||
|
}
|
||||||
|
updateBody, err := json.Marshal(updatePayload)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("marshal update payload: %v", err)
|
||||||
|
}
|
||||||
|
updateReq := httptest.NewRequest(http.MethodPost, "/api/v1/forward/update", bytes.NewReader(updateBody))
|
||||||
|
updateReq.Header.Set("Authorization", userToken)
|
||||||
|
updateReq.Header.Set("Content-Type", "application/json")
|
||||||
|
updateRes := httptest.NewRecorder()
|
||||||
|
router.ServeHTTP(updateRes, updateReq)
|
||||||
|
|
||||||
|
var out response.R
|
||||||
|
if err := json.NewDecoder(updateRes.Body).Decode(&out); err != nil {
|
||||||
|
t.Fatalf("decode update response: %v", err)
|
||||||
|
}
|
||||||
|
if out.Code == 0 {
|
||||||
|
t.Fatalf("expected local remote address to be rejected on update when toggle is off")
|
||||||
|
}
|
||||||
|
if !strings.Contains(out.Msg, "internal IP") && !strings.Contains(out.Msg, "内部") {
|
||||||
|
t.Fatalf("expected internal IP error on update, got code=%d msg=%q", out.Code, out.Msg)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("local remote address is allowed on update when toggle is on", func(t *testing.T) {
|
||||||
|
if err := repo.DB().Exec(`
|
||||||
|
INSERT INTO vite_config(name, value, time)
|
||||||
|
VALUES(?, ?, ?)
|
||||||
|
ON CONFLICT(name) DO UPDATE SET value = excluded.value, time = excluded.time
|
||||||
|
`, "allow_local_remote_addr", "true", time.Now().UnixMilli()).Error; err != nil {
|
||||||
|
t.Fatalf("enable allow_local_remote_addr: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var forwardID int64
|
||||||
|
if err := repo.DB().Raw(`SELECT id FROM forward WHERE name = ? ORDER BY id DESC LIMIT 1`, "safe-remote-before-update").Row().Scan(&forwardID); err != nil {
|
||||||
|
t.Fatalf("query forward id: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
updatePayload := map[string]interface{}{
|
||||||
|
"id": forwardID,
|
||||||
|
"name": "safe-remote-before-update",
|
||||||
|
"tunnelId": tunnelID,
|
||||||
|
"remoteAddr": "127.0.0.1:8081",
|
||||||
|
"strategy": "fifo",
|
||||||
|
}
|
||||||
|
updateBody, err := json.Marshal(updatePayload)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("marshal update payload: %v", err)
|
||||||
|
}
|
||||||
|
updateReq := httptest.NewRequest(http.MethodPost, "/api/v1/forward/update", bytes.NewReader(updateBody))
|
||||||
|
updateReq.Header.Set("Authorization", userToken)
|
||||||
|
updateReq.Header.Set("Content-Type", "application/json")
|
||||||
|
updateRes := httptest.NewRecorder()
|
||||||
|
router.ServeHTTP(updateRes, updateReq)
|
||||||
|
assertCode(t, updateRes, 0)
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -0,0 +1,326 @@
|
|||||||
|
package contract_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"net/url"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/gorilla/websocket"
|
||||||
|
|
||||||
|
"go-backend/internal/auth"
|
||||||
|
"go-backend/internal/http/response"
|
||||||
|
"go-backend/internal/security"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestMaxConnLimit(t *testing.T) {
|
||||||
|
secret := "contract-jwt-secret"
|
||||||
|
router, r := setupContractRouter(t, secret)
|
||||||
|
server := httptest.NewServer(router)
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
adminToken, err := auth.GenerateToken(1, "admin_user", 0, secret)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("generate admin token: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
now := time.Now().UnixMilli()
|
||||||
|
if err := r.DB().Exec(`
|
||||||
|
INSERT INTO tunnel(name, traffic_ratio, type, protocol, flow, created_time, updated_time, status, in_ip, inx)
|
||||||
|
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
|
`, "max-conn-tunnel", 1.0, 1, "tls", 99999, now, now, 1, nil, 0).Error; err != nil {
|
||||||
|
t.Fatalf("insert tunnel: %v", err)
|
||||||
|
}
|
||||||
|
var tunnelID int64
|
||||||
|
if err := r.DB().Raw("SELECT id FROM tunnel WHERE name = ?", "max-conn-tunnel").Scan(&tunnelID).Error; err != nil {
|
||||||
|
t.Fatalf("get tunnel ID: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := r.DB().Exec(`
|
||||||
|
INSERT INTO node(name, secret, server_ip, server_ip_v4, server_ip_v6, port, interface_name, version, http, tls, socks, created_time, updated_time, status, tcp_listen_addr, udp_listen_addr, inx)
|
||||||
|
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
|
`, "max-conn-node", "max-conn-secret", "10.20.0.1", "10.20.0.1", "", "32000-32010", "", "v1", 1, 1, 1, now, now, 1, "[::]", "[::]", 0).Error; err != nil {
|
||||||
|
t.Fatalf("insert node: %v", err)
|
||||||
|
}
|
||||||
|
var nodeID int64
|
||||||
|
if err := r.DB().Raw("SELECT id FROM node WHERE name = ?", "max-conn-node").Scan(&nodeID).Error; err != nil {
|
||||||
|
t.Fatalf("get node ID: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := r.DB().Exec(`
|
||||||
|
INSERT INTO chain_tunnel(tunnel_id, chain_type, node_id, port, strategy, inx, protocol)
|
||||||
|
VALUES(?, 1, ?, 32001, 'round', 1, 'tls')
|
||||||
|
`, tunnelID, nodeID).Error; err != nil {
|
||||||
|
t.Fatalf("insert chain_tunnel: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := r.DB().Exec(`
|
||||||
|
INSERT INTO user_tunnel(user_id, tunnel_id, num, flow, in_flow, out_flow, flow_reset_time, exp_time, status)
|
||||||
|
VALUES(1, ?, 10, 99999, 0, 0, 1, ?, 1)
|
||||||
|
`, tunnelID, now + 365*24*3600*1000).Error; err != nil { t.Fatalf("insert user_tunnel: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var commandMu sync.Mutex
|
||||||
|
receivedCommands := make([]string, 0)
|
||||||
|
var addCLimitersData json.RawMessage
|
||||||
|
var updateCLimitersData json.RawMessage
|
||||||
|
|
||||||
|
stopNode := startMockSessionForMaxConn(t, server.URL, "max-conn-secret", func(cmdType string, data json.RawMessage) (bool, string) {
|
||||||
|
commandMu.Lock()
|
||||||
|
defer commandMu.Unlock()
|
||||||
|
receivedCommands = append(receivedCommands, cmdType)
|
||||||
|
|
||||||
|
if cmdType == "AddCLimiters" {
|
||||||
|
addCLimitersData = append([]byte(nil), data...)
|
||||||
|
return true, "already exists"
|
||||||
|
}
|
||||||
|
if cmdType == "UpdateCLimiters" {
|
||||||
|
updateCLimitersData = append([]byte(nil), data...)
|
||||||
|
}
|
||||||
|
|
||||||
|
return false, ""
|
||||||
|
})
|
||||||
|
defer stopNode()
|
||||||
|
|
||||||
|
waitNodeStatus(t, r, nodeID, 1)
|
||||||
|
|
||||||
|
payload := map[string]interface{}{
|
||||||
|
"name": "max-conn-forward",
|
||||||
|
"tunnelId": tunnelID,
|
||||||
|
"remoteAddr": "1.1.1.1:443",
|
||||||
|
"strategy": "fifo",
|
||||||
|
"maxConn": 42,
|
||||||
|
"proxyProtocol": 2,
|
||||||
|
}
|
||||||
|
body, err := json.Marshal(payload)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("marshal payload: %v", err)
|
||||||
|
}
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/api/v1/forward/create", bytes.NewReader(body))
|
||||||
|
req.Header.Set("Authorization", adminToken)
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
res := httptest.NewRecorder()
|
||||||
|
router.ServeHTTP(res, req)
|
||||||
|
|
||||||
|
var out response.R
|
||||||
|
if err := json.NewDecoder(res.Body).Decode(&out); err != nil {
|
||||||
|
t.Fatalf("decode response: %v", err)
|
||||||
|
}
|
||||||
|
if out.Code != 0 {
|
||||||
|
t.Fatalf("expected create success, got code=%d msg=%s", out.Code, out.Msg)
|
||||||
|
}
|
||||||
|
|
||||||
|
var forwardID int64
|
||||||
|
if err := r.DB().Raw("SELECT id FROM forward WHERE name = ?", "max-conn-forward").Scan(&forwardID).Error; err != nil {
|
||||||
|
t.Fatalf("get forward ID: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
listOut := requestContractEnvelope(t, router, adminToken, "/api/v1/forward/list", nil)
|
||||||
|
if listOut.Code != 0 {
|
||||||
|
t.Fatalf("expected /forward/list success, got code=%d msg=%s", listOut.Code, listOut.Msg)
|
||||||
|
}
|
||||||
|
|
||||||
|
rows := mustContractSlice(t, listOut.Data, "forward list")
|
||||||
|
var target map[string]interface{}
|
||||||
|
for _, row := range rows {
|
||||||
|
item, ok := row.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
t.Fatalf("expected forward item to be object, got %T", row)
|
||||||
|
}
|
||||||
|
idVal, ok := item["id"].(float64)
|
||||||
|
if !ok {
|
||||||
|
t.Fatalf("expected forward id to be float64, got %T", item["id"])
|
||||||
|
}
|
||||||
|
if int64(idVal) == forwardID {
|
||||||
|
target = item
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if target == nil {
|
||||||
|
t.Fatalf("forward %d not found in /forward/list response", forwardID)
|
||||||
|
}
|
||||||
|
|
||||||
|
maxConnVal, ok := target["maxConn"].(float64)
|
||||||
|
if !ok {
|
||||||
|
t.Fatalf("expected maxConn to be float64, got %T (%v)", target["maxConn"], target["maxConn"])
|
||||||
|
}
|
||||||
|
if int(maxConnVal) != 42 {
|
||||||
|
t.Fatalf("expected maxConn 42 in /forward/list, got %v", maxConnVal)
|
||||||
|
}
|
||||||
|
|
||||||
|
proxyProtocolVal, ok := target["proxyProtocol"].(float64)
|
||||||
|
if !ok {
|
||||||
|
t.Fatalf("expected proxyProtocol to be float64, got %T (%v)", target["proxyProtocol"], target["proxyProtocol"])
|
||||||
|
}
|
||||||
|
if int(proxyProtocolVal) != 2 {
|
||||||
|
t.Fatalf("expected proxyProtocol 2 in /forward/list, got %v", proxyProtocolVal)
|
||||||
|
}
|
||||||
|
|
||||||
|
commandMu.Lock()
|
||||||
|
defer commandMu.Unlock()
|
||||||
|
|
||||||
|
hasAdd := false
|
||||||
|
hasUpdate := false
|
||||||
|
for _, cmd := range receivedCommands {
|
||||||
|
if cmd == "AddCLimiters" {
|
||||||
|
hasAdd = true
|
||||||
|
}
|
||||||
|
if cmd == "UpdateCLimiters" {
|
||||||
|
hasUpdate = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !hasAdd {
|
||||||
|
t.Fatalf("expected AddCLimiters to be sent, but it was not. Received: %v", receivedCommands)
|
||||||
|
}
|
||||||
|
if !hasUpdate {
|
||||||
|
t.Fatalf("expected UpdateCLimiters to be sent after AddCLimiters failed with already exists. Received: %v", receivedCommands)
|
||||||
|
}
|
||||||
|
|
||||||
|
expectedName := fmt.Sprintf("rule_conn_limit_%d", forwardID)
|
||||||
|
|
||||||
|
// verify payload for AddCLimiters
|
||||||
|
var addData map[string]interface{}
|
||||||
|
if err := json.Unmarshal(addCLimitersData, &addData); err != nil {
|
||||||
|
t.Fatalf("unmarshal AddCLimiters data: %v", err)
|
||||||
|
}
|
||||||
|
if addData["name"] != expectedName {
|
||||||
|
t.Fatalf("expected limiter name %s, got %v", expectedName, addData["name"])
|
||||||
|
}
|
||||||
|
if limits, ok := addData["limits"].([]interface{}); ok {
|
||||||
|
if len(limits) != 1 || limits[0] != "$ 42" {
|
||||||
|
t.Fatalf("expected limits to contain '$ 42', got %v", limits)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
t.Fatalf("invalid limits type in AddCLimiters data: %v", addData)
|
||||||
|
}
|
||||||
|
|
||||||
|
// verify payload for UpdateCLimiters
|
||||||
|
var updateData map[string]interface{}
|
||||||
|
if err := json.Unmarshal(updateCLimitersData, &updateData); err != nil {
|
||||||
|
t.Fatalf("unmarshal UpdateCLimiters data: %v", err)
|
||||||
|
}
|
||||||
|
if updateData["limiter"] != expectedName {
|
||||||
|
t.Fatalf("expected update limiter name %s, got %v", expectedName, updateData["limiter"])
|
||||||
|
}
|
||||||
|
nestedData, ok := updateData["data"].(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
t.Fatalf("expected nested 'data' in UpdateCLimiters, got %v", updateData)
|
||||||
|
}
|
||||||
|
if nestedData["name"] != expectedName {
|
||||||
|
t.Fatalf("expected nested name %s, got %v", expectedName, nestedData["name"])
|
||||||
|
}
|
||||||
|
if nestedLimits, ok := nestedData["limits"].([]interface{}); ok {
|
||||||
|
if len(nestedLimits) != 1 || nestedLimits[0] != "$ 42" {
|
||||||
|
t.Fatalf("expected nested limits to contain '$ 42', got %v", nestedLimits)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
t.Fatalf("invalid limits type in UpdateCLimiters nested data: %v", nestedData)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func startMockSessionForMaxConn(t *testing.T, baseURL string, nodeSecret string, onCommand func(cmdType string, data json.RawMessage) (bool, string)) func() {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
u, err := url.Parse(baseURL)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse provider url: %v", err)
|
||||||
|
}
|
||||||
|
if strings.EqualFold(u.Scheme, "https") {
|
||||||
|
u.Scheme = "wss"
|
||||||
|
} else {
|
||||||
|
u.Scheme = "ws"
|
||||||
|
}
|
||||||
|
u.Path = "/system-info"
|
||||||
|
q := u.Query()
|
||||||
|
q.Set("type", "1")
|
||||||
|
q.Set("secret", nodeSecret)
|
||||||
|
q.Set("version", "v1")
|
||||||
|
q.Set("http", "1")
|
||||||
|
q.Set("tls", "1")
|
||||||
|
q.Set("socks", "1")
|
||||||
|
u.RawQuery = q.Encode()
|
||||||
|
|
||||||
|
conn, _, err := websocket.DefaultDialer.Dial(u.String(), nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("dial mock node websocket: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
for {
|
||||||
|
_, raw, readErr := conn.ReadMessage()
|
||||||
|
if readErr != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
plain := raw
|
||||||
|
var wrap struct {
|
||||||
|
Encrypted bool `json:"encrypted"`
|
||||||
|
Data string `json:"data"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(raw, &wrap); err == nil && wrap.Encrypted && strings.TrimSpace(wrap.Data) != "" {
|
||||||
|
crypto, cryptoErr := security.NewAESCrypto(nodeSecret)
|
||||||
|
if cryptoErr == nil {
|
||||||
|
if dec, decErr := crypto.Decrypt(wrap.Data); decErr == nil {
|
||||||
|
plain = []byte(dec)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var cmd struct {
|
||||||
|
Type string `json:"type"`
|
||||||
|
RequestID string `json:"requestId"`
|
||||||
|
Data json.RawMessage `json:"data"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(plain, &cmd); err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(cmd.RequestID) == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
shouldFail := false
|
||||||
|
failMsg := ""
|
||||||
|
if onCommand != nil {
|
||||||
|
shouldFail, failMsg = onCommand(strings.TrimSpace(cmd.Type), cmd.Data)
|
||||||
|
}
|
||||||
|
|
||||||
|
respType := fmt.Sprintf("%sResponse", cmd.Type)
|
||||||
|
respPayload := map[string]interface{}{
|
||||||
|
"type": respType,
|
||||||
|
"success": !shouldFail,
|
||||||
|
"message": "OK",
|
||||||
|
"requestId": cmd.RequestID,
|
||||||
|
}
|
||||||
|
if shouldFail {
|
||||||
|
if strings.TrimSpace(failMsg) == "" {
|
||||||
|
failMsg = "mock command failed"
|
||||||
|
}
|
||||||
|
respPayload["message"] = failMsg
|
||||||
|
}
|
||||||
|
|
||||||
|
respBytes, err := json.Marshal(respPayload)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
_ = conn.WriteMessage(websocket.TextMessage, respBytes)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
var stopOnce sync.Once
|
||||||
|
return func() {
|
||||||
|
stopOnce.Do(func() {
|
||||||
|
_ = conn.Close()
|
||||||
|
wg.Wait()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -349,9 +349,9 @@ func TestBackupExportImportRestoreContracts(t *testing.T) {
|
|||||||
tunnelID := mustLastInsertID(t, r, "backup-forward-tunnel")
|
tunnelID := mustLastInsertID(t, r, "backup-forward-tunnel")
|
||||||
|
|
||||||
if err := r.DB().Exec(`
|
if err := r.DB().Exec(`
|
||||||
INSERT INTO forward(user_id, user_name, name, tunnel_id, remote_addr, strategy, in_flow, out_flow, created_time, updated_time, status, inx)
|
INSERT INTO forward(user_id, user_name, name, tunnel_id, remote_addr, strategy, in_flow, out_flow, created_time, updated_time, status, inx, proxy_protocol)
|
||||||
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
`, 1, "admin_user", "backup-forward", tunnelID, "127.0.0.1:9000", "fifo", 0, 0, now, now, 1, 88).Error; err != nil {
|
`, 1, "admin_user", "backup-forward", tunnelID, "127.0.0.1:9000", "fifo", 0, 0, now, now, 1, 88, 2).Error; err != nil {
|
||||||
t.Fatalf("seed forward for backup: %v", err)
|
t.Fatalf("seed forward for backup: %v", err)
|
||||||
}
|
}
|
||||||
forwardID := mustLastInsertID(t, r, "backup-forward")
|
forwardID := mustLastInsertID(t, r, "backup-forward")
|
||||||
@@ -412,6 +412,9 @@ func TestBackupExportImportRestoreContracts(t *testing.T) {
|
|||||||
if !ok {
|
if !ok {
|
||||||
t.Fatalf("expected forwardPorts for forward %d in payload", forwardID)
|
t.Fatalf("expected forwardPorts for forward %d in payload", forwardID)
|
||||||
}
|
}
|
||||||
|
if proxyProtocol, ok := forwardMap["proxyProtocol"].(float64); !ok || int(proxyProtocol) != 2 {
|
||||||
|
t.Fatalf("expected exported proxyProtocol 2 for forward %d, got %v", forwardID, forwardMap["proxyProtocol"])
|
||||||
|
}
|
||||||
for _, p := range portsRaw {
|
for _, p := range portsRaw {
|
||||||
portMap, ok := p.(map[string]interface{})
|
portMap, ok := p.(map[string]interface{})
|
||||||
if !ok {
|
if !ok {
|
||||||
@@ -475,6 +478,14 @@ func TestBackupExportImportRestoreContracts(t *testing.T) {
|
|||||||
t.Fatalf("expected forward_port node=%d port=%d after import, got %v", nodeID, port, after)
|
t.Fatalf("expected forward_port node=%d port=%d after import, got %v", nodeID, port, after)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var proxyProtocol int
|
||||||
|
if err := r.DB().Raw(`SELECT proxy_protocol FROM forward WHERE id = ?`, forwardID).Row().Scan(&proxyProtocol); err != nil {
|
||||||
|
t.Fatalf("query proxy_protocol after import: %v", err)
|
||||||
|
}
|
||||||
|
if proxyProtocol != 2 {
|
||||||
|
t.Fatalf("expected proxy_protocol 2 after import, got %d", proxyProtocol)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("backup export tolerates nullable legacy tunnel chain fields", func(t *testing.T) {
|
t.Run("backup export tolerates nullable legacy tunnel chain fields", func(t *testing.T) {
|
||||||
|
|||||||
@@ -0,0 +1,59 @@
|
|||||||
|
package contract_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"go-backend/internal/auth"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestUserListReturnsMaxConn(t *testing.T) {
|
||||||
|
secret := "contract-jwt-secret"
|
||||||
|
router, repo := setupContractRouter(t, secret)
|
||||||
|
now := time.Now().UnixMilli()
|
||||||
|
|
||||||
|
if err := repo.DB().Exec(`
|
||||||
|
INSERT INTO user(id, user, pwd, role_id, exp_time, flow, in_flow, out_flow, flow_reset_time, num, max_conn, created_time, updated_time, status)
|
||||||
|
VALUES(2, 'max_conn_user', 'pwd', 1, 2727251700000, 99999, 0, 0, 1, 10, 37, ?, ?, 1)
|
||||||
|
`, now, now).Error; err != nil {
|
||||||
|
t.Fatalf("insert user: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
adminToken, err := auth.GenerateToken(1, "admin_user", 0, secret)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("generate admin token: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
out := requestContractEnvelope(t, router, adminToken, "/api/v1/user/list", map[string]interface{}{})
|
||||||
|
if out.Code != 0 {
|
||||||
|
t.Fatalf("expected /user/list success, got code=%d msg=%s", out.Code, out.Msg)
|
||||||
|
}
|
||||||
|
|
||||||
|
rows := mustContractSlice(t, out.Data, "user list")
|
||||||
|
var target map[string]interface{}
|
||||||
|
for _, row := range rows {
|
||||||
|
item, ok := row.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
t.Fatalf("expected user item to be object, got %T", row)
|
||||||
|
}
|
||||||
|
idVal, ok := item["id"].(float64)
|
||||||
|
if !ok {
|
||||||
|
t.Fatalf("expected user id to be float64, got %T", item["id"])
|
||||||
|
}
|
||||||
|
if int64(idVal) == 2 {
|
||||||
|
target = item
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if target == nil {
|
||||||
|
t.Fatalf("user 2 not found in /user/list response")
|
||||||
|
}
|
||||||
|
|
||||||
|
maxConnVal, ok := target["maxConn"].(float64)
|
||||||
|
if !ok {
|
||||||
|
t.Fatalf("expected maxConn to be float64, got %T (%v)", target["maxConn"], target["maxConn"])
|
||||||
|
}
|
||||||
|
if int(maxConnVal) != 37 {
|
||||||
|
t.Fatalf("expected maxConn 37 in /user/list, got %v", maxConnVal)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -116,6 +116,10 @@ func main() {
|
|||||||
|
|
||||||
fmt.Printf("✅ 配置加载成功 - addr: %s\n", config.Addr)
|
fmt.Printf("✅ 配置加载成功 - addr: %s\n", config.Addr)
|
||||||
|
|
||||||
|
// 设置运行时配置持久化路径
|
||||||
|
socket.SetConfigPersistPath("gost.json")
|
||||||
|
// 启用持久化将在 program.Start() 后开启,避免启动加载阶段触发冗余写入
|
||||||
|
|
||||||
log := xlogger.NewLogger()
|
log := xlogger.NewLogger()
|
||||||
logger.SetDefault(log)
|
logger.SetDefault(log)
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import (
|
|||||||
metrics "github.com/go-gost/x/metrics/service"
|
metrics "github.com/go-gost/x/metrics/service"
|
||||||
"github.com/go-gost/x/registry"
|
"github.com/go-gost/x/registry"
|
||||||
xservice "github.com/go-gost/x/service"
|
xservice "github.com/go-gost/x/service"
|
||||||
|
"github.com/go-gost/x/socket"
|
||||||
"github.com/judwhite/go-svc"
|
"github.com/judwhite/go-svc"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
@@ -66,6 +67,10 @@ func (p *program) Start() error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Enable config persistence after initial load so runtime mutations
|
||||||
|
// (AddService, UpdateService, DeleteService, etc.) are saved to disk.
|
||||||
|
socket.EnableConfigPersist()
|
||||||
|
|
||||||
if err := p.run(cfg); err != nil {
|
if err := p.run(cfg); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,9 +44,14 @@ func Set(c *Config) {
|
|||||||
|
|
||||||
func OnUpdate(f func(c *Config) error) error {
|
func OnUpdate(f func(c *Config) error) error {
|
||||||
globalMux.Lock()
|
globalMux.Lock()
|
||||||
defer globalMux.Unlock()
|
err := f(global)
|
||||||
|
globalMux.Unlock()
|
||||||
|
|
||||||
return f(global)
|
if err == nil {
|
||||||
|
persist()
|
||||||
|
}
|
||||||
|
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
type LogConfig struct {
|
type LogConfig struct {
|
||||||
@@ -573,6 +578,7 @@ func (c *Config) Load() error {
|
|||||||
if err := v.ReadInConfig(); err != nil {
|
if err := v.ReadInConfig(); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
SetPersistPath(v.ConfigFileUsed())
|
||||||
|
|
||||||
return v.Unmarshal(c)
|
return v.Unmarshal(c)
|
||||||
}
|
}
|
||||||
@@ -590,6 +596,7 @@ func (c *Config) ReadFile(file string) error {
|
|||||||
if err := v.ReadInConfig(); err != nil {
|
if err := v.ReadInConfig(); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
SetPersistPath(v.ConfigFileUsed())
|
||||||
return v.Unmarshal(c)
|
return v.Unmarshal(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,94 @@
|
|||||||
|
package config
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
persistPath string
|
||||||
|
persistMu sync.Mutex
|
||||||
|
persistEnable bool
|
||||||
|
)
|
||||||
|
|
||||||
|
// SetPersistPath sets the file path where runtime config changes will be
|
||||||
|
// automatically persisted. Call this once during agent startup before any
|
||||||
|
// OnUpdate mutations occur.
|
||||||
|
func SetPersistPath(path string) {
|
||||||
|
persistMu.Lock()
|
||||||
|
defer persistMu.Unlock()
|
||||||
|
persistPath = path
|
||||||
|
}
|
||||||
|
|
||||||
|
func PersistPath() string {
|
||||||
|
persistMu.Lock()
|
||||||
|
defer persistMu.Unlock()
|
||||||
|
return persistPath
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnablePersist turns on automatic persistence. Call this after the initial
|
||||||
|
// config has been loaded (e.g. after program.Start) so that startup loading
|
||||||
|
// does not trigger redundant disk writes.
|
||||||
|
func EnablePersist() {
|
||||||
|
persistMu.Lock()
|
||||||
|
defer persistMu.Unlock()
|
||||||
|
persistEnable = true
|
||||||
|
}
|
||||||
|
|
||||||
|
// persist writes the current global config to the configured file atomically.
|
||||||
|
func persist() {
|
||||||
|
persistMu.Lock()
|
||||||
|
path := persistPath
|
||||||
|
enabled := persistEnable
|
||||||
|
persistMu.Unlock()
|
||||||
|
|
||||||
|
if !enabled || path == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg := Global()
|
||||||
|
if cfg == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var buf bytes.Buffer
|
||||||
|
enc := json.NewEncoder(&buf)
|
||||||
|
enc.SetIndent("", " ")
|
||||||
|
if err := enc.Encode(cfg); err != nil {
|
||||||
|
fmt.Printf("⚠️ config persist: marshal failed: %v\n", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Atomic write: write to temp file then rename
|
||||||
|
dir := filepath.Dir(path)
|
||||||
|
tmp, err := os.CreateTemp(dir, ".gost-*.tmp")
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("⚠️ config persist: create temp file failed: %v\n", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
tmpName := tmp.Name()
|
||||||
|
|
||||||
|
if _, err := tmp.Write(buf.Bytes()); err != nil {
|
||||||
|
tmp.Close()
|
||||||
|
os.Remove(tmpName)
|
||||||
|
fmt.Printf("⚠️ config persist: write failed: %v\n", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := tmp.Close(); err != nil {
|
||||||
|
os.Remove(tmpName)
|
||||||
|
fmt.Printf("⚠️ config persist: close temp file failed: %v\n", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := os.Rename(tmpName, path); err != nil {
|
||||||
|
os.Remove(tmpName)
|
||||||
|
fmt.Printf("⚠️ config persist: rename failed: %v\n", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Printf("💾 节点配置已持久化到 %s\n", path)
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
package config
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestReadFileSetsPersistPath(t *testing.T) {
|
||||||
|
originalPath := persistPath
|
||||||
|
originalEnabled := persistEnable
|
||||||
|
persistPath = ""
|
||||||
|
persistEnable = false
|
||||||
|
t.Cleanup(func() {
|
||||||
|
persistPath = originalPath
|
||||||
|
persistEnable = originalEnabled
|
||||||
|
})
|
||||||
|
|
||||||
|
dir := t.TempDir()
|
||||||
|
configFile := filepath.Join(dir, "custom-gost.yaml")
|
||||||
|
if err := os.WriteFile(configFile, []byte("services: []\n"), 0o644); err != nil {
|
||||||
|
t.Fatalf("write config file: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var cfg Config
|
||||||
|
if err := cfg.ReadFile(configFile); err != nil {
|
||||||
|
t.Fatalf("ReadFile: %v", err)
|
||||||
|
}
|
||||||
|
if persistPath != configFile {
|
||||||
|
t.Fatalf("expected persistPath %q, got %q", configFile, persistPath)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -102,3 +102,71 @@ type updateLimiterRequest struct {
|
|||||||
type deleteLimiterRequest struct {
|
type deleteLimiterRequest struct {
|
||||||
Limiter string `json:"limiter"`
|
Limiter string `json:"limiter"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func createConnLimiter(req createLimiterRequest) error {
|
||||||
|
name := strings.TrimSpace(req.Data.Name)
|
||||||
|
if name == "" {
|
||||||
|
return errors.New("limiter name is required")
|
||||||
|
}
|
||||||
|
req.Data.Name = name
|
||||||
|
|
||||||
|
if registry.ConnLimiterRegistry().IsRegistered(name) {
|
||||||
|
return errors.New("conn limiter " + name + " already exists")
|
||||||
|
}
|
||||||
|
|
||||||
|
v := parser.ParseConnLimiter(&req.Data)
|
||||||
|
|
||||||
|
if err := registry.ConnLimiterRegistry().Register(name, v); err != nil {
|
||||||
|
return errors.New("conn limiter " + name + " already exists")
|
||||||
|
}
|
||||||
|
|
||||||
|
if c := config.Global(); c != nil {
|
||||||
|
c.CLimiters = append(c.CLimiters, &req.Data)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func updateConnLimiter(req updateLimiterRequest) error {
|
||||||
|
name := strings.TrimSpace(req.Limiter)
|
||||||
|
req.Data.Name = name
|
||||||
|
if registry.ConnLimiterRegistry().IsRegistered(name) {
|
||||||
|
registry.ConnLimiterRegistry().Unregister(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
v := parser.ParseConnLimiter(&req.Data)
|
||||||
|
|
||||||
|
if err := registry.ConnLimiterRegistry().Register(name, v); err != nil {
|
||||||
|
return errors.New("conn limiter " + name + " already exists")
|
||||||
|
}
|
||||||
|
|
||||||
|
if c := config.Global(); c != nil {
|
||||||
|
for i := range c.CLimiters {
|
||||||
|
if c.CLimiters[i].Name == name {
|
||||||
|
c.CLimiters[i] = &req.Data
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
c.CLimiters = append(c.CLimiters, &req.Data)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func deleteConnLimiter(req deleteLimiterRequest) error {
|
||||||
|
name := strings.TrimSpace(req.Limiter)
|
||||||
|
|
||||||
|
if registry.ConnLimiterRegistry().IsRegistered(name) {
|
||||||
|
registry.ConnLimiterRegistry().Unregister(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
if c := config.Global(); c != nil {
|
||||||
|
limiteres := c.CLimiters
|
||||||
|
c.CLimiters = nil
|
||||||
|
for _, s := range limiteres {
|
||||||
|
if s.Name == name {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
c.CLimiters = append(c.CLimiters, s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -836,6 +836,18 @@ func (w *WebSocketReporter) routeCommand(cmd CommandMessage) {
|
|||||||
err = w.handleDeleteLimiter(cmd.Data)
|
err = w.handleDeleteLimiter(cmd.Data)
|
||||||
response.Type = "DeleteLimitersResponse"
|
response.Type = "DeleteLimitersResponse"
|
||||||
needSaveConfig = true
|
needSaveConfig = true
|
||||||
|
case "AddCLimiters":
|
||||||
|
err = w.handleAddCLimiter(cmd.Data)
|
||||||
|
response.Type = "AddCLimitersResponse"
|
||||||
|
needSaveConfig = true
|
||||||
|
case "UpdateCLimiters":
|
||||||
|
err = w.handleUpdateCLimiter(cmd.Data)
|
||||||
|
response.Type = "UpdateCLimitersResponse"
|
||||||
|
needSaveConfig = true
|
||||||
|
case "DeleteCLimiters":
|
||||||
|
err = w.handleDeleteCLimiter(cmd.Data)
|
||||||
|
response.Type = "DeleteCLimitersResponse"
|
||||||
|
needSaveConfig = true
|
||||||
|
|
||||||
// TCP Ping 诊断命令(只读,不需要保存配置)
|
// TCP Ping 诊断命令(只读,不需要保存配置)
|
||||||
case "TcpPing":
|
case "TcpPing":
|
||||||
@@ -1130,6 +1142,67 @@ func (w *WebSocketReporter) handleDeleteLimiter(data interface{}) error {
|
|||||||
return deleteLimiter(deleteReq)
|
return deleteLimiter(deleteReq)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (w *WebSocketReporter) handleAddCLimiter(data interface{}) error {
|
||||||
|
jsonData, err := json.Marshal(data)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("序列化数据失败: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var limiterConfig config.LimiterConfig
|
||||||
|
if err := json.Unmarshal(jsonData, &limiterConfig); err != nil {
|
||||||
|
return fmt.Errorf("解析限流器配置失败: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
req := createLimiterRequest{Data: limiterConfig}
|
||||||
|
return createConnLimiter(req)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *WebSocketReporter) handleUpdateCLimiter(data interface{}) error {
|
||||||
|
jsonData, err := json.Marshal(data)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("序列化数据失败: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var updateReq struct {
|
||||||
|
Limiter string `json:"limiter"`
|
||||||
|
Data config.LimiterConfig `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := json.Unmarshal(jsonData, &updateReq); err != nil {
|
||||||
|
var limiterConfig config.LimiterConfig
|
||||||
|
if err := json.Unmarshal(jsonData, &limiterConfig); err != nil {
|
||||||
|
return fmt.Errorf("解析更新请求失败: %v", err)
|
||||||
|
}
|
||||||
|
updateReq.Limiter = limiterConfig.Name
|
||||||
|
updateReq.Data = limiterConfig
|
||||||
|
}
|
||||||
|
|
||||||
|
req := updateLimiterRequest{
|
||||||
|
Limiter: updateReq.Limiter,
|
||||||
|
Data: updateReq.Data,
|
||||||
|
}
|
||||||
|
return updateConnLimiter(req)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *WebSocketReporter) handleDeleteCLimiter(data interface{}) error {
|
||||||
|
jsonData, err := json.Marshal(data)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("序列化数据失败: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var deleteReq deleteLimiterRequest
|
||||||
|
|
||||||
|
if err := json.Unmarshal(jsonData, &deleteReq); err != nil {
|
||||||
|
var limiterName string
|
||||||
|
if err := json.Unmarshal(jsonData, &limiterName); err != nil {
|
||||||
|
return fmt.Errorf("解析删除请求失败: %v", err)
|
||||||
|
}
|
||||||
|
deleteReq.Limiter = limiterName
|
||||||
|
}
|
||||||
|
|
||||||
|
return deleteConnLimiter(deleteReq)
|
||||||
|
}
|
||||||
|
|
||||||
// handleSetProtocol 处理设置屏蔽协议的命令
|
// handleSetProtocol 处理设置屏蔽协议的命令
|
||||||
func (w *WebSocketReporter) handleSetProtocol(data interface{}) error {
|
func (w *WebSocketReporter) handleSetProtocol(data interface{}) error {
|
||||||
jsonData, err := json.Marshal(data)
|
jsonData, err := json.Marshal(data)
|
||||||
@@ -1617,6 +1690,26 @@ func StartWebSocketReporterWithConfig(addr string, secret string, http int, tls
|
|||||||
return reporter
|
return reporter
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var configPersistPath string
|
||||||
|
|
||||||
|
// SetConfigPersistPath sets the path where runtime config changes will be
|
||||||
|
// persisted to disk (gost.json). Called by main during agent startup.
|
||||||
|
func SetConfigPersistPath(path string) {
|
||||||
|
configPersistPath = path
|
||||||
|
config.SetPersistPath(path)
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnableConfigPersist turns on automatic disk persistence after the initial
|
||||||
|
// config has been loaded and applied.
|
||||||
|
func EnableConfigPersist() {
|
||||||
|
config.EnablePersist()
|
||||||
|
path := config.PersistPath()
|
||||||
|
if path == "" {
|
||||||
|
path = configPersistPath
|
||||||
|
}
|
||||||
|
fmt.Printf("🔒 节点配置持久化已启用,运行时变更将自动保存到 %s\n", path)
|
||||||
|
}
|
||||||
|
|
||||||
// handleTcpPing 处理TCP ping诊断命令
|
// handleTcpPing 处理TCP ping诊断命令
|
||||||
func (w *WebSocketReporter) handleTcpPing(data interface{}) (TcpPingResponse, error) {
|
func (w *WebSocketReporter) handleTcpPing(data interface{}) (TcpPingResponse, error) {
|
||||||
jsonData, err := json.Marshal(data)
|
jsonData, err := json.Marshal(data)
|
||||||
|
|||||||
+18
-27
@@ -5,7 +5,7 @@ import {
|
|||||||
useNavigate,
|
useNavigate,
|
||||||
Navigate,
|
Navigate,
|
||||||
} from "react-router-dom";
|
} from "react-router-dom";
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect } from "react";
|
||||||
import { AnimatePresence } from "framer-motion";
|
import { AnimatePresence } from "framer-motion";
|
||||||
|
|
||||||
import IndexPage from "@/pages/index";
|
import IndexPage from "@/pages/index";
|
||||||
@@ -39,32 +39,7 @@ const ProtectedRoute = ({
|
|||||||
skipLayout?: boolean;
|
skipLayout?: boolean;
|
||||||
}) => {
|
}) => {
|
||||||
const isH5 = useH5Mode();
|
const isH5 = useH5Mode();
|
||||||
const navigate = useNavigate();
|
const authenticated = isLoggedIn();
|
||||||
const [authenticated, setAuthenticated] = useState(() => isLoggedIn());
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const handleSessionChange = () => {
|
|
||||||
const loggedIn = isLoggedIn();
|
|
||||||
|
|
||||||
setAuthenticated(loggedIn);
|
|
||||||
|
|
||||||
if (!loggedIn) {
|
|
||||||
navigate("/", { replace: true });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
window.addEventListener(SESSION_UPDATED_EVENT, handleSessionChange);
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
window.removeEventListener(SESSION_UPDATED_EVENT, handleSessionChange);
|
|
||||||
};
|
|
||||||
}, [navigate]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!authenticated) {
|
|
||||||
navigate("/", { replace: true });
|
|
||||||
}
|
|
||||||
}, [authenticated, navigate]);
|
|
||||||
|
|
||||||
if (!authenticated) {
|
if (!authenticated) {
|
||||||
return <Navigate replace to="/" />;
|
return <Navigate replace to="/" />;
|
||||||
@@ -103,6 +78,22 @@ const LoginRoute = () => {
|
|||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
|
const navigate = useNavigate();
|
||||||
|
|
||||||
|
// 全局登录状态监听,当检测到未登录且不在首页时,跳转到首页
|
||||||
|
useEffect(() => {
|
||||||
|
const handleSessionUpdate = () => {
|
||||||
|
if (!isLoggedIn() && location.pathname !== "/") {
|
||||||
|
navigate("/", { replace: true });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
window.addEventListener(SESSION_UPDATED_EVENT, handleSessionUpdate);
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
window.removeEventListener(SESSION_UPDATED_EVENT, handleSessionUpdate);
|
||||||
|
};
|
||||||
|
}, [location.pathname, navigate]);
|
||||||
|
|
||||||
// 处理自定义背景图片
|
// 处理自定义背景图片
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ export interface UserApiItem {
|
|||||||
num: number;
|
num: number;
|
||||||
expTime?: number;
|
expTime?: number;
|
||||||
flowResetTime?: number;
|
flowResetTime?: number;
|
||||||
|
maxConn?: number;
|
||||||
inFlow?: number;
|
inFlow?: number;
|
||||||
outFlow?: number;
|
outFlow?: number;
|
||||||
dailyQuotaGB?: number;
|
dailyQuotaGB?: number;
|
||||||
@@ -70,6 +71,8 @@ export interface ForwardApiItem {
|
|||||||
userId?: number;
|
userId?: number;
|
||||||
tunnelId?: number;
|
tunnelId?: number;
|
||||||
speedId?: number | null;
|
speedId?: number | null;
|
||||||
|
maxConn?: number;
|
||||||
|
proxyProtocol?: number;
|
||||||
inx?: number;
|
inx?: number;
|
||||||
[key: string]: unknown;
|
[key: string]: unknown;
|
||||||
}
|
}
|
||||||
@@ -200,6 +203,7 @@ export interface UserPackageInfoApiData {
|
|||||||
num: number;
|
num: number;
|
||||||
expTime?: string;
|
expTime?: string;
|
||||||
flowResetTime?: number;
|
flowResetTime?: number;
|
||||||
|
maxConn?: number;
|
||||||
[key: string]: unknown;
|
[key: string]: unknown;
|
||||||
};
|
};
|
||||||
tunnelPermissions: UserTunnelPermissionApiItem[];
|
tunnelPermissions: UserTunnelPermissionApiItem[];
|
||||||
@@ -276,6 +280,7 @@ export interface UserMutationPayload {
|
|||||||
num?: number;
|
num?: number;
|
||||||
expTime?: number | string;
|
expTime?: number | string;
|
||||||
flowResetTime?: number;
|
flowResetTime?: number;
|
||||||
|
maxConn?: number;
|
||||||
dailyQuotaGB?: number;
|
dailyQuotaGB?: number;
|
||||||
monthlyQuotaGB?: number;
|
monthlyQuotaGB?: number;
|
||||||
tunnelFlow?: number;
|
tunnelFlow?: number;
|
||||||
@@ -338,6 +343,7 @@ export interface UserTunnelAssignPayload {
|
|||||||
num?: number;
|
num?: number;
|
||||||
expTime?: number;
|
expTime?: number;
|
||||||
flowResetTime?: number;
|
flowResetTime?: number;
|
||||||
|
maxConn?: number;
|
||||||
status?: number;
|
status?: number;
|
||||||
speedId?: number | null;
|
speedId?: number | null;
|
||||||
tunnels?: Array<{ tunnelId: number; speedId?: number | null }>;
|
tunnels?: Array<{ tunnelId: number; speedId?: number | null }>;
|
||||||
@@ -366,6 +372,8 @@ export interface ForwardMutationPayload {
|
|||||||
remoteAddr?: string;
|
remoteAddr?: string;
|
||||||
strategy?: string;
|
strategy?: string;
|
||||||
speedId?: number | null;
|
speedId?: number | null;
|
||||||
|
maxConn?: number;
|
||||||
|
proxyProtocol?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface SpeedLimitMutationPayload {
|
export interface SpeedLimitMutationPayload {
|
||||||
|
|||||||
@@ -241,7 +241,6 @@ export default function AdminLayout({
|
|||||||
// 退出登录
|
// 退出登录
|
||||||
const handleLogout = () => {
|
const handleLogout = () => {
|
||||||
safeLogout();
|
safeLogout();
|
||||||
navigate("/");
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// 切换移动端菜单
|
// 切换移动端菜单
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { useNavigate } from "react-router-dom";
|
|
||||||
import toast from "react-hot-toast";
|
import toast from "react-hot-toast";
|
||||||
|
|
||||||
import { Button } from "@/shadcn-bridge/heroui/button";
|
import { Button } from "@/shadcn-bridge/heroui/button";
|
||||||
@@ -26,7 +25,6 @@ export default function ChangePasswordPage() {
|
|||||||
});
|
});
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
const [errors, setErrors] = useState<Partial<PasswordForm>>({});
|
const [errors, setErrors] = useState<Partial<PasswordForm>>({});
|
||||||
const navigate = useNavigate();
|
|
||||||
|
|
||||||
const validateForm = (): boolean => {
|
const validateForm = (): boolean => {
|
||||||
const newErrors: Partial<PasswordForm> = {};
|
const newErrors: Partial<PasswordForm> = {};
|
||||||
@@ -98,7 +96,6 @@ export default function ChangePasswordPage() {
|
|||||||
|
|
||||||
const logout = () => {
|
const logout = () => {
|
||||||
safeLogout();
|
safeLogout();
|
||||||
navigate("/");
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleKeyPress = (e: React.KeyboardEvent) => {
|
const handleKeyPress = (e: React.KeyboardEvent) => {
|
||||||
|
|||||||
@@ -185,6 +185,13 @@ const CONFIG_ITEMS: ConfigItem[] = [
|
|||||||
dependsOn: "github_proxy_enabled",
|
dependsOn: "github_proxy_enabled",
|
||||||
dependsValue: "true",
|
dependsValue: "true",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
key: "allow_local_remote_addr",
|
||||||
|
label: "允许转发到本地地址",
|
||||||
|
description:
|
||||||
|
"开启后,普通用户创建或编辑规则时可将目标地址指向 127.0.0.1、10.x.x.x、172.16-31.x.x、192.168.x.x 等本地或内网地址。默认关闭以降低开放代理风险。",
|
||||||
|
type: "switch",
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
const BACKUP_TYPE_OPTIONS = [
|
const BACKUP_TYPE_OPTIONS = [
|
||||||
@@ -219,6 +226,7 @@ const getInitialConfigs = (): Record<string, string> => {
|
|||||||
"app_favicon",
|
"app_favicon",
|
||||||
"github_proxy_enabled",
|
"github_proxy_enabled",
|
||||||
"github_proxy_url",
|
"github_proxy_url",
|
||||||
|
"allow_local_remote_addr",
|
||||||
];
|
];
|
||||||
const initialConfigs: Record<string, string> = {};
|
const initialConfigs: Record<string, string> = {};
|
||||||
|
|
||||||
|
|||||||
@@ -50,7 +50,6 @@ export default function DashboardPage() {
|
|||||||
const handleLogout = () => {
|
const handleLogout = () => {
|
||||||
safeLogout();
|
safeLogout();
|
||||||
toast.success("已退出登录");
|
toast.success("已退出登录");
|
||||||
navigate("/");
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const {
|
const {
|
||||||
|
|||||||
@@ -360,11 +360,7 @@ export const useDashboardData = (): DashboardDataState => {
|
|||||||
if (updateTime > storedTime) {
|
if (updateTime > storedTime) {
|
||||||
setIsAnnouncementModalOpen(true);
|
setIsAnnouncementModalOpen(true);
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch {
|
||||||
console.warn(
|
|
||||||
"Failed to read localStorage for announcement state",
|
|
||||||
err,
|
|
||||||
);
|
|
||||||
setIsAnnouncementModalOpen(true);
|
setIsAnnouncementModalOpen(true);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -385,8 +381,8 @@ export const useDashboardData = (): DashboardDataState => {
|
|||||||
"flvx_announcement_seen_time",
|
"flvx_announcement_seen_time",
|
||||||
announcement.update_time.toString(),
|
announcement.update_time.toString(),
|
||||||
);
|
);
|
||||||
} catch (err) {
|
} catch {
|
||||||
console.warn("Failed to set localStorage for announcement state", err);
|
// Ignore localStorage write failures and keep the modal dismissed.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, [announcement]);
|
}, [announcement]);
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ import { Switch } from "@/shadcn-bridge/heroui/switch";
|
|||||||
import { Alert } from "@/shadcn-bridge/heroui/alert";
|
import { Alert } from "@/shadcn-bridge/heroui/alert";
|
||||||
import { Progress } from "@/shadcn-bridge/heroui/progress";
|
import { Progress } from "@/shadcn-bridge/heroui/progress";
|
||||||
import { Checkbox } from "@/shadcn-bridge/heroui/checkbox";
|
import { Checkbox } from "@/shadcn-bridge/heroui/checkbox";
|
||||||
|
import { Accordion, AccordionItem } from "@/shadcn-bridge/heroui/accordion";
|
||||||
import {
|
import {
|
||||||
createForward,
|
createForward,
|
||||||
getForwardList,
|
getForwardList,
|
||||||
@@ -118,11 +119,13 @@ interface Forward {
|
|||||||
outFlow: number;
|
outFlow: number;
|
||||||
serviceRunning: boolean;
|
serviceRunning: boolean;
|
||||||
federationShareFlow?: number;
|
federationShareFlow?: number;
|
||||||
|
maxConn?: number;
|
||||||
createdTime: string;
|
createdTime: string;
|
||||||
userName?: string;
|
userName?: string;
|
||||||
userId?: number;
|
userId?: number;
|
||||||
inx?: number;
|
inx?: number;
|
||||||
speedId?: number | null;
|
speedId?: number | null;
|
||||||
|
proxyProtocol?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface Tunnel {
|
interface Tunnel {
|
||||||
@@ -157,6 +160,8 @@ interface ForwardForm {
|
|||||||
interfaceName?: string;
|
interfaceName?: string;
|
||||||
strategy: string;
|
strategy: string;
|
||||||
speedId: number | null;
|
speedId: number | null;
|
||||||
|
maxConn?: number;
|
||||||
|
proxyProtocol?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface ForwardUserGroup {
|
interface ForwardUserGroup {
|
||||||
@@ -573,6 +578,11 @@ const mapForwardApiItems = (items: ForwardApiItem[]): Forward[] => {
|
|||||||
typeof forward.speedId === "number" || forward.speedId === null
|
typeof forward.speedId === "number" || forward.speedId === null
|
||||||
? forward.speedId
|
? forward.speedId
|
||||||
: undefined,
|
: undefined,
|
||||||
|
maxConn: typeof forward.maxConn === "number" ? forward.maxConn : undefined,
|
||||||
|
proxyProtocol:
|
||||||
|
typeof forward.proxyProtocol === "number"
|
||||||
|
? forward.proxyProtocol
|
||||||
|
: undefined,
|
||||||
serviceRunning: forward.status === 1,
|
serviceRunning: forward.status === 1,
|
||||||
}));
|
}));
|
||||||
};
|
};
|
||||||
@@ -1306,6 +1316,8 @@ export default function ForwardPage() {
|
|||||||
interfaceName: "",
|
interfaceName: "",
|
||||||
strategy: "fifo",
|
strategy: "fifo",
|
||||||
speedId: null,
|
speedId: null,
|
||||||
|
maxConn: 0,
|
||||||
|
proxyProtocol: 0,
|
||||||
});
|
});
|
||||||
const [inIpTouched, setInIpTouched] = useState(false);
|
const [inIpTouched, setInIpTouched] = useState(false);
|
||||||
|
|
||||||
@@ -2093,6 +2105,7 @@ export default function ForwardPage() {
|
|||||||
interfaceName: "",
|
interfaceName: "",
|
||||||
strategy: "fifo",
|
strategy: "fifo",
|
||||||
speedId: null,
|
speedId: null,
|
||||||
|
proxyProtocol: 0,
|
||||||
});
|
});
|
||||||
setErrors({});
|
setErrors({});
|
||||||
setModalOpen(true);
|
setModalOpen(true);
|
||||||
@@ -2113,6 +2126,8 @@ export default function ForwardPage() {
|
|||||||
interfaceName: forward.interfaceName || "",
|
interfaceName: forward.interfaceName || "",
|
||||||
strategy: forward.strategy || "fifo",
|
strategy: forward.strategy || "fifo",
|
||||||
speedId: normalizeSpeedId(forward.speedId),
|
speedId: normalizeSpeedId(forward.speedId),
|
||||||
|
maxConn: forward.maxConn ?? 0,
|
||||||
|
proxyProtocol: forward.proxyProtocol ?? 0,
|
||||||
});
|
});
|
||||||
setErrors({});
|
setErrors({});
|
||||||
setModalOpen(true);
|
setModalOpen(true);
|
||||||
@@ -2241,6 +2256,8 @@ export default function ForwardPage() {
|
|||||||
remoteAddr: processedRemoteAddr,
|
remoteAddr: processedRemoteAddr,
|
||||||
strategy: addressCount > 1 ? form.strategy : "fifo",
|
strategy: addressCount > 1 ? form.strategy : "fifo",
|
||||||
speedId: normalizedSpeedId,
|
speedId: normalizedSpeedId,
|
||||||
|
maxConn: form.maxConn,
|
||||||
|
proxyProtocol: form.proxyProtocol,
|
||||||
};
|
};
|
||||||
|
|
||||||
res = await updateForward(updateData);
|
res = await updateForward(updateData);
|
||||||
@@ -2253,11 +2270,12 @@ export default function ForwardPage() {
|
|||||||
remoteAddr: processedRemoteAddr,
|
remoteAddr: processedRemoteAddr,
|
||||||
strategy: addressCount > 1 ? form.strategy : "fifo",
|
strategy: addressCount > 1 ? form.strategy : "fifo",
|
||||||
speedId: normalizedSpeedId,
|
speedId: normalizedSpeedId,
|
||||||
|
maxConn: form.maxConn,
|
||||||
|
proxyProtocol: form.proxyProtocol,
|
||||||
};
|
};
|
||||||
|
|
||||||
res = await createForward(createData);
|
res = await createForward(createData);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (res.code === 0) {
|
if (res.code === 0) {
|
||||||
const warningItems = Array.isArray((res as any).data?.warnings)
|
const warningItems = Array.isArray((res as any).data?.warnings)
|
||||||
? (res as any).data.warnings
|
? (res as any).data.warnings
|
||||||
@@ -2582,7 +2600,7 @@ export default function ForwardPage() {
|
|||||||
try {
|
try {
|
||||||
document.execCommand("copy");
|
document.execCommand("copy");
|
||||||
toast.success(`已复制${label}`);
|
toast.success(`已复制${label}`);
|
||||||
} catch (err) {
|
} catch {
|
||||||
toast.error("复制失败");
|
toast.error("复制失败");
|
||||||
}
|
}
|
||||||
document.body.removeChild(textArea);
|
document.body.removeChild(textArea);
|
||||||
@@ -4735,38 +4753,6 @@ export default function ForwardPage() {
|
|||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{isAdmin && (
|
|
||||||
<Select
|
|
||||||
label="规则限速"
|
|
||||||
placeholder="不限速"
|
|
||||||
selectedKeys={
|
|
||||||
selectedSpeedId !== null
|
|
||||||
? [selectedSpeedId.toString()]
|
|
||||||
: []
|
|
||||||
}
|
|
||||||
variant="bordered"
|
|
||||||
onSelectionChange={(keys) => {
|
|
||||||
const selectedKey = Array.from(keys)[0] as
|
|
||||||
| string
|
|
||||||
| undefined;
|
|
||||||
|
|
||||||
setForm((prev) => ({
|
|
||||||
...prev,
|
|
||||||
speedId: selectedKey ? Number(selectedKey) : null,
|
|
||||||
}));
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{availableSpeedLimits.map((speedLimit) => (
|
|
||||||
<SelectItem
|
|
||||||
key={speedLimit.id.toString()}
|
|
||||||
textValue={speedLimit.name}
|
|
||||||
>
|
|
||||||
{speedLimit.name}
|
|
||||||
</SelectItem>
|
|
||||||
))}
|
|
||||||
</Select>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<Select
|
<Select
|
||||||
description={
|
description={
|
||||||
isEdit
|
isEdit
|
||||||
@@ -4894,6 +4880,92 @@ export default function ForwardPage() {
|
|||||||
<SelectItem key="hash">哈希模式 - IP哈希</SelectItem>
|
<SelectItem key="hash">哈希模式 - IP哈希</SelectItem>
|
||||||
</Select>
|
</Select>
|
||||||
)}
|
)}
|
||||||
|
<Accordion className="px-0" variant="light">
|
||||||
|
<AccordionItem
|
||||||
|
key="advanced"
|
||||||
|
aria-label="高级设置"
|
||||||
|
className="border-b-0 [&_[data-slot=accordion-trigger]]:no-underline [&_[data-slot=accordion-trigger]]:hover:no-underline"
|
||||||
|
title={
|
||||||
|
<span className="text-small text-default-500 font-medium">
|
||||||
|
高级设置
|
||||||
|
</span>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<div className="space-y-4 pb-2">
|
||||||
|
<Input
|
||||||
|
description="此设置优先于用户的全局连接数限制。0 表示不限制。"
|
||||||
|
label="最大连接数"
|
||||||
|
min="0"
|
||||||
|
placeholder="0 或空表示不限制"
|
||||||
|
type="number"
|
||||||
|
value={
|
||||||
|
form.maxConn === 0 ? "" : String(form.maxConn || "")
|
||||||
|
}
|
||||||
|
variant="bordered"
|
||||||
|
onChange={(e) => {
|
||||||
|
const value = Math.max(
|
||||||
|
Number(e.target.value) || 0,
|
||||||
|
0,
|
||||||
|
);
|
||||||
|
|
||||||
|
setForm((prev) => ({ ...prev, maxConn: value }));
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<Select
|
||||||
|
description="启用 PROXY protocol,用于透传客户端真实 IP"
|
||||||
|
label="Proxy Protocol"
|
||||||
|
placeholder="禁用"
|
||||||
|
selectedKeys={[String(form.proxyProtocol || 0)]}
|
||||||
|
variant="bordered"
|
||||||
|
onSelectionChange={(keys) => {
|
||||||
|
const selectedKey = Array.from(keys)[0] as string;
|
||||||
|
|
||||||
|
setForm((prev) => ({
|
||||||
|
...prev,
|
||||||
|
proxyProtocol: Number(selectedKey),
|
||||||
|
}));
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<SelectItem key="0">禁用</SelectItem>
|
||||||
|
<SelectItem key="1">Version 1</SelectItem>
|
||||||
|
<SelectItem key="2">Version 2</SelectItem>
|
||||||
|
</Select>
|
||||||
|
{isAdmin && (
|
||||||
|
<Select
|
||||||
|
label="规则限速"
|
||||||
|
placeholder="不限速"
|
||||||
|
selectedKeys={
|
||||||
|
selectedSpeedId !== null
|
||||||
|
? [selectedSpeedId.toString()]
|
||||||
|
: []
|
||||||
|
}
|
||||||
|
variant="bordered"
|
||||||
|
onSelectionChange={(keys) => {
|
||||||
|
const selectedKey = Array.from(keys)[0] as
|
||||||
|
| string
|
||||||
|
| undefined;
|
||||||
|
|
||||||
|
setForm((prev) => ({
|
||||||
|
...prev,
|
||||||
|
speedId: selectedKey
|
||||||
|
? Number(selectedKey)
|
||||||
|
: null,
|
||||||
|
}));
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{availableSpeedLimits.map((speedLimit) => (
|
||||||
|
<SelectItem
|
||||||
|
key={speedLimit.id.toString()}
|
||||||
|
textValue={speedLimit.name}
|
||||||
|
>
|
||||||
|
{speedLimit.name}
|
||||||
|
</SelectItem>
|
||||||
|
))}
|
||||||
|
</Select>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</AccordionItem>
|
||||||
|
</Accordion>
|
||||||
</div>
|
</div>
|
||||||
</ModalBody>
|
</ModalBody>
|
||||||
<ModalFooter>
|
<ModalFooter>
|
||||||
|
|||||||
@@ -127,7 +127,6 @@ export default function ProfilePage() {
|
|||||||
// 退出登录
|
// 退出登录
|
||||||
const handleLogout = () => {
|
const handleLogout = () => {
|
||||||
safeLogout();
|
safeLogout();
|
||||||
navigate("/", { replace: true });
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// 密码表单验证
|
// 密码表单验证
|
||||||
|
|||||||
@@ -160,6 +160,7 @@ const normalizeUserItem = (item: Partial<User>): User => {
|
|||||||
monthlyUsedBytes: Number(item.monthlyUsedBytes ?? 0),
|
monthlyUsedBytes: Number(item.monthlyUsedBytes ?? 0),
|
||||||
disabledByQuota: Number(item.disabledByQuota ?? 0),
|
disabledByQuota: Number(item.disabledByQuota ?? 0),
|
||||||
quotaDisabledAt: Number(item.quotaDisabledAt ?? 0),
|
quotaDisabledAt: Number(item.quotaDisabledAt ?? 0),
|
||||||
|
maxConn: item.maxConn != null ? Number(item.maxConn) : undefined,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -219,6 +220,7 @@ export default function UserPage() {
|
|||||||
num: 10,
|
num: 10,
|
||||||
expTime: null,
|
expTime: null,
|
||||||
flowResetTime: 0,
|
flowResetTime: 0,
|
||||||
|
maxConn: 0,
|
||||||
});
|
});
|
||||||
const [userFormLoading, setUserFormLoading] = useState(false);
|
const [userFormLoading, setUserFormLoading] = useState(false);
|
||||||
const [quotaResetLoading, setQuotaResetLoading] = useState(false);
|
const [quotaResetLoading, setQuotaResetLoading] = useState(false);
|
||||||
@@ -514,6 +516,7 @@ export default function UserPage() {
|
|||||||
num: 10,
|
num: 10,
|
||||||
expTime: null,
|
expTime: null,
|
||||||
flowResetTime: 0,
|
flowResetTime: 0,
|
||||||
|
maxConn: 0,
|
||||||
groupIds: [],
|
groupIds: [],
|
||||||
});
|
});
|
||||||
onUserModalOpen();
|
onUserModalOpen();
|
||||||
@@ -543,6 +546,7 @@ export default function UserPage() {
|
|||||||
num: user.num,
|
num: user.num,
|
||||||
expTime: user.expTime ? new Date(user.expTime) : null,
|
expTime: user.expTime ? new Date(user.expTime) : null,
|
||||||
flowResetTime: user.flowResetTime ?? 0,
|
flowResetTime: user.flowResetTime ?? 0,
|
||||||
|
maxConn: user.maxConn ?? 0,
|
||||||
groupIds: currentGroupIds,
|
groupIds: currentGroupIds,
|
||||||
});
|
});
|
||||||
onUserModalOpen();
|
onUserModalOpen();
|
||||||
@@ -1516,6 +1520,20 @@ export default function UserPage() {
|
|||||||
setUserForm((prev) => ({ ...prev, flow: value }));
|
setUserForm((prev) => ({ ...prev, flow: value }));
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
<Input
|
||||||
|
label="最大连接数"
|
||||||
|
min="0"
|
||||||
|
placeholder="0 或空表示不限制"
|
||||||
|
type="number"
|
||||||
|
value={
|
||||||
|
userForm.maxConn === 0 ? "" : String(userForm.maxConn || "")
|
||||||
|
}
|
||||||
|
onChange={(e) => {
|
||||||
|
const value = Math.max(Number(e.target.value) || 0, 0);
|
||||||
|
|
||||||
|
setUserForm((prev) => ({ ...prev, maxConn: value }));
|
||||||
|
}}
|
||||||
|
/>
|
||||||
<Input
|
<Input
|
||||||
isRequired
|
isRequired
|
||||||
label="规则数量"
|
label="规则数量"
|
||||||
@@ -1926,6 +1944,7 @@ export default function UserPage() {
|
|||||||
<TableColumn>规则数量</TableColumn>
|
<TableColumn>规则数量</TableColumn>
|
||||||
<TableColumn>状态</TableColumn>
|
<TableColumn>状态</TableColumn>
|
||||||
<TableColumn>限速规则</TableColumn>
|
<TableColumn>限速规则</TableColumn>
|
||||||
|
<TableColumn>最大连接</TableColumn>
|
||||||
<TableColumn>重置时间</TableColumn>
|
<TableColumn>重置时间</TableColumn>
|
||||||
<TableColumn>到期时间</TableColumn>
|
<TableColumn>到期时间</TableColumn>
|
||||||
<TableColumn>操作</TableColumn>
|
<TableColumn>操作</TableColumn>
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import { registerTheme } from "./registry";
|
import { registerTheme } from "./registry";
|
||||||
|
|
||||||
// ── Built-in themes ──────────────────────────────────────────────────────────
|
// ── Built-in themes ──────────────────────────────────────────────────────────
|
||||||
import defaultTheme from "./default";
|
import defaultTheme from "./default";
|
||||||
import cyberpunkTheme from "./example-cyberpunk";
|
import cyberpunkTheme from "./example-cyberpunk";
|
||||||
|
|||||||
@@ -117,8 +117,6 @@ export function activateTheme(id: string): void {
|
|||||||
const pkg = installed.get(id);
|
const pkg = installed.get(id);
|
||||||
|
|
||||||
if (!pkg) {
|
if (!pkg) {
|
||||||
console.warn(`[FLVX themes] Theme "${id}" is not registered.`);
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ export interface User {
|
|||||||
monthlyUsedBytes?: number;
|
monthlyUsedBytes?: number;
|
||||||
disabledByQuota?: number;
|
disabledByQuota?: number;
|
||||||
quotaDisabledAt?: number;
|
quotaDisabledAt?: number;
|
||||||
|
maxConn?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface UserGroup {
|
export interface UserGroup {
|
||||||
@@ -44,6 +45,7 @@ export interface UserForm {
|
|||||||
num: number;
|
num: number;
|
||||||
expTime: Date | null;
|
expTime: Date | null;
|
||||||
flowResetTime: number;
|
flowResetTime: number;
|
||||||
|
maxConn?: number;
|
||||||
groupIds?: number[];
|
groupIds?: number[];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -56,7 +58,8 @@ export interface UserTunnel {
|
|||||||
flow: number; // 流量限制(GB)
|
flow: number; // 流量限制(GB)
|
||||||
num: number; // 转发数量
|
num: number; // 转发数量
|
||||||
expTime: number; // 过期时间戳
|
expTime: number; // 过期时间戳
|
||||||
flowResetTime: number; // 流量重置日期
|
flowResetTime: number;
|
||||||
|
maxConn?: number; // 流量重置日期
|
||||||
speedId?: number | null; // 限速规则ID
|
speedId?: number | null; // 限速规则ID
|
||||||
speedLimitName?: string; // 限速规则名称
|
speedLimitName?: string; // 限速规则名称
|
||||||
inFlow?: number; // 下载流量(字节)
|
inFlow?: number; // 下载流量(字节)
|
||||||
@@ -70,6 +73,7 @@ export interface UserTunnelForm {
|
|||||||
num: number;
|
num: number;
|
||||||
expTime: Date | null;
|
expTime: Date | null;
|
||||||
flowResetTime: number;
|
flowResetTime: number;
|
||||||
|
maxConn?: number;
|
||||||
speedId: number | null;
|
speedId: number | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { clearSession } from "@/utils/session";
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 安全退出登录函数
|
* 安全退出登录函数
|
||||||
* 清除登录相关数据,但保留用户偏好设置(如主题)
|
* 清除登录相关数据
|
||||||
*/
|
*/
|
||||||
export const safeLogout = () => {
|
export const safeLogout = () => {
|
||||||
clearSession();
|
clearSession();
|
||||||
|
|||||||
Reference in New Issue
Block a user