luckfun233 commited on
Commit ·
5720298
1
Parent(s): cf6e1f1
fix(auth): 登录限流/MFA 冷却与设备风控参数补全
Browse files- 登录响应 40029 TOO_MANY_REQUESTS 时进入 5 分钟冷却,mfa_ticket 时
进入 30 分钟冷却,冷却期内不再重复提交密码,避免持续加重风控
- 新增 LoginChallengeError,MFA 场景不再误报 missing login token
- 会话探针成功后调用 auth_token/check_device,支持 rotate.token 轮换
- 账号配置新增可选 x_device_id,登录与 Android 请求按需携带
- 文档补充登录/MFA 实测结果、可信设备 ES256 流程与端点全集
- docs/deepseek-android-275-sse-fix-research.md +103 -0
- internal/auth/request.go +89 -2
- internal/auth/session_probe_test.go +43 -0
- internal/config/config.go +5 -4
- internal/deepseek/client/client_auth.go +23 -1
- internal/deepseek/client/client_auth_test.go +26 -1
- internal/deepseek/client/client_user_session.go +49 -1
- internal/deepseek/protocol/constants.go +1 -0
- internal/httpapi/admin/accounts/handler_accounts_crud.go +5 -0
- internal/httpapi/admin/shared/helpers.go +1 -0
docs/deepseek-android-275-sse-fix-research.md
CHANGED
|
@@ -556,6 +556,106 @@ finish_reason: stop
|
|
| 556 |
|
| 557 |
---
|
| 558 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 559 |
## 附录 A:证据索引
|
| 560 |
|
| 561 |
| 主题 | 证据 |
|
|
@@ -577,6 +677,9 @@ finish_reason: stop
|
|
| 577 |
| 数美 SDK | `defpackage/a4a.java:19-55`、`com/ishumei/smantifraud/l111l11I1IIIl.java:45-46` |
|
| 578 |
| 风控开关 | `defpackage/fx2.java:12-20`、`hx2.java:1484` |
|
| 579 |
| MFA/验证码 | `defpackage/bd7.java`、`zd3.java:12-20`、`sq1.java:12-19` |
|
|
|
|
|
|
|
|
|
|
| 580 |
| ds2api 修复 | `internal/sse/parser.go`、`internal/deepseek/client/client_completion.go`、`client_continue.go` |
|
| 581 |
|
| 582 |
## 附录 B:关键 JSON 速查
|
|
|
|
| 556 |
|
| 557 |
---
|
| 558 |
|
| 559 |
+
## 14. 登录 / 刷新 / MFA 深挖(2026-11-07 实测)
|
| 560 |
+
|
| 561 |
+
### 14.1 登录实测结果
|
| 562 |
+
|
| 563 |
+
用同一账号、固定/新签发 device_id 分别测试:
|
| 564 |
+
|
| 565 |
+
| 场景 | 结果 |
|
| 566 |
+
|---|---|
|
| 567 |
+
| 配置里的数美 device_id(`B...`) | `code=0 biz_code=0`,返回 64 字符 token |
|
| 568 |
+
| 新签发一个数美 device_id | `code=0 biz_code=0`,返回 token,**未触发 MFA** |
|
| 569 |
+
| 伪造 device_id | `code=0 biz_code=11 biz_msg=RISK_DEVICE_DETECTED` |
|
| 570 |
+
| 连续多次密码登录 | 最终返回 `code=40029 msg=TOO_MANY_REQUESTS` |
|
| 571 |
+
| `GET /api/v0/users/current` | `200`,返回当前 token |
|
| 572 |
+
| `POST /api/v0/users/auth_token/check_device` | `200`,`biz_data.rotate=null` |
|
| 573 |
+
|
| 574 |
+
结论:
|
| 575 |
+
|
| 576 |
+
1. 固定 device_id 或新签发的真实数美 device_id 都能正常重新登录,**当前账号没有被 MFA 挑战**;
|
| 577 |
+
2. 真正需要避免的是**高频密码登录**:连续登录十几次后会命中 `40029 TOO_MANY_REQUESTS`;
|
| 578 |
+
3. 伪造 device_id 仍会被 `RISK_DEVICE_DETECTED` 拦截,所以不能省掉数美签发步骤。
|
| 579 |
+
|
| 580 |
+
### 14.2 登录相关端点全集(2.7.5)
|
| 581 |
+
|
| 582 |
+
```text
|
| 583 |
+
POST /api/v0/users/login
|
| 584 |
+
GET /api/v0/users/current
|
| 585 |
+
POST /api/v0/users/auth_token/check_device
|
| 586 |
+
POST /api/v0/users/mfa/create_verification_code
|
| 587 |
+
POST /api/v0/users/mfa/check_verification_code
|
| 588 |
+
POST /api/v0/users/mfa/verify_signature
|
| 589 |
+
POST /api/v0/users/mfa/trusted_device/register
|
| 590 |
+
POST /api/v0/users/mfa/trusted_device/verify
|
| 591 |
+
```
|
| 592 |
+
|
| 593 |
+
登录响应 `UsersLoginResponseBizData`(`defpackage/inb.java`):
|
| 594 |
+
|
| 595 |
+
```json
|
| 596 |
+
{
|
| 597 |
+
"user": { "...": "...", "token": "..." },
|
| 598 |
+
"mfa_ticket": "可选;非空表示需要 MFA"
|
| 599 |
+
}
|
| 600 |
+
```
|
| 601 |
+
|
| 602 |
+
### 14.3 MFA 请求模型
|
| 603 |
+
|
| 604 |
+
| 模型 | 字段 | 用途 |
|
| 605 |
+
|---|---|---|
|
| 606 |
+
| `MfaCreateVerificationCodeRequest` | `mfa_session_id`、`shumei_device_id`、`shumei_verification?`、`hcaptcha_token?`、`turnstile_token?` | 发送邮箱/短信验证码 |
|
| 607 |
+
| `MfaCheckVerificationCodeRequest` | `mfa_session_id`、`verification_code` | 校验验证码 |
|
| 608 |
+
| `MfaVerifySignatureRequest` | `mfa_session_id`、`mfa_signature` | 用可信设备私钥签名验证 |
|
| 609 |
+
| `MfaTrustedDeviceRegisterRequest` | `mfa_ticket`、`mfa_public_key`、`mfa_algorithm`(默认 `ES256`) | 注册可信设备公钥 |
|
| 610 |
+
| `MfaTrustedDeviceVerifyRequest` | `mfa_ticket`、`mfa_signature` | 验证可信设备签名 |
|
| 611 |
+
| `MfaSessionResponseBizData` | `mfa_session_id`、`mfa_challenge?` | MFA 会话/挑战 |
|
| 612 |
+
| `MfaTrustedDeviceRegisterResponseBizData` | `mfa_ticket`、`credential_id`、`mfa_challenge?` | 注册结果 |
|
| 613 |
+
| `MfaTrustedDeviceVerifyResponseBizData` | `credential_id`、`expire_at` | 验证结果 |
|
| 614 |
+
|
| 615 |
+
### 14.4 可信设备(Passkey 风格)流程
|
| 616 |
+
|
| 617 |
+
从 `defpackage/s8b.java` + `qd7/zd7/td7/ce7` 模型还原:
|
| 618 |
+
|
| 619 |
+
```text
|
| 620 |
+
登录返回 mfa_ticket
|
| 621 |
+
→ 生成 ES256 密钥对(Android Keystore alias = mfa_device)
|
| 622 |
+
→ POST /mfa/trusted_device/register
|
| 623 |
+
{mfa_ticket, mfa_public_key, mfa_algorithm:"ES256"}
|
| 624 |
+
→ 响应 {mfa_ticket, credential_id, mfa_challenge}
|
| 625 |
+
→ 用私钥签名 challenge + "\n" + mfa_ticket + "\n" + credential_id + "\nregister"
|
| 626 |
+
→ POST /mfa/trusted_device/verify
|
| 627 |
+
{mfa_ticket, mfa_signature}
|
| 628 |
+
→ 响应 {credential_id, expire_at}
|
| 629 |
+
→ 本地保存 mfa_credential_id,下次登录优先用签名验证
|
| 630 |
+
```
|
| 631 |
+
|
| 632 |
+
这意味着:
|
| 633 |
+
|
| 634 |
+
- 可信设备是**设备绑定**的(Android Keystore 私钥不可导出),无法在 Go 服务里复制;
|
| 635 |
+
- 但服务端仍提供邮箱/短信验证码通道,理论上可以通过管理端手工输入验证码完成;
|
| 636 |
+
- hCaptcha / Turnstile 需要浏览器环境,纯 Go 侧无法自动完成。
|
| 637 |
+
|
| 638 |
+
### 14.5 ds2api 的处置策略
|
| 639 |
+
|
| 640 |
+
本次新增:
|
| 641 |
+
|
| 642 |
+
1. **登录冷却**:登录返回 `40029 TOO_MANY_REQUESTS` 时,冷却 5 分钟;返回 `mfa_ticket` 时冷却 30 分钟,冷却期内不再提交密码。
|
| 643 |
+
2. **MFA 明确报错**:登录响应有 `mfa_ticket` 时返回 `LoginChallengeError`,不再报“missing login token”。
|
| 644 |
+
3. **刷新探针优先**:`users/current` 探针成功就不登录;失败才回退密码登录(已有逻辑)。
|
| 645 |
+
4. **check_device rotate**:探针成功后顺带调用 `auth_token/check_device`,若 `rotate.token` 非空则采纳;当前实测为 `null`。
|
| 646 |
+
5. **x-device-id 可选注入**:账号配置新增 `x_device_id`,登录和所有 Android 请求都会携带;留空则不发送(不伪造)。
|
| 647 |
+
|
| 648 |
+
如果账号真的被 MFA 挑战,推荐流程:
|
| 649 |
+
|
| 650 |
+
```text
|
| 651 |
+
官方 App/浏览器完成验证
|
| 652 |
+
→ 抓包或从本地存储取出 token
|
| 653 |
+
→ 在 ds2api 管理端把 token 填入账号(token-only 模式)
|
| 654 |
+
→ ds2api 后续用 users/current 探针续期,不再提交密码
|
| 655 |
+
```
|
| 656 |
+
|
| 657 |
+
这比在服务端硬编码密码/验证码更稳,也不会因为反复登录加重风控。
|
| 658 |
+
|
| 659 |
## 附录 A:证据索引
|
| 660 |
|
| 661 |
| 主题 | 证据 |
|
|
|
|
| 677 |
| 数美 SDK | `defpackage/a4a.java:19-55`、`com/ishumei/smantifraud/l111l11I1IIIl.java:45-46` |
|
| 678 |
| 风控开关 | `defpackage/fx2.java:12-20`、`hx2.java:1484` |
|
| 679 |
| MFA/验证码 | `defpackage/bd7.java`、`zd3.java:12-20`、`sq1.java:12-19` |
|
| 680 |
+
| MFA 各请求模型 | `defpackage/bd7.java`、`vc7.java`、`ge7.java`、`xd7.java`、`od7.java`、`rd7.java`、`ae7.java`、`id7.java` |
|
| 681 |
+
| 可信设备流程 | `defpackage/s8b.java`、`qd7.java`、`zd7.java`、`td7.java`、`ce7.java` |
|
| 682 |
+
| 登录 mfa_ticket | `defpackage/inb.java`、`lb8.java:86-110` |
|
| 683 |
| ds2api 修复 | `internal/sse/parser.go`、`internal/deepseek/client/client_completion.go`、`client_continue.go` |
|
| 684 |
|
| 685 |
## 附录 B:关键 JSON 速查
|
internal/auth/request.go
CHANGED
|
@@ -5,6 +5,7 @@ import (
|
|
| 5 |
"crypto/sha256"
|
| 6 |
"encoding/hex"
|
| 7 |
"errors"
|
|
|
|
| 8 |
"math/rand"
|
| 9 |
"net/http"
|
| 10 |
"strings"
|
|
@@ -27,11 +28,41 @@ var (
|
|
| 27 |
// 只有这种情况才值得清空本地 token 并回退到密码登录。
|
| 28 |
ErrSessionExpired = errors.New("deepseek session rejected")
|
| 29 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 30 |
// errSessionProbeUnavailable 表示当前没有可用的无密码探针:未注入探针函数,
|
| 31 |
// 或本地还没有 token 可以拿去做探测。
|
| 32 |
errSessionProbeUnavailable = errors.New("session probe unavailable")
|
| 33 |
)
|
| 34 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 35 |
type RequestAuth struct {
|
| 36 |
UseConfigToken bool
|
| 37 |
DeepSeekToken string
|
|
@@ -76,8 +107,10 @@ type Resolver struct {
|
|
| 76 |
// (与历史行为一致)。
|
| 77 |
RefreshSession RefreshSessionFunc
|
| 78 |
|
| 79 |
-
mu
|
| 80 |
-
tokenRefreshedAt
|
|
|
|
|
|
|
| 81 |
}
|
| 82 |
|
| 83 |
func NewResolver(store *config.Store, pool *account.Pool, login LoginFunc) *Resolver {
|
|
@@ -267,20 +300,74 @@ func FromContext(ctx context.Context) (*RequestAuth, bool) {
|
|
| 267 |
}
|
| 268 |
|
| 269 |
func (r *Resolver) loginAndPersist(ctx context.Context, a *RequestAuth) error {
|
|
|
|
|
|
|
|
|
|
| 270 |
token, err := r.Login(ctx, a.Account)
|
| 271 |
if err != nil {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 272 |
// Detect USER_IS_BANNED: auto-ban the account and promote standby accounts.
|
| 273 |
if strings.Contains(strings.ToUpper(err.Error()), "USER_IS_BANNED") {
|
| 274 |
r.handleBannedAccount(a.AccountID)
|
| 275 |
}
|
| 276 |
return err
|
| 277 |
}
|
|
|
|
| 278 |
a.Account.Token = token
|
| 279 |
a.DeepSeekToken = token
|
| 280 |
r.markTokenRefreshedNow(a.AccountID)
|
| 281 |
return r.Store.UpdateAccountToken(a.AccountID, token)
|
| 282 |
}
|
| 283 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 284 |
// handleBannedAccount marks an account as banned and promotes standby accounts
|
| 285 |
// based on the segment-based rule: if active normal accounts fall below half of
|
| 286 |
// total normal accounts (per segment), promote standby accounts.
|
|
|
|
| 5 |
"crypto/sha256"
|
| 6 |
"encoding/hex"
|
| 7 |
"errors"
|
| 8 |
+
"fmt"
|
| 9 |
"math/rand"
|
| 10 |
"net/http"
|
| 11 |
"strings"
|
|
|
|
| 28 |
// 只有这种情况才值得清空本地 token 并回退到密码登录。
|
| 29 |
ErrSessionExpired = errors.New("deepseek session rejected")
|
| 30 |
|
| 31 |
+
// ErrLoginRateLimited 表示上游对密码登录返回了 TOO_MANY_REQUESTS(code 40029)。
|
| 32 |
+
// 继续重试只会延长限流窗口,因此调用方需要退避。
|
| 33 |
+
ErrLoginRateLimited = errors.New("deepseek login rate limited")
|
| 34 |
+
|
| 35 |
+
// ErrLoginCooldown 表示上一次登录已触发限流或 MFA 挑战,当前处于冷却期。
|
| 36 |
+
// 这不是上游错误,而是本地保护:冷却期内不再提交密码。
|
| 37 |
+
ErrLoginCooldown = errors.New("deepseek login cooldown active")
|
| 38 |
+
|
| 39 |
// errSessionProbeUnavailable 表示当前没有可用的无密码探针:未注入探针函数,
|
| 40 |
// 或本地还没有 token 可以拿去做探测。
|
| 41 |
errSessionProbeUnavailable = errors.New("session probe unavailable")
|
| 42 |
)
|
| 43 |
|
| 44 |
+
// LoginChallengeError 表示上游要求额外的人机/多因素验证,而不是密码错误。
|
| 45 |
+
// 典型场景:登录响应返回非空 mfa_ticket(需要邮箱/短信验证码或可信设备签名)。
|
| 46 |
+
type LoginChallengeError struct {
|
| 47 |
+
Kind string // 目前为 "mfa"
|
| 48 |
+
Ticket string
|
| 49 |
+
Message string
|
| 50 |
+
}
|
| 51 |
+
|
| 52 |
+
func (e *LoginChallengeError) Error() string {
|
| 53 |
+
if e == nil {
|
| 54 |
+
return "deepseek login challenge required"
|
| 55 |
+
}
|
| 56 |
+
msg := strings.TrimSpace(e.Message)
|
| 57 |
+
if msg == "" {
|
| 58 |
+
msg = "deepseek login requires additional verification"
|
| 59 |
+
}
|
| 60 |
+
if strings.TrimSpace(e.Ticket) != "" {
|
| 61 |
+
return msg + " (mfa_ticket present)"
|
| 62 |
+
}
|
| 63 |
+
return msg
|
| 64 |
+
}
|
| 65 |
+
|
| 66 |
type RequestAuth struct {
|
| 67 |
UseConfigToken bool
|
| 68 |
DeepSeekToken string
|
|
|
|
| 107 |
// (与历史行为一致)。
|
| 108 |
RefreshSession RefreshSessionFunc
|
| 109 |
|
| 110 |
+
mu sync.Mutex
|
| 111 |
+
tokenRefreshedAt map[string]time.Time
|
| 112 |
+
loginCooldownUntil time.Time
|
| 113 |
+
loginCooldownReason string
|
| 114 |
}
|
| 115 |
|
| 116 |
func NewResolver(store *config.Store, pool *account.Pool, login LoginFunc) *Resolver {
|
|
|
|
| 300 |
}
|
| 301 |
|
| 302 |
func (r *Resolver) loginAndPersist(ctx context.Context, a *RequestAuth) error {
|
| 303 |
+
if err := r.loginCooldownError(); err != nil {
|
| 304 |
+
return err
|
| 305 |
+
}
|
| 306 |
token, err := r.Login(ctx, a.Account)
|
| 307 |
if err != nil {
|
| 308 |
+
// 上游登录限流 / MFA 挑战都不是“密码错误”,继续重试只会加重风控。
|
| 309 |
+
var challenge *LoginChallengeError
|
| 310 |
+
switch {
|
| 311 |
+
case errors.Is(err, ErrLoginRateLimited):
|
| 312 |
+
r.setLoginCooldown(5*time.Minute, err.Error())
|
| 313 |
+
case errors.As(err, &challenge):
|
| 314 |
+
r.setLoginCooldown(30*time.Minute, challenge.Error())
|
| 315 |
+
}
|
| 316 |
// Detect USER_IS_BANNED: auto-ban the account and promote standby accounts.
|
| 317 |
if strings.Contains(strings.ToUpper(err.Error()), "USER_IS_BANNED") {
|
| 318 |
r.handleBannedAccount(a.AccountID)
|
| 319 |
}
|
| 320 |
return err
|
| 321 |
}
|
| 322 |
+
r.clearLoginCooldown()
|
| 323 |
a.Account.Token = token
|
| 324 |
a.DeepSeekToken = token
|
| 325 |
r.markTokenRefreshedNow(a.AccountID)
|
| 326 |
return r.Store.UpdateAccountToken(a.AccountID, token)
|
| 327 |
}
|
| 328 |
|
| 329 |
+
// loginCooldownError 返回当前登录冷却状态。冷却由上游 429 或 MFA 挑战触发,
|
| 330 |
+
// 目的是避免在风控窗口内反复提交密码。
|
| 331 |
+
func (r *Resolver) loginCooldownError() error {
|
| 332 |
+
if r == nil {
|
| 333 |
+
return nil
|
| 334 |
+
}
|
| 335 |
+
r.mu.Lock()
|
| 336 |
+
defer r.mu.Unlock()
|
| 337 |
+
if r.loginCooldownUntil.IsZero() || !time.Now().Before(r.loginCooldownUntil) {
|
| 338 |
+
return nil
|
| 339 |
+
}
|
| 340 |
+
reason := strings.TrimSpace(r.loginCooldownReason)
|
| 341 |
+
if reason == "" {
|
| 342 |
+
reason = "upstream risk control"
|
| 343 |
+
}
|
| 344 |
+
return fmt.Errorf("%w: %s (retry after %s)", ErrLoginCooldown, reason, r.loginCooldownUntil.Format(time.RFC3339))
|
| 345 |
+
}
|
| 346 |
+
|
| 347 |
+
func (r *Resolver) setLoginCooldown(d time.Duration, reason string) {
|
| 348 |
+
if r == nil || d <= 0 {
|
| 349 |
+
return
|
| 350 |
+
}
|
| 351 |
+
r.mu.Lock()
|
| 352 |
+
defer r.mu.Unlock()
|
| 353 |
+
until := time.Now().Add(d)
|
| 354 |
+
if until.After(r.loginCooldownUntil) {
|
| 355 |
+
r.loginCooldownUntil = until
|
| 356 |
+
r.loginCooldownReason = strings.TrimSpace(reason)
|
| 357 |
+
}
|
| 358 |
+
config.Logger.Warn("[login] cooldown enabled after upstream challenge", "duration", d.String(), "reason", reason)
|
| 359 |
+
}
|
| 360 |
+
|
| 361 |
+
func (r *Resolver) clearLoginCooldown() {
|
| 362 |
+
if r == nil {
|
| 363 |
+
return
|
| 364 |
+
}
|
| 365 |
+
r.mu.Lock()
|
| 366 |
+
defer r.mu.Unlock()
|
| 367 |
+
r.loginCooldownUntil = time.Time{}
|
| 368 |
+
r.loginCooldownReason = ""
|
| 369 |
+
}
|
| 370 |
+
|
| 371 |
// handleBannedAccount marks an account as banned and promotes standby accounts
|
| 372 |
// based on the segment-based rule: if active normal accounts fall below half of
|
| 373 |
// total normal accounts (per segment), promote standby accounts.
|
internal/auth/session_probe_test.go
CHANGED
|
@@ -233,3 +233,46 @@ func findTestToken(t *testing.T, store *config.Store) string {
|
|
| 233 |
}
|
| 234 |
return acc.Token
|
| 235 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 233 |
}
|
| 234 |
return acc.Token
|
| 235 |
}
|
| 236 |
+
|
| 237 |
+
// 上游 TOO_MANY_REQUESTS 后应进入冷却,短时间内不再重复提交密码。
|
| 238 |
+
func TestLoginCooldownAfterRateLimit(t *testing.T) {
|
| 239 |
+
var loginCount int32
|
| 240 |
+
r, _ := newProbeTestResolver(t, func(_ context.Context, _ config.Account) (string, error) {
|
| 241 |
+
atomic.AddInt32(&loginCount, 1)
|
| 242 |
+
return "", fmt.Errorf("%w: TOO_MANY_REQUESTS", ErrLoginRateLimited)
|
| 243 |
+
})
|
| 244 |
+
a := newProbeTestAuth("session-token")
|
| 245 |
+
|
| 246 |
+
if r.RefreshToken(context.Background(), a) {
|
| 247 |
+
t.Fatal("expected refresh to fail on rate limit")
|
| 248 |
+
}
|
| 249 |
+
if got := atomic.LoadInt32(&loginCount); got != 1 {
|
| 250 |
+
t.Fatalf("expected one login attempt, got %d", got)
|
| 251 |
+
}
|
| 252 |
+
if r.RefreshToken(context.Background(), a) {
|
| 253 |
+
t.Fatal("expected refresh to fail during cooldown")
|
| 254 |
+
}
|
| 255 |
+
if got := atomic.LoadInt32(&loginCount); got != 1 {
|
| 256 |
+
t.Fatalf("expected cooldown to skip login, got %d attempts", got)
|
| 257 |
+
}
|
| 258 |
+
}
|
| 259 |
+
|
| 260 |
+
// MFA 挑战不是密码错误,也应进入冷却并停止重试。
|
| 261 |
+
func TestLoginCooldownAfterMFAChallenge(t *testing.T) {
|
| 262 |
+
var loginCount int32
|
| 263 |
+
r, _ := newProbeTestResolver(t, func(_ context.Context, _ config.Account) (string, error) {
|
| 264 |
+
atomic.AddInt32(&loginCount, 1)
|
| 265 |
+
return "", &LoginChallengeError{Kind: "mfa", Ticket: "ticket-1", Message: "mfa required"}
|
| 266 |
+
})
|
| 267 |
+
a := newProbeTestAuth("session-token")
|
| 268 |
+
|
| 269 |
+
if r.RefreshToken(context.Background(), a) {
|
| 270 |
+
t.Fatal("expected refresh to fail on MFA challenge")
|
| 271 |
+
}
|
| 272 |
+
if r.RefreshToken(context.Background(), a) {
|
| 273 |
+
t.Fatal("expected refresh to fail during cooldown")
|
| 274 |
+
}
|
| 275 |
+
if got := atomic.LoadInt32(&loginCount); got != 1 {
|
| 276 |
+
t.Fatalf("expected one login attempt, got %d", got)
|
| 277 |
+
}
|
| 278 |
+
}
|
internal/config/config.go
CHANGED
|
@@ -44,10 +44,11 @@ type Account struct {
|
|
| 44 |
Password string `json:"password,omitempty"`
|
| 45 |
Token string `json:"token,omitempty"`
|
| 46 |
ProxyID string `json:"proxy_id,omitempty"`
|
| 47 |
-
Role string `json:"role,omitempty"`
|
| 48 |
-
Banned bool `json:"banned,omitempty"`
|
| 49 |
-
DeviceID string `json:"device_id,omitempty"`
|
| 50 |
-
RangersID string `json:"rangers_id,omitempty"`
|
|
|
|
| 51 |
}
|
| 52 |
|
| 53 |
type APIKey struct {
|
|
|
|
| 44 |
Password string `json:"password,omitempty"`
|
| 45 |
Token string `json:"token,omitempty"`
|
| 46 |
ProxyID string `json:"proxy_id,omitempty"`
|
| 47 |
+
Role string `json:"role,omitempty"` // "normal" (default) or "standby"
|
| 48 |
+
Banned bool `json:"banned,omitempty"` // true when USER_IS_BANNED detected
|
| 49 |
+
DeviceID string `json:"device_id,omitempty"` // 可选:用户从自己手机抓包填入的数美 device_id(Base64 blob)。未填则基于账号稳定生成。
|
| 50 |
+
RangersID string `json:"rangers_id,omitempty"` // 可选:用户从自己手机抓包填入的火山 x-rangers-id。未填则基于账号稳定生成。
|
| 51 |
+
XDeviceID string `json:"x_device_id,omitempty"` // 可选:真实 Android 客户端派生的 x-device-id(Android ID + BRAND 的 AES 结果)。未填则不发送该头。
|
| 52 |
}
|
| 53 |
|
| 54 |
type APIKey struct {
|
internal/deepseek/client/client_auth.go
CHANGED
|
@@ -52,6 +52,9 @@ func (c *Client) loginWithDevice(ctx context.Context, acc config.Account, regene
|
|
| 52 |
// 登录请求头需要带 x-rangers-id(HAR entry 51 显示登录请求也带这个头)。
|
| 53 |
// 但登录请求不带 Authorization(用户尚未拿到 token)。
|
| 54 |
loginHeaders := c.authHeadersWithRangers("", config.AndroidAccountRangersID(acc))
|
|
|
|
|
|
|
|
|
|
| 55 |
if email := strings.TrimSpace(acc.Email); email != "" {
|
| 56 |
payload["email"] = email
|
| 57 |
} else if mobile := strings.TrimSpace(acc.Mobile); mobile != "" {
|
|
@@ -66,6 +69,10 @@ func (c *Client) loginWithDevice(ctx context.Context, acc config.Account, regene
|
|
| 66 |
return "", err
|
| 67 |
}
|
| 68 |
code := intFrom(resp["code"])
|
|
|
|
|
|
|
|
|
|
|
|
|
| 69 |
if code != 0 {
|
| 70 |
return "", fmt.Errorf("login failed: %v", resp["msg"])
|
| 71 |
}
|
|
@@ -79,6 +86,15 @@ func (c *Client) loginWithDevice(ctx context.Context, acc config.Account, regene
|
|
| 79 |
return "", fmt.Errorf("login failed: %v", data["biz_msg"])
|
| 80 |
}
|
| 81 |
bizData, _ := data["biz_data"].(map[string]any)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 82 |
user, _ := bizData["user"].(map[string]any)
|
| 83 |
token, _ := user["token"].(string)
|
| 84 |
if strings.TrimSpace(token) == "" {
|
|
@@ -244,7 +260,13 @@ func (c *Client) authHeadersWithAuth(a *auth.RequestAuth) map[string]string {
|
|
| 244 |
return c.authHeadersWithRangers("", "")
|
| 245 |
}
|
| 246 |
rangersID := config.AndroidAccountRangersID(a.Account)
|
| 247 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 248 |
}
|
| 249 |
|
| 250 |
func (c *Client) authHeadersWithRangers(token, rangersID string) map[string]string {
|
|
|
|
| 52 |
// 登录请求头需要带 x-rangers-id(HAR entry 51 显示登录请求也带这个头)。
|
| 53 |
// 但登录请求不带 Authorization(用户尚未拿到 token)。
|
| 54 |
loginHeaders := c.authHeadersWithRangers("", config.AndroidAccountRangersID(acc))
|
| 55 |
+
if xid := strings.TrimSpace(acc.XDeviceID); xid != "" {
|
| 56 |
+
loginHeaders["x-device-id"] = xid
|
| 57 |
+
}
|
| 58 |
if email := strings.TrimSpace(acc.Email); email != "" {
|
| 59 |
payload["email"] = email
|
| 60 |
} else if mobile := strings.TrimSpace(acc.Mobile); mobile != "" {
|
|
|
|
| 69 |
return "", err
|
| 70 |
}
|
| 71 |
code := intFrom(resp["code"])
|
| 72 |
+
msg, _ := resp["msg"].(string)
|
| 73 |
+
if code == 40029 || strings.EqualFold(strings.TrimSpace(msg), "TOO_MANY_REQUESTS") {
|
| 74 |
+
return "", fmt.Errorf("%w: %s", auth.ErrLoginRateLimited, strings.TrimSpace(msg))
|
| 75 |
+
}
|
| 76 |
if code != 0 {
|
| 77 |
return "", fmt.Errorf("login failed: %v", resp["msg"])
|
| 78 |
}
|
|
|
|
| 86 |
return "", fmt.Errorf("login failed: %v", data["biz_msg"])
|
| 87 |
}
|
| 88 |
bizData, _ := data["biz_data"].(map[string]any)
|
| 89 |
+
if ticket, _ := bizData["mfa_ticket"].(string); strings.TrimSpace(ticket) != "" {
|
| 90 |
+
// 密码正确,但上游要求 MFA/可信设备验证。此时没有 token,重复登录只会
|
| 91 |
+
// 反复触发风控;把 challenge 明确抛给上层,由 Resolver 进入冷却。
|
| 92 |
+
return "", &auth.LoginChallengeError{
|
| 93 |
+
Kind: "mfa",
|
| 94 |
+
Ticket: strings.TrimSpace(ticket),
|
| 95 |
+
Message: "deepseek account requires MFA verification",
|
| 96 |
+
}
|
| 97 |
+
}
|
| 98 |
user, _ := bizData["user"].(map[string]any)
|
| 99 |
token, _ := user["token"].(string)
|
| 100 |
if strings.TrimSpace(token) == "" {
|
|
|
|
| 260 |
return c.authHeadersWithRangers("", "")
|
| 261 |
}
|
| 262 |
rangersID := config.AndroidAccountRangersID(a.Account)
|
| 263 |
+
headers := c.authHeadersWithRangers(a.DeepSeekToken, rangersID)
|
| 264 |
+
if !dsprotocol.IsWebPlatform() {
|
| 265 |
+
if xid := strings.TrimSpace(a.Account.XDeviceID); xid != "" {
|
| 266 |
+
headers["x-device-id"] = xid
|
| 267 |
+
}
|
| 268 |
+
}
|
| 269 |
+
return headers
|
| 270 |
}
|
| 271 |
|
| 272 |
func (c *Client) authHeadersWithRangers(token, rangersID string) map[string]string {
|
internal/deepseek/client/client_auth_test.go
CHANGED
|
@@ -1,6 +1,12 @@
|
|
| 1 |
package client
|
| 2 |
|
| 3 |
-
import
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 4 |
|
| 5 |
func TestExtractCreateSessionIDSupportsLegacyShape(t *testing.T) {
|
| 6 |
resp := map[string]any{
|
|
@@ -32,3 +38,22 @@ func TestExtractCreateSessionIDSupportsNestedChatSessionShape(t *testing.T) {
|
|
| 32 |
t.Fatalf("expected nested session id, got %q", got)
|
| 33 |
}
|
| 34 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
package client
|
| 2 |
|
| 3 |
+
import (
|
| 4 |
+
"testing"
|
| 5 |
+
|
| 6 |
+
"ds2api/internal/auth"
|
| 7 |
+
"ds2api/internal/config"
|
| 8 |
+
dsprotocol "ds2api/internal/deepseek/protocol"
|
| 9 |
+
)
|
| 10 |
|
| 11 |
func TestExtractCreateSessionIDSupportsLegacyShape(t *testing.T) {
|
| 12 |
resp := map[string]any{
|
|
|
|
| 38 |
t.Fatalf("expected nested session id, got %q", got)
|
| 39 |
}
|
| 40 |
}
|
| 41 |
+
|
| 42 |
+
func TestAuthHeadersIncludeOptionalXDeviceID(t *testing.T) {
|
| 43 |
+
dsprotocol.ApplyPlatform("android")
|
| 44 |
+
t.Cleanup(func() { dsprotocol.ApplyPlatform("android") })
|
| 45 |
+
|
| 46 |
+
c := &Client{}
|
| 47 |
+
headers := c.authHeadersWithAuth(&auth.RequestAuth{
|
| 48 |
+
DeepSeekToken: "token",
|
| 49 |
+
Account: config.Account{XDeviceID: "x-device-value"},
|
| 50 |
+
})
|
| 51 |
+
if got := headers["x-device-id"]; got != "x-device-value" {
|
| 52 |
+
t.Fatalf("expected x-device-id header, got %q", got)
|
| 53 |
+
}
|
| 54 |
+
|
| 55 |
+
without := c.authHeadersWithAuth(&auth.RequestAuth{DeepSeekToken: "token"})
|
| 56 |
+
if _, ok := without["x-device-id"]; ok {
|
| 57 |
+
t.Fatalf("x-device-id should be omitted when account value is empty")
|
| 58 |
+
}
|
| 59 |
+
}
|
internal/deepseek/client/client_user_session.go
CHANGED
|
@@ -31,11 +31,59 @@ func (c *Client) RefreshSessionToken(ctx context.Context, acc config.Account) (s
|
|
| 31 |
}
|
| 32 |
clients := c.requestClientsForAccount(acc)
|
| 33 |
headers := c.authHeadersWithRangers(token, config.AndroidAccountRangersID(acc))
|
|
|
|
|
|
|
|
|
|
| 34 |
resp, status, err := c.getJSONWithStatus(ctx, clients.regular, dsprotocol.DeepSeekCurrentUserURL, headers)
|
| 35 |
if err != nil {
|
| 36 |
return "", fmt.Errorf("refresh session token: %w", err)
|
| 37 |
}
|
| 38 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 39 |
}
|
| 40 |
|
| 41 |
// interpretCurrentUserResponse 把 users/current 的响应翻译成“新 token / 会话失效 /
|
|
|
|
| 31 |
}
|
| 32 |
clients := c.requestClientsForAccount(acc)
|
| 33 |
headers := c.authHeadersWithRangers(token, config.AndroidAccountRangersID(acc))
|
| 34 |
+
if xid := strings.TrimSpace(acc.XDeviceID); xid != "" {
|
| 35 |
+
headers["x-device-id"] = xid
|
| 36 |
+
}
|
| 37 |
resp, status, err := c.getJSONWithStatus(ctx, clients.regular, dsprotocol.DeepSeekCurrentUserURL, headers)
|
| 38 |
if err != nil {
|
| 39 |
return "", fmt.Errorf("refresh session token: %w", err)
|
| 40 |
}
|
| 41 |
+
current, err := interpretCurrentUserResponse(status, resp)
|
| 42 |
+
if err != nil {
|
| 43 |
+
return "", err
|
| 44 |
+
}
|
| 45 |
+
// 官方 Android 客户端还会调用 check_device 上报设备;服务端可在
|
| 46 |
+
// biz_data.rotate.token 里下发轮换后的 token。抓包中通常为 null,
|
| 47 |
+
// 这里作为增强通道:失败不影响已经拿到的 users/current 结果。
|
| 48 |
+
if rotated, rotateErr := c.checkDeviceRotate(ctx, acc, current); rotateErr == nil && rotated != "" {
|
| 49 |
+
return rotated, nil
|
| 50 |
+
} else if rotateErr != nil {
|
| 51 |
+
config.Logger.Debug("[refresh_token] check_device inconclusive", "error", rotateErr)
|
| 52 |
+
}
|
| 53 |
+
return current, nil
|
| 54 |
+
}
|
| 55 |
+
|
| 56 |
+
// checkDeviceRotate 调用 /api/v0/users/auth_token/check_device,读取可选的
|
| 57 |
+
// biz_data.rotate.token。device_id 为空时不调用,避免主动上报可疑设备身份。
|
| 58 |
+
func (c *Client) checkDeviceRotate(ctx context.Context, acc config.Account, token string) (string, error) {
|
| 59 |
+
deviceID := strings.TrimSpace(acc.DeviceID)
|
| 60 |
+
if deviceID == "" || strings.TrimSpace(token) == "" {
|
| 61 |
+
return "", nil
|
| 62 |
+
}
|
| 63 |
+
clients := c.requestClientsForAccount(acc)
|
| 64 |
+
headers := c.authHeadersWithRangers(token, config.AndroidAccountRangersID(acc))
|
| 65 |
+
if xid := strings.TrimSpace(acc.XDeviceID); xid != "" {
|
| 66 |
+
headers["x-device-id"] = xid
|
| 67 |
+
}
|
| 68 |
+
resp, status, err := c.postJSONWithStatus(ctx, clients.regular, clients.fallback, dsprotocol.DeepSeekCheckDeviceURL, headers, map[string]any{
|
| 69 |
+
"device_id": deviceID,
|
| 70 |
+
"device_model": "",
|
| 71 |
+
})
|
| 72 |
+
if err != nil {
|
| 73 |
+
return "", err
|
| 74 |
+
}
|
| 75 |
+
code, bizCode, msg, bizMsg := extractResponseStatus(resp)
|
| 76 |
+
if status != http.StatusOK || code != 0 || bizCode != 0 {
|
| 77 |
+
return "", fmt.Errorf("check_device failed: status=%d code=%d biz_code=%d msg=%q biz_msg=%q", status, code, bizCode, msg, bizMsg)
|
| 78 |
+
}
|
| 79 |
+
data, _ := resp["data"].(map[string]any)
|
| 80 |
+
bizData, _ := data["biz_data"].(map[string]any)
|
| 81 |
+
rotate, _ := bizData["rotate"].(map[string]any)
|
| 82 |
+
if rotate == nil {
|
| 83 |
+
return "", nil
|
| 84 |
+
}
|
| 85 |
+
rotated, _ := rotate["token"].(string)
|
| 86 |
+
return strings.TrimSpace(rotated), nil
|
| 87 |
}
|
| 88 |
|
| 89 |
// interpretCurrentUserResponse 把 users/current 的响应翻译成“新 token / 会话失效 /
|
internal/deepseek/protocol/constants.go
CHANGED
|
@@ -11,6 +11,7 @@ const (
|
|
| 11 |
DeepSeekHost = "chat.deepseek.com"
|
| 12 |
DeepSeekLoginURL = "https://chat.deepseek.com/api/v0/users/login"
|
| 13 |
DeepSeekCurrentUserURL = "https://chat.deepseek.com/api/v0/users/current"
|
|
|
|
| 14 |
DeepSeekCreateSessionURL = "https://chat.deepseek.com/api/v0/chat_session/create"
|
| 15 |
DeepSeekCreatePowURL = "https://chat.deepseek.com/api/v0/chat/create_pow_challenge"
|
| 16 |
DeepSeekCompletionURL = "https://chat.deepseek.com/api/v0/chat/completion"
|
|
|
|
| 11 |
DeepSeekHost = "chat.deepseek.com"
|
| 12 |
DeepSeekLoginURL = "https://chat.deepseek.com/api/v0/users/login"
|
| 13 |
DeepSeekCurrentUserURL = "https://chat.deepseek.com/api/v0/users/current"
|
| 14 |
+
DeepSeekCheckDeviceURL = "https://chat.deepseek.com/api/v0/users/auth_token/check_device"
|
| 15 |
DeepSeekCreateSessionURL = "https://chat.deepseek.com/api/v0/chat_session/create"
|
| 16 |
DeepSeekCreatePowURL = "https://chat.deepseek.com/api/v0/chat/create_pow_challenge"
|
| 17 |
DeepSeekCompletionURL = "https://chat.deepseek.com/api/v0/chat/completion"
|
internal/httpapi/admin/accounts/handler_accounts_crud.go
CHANGED
|
@@ -74,6 +74,7 @@ func (h *Handler) listAccounts(w http.ResponseWriter, r *http.Request) {
|
|
| 74 |
"device_id": acc.DeviceID,
|
| 75 |
"device_id_preview": maskSecretPreview(acc.DeviceID),
|
| 76 |
"rangers_id": acc.RangersID,
|
|
|
|
| 77 |
"device_id_generated": acc.DeviceID == "",
|
| 78 |
"rangers_id_generated": acc.RangersID == "",
|
| 79 |
})
|
|
@@ -130,6 +131,7 @@ func (h *Handler) updateAccount(w http.ResponseWriter, r *http.Request) {
|
|
| 130 |
remark, remarkOK := fieldStringOptional(req, "remark")
|
| 131 |
deviceID, deviceIDOK := fieldStringOptional(req, "device_id")
|
| 132 |
rangersID, rangersIDOK := fieldStringOptional(req, "rangers_id")
|
|
|
|
| 133 |
|
| 134 |
err := h.Store.Update(func(c *config.Config) error {
|
| 135 |
for i, acc := range c.Accounts {
|
|
@@ -148,6 +150,9 @@ func (h *Handler) updateAccount(w http.ResponseWriter, r *http.Request) {
|
|
| 148 |
if rangersIDOK {
|
| 149 |
c.Accounts[i].RangersID = rangersID
|
| 150 |
}
|
|
|
|
|
|
|
|
|
|
| 151 |
return nil
|
| 152 |
}
|
| 153 |
return newRequestError("账号不存在")
|
|
|
|
| 74 |
"device_id": acc.DeviceID,
|
| 75 |
"device_id_preview": maskSecretPreview(acc.DeviceID),
|
| 76 |
"rangers_id": acc.RangersID,
|
| 77 |
+
"x_device_id": acc.XDeviceID,
|
| 78 |
"device_id_generated": acc.DeviceID == "",
|
| 79 |
"rangers_id_generated": acc.RangersID == "",
|
| 80 |
})
|
|
|
|
| 131 |
remark, remarkOK := fieldStringOptional(req, "remark")
|
| 132 |
deviceID, deviceIDOK := fieldStringOptional(req, "device_id")
|
| 133 |
rangersID, rangersIDOK := fieldStringOptional(req, "rangers_id")
|
| 134 |
+
xDeviceID, xDeviceIDOK := fieldStringOptional(req, "x_device_id")
|
| 135 |
|
| 136 |
err := h.Store.Update(func(c *config.Config) error {
|
| 137 |
for i, acc := range c.Accounts {
|
|
|
|
| 150 |
if rangersIDOK {
|
| 151 |
c.Accounts[i].RangersID = rangersID
|
| 152 |
}
|
| 153 |
+
if xDeviceIDOK {
|
| 154 |
+
c.Accounts[i].XDeviceID = xDeviceID
|
| 155 |
+
}
|
| 156 |
return nil
|
| 157 |
}
|
| 158 |
return newRequestError("账号不存在")
|
internal/httpapi/admin/shared/helpers.go
CHANGED
|
@@ -178,6 +178,7 @@ func toAccount(m map[string]any) config.Account {
|
|
| 178 |
Role: role,
|
| 179 |
DeviceID: fieldString(m, "device_id"),
|
| 180 |
RangersID: fieldString(m, "rangers_id"),
|
|
|
|
| 181 |
}
|
| 182 |
}
|
| 183 |
|
|
|
|
| 178 |
Role: role,
|
| 179 |
DeviceID: fieldString(m, "device_id"),
|
| 180 |
RangersID: fieldString(m, "rangers_id"),
|
| 181 |
+
XDeviceID: fieldString(m, "x_device_id"),
|
| 182 |
}
|
| 183 |
}
|
| 184 |
|