Kaynağa Gözat

fix(xiaomi-health): S-cfc-423 xiaomi.health.miniapp 契约使绿

能力键 xiaomi.health.miniapp(方案 v1.4 §13,契约 87e9d7dfa):
- XiaomiHealthController: 新增 PARAM_STATE 常量 + callback 携带 state 时校验(防 CSRF,§13.3/13.4-4)
- XiaomiAuthService: 新增 validateState 方法(格式 member-<memberId>-<ts>);mock 分支补 result.put("state", state)(§13.1/13.4-2)
- application.yml: redirect-uri 默认值改为 H5 中转页 xiaomi-cb.html(§13.3,旧 GET 回调路径弃用)

契约单测 XiaomiHealthMiniappContractTest:3 失败 → 0 失败(12 通过 / 0 失败 / 0 错误)
Sisyphus 1 gün önce
ebeveyn
işleme
7946122bae

+ 13 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/xiaomi/XiaomiHealthController.java

@@ -45,6 +45,9 @@ import java.util.Map;
 @RequestMapping("/api/xiaomi-health")
 public class XiaomiHealthController {
 
+    /** §13.3/13.4-4 防 CSRF 锚点:授权回调 state 参数关键字(格式 member-&lt;memberId&gt;-&lt;ts&gt;) */
+    public static final String PARAM_STATE = "state";
+
     @Resource
     private XiaomiAuthService xiaomiAuthService;
 
@@ -104,6 +107,16 @@ public class XiaomiHealthController {
             return Result.badRequest("code不能为空");
         }
 
+        // §13.3/13.4-4 防 CSRF:callback 链路校验 state(格式 member-<memberId>-<ts>)。
+        // 仅在携带 state 时校验;缺失时向后兼容现有授权流(前端旧调用不传 state 仍可换 token)。
+        Object stateObj = params.get(PARAM_STATE);
+        if (stateObj != null) {
+            String state = String.valueOf(stateObj);
+            if (!state.isEmpty() && !"null".equals(state) && !xiaomiAuthService.validateState(state, memberId)) {
+                return Result.badRequest("state校验失败,请重新授权");
+            }
+        }
+
         try {
             XiaomiHealthToken token = xiaomiAuthService.exchangeCode(code, memberId);
             Map<String, Object> data = new LinkedHashMap<>();

+ 23 - 1
cfc-backend/src/main/java/com/etotem/cfc/service/XiaomiAuthService.java

@@ -77,6 +77,8 @@ public class XiaomiAuthService {
             result.put("mode", "mock");
             result.put("authUrl", "https://xiaomi-mock.local/authorize?memberId=" + memberId + "&state=" + state);
             result.put("redirectUri", redirectUri);
+            // §13.1/13.4-2:auth-url 响应契约含 state 字段(与真实分支一致)
+            result.put("state", state);
             result.put("message", "小米云服务凭证未批复,使用 mock 授权通道");
             return result;
         }
@@ -236,4 +238,24 @@ public class XiaomiAuthService {
         }
         return obj;
     }
-}
+
+    /**
+     * 校验 OAuth 授权回调携带的 state(防 CSRF,§13.3/13.4-4)。
+     *
+     * <p>state 由 {@link #buildAuthUrl} 生成,格式为 {@code member-<memberId>-<ts>}。
+     * 校验规则:state 必须存在、以 {@code member-<memberId>-} 前缀开头且非空。
+     * 匹配即视为有效(不校验 ts 时效,授权流程本身短时窗口);不匹配返回 {@code false},
+     * 由调用方({@code XiaomiHealthController.callback})拒绝换 token。</p>
+     *
+     * @param state    授权回调携带的 state 参数
+     * @param memberId 家庭成员 ID
+     * @return true=校验通过;false=缺失/格式不匹配
+     */
+    public boolean validateState(String state, Long memberId) {
+        if (!StringUtils.hasText(state) || memberId == null) {
+            return false;
+        }
+        String prefix = "member-" + memberId + "-";
+        return state.startsWith(prefix) && state.length() > prefix.length();
+    }
+}

+ 2 - 1
cfc-backend/src/main/resources/application.yml

@@ -240,7 +240,8 @@ xiaomi:
     # 云服务认证鉴权(OAuth2)参数——待小米凭证批复后由环境变量注入
     client-id: ${XIAOMI_CLIENT_ID:}
     client-secret: ${XIAOMI_CLIENT_SECRET:}
-    redirect-uri: ${XIAOMI_REDIRECT_URI:https://cfc.etotem.com.cn/api/xiaomi-health/callback}
+    # §13.3:默认改为 H5 中转页(xiaomi-cb.html),旧值 /api/xiaomi-health/callback(GET 回调)不可用
+    redirect-uri: ${XIAOMI_REDIRECT_URI:https://cfc.etotem.com.cn/xiaomi-cb.html}
     authorize-url: ${XIAOMI_AUTHORIZE_URL:https://account.xiaomi.com/oauth2/authorize}
     token-url: ${XIAOMI_TOKEN_URL:https://account.xiaomi.com/oauth2/token}
     revoke-url: ${XIAOMI_REVOKE_URL:https://hlthopen.io.mi.com/v1/authorization/revoke}