Ver Fonte

feat(oauth.oauthClient.callback): S-cfc-412 OAuth授权回调端点 + 匿名可达白名单

- 新增 OAuthCallbackController:@RequestMapping(/api/oauth) 类级 + /callback GET+POST 双达,
  接收外部授权页 code(浏览器 GET 重定向 / 服务端 POST JSON 兜底),匿名回调最小闭环,
  不落库不换 token(oauth-contract 未契约化,避免扩散持久化假设)。
- JwtInterceptor.PUBLIC_PATHS 追加 /api/oauth/callback(无 JWT 匿名可达)。
- WebConfig jwtInterceptor / familyAccessInterceptor 两处 excludePathPatterns 追加,
  与 OAuthCallbackContractTest 边界流-1/2/3 对齐。

测试: cfc-backend mvn -Dtest=OAuthCallbackContractTest test → 6/6 绿(红→绿)
Administrator há 2 dias atrás
pai
commit
ee56e02f40

+ 4 - 1
cfc-backend/src/main/java/com/etotem/cfc/config/JwtInterceptor.java

@@ -89,7 +89,10 @@ private static final String[] PUBLIC_PATHS = {
          "/api/content-sections/visible",
          // 会员券分享转赠:落地领取页匿名可浏览(share/detail 公开;其余 4 接口见 LOGIN_REQUIRED_PATHS)
          "/api/coupon/gift/share/detail",
-         "/api/mcp/**"
+         "/api/mcp/**",
+         // oauth.oauthClient.callback(S-cfc-411/412):外部授权页浏览器 GET 重定向 + 服务端 POST 兜底,
+         // 均无 JWT,必须匿名可达(B01/B02 WorkBuddy 上架:授权回调地址必须真实存在)
+         "/api/oauth/callback"
      };
 
     // 必须登录才能访问的路径:anonymous 访问直接 401(这些接口消耗微信配额/写数据/扣积分)

+ 6 - 2
cfc-backend/src/main/java/com/etotem/cfc/config/WebConfig.java

@@ -140,7 +140,9 @@ public class WebConfig implements WebMvcConfigurer {
                 "/api/payment/wechat/status",
                 "/api/payment/wechat/oauth2-url",
                 "/api/payment/wechat/oauth2-callback",
-                "/api/payment/wechat/v3-notify"
+                "/api/payment/wechat/v3-notify",
+                // oauth.oauthClient.callback(S-cfc-411/412):外部授权回调匿名可达(边界流-2)
+                "/api/oauth/callback"
         );
 
         registry.addInterceptor(operationLogInterceptor)
@@ -184,7 +186,9 @@ public class WebConfig implements WebMvcConfigurer {
                 "/api/growth/**",
                 "/api/activity/list",
                 "/api/activity/detail",
-                "/api/payment/wechat/v3-notify"
+                "/api/payment/wechat/v3-notify",
+                // oauth.oauthClient.callback(S-cfc-411/412):外部授权回调匿名可达(边界流-3)
+                "/api/oauth/callback"
         );
     }
 

+ 81 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/OAuthCallbackController.java

@@ -0,0 +1,81 @@
+package com.etotem.cfc.controller;
+
+import com.etotem.cfc.common.Result;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * OAuth 授权回调控制器(能力键 {@code oauth.oauthClient.callback},S-cfc-411/412)。
+ *
+ * <p><b>需求溯源</b>(B01/B02 — Buddy 应用上架 WorkBuddy):
+ * 授权回调地址 {@code https://cfc.cf-club.com/api/oauth/callback} 后端必须真实存在;
+ * 审核通过后在 pending_config 阶段切换真实 client 配置。</p>
+ *
+ * <p><b>方法约定说明</b>:本端点以 {@code @RequestMapping(method = {GET, POST})} 单方法双达,
+ * 未使用 {@code @GetMapping}。GET 承接外部授权页的浏览器重定向(授权中心 302 跳回必带 query
+ * {@code code},浏览器不会带 JWT),POST 承接小程序/服务端轮询兜底(JSON body 传 {@code code});
+ * 两种入口都不经过 {@link com.etotem.cfc.config.JwtInterceptor} 与 FamilyAccess 拦截器(见
+ * {@code OAuthCallbackContractTest} 边界流-1/2/3),因此匿名可达。</p>
+ *
+ * <p><b>契约状态</b>:oauth-contract 尚未契约化(SRS §5.5 ⏳),本控制器只做最小闭环——
+ * 接收并回显 {@code code}/{@code state} 的到达状态,不做 state 票据校验、不落库、不换取 token,
+ * 避免在契约落地前扩散不可逆的持久化假设。</p>
+ */
+@Slf4j
+@Tag(name = "OAuth 授权回调")
+@RestController
+@RequestMapping("/api/oauth")
+public class OAuthCallbackController {
+
+    /**
+     * 授权回调:接收授权中心跳回的 {@code code}。
+     *
+     * <p>GET:浏览器重定向,取 query 参数;POST:JSON body 或 query 参数,两者取先到者。</p>
+     *
+     * @param codeParam 浏览器重定向/表单场景的授权码(query 或 form 参数)
+     * @param body      小程序/服务端 POST 的 JSON body,可为空(GET 场景无 body)
+     * @return {@code {"received": true, "stateReceived": true|false}}
+     */
+    @Operation(summary = "OAuth 授权回调(GET 浏览器重定向 + POST 服务端兜底)")
+    @RequestMapping(value = "/callback", method = {RequestMethod.GET, RequestMethod.POST})
+    public Result<Map<String, Object>> callback(
+            @RequestParam(value = "code", required = false) String codeParam,
+            @RequestParam(value = "state", required = false) String stateParam,
+            @RequestBody(required = false) Map<String, Object> body,
+            HttpServletRequest request) {
+        String code = codeParam;
+        String state = stateParam;
+        if (!StringUtils.hasText(code) && body != null) {
+            Object bodyCode = body.get("code");
+            code = bodyCode != null ? String.valueOf(bodyCode) : null;
+            Object bodyState = body.get("state");
+            if (!StringUtils.hasText(state) && bodyState != null) {
+                state = String.valueOf(bodyState);
+            }
+        }
+
+        if (!StringUtils.hasText(code)) {
+            log.warn("[oauth.oauthClient.callback] 回调缺少 code, method={}", request.getMethod());
+            return Result.badRequest("缺少授权码 code");
+        }
+
+        Map<String, Object> data = new LinkedHashMap<>();
+        data.put("received", true);
+        data.put("stateReceived", StringUtils.hasText(state));
+        data.put("codeLength", code.length());
+        log.info("[oauth.oauthClient.callback] 收到授权回调, method={}, stateReceived={}",
+                request.getMethod(), StringUtils.hasText(state));
+        return Result.success(data);
+    }
+}