修复(#71): 校验订阅限速非法参数

Co-authored-by: multica-agent <github@multica.ai>

apis/admin/user.api

@@ -76,29 +76,6 @@ type (
 		GiftAmount         int64  `json:"gift_amount"`
 		IsAdmin            bool   `json:"is_admin"`
 	}
-	UserSubscribeDetail {
-		Id             int64     `json:"id"`
-		UserId         int64     `json:"user_id"`
-		User           User      `json:"user"`
-		OrderId        int64     `json:"order_id"`
-		SubscribeId    int64     `json:"subscribe_id"`
-		Subscribe      Subscribe `json:"subscribe"`
-		NodeGroupId    int64     `json:"node_group_id"`
-		GroupLocked    bool      `json:"group_locked"`
-		StartTime      int64     `json:"start_time"`
-		ExpireTime     int64     `json:"expire_time"`
-		ResetTime      int64     `json:"reset_time"`
-		Traffic        int64     `json:"traffic"`
-		Download       int64     `json:"download"`
-		Upload         int64     `json:"upload"`
-		Token          string    `json:"token"`
-		Status         uint8     `json:"status"`
-		EffectiveSpeed int64     `json:"effective_speed"`
-		IsThrottled    bool      `json:"is_throttled"`
-		ThrottleRule   string    `json:"throttle_rule,omitempty"`
-		CreatedAt      int64     `json:"created_at"`
-		UpdatedAt      int64     `json:"updated_at"`
-	}
 	BatchDeleteUserRequest {
 		Ids []int64 `json:"ids" validate:"required"`
 	}
@@ -162,6 +139,8 @@ type (
 		ExpiredAt    int64  `json:"expired_at"`
 		Traffic      int64  `json:"traffic"`
 		SubscribeId  int64  `json:"subscribe_id"`
+		SpeedLimit   int64  `json:"speed_limit,optional"`
+		TrafficLimit string `json:"traffic_limit,optional"`
 	}
 	UpdateUserSubscribeRequest {
 		UserSubscribeId int64   `json:"user_subscribe_id"`
@@ -170,6 +149,8 @@ type (
 		ExpiredAt       int64   `json:"expired_at"`
 		Upload          int64   `json:"upload"`
 		Download        int64   `json:"download"`
+		SpeedLimit      *int64  `json:"speed_limit,omitempty" validate:"omitempty,gte=0"`
+		TrafficLimit    *string `json:"traffic_limit,omitempty"`
 	}
 	GetUserLoginLogsRequest {
 		Page   int   `form:"page"`

apis/types.api

@@ -536,6 +536,35 @@ type (
 		CreatedAt              int64     `json:"created_at"`
 		UpdatedAt              int64     `json:"updated_at"`
 	}
+	UserSubscribeDetail {
+		Id             int64          `json:"id"`
+		UserId         int64          `json:"user_id"`
+		User           User           `json:"user"`
+		OrderId        int64          `json:"order_id"`
+		SubscribeId    int64          `json:"subscribe_id"`
+		Subscribe      Subscribe      `json:"subscribe"`
+		NodeGroupId    int64          `json:"node_group_id"`
+		NodeGroupName  string         `json:"node_group_name"`
+		GroupLocked    bool           `json:"group_locked"`
+		StartTime      int64          `json:"start_time"`
+		ExpireTime     int64          `json:"expire_time"`
+		ResetTime      int64          `json:"reset_time"`
+		Traffic        int64          `json:"traffic"`
+		Download       int64          `json:"download"`
+		Upload         int64          `json:"upload"`
+		SpeedLimit     int64          `json:"speed_limit"`
+		TrafficLimit   []TrafficLimit `json:"user_traffic_limit"`
+		PlanSpeedLimit int64          `json:"plan_speed_limit"`
+		Token          string         `json:"token"`
+		Status         uint8          `json:"status"`
+		EffectiveSpeed int64          `json:"effective_speed"`
+		IsThrottled    bool           `json:"is_throttled"`
+		ThrottleRule   string         `json:"throttle_rule,omitempty"`
+		ThrottleStart  int64          `json:"throttle_start,omitempty"`
+		ThrottleEnd    int64          `json:"throttle_end,omitempty"`
+		CreatedAt      int64          `json:"created_at"`
+		UpdatedAt      int64          `json:"updated_at"`
+	}
 	UserAffiliate {
 		Avatar       string `json:"avatar"`
 		Identifier   string `json:"identifier"`

initialize/migrate/database/02153_user_subscribe_speed_limit.down.sql

@@ -0,0 +1,5 @@
+-- Purpose: Rollback user-level speed limit overrides from user_subscribe
+
+ALTER TABLE `user_subscribe`
+  DROP COLUMN IF EXISTS `traffic_limit`,
+  DROP COLUMN IF EXISTS `speed_limit`;

initialize/migrate/database/02153_user_subscribe_speed_limit.up.sql

@@ -0,0 +1,37 @@
+-- Purpose: Add user-level speed limit overrides to user_subscribe
+
+SET @column_exists = (
+  SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE TABLE_SCHEMA = DATABASE()
+    AND TABLE_NAME = 'user_subscribe'
+    AND COLUMN_NAME = 'speed_limit'
+);
+
+SET @sql = IF(
+  @column_exists = 0,
+  'ALTER TABLE `user_subscribe` ADD COLUMN `speed_limit` int NOT NULL DEFAULT 0 COMMENT ''User-level speed limit override (Mbps, 0=use plan default)'' AFTER `upload`',
+  'SELECT ''Column speed_limit already exists in user_subscribe table'''
+);
+
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET @column_exists = (
+  SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE TABLE_SCHEMA = DATABASE()
+    AND TABLE_NAME = 'user_subscribe'
+    AND COLUMN_NAME = 'traffic_limit'
+);
+
+SET @sql = IF(
+  @column_exists = 0,
+  'ALTER TABLE `user_subscribe` ADD COLUMN `traffic_limit` text DEFAULT NULL COMMENT ''User-level traffic limit rules override (JSON, NULL=use plan default)'' AFTER `speed_limit`',
+  'SELECT ''Column traffic_limit already exists in user_subscribe table'''
+);
+
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;

internal/handler/admin/user/updateUserSubscribeHandler.go

@@ -1,6 +1,9 @@
 package user
 
 import (
+	"encoding/json"
+	"errors"
+
 	"github.com/gin-gonic/gin"
 	"github.com/perfect-panel/server/internal/logic/admin/user"
 	"github.com/perfect-panel/server/internal/svc"
@@ -18,9 +21,25 @@ func UpdateUserSubscribeHandler(svcCtx *svc.ServiceContext) func(c *gin.Context)
 			result.ParamErrorResult(c, validateErr)
 			return
 		}
+		if err := validateUpdateUserSubscribeTrafficLimit(&req); err != nil {
+			result.ParamErrorResult(c, err)
+			return
+		}
 
 		l := user.NewUpdateUserSubscribeLogic(c.Request.Context(), svcCtx)
 		err := l.UpdateUserSubscribe(&req)
 		result.HttpResult(c, nil, err)
 	}
 }
+
+func validateUpdateUserSubscribeTrafficLimit(req *types.UpdateUserSubscribeRequest) error {
+	if req.TrafficLimit == nil || *req.TrafficLimit == "" {
+		return nil
+	}
+
+	var rules []types.TrafficLimit
+	if err := json.Unmarshal([]byte(*req.TrafficLimit), &rules); err != nil {
+		return errors.New("traffic_limit must be a valid JSON array")
+	}
+	return nil
+}

internal/handler/admin/user/updateUserSubscribeHandler_test.go

@@ -0,0 +1,59 @@
+package user
+
+import (
+	"bytes"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/gin-gonic/gin"
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/pkg/xerr"
+)
+
+func TestUpdateUserSubscribeHandlerRejectsInvalidLimits(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+
+	tests := []struct {
+		name string
+		body string
+	}{
+		{
+			name: "negative speed limit",
+			body: `{"user_subscribe_id":1,"subscribe_id":1,"traffic":0,"expired_at":4102444800000,"upload":0,"download":0,"speed_limit":-1}`,
+		},
+		{
+			name: "invalid traffic limit json",
+			body: `{"user_subscribe_id":1,"subscribe_id":1,"traffic":0,"expired_at":4102444800000,"upload":0,"download":0,"traffic_limit":"not-json"}`,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			router := gin.New()
+			router.PUT("/v1/admin/user/subscribe", UpdateUserSubscribeHandler(&svc.ServiceContext{}))
+
+			req := httptest.NewRequest(http.MethodPut, "/v1/admin/user/subscribe", bytes.NewBufferString(tt.body))
+			req.Header.Set("Content-Type", "application/json")
+			rec := httptest.NewRecorder()
+
+			router.ServeHTTP(rec, req)
+
+			if rec.Code != http.StatusOK {
+				t.Fatalf("expected HTTP 200, got %d", rec.Code)
+			}
+
+			var resp struct {
+				Code uint32 `json:"code"`
+				Msg  string `json:"msg"`
+			}
+			if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil {
+				t.Fatalf("unmarshal response: %v", err)
+			}
+			if resp.Code != xerr.InvalidParams {
+				t.Fatalf("expected code %d, got %d (%s)", xerr.InvalidParams, resp.Code, resp.Msg)
+			}
+		})
+	}
+}

internal/logic/admin/user/updateUserSubscribeLogic.go

@@ -39,6 +39,14 @@ func (l *UpdateUserSubscribeLogic) UpdateUserSubscribe(req *types.UpdateUserSubs
 	} else {
 		userSub.Status = 1
 	}
+	speedLimit := userSub.SpeedLimit
+	if req.SpeedLimit != nil {
+		speedLimit = *req.SpeedLimit
+	}
+	trafficLimit := userSub.TrafficLimit
+	if req.TrafficLimit != nil {
+		trafficLimit = *req.TrafficLimit
+	}
 
 	err = l.svcCtx.UserModel.UpdateSubscribe(l.ctx, &user.Subscribe{
 		Id:           userSub.Id,
@@ -50,6 +58,8 @@ func (l *UpdateUserSubscribeLogic) UpdateUserSubscribe(req *types.UpdateUserSubs
 		Traffic:      req.Traffic,
 		Download:     req.Download,
 		Upload:       req.Upload,
+		SpeedLimit:   speedLimit,
+		TrafficLimit: trafficLimit,
 		Token:        userSub.Token,
 		UUID:         userSub.UUID,
 		Status:       userSub.Status,

internal/model/user/user.go

@@ -101,6 +101,8 @@ type Subscribe struct {
 	Traffic         int64      `gorm:"default:0;comment:Traffic"`
 	Download        int64      `gorm:"default:0;comment:Download Traffic"`
 	Upload          int64      `gorm:"default:0;comment:Upload Traffic"`
+	SpeedLimit      int64      `gorm:"default:0;comment:User-level speed limit override (Mbps, 0=use plan default)"`
+	TrafficLimit    string     `gorm:"type:text;default:null;comment:User-level traffic limit rules override (JSON)"`
 	ExpiredDownload int64      `gorm:"default:0;comment:Expired period download traffic (bytes)"`
 	ExpiredUpload   int64      `gorm:"default:0;comment:Expired period upload traffic (bytes)"`
 	Token           string     `gorm:"index:idx_token;unique;type:varchar(255);default:'';comment:Token"`

internal/types/types.go

@@ -545,6 +545,8 @@ type CreateUserSubscribeRequest struct {
 	ExpiredAt    int64  `json:"expired_at"`
 	Traffic      int64  `json:"traffic"`
 	SubscribeId  int64  `json:"subscribe_id"`
+	SpeedLimit   int64  `json:"speed_limit,optional"`
+	TrafficLimit string `json:"traffic_limit,optional"`
 }
 
 type CreateUserTicketFollowRequest struct {
@@ -3323,6 +3325,8 @@ type UpdateUserSubscribeRequest struct {
 	ExpiredAt       int64   `json:"expired_at"`
 	Upload          int64   `json:"upload"`
 	Download        int64   `json:"download"`
+	SpeedLimit      *int64  `json:"speed_limit,omitempty" validate:"omitempty,gte=0"`
+	TrafficLimit    *string `json:"traffic_limit,omitempty"`
 }
 
 type UpdateUserTicketStatusRequest struct {
@@ -3489,6 +3493,9 @@ type UserSubscribeDetail struct {
 	Traffic        int64          `json:"traffic"`
 	Download       int64          `json:"download"`
 	Upload         int64          `json:"upload"`
+	SpeedLimit     int64          `json:"speed_limit"`
+	TrafficLimit   []TrafficLimit `json:"user_traffic_limit"`
+	PlanSpeedLimit int64          `json:"plan_speed_limit"`
 	Token          string         `json:"token"`
 	Status         uint8          `json:"status"`
 	EffectiveSpeed int64          `json:"effective_speed"`