根据 Codex 代码审查报告,修复所有 P0 和 P1 优先级问题。 ## P0 紧急修复 ### 1. 修复集成测试编译错误 - 更新 group_repo_integration_test.go 中所有 ListWithFilters 调用 - 添加缺失的 search 参数(传入空字符串) - 修复 4 处旧签名调用,避免 CI 编译失败 ### 2. 添加统一的 search 参数输入验证 为所有 admin handler 添加一致的输入验证逻辑: - group_handler.go: 添加 TrimSpace + 长度限制 - proxy_handler.go: 添加 TrimSpace + 长度限制 - redeem_handler.go: 添加 TrimSpace + 长度限制 - user_handler.go: 添加 TrimSpace + 长度限制 验证规则: - TrimSpace() 去除首尾空格 - 最大长度 100 字符(防止 DoS 攻击) - 超长输入自动截断 ## P1 改进 ### 3. 补充 search 功能的单元测试 新增 admin_service_group_test.go 中的测试: - TestAdminService_ListGroups_WithSearch - search 参数正常传递到 repository 层 - search 为空字符串时的行为 - search 与其他过滤条件组合使用 新增 admin_service_search_test.go 文件: - 为其他 admin API 添加 search 测试覆盖 - 统一的测试模式和断言 ### 4. 补充 search 功能的集成测试 新增 group_repo_integration_test.go 测试场景: - TestListWithFilters_Search - 搜索 name 字段匹配 - 搜索 description 字段匹配 - 搜索不存在内容(返回空) - 大小写不敏感测试 - 特殊字符转义测试(%、_) - 与其他过滤条件组合 ## 测试结果 - ✅ 编译检查通过 - ✅ 单元测试全部通过 (3/3) - ✅ 集成测试编译通过 - ✅ 所有 service 测试通过 ## 影响范围 修改文件: 8 个 代码变更: +234 行 / -8 行 ## 相关 Issue 解决代码审查中的安全性和稳定性问题: - 防止 DoS 攻击(超长搜索字符串) - 修复测试编译错误(CI 阻塞问题) - 提升测试覆盖率
329 lines
8.8 KiB
Go
329 lines
8.8 KiB
Go
package admin
|
|
|
|
import (
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/Wei-Shaw/sub2api/internal/handler/dto"
|
|
"github.com/Wei-Shaw/sub2api/internal/pkg/response"
|
|
"github.com/Wei-Shaw/sub2api/internal/service"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
// ProxyHandler handles admin proxy management
|
|
type ProxyHandler struct {
|
|
adminService service.AdminService
|
|
}
|
|
|
|
// NewProxyHandler creates a new admin proxy handler
|
|
func NewProxyHandler(adminService service.AdminService) *ProxyHandler {
|
|
return &ProxyHandler{
|
|
adminService: adminService,
|
|
}
|
|
}
|
|
|
|
// CreateProxyRequest represents create proxy request
|
|
type CreateProxyRequest struct {
|
|
Name string `json:"name" binding:"required"`
|
|
Protocol string `json:"protocol" binding:"required,oneof=http https socks5 socks5h"`
|
|
Host string `json:"host" binding:"required"`
|
|
Port int `json:"port" binding:"required,min=1,max=65535"`
|
|
Username string `json:"username"`
|
|
Password string `json:"password"`
|
|
}
|
|
|
|
// UpdateProxyRequest represents update proxy request
|
|
type UpdateProxyRequest struct {
|
|
Name string `json:"name"`
|
|
Protocol string `json:"protocol" binding:"omitempty,oneof=http https socks5 socks5h"`
|
|
Host string `json:"host"`
|
|
Port int `json:"port" binding:"omitempty,min=1,max=65535"`
|
|
Username string `json:"username"`
|
|
Password string `json:"password"`
|
|
Status string `json:"status" binding:"omitempty,oneof=active inactive"`
|
|
}
|
|
|
|
// List handles listing all proxies with pagination
|
|
// GET /api/v1/admin/proxies
|
|
func (h *ProxyHandler) List(c *gin.Context) {
|
|
page, pageSize := response.ParsePagination(c)
|
|
protocol := c.Query("protocol")
|
|
status := c.Query("status")
|
|
search := c.Query("search")
|
|
// 标准化和验证 search 参数
|
|
search = strings.TrimSpace(search)
|
|
if len(search) > 100 {
|
|
search = search[:100]
|
|
}
|
|
|
|
proxies, total, err := h.adminService.ListProxiesWithAccountCount(c.Request.Context(), page, pageSize, protocol, status, search)
|
|
if err != nil {
|
|
response.ErrorFrom(c, err)
|
|
return
|
|
}
|
|
|
|
out := make([]dto.ProxyWithAccountCount, 0, len(proxies))
|
|
for i := range proxies {
|
|
out = append(out, *dto.ProxyWithAccountCountFromService(&proxies[i]))
|
|
}
|
|
response.Paginated(c, out, total, page, pageSize)
|
|
}
|
|
|
|
// GetAll handles getting all active proxies without pagination
|
|
// GET /api/v1/admin/proxies/all
|
|
// Optional query param: with_count=true to include account count per proxy
|
|
func (h *ProxyHandler) GetAll(c *gin.Context) {
|
|
withCount := c.Query("with_count") == "true"
|
|
|
|
if withCount {
|
|
proxies, err := h.adminService.GetAllProxiesWithAccountCount(c.Request.Context())
|
|
if err != nil {
|
|
response.ErrorFrom(c, err)
|
|
return
|
|
}
|
|
out := make([]dto.ProxyWithAccountCount, 0, len(proxies))
|
|
for i := range proxies {
|
|
out = append(out, *dto.ProxyWithAccountCountFromService(&proxies[i]))
|
|
}
|
|
response.Success(c, out)
|
|
return
|
|
}
|
|
|
|
proxies, err := h.adminService.GetAllProxies(c.Request.Context())
|
|
if err != nil {
|
|
response.ErrorFrom(c, err)
|
|
return
|
|
}
|
|
|
|
out := make([]dto.Proxy, 0, len(proxies))
|
|
for i := range proxies {
|
|
out = append(out, *dto.ProxyFromService(&proxies[i]))
|
|
}
|
|
response.Success(c, out)
|
|
}
|
|
|
|
// GetByID handles getting a proxy by ID
|
|
// GET /api/v1/admin/proxies/:id
|
|
func (h *ProxyHandler) GetByID(c *gin.Context) {
|
|
proxyID, err := strconv.ParseInt(c.Param("id"), 10, 64)
|
|
if err != nil {
|
|
response.BadRequest(c, "Invalid proxy ID")
|
|
return
|
|
}
|
|
|
|
proxy, err := h.adminService.GetProxy(c.Request.Context(), proxyID)
|
|
if err != nil {
|
|
response.ErrorFrom(c, err)
|
|
return
|
|
}
|
|
|
|
response.Success(c, dto.ProxyFromService(proxy))
|
|
}
|
|
|
|
// Create handles creating a new proxy
|
|
// POST /api/v1/admin/proxies
|
|
func (h *ProxyHandler) Create(c *gin.Context) {
|
|
var req CreateProxyRequest
|
|
if err := c.ShouldBindJSON(&req); err != nil {
|
|
response.BadRequest(c, "Invalid request: "+err.Error())
|
|
return
|
|
}
|
|
|
|
proxy, err := h.adminService.CreateProxy(c.Request.Context(), &service.CreateProxyInput{
|
|
Name: strings.TrimSpace(req.Name),
|
|
Protocol: strings.TrimSpace(req.Protocol),
|
|
Host: strings.TrimSpace(req.Host),
|
|
Port: req.Port,
|
|
Username: strings.TrimSpace(req.Username),
|
|
Password: strings.TrimSpace(req.Password),
|
|
})
|
|
if err != nil {
|
|
response.ErrorFrom(c, err)
|
|
return
|
|
}
|
|
|
|
response.Success(c, dto.ProxyFromService(proxy))
|
|
}
|
|
|
|
// Update handles updating a proxy
|
|
// PUT /api/v1/admin/proxies/:id
|
|
func (h *ProxyHandler) Update(c *gin.Context) {
|
|
proxyID, err := strconv.ParseInt(c.Param("id"), 10, 64)
|
|
if err != nil {
|
|
response.BadRequest(c, "Invalid proxy ID")
|
|
return
|
|
}
|
|
|
|
var req UpdateProxyRequest
|
|
if err := c.ShouldBindJSON(&req); err != nil {
|
|
response.BadRequest(c, "Invalid request: "+err.Error())
|
|
return
|
|
}
|
|
|
|
proxy, err := h.adminService.UpdateProxy(c.Request.Context(), proxyID, &service.UpdateProxyInput{
|
|
Name: strings.TrimSpace(req.Name),
|
|
Protocol: strings.TrimSpace(req.Protocol),
|
|
Host: strings.TrimSpace(req.Host),
|
|
Port: req.Port,
|
|
Username: strings.TrimSpace(req.Username),
|
|
Password: strings.TrimSpace(req.Password),
|
|
Status: strings.TrimSpace(req.Status),
|
|
})
|
|
if err != nil {
|
|
response.ErrorFrom(c, err)
|
|
return
|
|
}
|
|
|
|
response.Success(c, dto.ProxyFromService(proxy))
|
|
}
|
|
|
|
// Delete handles deleting a proxy
|
|
// DELETE /api/v1/admin/proxies/:id
|
|
func (h *ProxyHandler) Delete(c *gin.Context) {
|
|
proxyID, err := strconv.ParseInt(c.Param("id"), 10, 64)
|
|
if err != nil {
|
|
response.BadRequest(c, "Invalid proxy ID")
|
|
return
|
|
}
|
|
|
|
err = h.adminService.DeleteProxy(c.Request.Context(), proxyID)
|
|
if err != nil {
|
|
response.ErrorFrom(c, err)
|
|
return
|
|
}
|
|
|
|
response.Success(c, gin.H{"message": "Proxy deleted successfully"})
|
|
}
|
|
|
|
// Test handles testing proxy connectivity
|
|
// POST /api/v1/admin/proxies/:id/test
|
|
func (h *ProxyHandler) Test(c *gin.Context) {
|
|
proxyID, err := strconv.ParseInt(c.Param("id"), 10, 64)
|
|
if err != nil {
|
|
response.BadRequest(c, "Invalid proxy ID")
|
|
return
|
|
}
|
|
|
|
result, err := h.adminService.TestProxy(c.Request.Context(), proxyID)
|
|
if err != nil {
|
|
response.ErrorFrom(c, err)
|
|
return
|
|
}
|
|
|
|
response.Success(c, result)
|
|
}
|
|
|
|
// GetStats handles getting proxy statistics
|
|
// GET /api/v1/admin/proxies/:id/stats
|
|
func (h *ProxyHandler) GetStats(c *gin.Context) {
|
|
proxyID, err := strconv.ParseInt(c.Param("id"), 10, 64)
|
|
if err != nil {
|
|
response.BadRequest(c, "Invalid proxy ID")
|
|
return
|
|
}
|
|
|
|
// Return mock data for now
|
|
_ = proxyID
|
|
response.Success(c, gin.H{
|
|
"total_accounts": 0,
|
|
"active_accounts": 0,
|
|
"total_requests": 0,
|
|
"success_rate": 100.0,
|
|
"average_latency": 0,
|
|
})
|
|
}
|
|
|
|
// GetProxyAccounts handles getting accounts using a proxy
|
|
// GET /api/v1/admin/proxies/:id/accounts
|
|
func (h *ProxyHandler) GetProxyAccounts(c *gin.Context) {
|
|
proxyID, err := strconv.ParseInt(c.Param("id"), 10, 64)
|
|
if err != nil {
|
|
response.BadRequest(c, "Invalid proxy ID")
|
|
return
|
|
}
|
|
|
|
page, pageSize := response.ParsePagination(c)
|
|
|
|
accounts, total, err := h.adminService.GetProxyAccounts(c.Request.Context(), proxyID, page, pageSize)
|
|
if err != nil {
|
|
response.ErrorFrom(c, err)
|
|
return
|
|
}
|
|
|
|
out := make([]dto.Account, 0, len(accounts))
|
|
for i := range accounts {
|
|
out = append(out, *dto.AccountFromService(&accounts[i]))
|
|
}
|
|
response.Paginated(c, out, total, page, pageSize)
|
|
}
|
|
|
|
// BatchCreateProxyItem represents a single proxy in batch create request
|
|
type BatchCreateProxyItem struct {
|
|
Protocol string `json:"protocol" binding:"required,oneof=http https socks5 socks5h"`
|
|
Host string `json:"host" binding:"required"`
|
|
Port int `json:"port" binding:"required,min=1,max=65535"`
|
|
Username string `json:"username"`
|
|
Password string `json:"password"`
|
|
}
|
|
|
|
// BatchCreateRequest represents batch create proxies request
|
|
type BatchCreateRequest struct {
|
|
Proxies []BatchCreateProxyItem `json:"proxies" binding:"required,min=1"`
|
|
}
|
|
|
|
// BatchCreate handles batch creating proxies
|
|
// POST /api/v1/admin/proxies/batch
|
|
func (h *ProxyHandler) BatchCreate(c *gin.Context) {
|
|
var req BatchCreateRequest
|
|
if err := c.ShouldBindJSON(&req); err != nil {
|
|
response.BadRequest(c, "Invalid request: "+err.Error())
|
|
return
|
|
}
|
|
|
|
created := 0
|
|
skipped := 0
|
|
|
|
for _, item := range req.Proxies {
|
|
// Trim all string fields
|
|
host := strings.TrimSpace(item.Host)
|
|
protocol := strings.TrimSpace(item.Protocol)
|
|
username := strings.TrimSpace(item.Username)
|
|
password := strings.TrimSpace(item.Password)
|
|
|
|
// Check for duplicates (same host, port, username, password)
|
|
exists, err := h.adminService.CheckProxyExists(c.Request.Context(), host, item.Port, username, password)
|
|
if err != nil {
|
|
response.ErrorFrom(c, err)
|
|
return
|
|
}
|
|
|
|
if exists {
|
|
skipped++
|
|
continue
|
|
}
|
|
|
|
// Create proxy with default name
|
|
_, err = h.adminService.CreateProxy(c.Request.Context(), &service.CreateProxyInput{
|
|
Name: "default",
|
|
Protocol: protocol,
|
|
Host: host,
|
|
Port: item.Port,
|
|
Username: username,
|
|
Password: password,
|
|
})
|
|
if err != nil {
|
|
// If creation fails due to duplicate, count as skipped
|
|
skipped++
|
|
continue
|
|
}
|
|
|
|
created++
|
|
}
|
|
|
|
response.Success(c, gin.H{
|
|
"created": created,
|
|
"skipped": skipped,
|
|
})
|
|
}
|