feat(server): 设备上限登录闸(超限非硬拒登,返回 device_limit 信号)#16
启用设备数量限制的服务端部分。登录照常成功签发 token(非硬拒登),但若账户活跃 设备数超套餐上限,登录响应带 device_limit 信号,客户端据此弹「移除设备」页。 - devices/store.go:CountActiveDevices(last_seen 近 staleWindow)+ PruneStaleDevices (删超期僵尸行,免费版重装 churn 自愈) - devices/service.go:staleWindow=30d;DeviceLimitStatus + CheckDeviceLimit (best-effort prune → ResolvePlan → 活跃 count > cap 即 Over,附活跃设备列表) - auth:DeviceRegistrar 加 CheckDeviceLimit;recordLogin 回传 *DeviceLimit; LoginOutcome.DeviceLimit;Login 透传;handler tokenPairResponse.device_limit(omitempty) - main.go:authDeviceRegistrar 适配 devices.CheckDeviceLimit → auth.DeviceLimit - 测试:auth 登录透传超限信号(仍签发 token);devices within/over/prune-stale 连接侧 backstop(服务端硬拦)本轮从简未做,作为后续硬化(登录闸为客户端可信信号)。 DB 无 schema 变更。 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -265,6 +265,55 @@ func TestDeviceLimitEnforced(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// TestCheckDeviceLimit covers the login-gate helper: within-cap, over-cap (active
|
||||
// devices exceed the plan cap), and stale-prune (churned rows dropped + excluded).
|
||||
func TestCheckDeviceLimit(t *testing.T) {
|
||||
db := setupMySQL(t)
|
||||
svc := devices.NewService(devices.NewStore(db), nil)
|
||||
ctx := context.Background()
|
||||
userID := createUser(t, db, "cap@example.com", "active") // free plan, cap 1
|
||||
|
||||
// 1 device → within cap.
|
||||
d1 := newUUID(t, db)
|
||||
if _, _, e := svc.RegisterIfAbsent(ctx, devices.RegisterInput{UserID: userID, DeviceUUID: d1, Name: "P1", Platform: "android"}); e != nil {
|
||||
t.Fatalf("register d1: %v", e)
|
||||
}
|
||||
st, apiErr := svc.CheckDeviceLimit(ctx, userID)
|
||||
if apiErr != nil {
|
||||
t.Fatalf("CheckDeviceLimit: %v", apiErr)
|
||||
}
|
||||
if st.Over || st.MaxDevices != 1 {
|
||||
t.Fatalf("1 device should be within cap 1, got %+v", st)
|
||||
}
|
||||
|
||||
// 2nd device (MaxDevices:0 bypasses the register-time cap) → over cap.
|
||||
d2 := newUUID(t, db)
|
||||
if _, _, e := svc.RegisterIfAbsent(ctx, devices.RegisterInput{UserID: userID, DeviceUUID: d2, Name: "P2", Platform: "ios"}); e != nil {
|
||||
t.Fatalf("register d2: %v", e)
|
||||
}
|
||||
st, _ = svc.CheckDeviceLimit(ctx, userID)
|
||||
if !st.Over || len(st.Devices) != 2 {
|
||||
t.Fatalf("2 devices should exceed cap 1, got %+v", st)
|
||||
}
|
||||
|
||||
// Age d1 past staleWindow → pruned + excluded → back within cap.
|
||||
if _, err := db.Exec(`UPDATE devices SET last_seen=? WHERE uuid=?`,
|
||||
time.Now().UTC().Add(-40*24*time.Hour), d1); err != nil {
|
||||
t.Fatalf("age d1: %v", err)
|
||||
}
|
||||
st, _ = svc.CheckDeviceLimit(ctx, userID)
|
||||
if st.Over {
|
||||
t.Fatalf("stale device should be pruned/excluded → within cap, got %+v", st)
|
||||
}
|
||||
var n int
|
||||
if err := db.QueryRow(`SELECT COUNT(1) FROM devices WHERE uuid=?`, d1).Scan(&n); err != nil {
|
||||
t.Fatalf("count d1: %v", err)
|
||||
}
|
||||
if n != 0 {
|
||||
t.Errorf("stale device should be pruned, still present")
|
||||
}
|
||||
}
|
||||
|
||||
// TestDeleteOthersDevice verifies ownership enforcement and not-found handling.
|
||||
func TestDeleteOthersDevice(t *testing.T) {
|
||||
db := setupMySQL(t)
|
||||
|
||||
@@ -90,6 +90,20 @@ type Device struct {
|
||||
// app 一关 ~90s 内转离线。
|
||||
const onlineWindow = 90 * time.Second
|
||||
|
||||
// staleWindow: devices not seen within this window are "stale" — excluded from the
|
||||
// plan-cap count and best-effort pruned on login. Covers free-plan reinstall churn
|
||||
// (each reinstall churns the device UUID, leaving zombie rows) without locking users out.
|
||||
const staleWindow = 30 * 24 * time.Hour
|
||||
|
||||
// DeviceLimitStatus reports the device-cap state. Over is true when the account's
|
||||
// active device count exceeds the plan cap; Devices lists the active set so the
|
||||
// client can present "remove a device" UX.
|
||||
type DeviceLimitStatus struct {
|
||||
Over bool `json:"over"`
|
||||
MaxDevices int `json:"max_devices"`
|
||||
Devices []Device `json:"devices,omitempty"`
|
||||
}
|
||||
|
||||
func toAPIDevice(d DeviceRow) Device {
|
||||
out := Device{UUID: d.UUID, Name: d.Name, Platform: d.Platform}
|
||||
if d.LastSeen.Valid {
|
||||
@@ -444,6 +458,37 @@ func (svc *Service) ResolvePlan(ctx context.Context, userID int64) (Plan, *apier
|
||||
return resolveEffectivePlan(time.Now().UTC(), status, subs, free)
|
||||
}
|
||||
|
||||
// CheckDeviceLimit prunes stale devices (best-effort churn cleanup), resolves the
|
||||
// plan cap, and reports whether the account's active device count exceeds it. Used
|
||||
// by the login flow (non-hard-reject gate) and the connect backstop. When over, the
|
||||
// active device list is included so the client can present "remove a device" UX.
|
||||
// The device is already registered by the time this runs, so "over" means
|
||||
// activeCount > cap. MaxDevices==0 means uncapped (never over).
|
||||
func (svc *Service) CheckDeviceLimit(ctx context.Context, userID int64) (*DeviceLimitStatus, *apierr.Error) {
|
||||
cutoff := time.Now().UTC().Add(-staleWindow)
|
||||
if _, err := svc.store.PruneStaleDevices(ctx, userID, cutoff); err != nil {
|
||||
_ = err // prune failure must never block login/connect
|
||||
}
|
||||
plan, apiErr := svc.ResolvePlan(ctx, userID)
|
||||
if apiErr != nil {
|
||||
return nil, apiErr
|
||||
}
|
||||
active, err := svc.store.CountActiveDevices(ctx, userID, cutoff)
|
||||
if err != nil {
|
||||
return nil, apierr.ErrInternal
|
||||
}
|
||||
st := &DeviceLimitStatus{MaxDevices: plan.MaxDevices}
|
||||
st.Over = plan.MaxDevices > 0 && active > plan.MaxDevices
|
||||
if st.Over {
|
||||
devs, apiErr := svc.ListDevices(ctx, userID)
|
||||
if apiErr != nil {
|
||||
return nil, apiErr
|
||||
}
|
||||
st.Devices = devs
|
||||
}
|
||||
return st, nil
|
||||
}
|
||||
|
||||
// resolveEffectivePlan is the pure plan-resolution rule (no I/O), unit-tested
|
||||
// directly:
|
||||
//
|
||||
|
||||
@@ -131,6 +131,34 @@ func (s *Store) countDevicesTx(ctx context.Context, tx *sql.Tx, userID int64) (i
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// CountActiveDevices counts the user's devices seen within the active window
|
||||
// (last_seen > cutoff). Stale rows (churned free-plan reinstalls) and never-seen
|
||||
// rows are excluded so they don't count against the plan cap.
|
||||
func (s *Store) CountActiveDevices(ctx context.Context, userID int64, cutoff time.Time) (int, error) {
|
||||
var n int
|
||||
if err := s.db.QueryRowContext(ctx,
|
||||
`SELECT COUNT(1) FROM devices WHERE user_id=? AND last_seen IS NOT NULL AND last_seen > ?`,
|
||||
userID, cutoff.UTC()).Scan(&n); err != nil {
|
||||
return 0, fmt.Errorf("store.CountActiveDevices: %w", err)
|
||||
}
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// PruneStaleDevices deletes the user's devices not seen since cutoff (best-effort
|
||||
// churn cleanup). Stale devices are offline; their sessions/credentials have long
|
||||
// expired and node resync reconciles any residue, so a plain row delete is safe.
|
||||
// Returns the number of rows removed.
|
||||
func (s *Store) PruneStaleDevices(ctx context.Context, userID int64, cutoff time.Time) (int64, error) {
|
||||
res, err := s.db.ExecContext(ctx,
|
||||
`DELETE FROM devices WHERE user_id=? AND last_seen IS NOT NULL AND last_seen < ?`,
|
||||
userID, cutoff.UTC())
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("store.PruneStaleDevices: %w", err)
|
||||
}
|
||||
n, _ := res.RowsAffected()
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// insertDeviceTx inserts a new device row inside tx and returns it.
|
||||
func (s *Store) insertDeviceTx(ctx context.Context, tx *sql.Tx, uuid string, userID int64, name, platform, clientVersion string) (*DeviceRow, error) {
|
||||
now := time.Now().UTC()
|
||||
|
||||
Reference in New Issue
Block a user