diff --git a/.env.example b/.env.example index 9ffc4a0..48a4ea4 100644 --- a/.env.example +++ b/.env.example @@ -64,6 +64,11 @@ CHUANGLAN_SMS_TEMPLATE_ID=1022457679 CHUANGLAN_SMS_SIGNATURE= CHUANGLAN_SMS_ENDPOINT=https://smssh.253.com/msg/sms/v2/tpl/send CHUANGLAN_SMS_TIMEOUT_SEC=10 +# --- 阿里云号码认证·一键登录(Dypnsapi GetMobile 换号)。同账号可填与 ALIYUN_SMS_ACCESS_KEY_* 相同的值 --- +ALIYUN_ONEKEY_ACCESS_KEY_ID= +ALIYUN_ONEKEY_ACCESS_KEY_SECRET= +ALIYUN_ONEKEY_ENDPOINT=dypnsapi.aliyuncs.com +ALIYUN_ONEKEY_TIMEOUT_SEC=15 # ===== 测试账号(release 包全流程联调用)===== # 配一个固定测试手机号,专供无 SIM 卡 / 不走一键登录时打通全流程:该号登录【免短信验证码】 diff --git a/app/api/v1/auth.py b/app/api/v1/auth.py index a8c3141..813f5ac 100644 --- a/app/api/v1/auth.py +++ b/app/api/v1/auth.py @@ -33,7 +33,7 @@ from app.core.security import ( issue_token_pair, ) from app.integrations import wxpay -from app.integrations.jiguang import JiguangError, mask_phone, verify_and_get_phone +from app.integrations.oneclick import OneClickError, mask_phone, verify_and_get_phone from app.integrations.sms import SmsError, send_code, verify_code from app.repositories import onboarding as onboarding_repo from app.repositories import phone_rebind as rebind_repo @@ -110,14 +110,15 @@ def jverify_login(req: JverifyLoginRequest, request: Request, db: DbSession) -> ): raise HTTPException(status_code=403, detail="当前设备环境异常,暂无法登录") logger.info( - "jverify_login operator=%s token_len=%d", + "jverify_login provider=%s operator=%s token_len=%d", + req.provider or "-", req.operator or "-", len(req.login_token), ) try: - phone = verify_and_get_phone(req.login_token) - except JiguangError as e: + phone = verify_and_get_phone(req.provider, req.login_token) + except OneClickError as e: risk_repo.record_behavior_event( db, event_type=risk_repo.EVENT_ONECLICK_LOGIN, @@ -128,11 +129,11 @@ def jverify_login(req: JverifyLoginRequest, request: Request, db: DbSession) -> client_ip=_client_ip(request), outcome="failed", reason=str(e), - details={"operator": req.operator or None}, + details={"operator": req.operator or None, "provider": req.provider or None}, evaluate_rule=risk_repo.RULE_ONECLICK_DAILY, ) - logger.error("[JG] verify+decrypt failed: %s", e, exc_info=True) - raise HTTPException(status_code=502, detail=f"jiguang verify failed: {e}") from e + logger.error("[oneclick] verify+decrypt failed: %s", e, exc_info=True) + raise HTTPException(status_code=502, detail=f"oneclick verify failed: {e}") from e user = user_repo.upsert_user_for_login(db, phone=phone, register_channel="jverify") risk_repo.record_behavior_event( @@ -146,7 +147,7 @@ def jverify_login(req: JverifyLoginRequest, request: Request, db: DbSession) -> phone=phone, client_ip=_client_ip(request), outcome="success", - details={"operator": req.operator or None}, + details={"operator": req.operator or None, "provider": req.provider or None}, evaluate_rule=risk_repo.RULE_ONECLICK_DAILY, ) if user.status != "active": @@ -492,10 +493,10 @@ def wechat_bind_phone_jverify( raise HTTPException(status_code=401, detail="授权已过期,请重新用微信登录") from e try: - phone = verify_and_get_phone(req.login_token) - except JiguangError as e: - logger.error("[JG] verify+decrypt failed: %s", e, exc_info=True) - raise HTTPException(status_code=502, detail=f"jiguang verify failed: {e}") from e + phone = verify_and_get_phone("jiguang", req.login_token) + except OneClickError as e: + logger.error("[oneclick] verify+decrypt failed: %s", e, exc_info=True) + raise HTTPException(status_code=502, detail=f"oneclick verify failed: {e}") from e return _finish_wechat_bind( db, diff --git a/app/core/config.py b/app/core/config.py index e020307..c144e21 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -165,6 +165,14 @@ class Settings(BaseSettings): CHUANGLAN_SMS_ENDPOINT: str = "https://smssh.253.com/msg/sms/v2/tpl/send" CHUANGLAN_SMS_TIMEOUT_SEC: int = 10 # httpx 读/连超时秒 + # ===== 阿里云号码认证·一键登录(Dypnsapi GetMobile 换号)===== + # 与短信同属 dypnsapi 产品:同一阿里云账号可复用 ALIYUN_SMS_ACCESS_KEY_*,默认独立字段解耦。 + # 缺凭证 → provider=aliyun 换号抛错→502,不启动崩(见 aliyun_oneclick_configured)。 + ALIYUN_ONEKEY_ACCESS_KEY_ID: str = "" + ALIYUN_ONEKEY_ACCESS_KEY_SECRET: str = "" + ALIYUN_ONEKEY_ENDPOINT: str = "dypnsapi.aliyuncs.com" + ALIYUN_ONEKEY_TIMEOUT_SEC: int = 15 # 阿里云 API 读/连超时秒 + @property def aliyun_sms_configured(self) -> bool: """阿里云短信凭证齐全(缺则 SMS_PROVIDER=aliyun 时 /sms/* 返 503,而非启动崩)。""" @@ -175,6 +183,13 @@ class Settings(BaseSettings): and self.ALIYUN_SMS_TEMPLATE_CODE ) + @property + def aliyun_oneclick_configured(self) -> bool: + """阿里云一键登录凭证齐全(缺则 provider=aliyun 换号抛错→502,而非启动崩)。""" + return bool( + self.ALIYUN_ONEKEY_ACCESS_KEY_ID and self.ALIYUN_ONEKEY_ACCESS_KEY_SECRET + ) + @property def chuanglan_sms_configured(self) -> bool: """创蓝短信凭证齐全(缺则 SMS_PROVIDER=chuanglan 时 /sms/send 返 503,而非启动崩)。""" diff --git a/app/integrations/aliyun_onekey.py b/app/integrations/aliyun_onekey.py new file mode 100644 index 0000000..5efa7ca --- /dev/null +++ b/app/integrations/aliyun_onekey.py @@ -0,0 +1,89 @@ +"""阿里云号码认证·一键登录服务端换号(Dypnsapi GetMobile)。 + +链路: + Android 阿里云 SDK getLoginToken → spToken(access_token) + → 本服务调 Dypnsapi GetMobile(AccessToken=spToken) + → 阿里云直接返回明文手机号(无需 RSA/AES,比极光/创蓝少一步解密) + +与 jiguang 对齐:对外暴露 verify_and_get_phone(login_token)->str,失败抛 AliyunOneClickError, +由 oneclick.py 门面统一 catch。 + +SDK 交互隔离在 _call_get_mobile 薄封装(惰性 import + 惰性建 client,仿 sms/aliyun.py), +单测 monkeypatch 它即可,不触真 SDK/网络。凭证复用/独立见 config.ALIYUN_ONEKEY_*。 +""" +from __future__ import annotations + +import logging + +from app.core.config import settings + +logger = logging.getLogger("shagua.aliyun.onekey") + +_client = None # 惰性构建的 dypnsapi client(模块级缓存) + + +class AliyunOneClickError(Exception): + """阿里云取号失败的统一异常,由 oneclick 门面 catch 翻成 4xx/5xx。""" + + +def verify_and_get_phone(login_token: str) -> str: + """对外唯一函数:loginToken(access_token) → 明文手机号。失败抛 AliyunOneClickError。""" + if not settings.aliyun_oneclick_configured: + raise AliyunOneClickError("ALIYUN_ONEKEY_ACCESS_KEY_ID/SECRET not configured") + + result = _call_get_mobile(login_token) + if not (result["success"] and result["code"] == "OK"): + logger.error( + "[ALIYUN-ONEKEY] get_mobile failed code=%s msg=%s", + result["code"], result["message"], + ) + raise AliyunOneClickError(f"aliyun get_mobile failed code={result['code']}") + + phone = (result["mobile"] or "").strip() + if not (phone.isdigit() and len(phone) == 11): + logger.error("[ALIYUN-ONEKEY] unexpected mobile format: %r", phone) + raise AliyunOneClickError("aliyun get_mobile returned non-phone") + return phone + + +# ==================== SDK 接缝(单测 monkeypatch 这个)==================== + +def _get_client(): + """惰性构建 dypnsapi client(仿 sms/aliyun.py:jiguang-only 部署不加载 alibabacloud)。""" + global _client + if _client is None: + from alibabacloud_dypnsapi20170525.client import Client + from alibabacloud_tea_openapi import models as open_api_models + + cfg = open_api_models.Config( + access_key_id=settings.ALIYUN_ONEKEY_ACCESS_KEY_ID, + access_key_secret=settings.ALIYUN_ONEKEY_ACCESS_KEY_SECRET, + read_timeout=settings.ALIYUN_ONEKEY_TIMEOUT_SEC * 1000, # SDK 单位 ms + connect_timeout=settings.ALIYUN_ONEKEY_TIMEOUT_SEC * 1000, + ) + cfg.endpoint = settings.ALIYUN_ONEKEY_ENDPOINT + _client = Client(cfg) + return _client + + +def _call_get_mobile(login_token: str) -> dict: + """调 GetMobile。返回归一化 {success, code, message, mobile};import/建 client/调用任一失败抛 AliyunOneClickError。 + + ⚠️ GetMobile 响应体字段名以实际 SDK 为准(code=="OK"、get_mobile_result_dto.mobile)。接真号联调时 + 若字段不同,只需改本函数末尾归一化,verify_and_get_phone 及单测不动。 + """ + try: + from alibabacloud_dypnsapi20170525 import models as dypns_models + req = dypns_models.GetMobileRequest(access_token=login_token) + body = _get_client().get_mobile(req).body + except Exception as e: + logger.exception("[ALIYUN-ONEKEY] get_mobile 调用异常") + raise AliyunOneClickError("aliyun get_mobile 调用异常") from e + dto = getattr(body, "get_mobile_result_dto", None) + mobile = getattr(dto, "mobile", None) if dto else None + return { + "success": (body.code == "OK"), + "code": body.code, + "message": body.message, + "mobile": mobile, + } diff --git a/app/integrations/oneclick.py b/app/integrations/oneclick.py new file mode 100644 index 0000000..7b5fe09 --- /dev/null +++ b/app/integrations/oneclick.py @@ -0,0 +1,41 @@ +"""一键登录换号门面:按 provider 分派到极光/阿里云, 统一异常与手机号脱敏。 + +为什么要门面:一键登录 token 与「拉授权页的那家 SDK」强绑定 —— 客户端用极光 SDK 拉的 +token 只能用极光换号, 阿里云的只能用阿里云换号。所以 provider 必须由客户端如实上报, 服务端 +按此分派、不能猜。老客户端不带 provider → 默认极光(向后兼容)。 + +用法(api 层): + from app.integrations import oneclick + try: + phone = oneclick.verify_and_get_phone(req.provider, req.login_token) + except oneclick.OneClickError as e: + raise HTTPException(502, ...) from e +""" +from __future__ import annotations + +# 用「模块属性访问」而非 from ... import 函数:保证 monkeypatch 各家实现时门面能拿到替身。 +from app.integrations import aliyun_onekey, jiguang +from app.integrations.jiguang import mask_phone # 复用脱敏, 从门面转出供 api 层用 + +__all__ = ["OneClickError", "mask_phone", "verify_and_get_phone"] + +PROVIDER_JIGUANG = "jiguang" +PROVIDER_ALIYUN = "aliyun" + + +class OneClickError(Exception): + """换号失败统一异常(不区分厂商), api 层 catch → 502。""" + + +def verify_and_get_phone(provider: str, login_token: str) -> str: + """按 provider 换取明文手机号。失败(任一厂商)抛 OneClickError。 + + provider 大小写不敏感;空 / 未知值兜底走极光(主家), 不因客户端传错值而拒登。 + """ + p = (provider or PROVIDER_JIGUANG).strip().lower() + try: + if p == PROVIDER_ALIYUN: + return aliyun_onekey.verify_and_get_phone(login_token) + return jiguang.verify_and_get_phone(login_token) + except (jiguang.JiguangError, aliyun_onekey.AliyunOneClickError) as e: + raise OneClickError(f"[{p}] {e}") from e diff --git a/app/schemas/auth.py b/app/schemas/auth.py index b5c185c..9b02e04 100644 --- a/app/schemas/auth.py +++ b/app/schemas/auth.py @@ -67,6 +67,11 @@ class JverifyLoginRequest(BaseModel): device_model: str = Field( "", max_length=128, description="客户端设备型号快照,用于登录安全审计" ) + provider: str = Field( + "jiguang", + description="一键登录厂商:jiguang(默认)/aliyun。决定后端用哪家换号," + "必须与客户端拉授权页的 SDK 一致。老客户端不带→默认极光(向后兼容)。", + ) # ===== 短信验证码 ===== diff --git a/tests/test_aliyun_onekey.py b/tests/test_aliyun_onekey.py new file mode 100644 index 0000000..a937f4b --- /dev/null +++ b/tests/test_aliyun_onekey.py @@ -0,0 +1,51 @@ +"""阿里云一键登录换号 provider 单测:monkeypatch SDK 接缝 _call_get_mobile,不触真 SDK/网络。 + + SGB_TEST_SKIP_DB=1 pytest tests/test_aliyun_onekey.py +""" +from __future__ import annotations + +import pytest + +from app.core.config import settings +from app.integrations import aliyun_onekey + + +def _configure(monkeypatch): + monkeypatch.setattr(settings, "ALIYUN_ONEKEY_ACCESS_KEY_ID", "ak") + monkeypatch.setattr(settings, "ALIYUN_ONEKEY_ACCESS_KEY_SECRET", "sk") + + +def test_get_phone_success(monkeypatch): + _configure(monkeypatch) + monkeypatch.setattr( + aliyun_onekey, "_call_get_mobile", + lambda t: {"success": True, "code": "OK", "message": "OK", "mobile": "13800138000"}, + ) + assert aliyun_onekey.verify_and_get_phone("tok") == "13800138000" + + +def test_api_failure_raises(monkeypatch): + _configure(monkeypatch) + monkeypatch.setattr( + aliyun_onekey, "_call_get_mobile", + lambda t: {"success": False, "code": "MobileNumberIllegal", "message": "x", "mobile": None}, + ) + with pytest.raises(aliyun_onekey.AliyunOneClickError): + aliyun_onekey.verify_and_get_phone("tok") + + +def test_non_phone_result_raises(monkeypatch): + _configure(monkeypatch) + monkeypatch.setattr( + aliyun_onekey, "_call_get_mobile", + lambda t: {"success": True, "code": "OK", "message": "OK", "mobile": "not-a-phone"}, + ) + with pytest.raises(aliyun_onekey.AliyunOneClickError): + aliyun_onekey.verify_and_get_phone("tok") + + +def test_not_configured_raises(monkeypatch): + monkeypatch.setattr(settings, "ALIYUN_ONEKEY_ACCESS_KEY_ID", "") + monkeypatch.setattr(settings, "ALIYUN_ONEKEY_ACCESS_KEY_SECRET", "") + with pytest.raises(aliyun_onekey.AliyunOneClickError): + aliyun_onekey.verify_and_get_phone("tok") diff --git a/tests/test_jverify_login_endpoint.py b/tests/test_jverify_login_endpoint.py new file mode 100644 index 0000000..9e5ab01 --- /dev/null +++ b/tests/test_jverify_login_endpoint.py @@ -0,0 +1,50 @@ +"""jverify-login 端点:provider 分派 + 错误映射(端到端:换号 → 建号 → 签 JWT)。 + +需要 DB(建号)。本机无 PG 时 client fixture 会自动 skip(SGB_TEST_SKIP_DB=1); +PG 环境(CI 或本地起 Docker)完整跑。换号一步 monkeypatch 掉, 只验端点编排: +provider 是否原样传给门面、成功建号、OneClickError → 502。 +""" +from __future__ import annotations + +from app.api.v1 import auth +from app.integrations.oneclick import OneClickError + + +def test_jverify_login_default_provider_builds_account(client, monkeypatch): + """不带 provider 的老客户端 → 门面按默认(极光)换号, 建号登录成功。""" + monkeypatch.setattr(auth, "verify_and_get_phone", lambda provider, token: "13500000000") + r = client.post("/api/v1/auth/jverify-login", json={"login_token": "tok-old"}) + assert r.status_code == 200 + body = r.json() + assert body["user"]["phone"] == "13500000000" + assert body["access_token"] + + +def test_jverify_login_passes_provider_to_facade(client, monkeypatch): + """provider=aliyun 必须原样传给门面(它决定用哪家换号)。""" + captured: dict = {} + + def fake(provider, token): + captured["provider"] = provider + captured["token"] = token + return "13500000001" + + monkeypatch.setattr(auth, "verify_and_get_phone", fake) + r = client.post( + "/api/v1/auth/jverify-login", + json={"login_token": "tok-al", "provider": "aliyun"}, + ) + assert r.status_code == 200 + assert captured["provider"] == "aliyun" + assert captured["token"] == "tok-al" + + +def test_jverify_login_oneclick_error_maps_to_502(client, monkeypatch): + """任一厂商换号失败(OneClickError) → 502, 不建号。""" + + def boom(provider, token): + raise OneClickError("verify failed") + + monkeypatch.setattr(auth, "verify_and_get_phone", boom) + r = client.post("/api/v1/auth/jverify-login", json={"login_token": "tok"}) + assert r.status_code == 502 diff --git a/tests/test_oneclick.py b/tests/test_oneclick.py new file mode 100644 index 0000000..758c29f --- /dev/null +++ b/tests/test_oneclick.py @@ -0,0 +1,74 @@ +"""一键登录换号门面 oneclick 单测:按 provider 分派到极光/阿里云, 统一异常。 + +纯函数(monkeypatch 掉两家的 verify_and_get_phone), 不碰 DB。本机可跑: + SGB_TEST_SKIP_DB=1 pytest tests/test_oneclick.py +""" +from __future__ import annotations + +import pytest + +from app.integrations import aliyun_onekey, jiguang, oneclick + + +def test_dispatch_defaults_to_jiguang_when_blank(monkeypatch): + """provider 为空 = 老客户端 → 走极光(向后兼容)。""" + seen = {} + + def fake_jg(t): + seen["jg"] = t + return "13800000000" + + monkeypatch.setattr(jiguang, "verify_and_get_phone", fake_jg) + assert oneclick.verify_and_get_phone("", "tok") == "13800000000" + assert seen["jg"] == "tok" + + +def test_dispatch_jiguang_explicit(monkeypatch): + monkeypatch.setattr(jiguang, "verify_and_get_phone", lambda t: "13811111111") + assert oneclick.verify_and_get_phone("jiguang", "tok") == "13811111111" + + +def test_dispatch_aliyun(monkeypatch): + seen = {} + + def fake_al(t): + seen["al"] = t + return "13822222222" + + monkeypatch.setattr(aliyun_onekey, "verify_and_get_phone", fake_al) + assert oneclick.verify_and_get_phone("aliyun", "tok") == "13822222222" + assert seen["al"] == "tok" + + +def test_provider_is_case_insensitive(monkeypatch): + monkeypatch.setattr(aliyun_onekey, "verify_and_get_phone", lambda t: "13844444444") + assert oneclick.verify_and_get_phone("Aliyun", "tok") == "13844444444" + + +def test_unknown_provider_falls_back_to_jiguang(monkeypatch): + """未知 provider 兜底走极光(主家), 不因客户端传错值而拒登。""" + monkeypatch.setattr(jiguang, "verify_and_get_phone", lambda t: "13833333333") + assert oneclick.verify_and_get_phone("weird-value", "tok") == "13833333333" + + +def test_jiguang_error_wrapped_as_oneclick_error(monkeypatch): + def boom(_t): + raise jiguang.JiguangError("jg down") + + monkeypatch.setattr(jiguang, "verify_and_get_phone", boom) + with pytest.raises(oneclick.OneClickError): + oneclick.verify_and_get_phone("jiguang", "tok") + + +def test_aliyun_error_wrapped_as_oneclick_error(monkeypatch): + def boom(_t): + raise aliyun_onekey.AliyunOneClickError("aliyun down") + + monkeypatch.setattr(aliyun_onekey, "verify_and_get_phone", boom) + with pytest.raises(oneclick.OneClickError): + oneclick.verify_and_get_phone("aliyun", "tok") + + +def test_mask_phone_reexported(): + """auth 层只依赖 oneclick, 脱敏函数从门面转出。""" + assert oneclick.mask_phone("13800138000") == "138****00" diff --git a/tests/test_wechat_login.py b/tests/test_wechat_login.py index 84504c5..86c638e 100644 --- a/tests/test_wechat_login.py +++ b/tests/test_wechat_login.py @@ -147,8 +147,8 @@ def test_wechat_bind_jverify_creates_account(client, monkeypatch) -> None: """本机号(极光)绑定路径:verify_and_get_phone 拦掉,未占用 → 建号登入。""" monkeypatch.setattr(wxpay, "code_to_userinfo", _fake_userinfo("openid_jv_5", "极光用户", None)) phone = "13900139005" - # 极光 loginToken→手机号 在 auth 模块命名空间打桩(auth.py 顶部 from ...jiguang import verify_and_get_phone) - monkeypatch.setattr(auth, "verify_and_get_phone", lambda token: phone) + # loginToken→手机号 在 auth 模块命名空间打桩(auth.py 顶部改 from ...oneclick import verify_and_get_phone,2 参 provider/token) + monkeypatch.setattr(auth, "verify_and_get_phone", lambda provider, token: phone) ticket = client.post( "/api/v1/auth/wechat-login", json={"code": "c", "device_id": "devE"} @@ -181,11 +181,11 @@ def test_wechat_bind_jverify_expired_ticket_returns_401(client, monkeypatch) -> def test_wechat_bind_jverify_jiguang_error_returns_502(client, monkeypatch) -> None: - """极光核验失败(JiguangError)→ 502。""" + """换号失败(OneClickError)→ 502。""" monkeypatch.setattr(wxpay, "code_to_userinfo", _fake_userinfo("openid_jv_err")) - def _raise(token: str) -> str: - raise auth.JiguangError("mock jg failure") + def _raise(provider: str, token: str) -> str: + raise auth.OneClickError("mock oneclick failure") monkeypatch.setattr(auth, "verify_and_get_phone", _raise) ticket = client.post(