7c3d5cadd5
根据 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 阻塞问题） - 提升测试覆盖率
275 lines
8.2 KiB
Go
275 lines
8.2 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"
|
||
)
|
||
|
||
// GroupHandler handles admin group management
|
||
type GroupHandler struct {
|
||
adminService service.AdminService
|
||
}
|
||
|
||
// NewGroupHandler creates a new admin group handler
|
||
func NewGroupHandler(adminService service.AdminService) *GroupHandler {
|
||
return &GroupHandler{
|
||
adminService: adminService,
|
||
}
|
||
}
|
||
|
||
// CreateGroupRequest represents create group request
|
||
type CreateGroupRequest struct {
|
||
Name string `json:"name" binding:"required"`
|
||
Description string `json:"description"`
|
||
Platform string `json:"platform" binding:"omitempty,oneof=anthropic openai gemini antigravity"`
|
||
RateMultiplier float64 `json:"rate_multiplier"`
|
||
IsExclusive bool `json:"is_exclusive"`
|
||
SubscriptionType string `json:"subscription_type" binding:"omitempty,oneof=standard subscription"`
|
||
DailyLimitUSD *float64 `json:"daily_limit_usd"`
|
||
WeeklyLimitUSD *float64 `json:"weekly_limit_usd"`
|
||
MonthlyLimitUSD *float64 `json:"monthly_limit_usd"`
|
||
// 图片生成计费配置（antigravity 和 gemini 平台使用，负数表示清除配置）
|
||
ImagePrice1K *float64 `json:"image_price_1k"`
|
||
ImagePrice2K *float64 `json:"image_price_2k"`
|
||
ImagePrice4K *float64 `json:"image_price_4k"`
|
||
ClaudeCodeOnly bool `json:"claude_code_only"`
|
||
FallbackGroupID *int64 `json:"fallback_group_id"`
|
||
}
|
||
|
||
// UpdateGroupRequest represents update group request
|
||
type UpdateGroupRequest struct {
|
||
Name string `json:"name"`
|
||
Description string `json:"description"`
|
||
Platform string `json:"platform" binding:"omitempty,oneof=anthropic openai gemini antigravity"`
|
||
RateMultiplier *float64 `json:"rate_multiplier"`
|
||
IsExclusive *bool `json:"is_exclusive"`
|
||
Status string `json:"status" binding:"omitempty,oneof=active inactive"`
|
||
SubscriptionType string `json:"subscription_type" binding:"omitempty,oneof=standard subscription"`
|
||
DailyLimitUSD *float64 `json:"daily_limit_usd"`
|
||
WeeklyLimitUSD *float64 `json:"weekly_limit_usd"`
|
||
MonthlyLimitUSD *float64 `json:"monthly_limit_usd"`
|
||
// 图片生成计费配置（antigravity 和 gemini 平台使用，负数表示清除配置）
|
||
ImagePrice1K *float64 `json:"image_price_1k"`
|
||
ImagePrice2K *float64 `json:"image_price_2k"`
|
||
ImagePrice4K *float64 `json:"image_price_4k"`
|
||
ClaudeCodeOnly *bool `json:"claude_code_only"`
|
||
FallbackGroupID *int64 `json:"fallback_group_id"`
|
||
}
|
||
|
||
// List handles listing all groups with pagination
|
||
// GET /api/v1/admin/groups
|
||
func (h *GroupHandler) List(c *gin.Context) {
|
||
page, pageSize := response.ParsePagination(c)
|
||
platform := c.Query("platform")
|
||
status := c.Query("status")
|
||
search := c.Query("search")
|
||
// 标准化和验证 search 参数
|
||
search = strings.TrimSpace(search)
|
||
if len(search) > 100 {
|
||
search = search[:100]
|
||
}
|
||
isExclusiveStr := c.Query("is_exclusive")
|
||
|
||
var isExclusive *bool
|
||
if isExclusiveStr != "" {
|
||
val := isExclusiveStr == "true"
|
||
isExclusive = &val
|
||
}
|
||
|
||
groups, total, err := h.adminService.ListGroups(c.Request.Context(), page, pageSize, platform, status, search, isExclusive)
|
||
if err != nil {
|
||
response.ErrorFrom(c, err)
|
||
return
|
||
}
|
||
|
||
outGroups := make([]dto.Group, 0, len(groups))
|
||
for i := range groups {
|
||
outGroups = append(outGroups, *dto.GroupFromService(&groups[i]))
|
||
}
|
||
response.Paginated(c, outGroups, total, page, pageSize)
|
||
}
|
||
|
||
// GetAll handles getting all active groups without pagination
|
||
// GET /api/v1/admin/groups/all
|
||
func (h *GroupHandler) GetAll(c *gin.Context) {
|
||
platform := c.Query("platform")
|
||
|
||
var groups []service.Group
|
||
var err error
|
||
|
||
if platform != "" {
|
||
groups, err = h.adminService.GetAllGroupsByPlatform(c.Request.Context(), platform)
|
||
} else {
|
||
groups, err = h.adminService.GetAllGroups(c.Request.Context())
|
||
}
|
||
|
||
if err != nil {
|
||
response.ErrorFrom(c, err)
|
||
return
|
||
}
|
||
|
||
outGroups := make([]dto.Group, 0, len(groups))
|
||
for i := range groups {
|
||
outGroups = append(outGroups, *dto.GroupFromService(&groups[i]))
|
||
}
|
||
response.Success(c, outGroups)
|
||
}
|
||
|
||
// GetByID handles getting a group by ID
|
||
// GET /api/v1/admin/groups/:id
|
||
func (h *GroupHandler) GetByID(c *gin.Context) {
|
||
groupID, err := strconv.ParseInt(c.Param("id"), 10, 64)
|
||
if err != nil {
|
||
response.BadRequest(c, "Invalid group ID")
|
||
return
|
||
}
|
||
|
||
group, err := h.adminService.GetGroup(c.Request.Context(), groupID)
|
||
if err != nil {
|
||
response.ErrorFrom(c, err)
|
||
return
|
||
}
|
||
|
||
response.Success(c, dto.GroupFromService(group))
|
||
}
|
||
|
||
// Create handles creating a new group
|
||
// POST /api/v1/admin/groups
|
||
func (h *GroupHandler) Create(c *gin.Context) {
|
||
var req CreateGroupRequest
|
||
if err := c.ShouldBindJSON(&req); err != nil {
|
||
response.BadRequest(c, "Invalid request: "+err.Error())
|
||
return
|
||
}
|
||
|
||
group, err := h.adminService.CreateGroup(c.Request.Context(), &service.CreateGroupInput{
|
||
Name: req.Name,
|
||
Description: req.Description,
|
||
Platform: req.Platform,
|
||
RateMultiplier: req.RateMultiplier,
|
||
IsExclusive: req.IsExclusive,
|
||
SubscriptionType: req.SubscriptionType,
|
||
DailyLimitUSD: req.DailyLimitUSD,
|
||
WeeklyLimitUSD: req.WeeklyLimitUSD,
|
||
MonthlyLimitUSD: req.MonthlyLimitUSD,
|
||
ImagePrice1K: req.ImagePrice1K,
|
||
ImagePrice2K: req.ImagePrice2K,
|
||
ImagePrice4K: req.ImagePrice4K,
|
||
ClaudeCodeOnly: req.ClaudeCodeOnly,
|
||
FallbackGroupID: req.FallbackGroupID,
|
||
})
|
||
if err != nil {
|
||
response.ErrorFrom(c, err)
|
||
return
|
||
}
|
||
|
||
response.Success(c, dto.GroupFromService(group))
|
||
}
|
||
|
||
// Update handles updating a group
|
||
// PUT /api/v1/admin/groups/:id
|
||
func (h *GroupHandler) Update(c *gin.Context) {
|
||
groupID, err := strconv.ParseInt(c.Param("id"), 10, 64)
|
||
if err != nil {
|
||
response.BadRequest(c, "Invalid group ID")
|
||
return
|
||
}
|
||
|
||
var req UpdateGroupRequest
|
||
if err := c.ShouldBindJSON(&req); err != nil {
|
||
response.BadRequest(c, "Invalid request: "+err.Error())
|
||
return
|
||
}
|
||
|
||
group, err := h.adminService.UpdateGroup(c.Request.Context(), groupID, &service.UpdateGroupInput{
|
||
Name: req.Name,
|
||
Description: req.Description,
|
||
Platform: req.Platform,
|
||
RateMultiplier: req.RateMultiplier,
|
||
IsExclusive: req.IsExclusive,
|
||
Status: req.Status,
|
||
SubscriptionType: req.SubscriptionType,
|
||
DailyLimitUSD: req.DailyLimitUSD,
|
||
WeeklyLimitUSD: req.WeeklyLimitUSD,
|
||
MonthlyLimitUSD: req.MonthlyLimitUSD,
|
||
ImagePrice1K: req.ImagePrice1K,
|
||
ImagePrice2K: req.ImagePrice2K,
|
||
ImagePrice4K: req.ImagePrice4K,
|
||
ClaudeCodeOnly: req.ClaudeCodeOnly,
|
||
FallbackGroupID: req.FallbackGroupID,
|
||
})
|
||
if err != nil {
|
||
response.ErrorFrom(c, err)
|
||
return
|
||
}
|
||
|
||
response.Success(c, dto.GroupFromService(group))
|
||
}
|
||
|
||
// Delete handles deleting a group
|
||
// DELETE /api/v1/admin/groups/:id
|
||
func (h *GroupHandler) Delete(c *gin.Context) {
|
||
groupID, err := strconv.ParseInt(c.Param("id"), 10, 64)
|
||
if err != nil {
|
||
response.BadRequest(c, "Invalid group ID")
|
||
return
|
||
}
|
||
|
||
err = h.adminService.DeleteGroup(c.Request.Context(), groupID)
|
||
if err != nil {
|
||
response.ErrorFrom(c, err)
|
||
return
|
||
}
|
||
|
||
response.Success(c, gin.H{"message": "Group deleted successfully"})
|
||
}
|
||
|
||
// GetStats handles getting group statistics
|
||
// GET /api/v1/admin/groups/:id/stats
|
||
func (h *GroupHandler) GetStats(c *gin.Context) {
|
||
groupID, err := strconv.ParseInt(c.Param("id"), 10, 64)
|
||
if err != nil {
|
||
response.BadRequest(c, "Invalid group ID")
|
||
return
|
||
}
|
||
|
||
// Return mock data for now
|
||
response.Success(c, gin.H{
|
||
"total_api_keys": 0,
|
||
"active_api_keys": 0,
|
||
"total_requests": 0,
|
||
"total_cost": 0.0,
|
||
})
|
||
_ = groupID // TODO: implement actual stats
|
||
}
|
||
|
||
// GetGroupAPIKeys handles getting API keys in a group
|
||
// GET /api/v1/admin/groups/:id/api-keys
|
||
func (h *GroupHandler) GetGroupAPIKeys(c *gin.Context) {
|
||
groupID, err := strconv.ParseInt(c.Param("id"), 10, 64)
|
||
if err != nil {
|
||
response.BadRequest(c, "Invalid group ID")
|
||
return
|
||
}
|
||
|
||
page, pageSize := response.ParsePagination(c)
|
||
|
||
keys, total, err := h.adminService.GetGroupAPIKeys(c.Request.Context(), groupID, page, pageSize)
|
||
if err != nil {
|
||
response.ErrorFrom(c, err)
|
||
return
|
||
}
|
||
|
||
outKeys := make([]dto.APIKey, 0, len(keys))
|
||
for i := range keys {
|
||
outKeys = append(outKeys, *dto.APIKeyFromService(&keys[i]))
|
||
}
|
||
response.Paginated(c, outKeys, total, page, pageSize)
|
||
}
|