From c7904aa6ee9bf4ebccc80c316de7d009b6069267 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 10 Oct 2026 16:19:26 +0800 Subject: [PATCH] =?UTF-8?q?fix(iap):=20proxy=5Fredirect=20=E6=94=B9?= =?UTF-8?q?=E7=94=A8=E6=AD=A3=E5=88=99,=20=E8=A6=86=E7=9B=96=20demo=20app?= =?UTF-8?q?=20=E8=BF=94=E7=9A=84=E7=9B=B8=E5=AF=B9=20Location=20=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit v0.7.19 用字面量 proxy_redirect http://app_crm_backend/ /proxy/app-crm/; 只匹配绝对 URL, 但 demo app redirect("/") 返的是相对路径, 改写不生效。 v0.7.20 改用正则 ~^(https?://[^/]+)?(/.*)$ /proxy/app-crm$2: - 相对路径 /, /me, /logout 等都以 / 开头, 命中 - 绝对 URL http://app_crm_backend/... 也覆盖 - 是路径部分, 写入 /proxy/app-crm + 路径 iPhone 点 workbench → /oauth/authorize → /proxy/app-crm/callback → demo app 兑换 token (200) → redirect("/") → 被改写为 /proxy/app-crm/ → IAP 拿 sso_sid 注 X-Auth → proxy_pass → 用户看 demo app, 不再 /admin/ Co-Authored-By: Claude Code --- deploy/nginx.conf | 72 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/deploy/nginx.conf b/deploy/nginx.conf index d3fa21a..4f679c0 100644 --- a/deploy/nginx.conf +++ b/deploy/nginx.conf @@ -69,6 +69,16 @@ http { ipass_state state 16m; # 身份会话+账号 Key(精简版无域名/用量/缓存/WAF) ipass_data_dir /usr/local/nginx/data; + # ------------------------------------------------------------------ + # IAP 反代:demo app 跑在 Mac 宿主机(launchd cn.ssw.wecom-crm-bot / + # cn.ssw.mock-crm,bind 127.0.0.1:18101/18102)。容器内靠 + # host.docker.internal(OrbStack 解析为 0.250.250.254 = Mac loopback)走通。 + # 上游不能用 192.168.1.18(demo app 没 bind 该接口,connection refused), + # 也不能用 127.0.0.1(容器 loopback ≠ 宿主机 loopback)。 + # ------------------------------------------------------------------ + upstream app_crm_backend { server host.docker.internal:18101; keepalive 16; } + upstream app_mobile_backend { server host.docker.internal:18102; keepalive 16; } + # ================================================================== # 主 server(NodePort 30082):管理台 + IdP 全部端点 # ================================================================== @@ -154,5 +164,67 @@ http { root /usr/local/nginx/data/verify; add_header Content-Type "text/plain; charset=utf-8" always; } + + # ---- IAP 反代 demo app(v0.7.12+,出站代理模式)---- + # /callback 子路径单独挂:不走 sso_iap(IdP 来的回调无 JWT/cookie, + # 否则 IAP 会 401 → 跳登录 → 死循环)。其它路径挂 sso_iap 强制 sso_sid, + # sso_sid 由 WeChat Work 登录或 /login 流程写入,缺失时跳企微登录。 + # + # proxy_redirect 必须写正则 ~^/:demo app 内部 redirect("/") 返的 + # 是相对路径,浏览器按当前请求 Host(公网域)解析 → 跳到 IdP 根 + # → /admin/,不是 demo app。把所有以 / 开头的 Location 重写回 IAP + # 路径,覆盖 redirect("/")/redirect("/me")/redirect("/logout") 等 + # 全部 demo app 内部跳转。绝对 URL(含 http://app_crm_backend/) + # 也一并覆盖 → 公网/IAP 场景下不会泄漏 backend 地址。 + location /proxy/app-crm/callback { + ipass_api off; # 防 merge_loc_conf 漏父级 ipass_api on + proxy_pass http://app_crm_backend/callback; + proxy_redirect ~^(https?://[^/]+)?(/.*)$ /proxy/app-crm$2; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + } + location /proxy/app-crm/ { + ipass_api off; # 防 merge_loc_conf 漏父级 ipass_api on + sso_iap on; + error_page 401 = @iap_oauth_login; + proxy_pass http://app_crm_backend/; + proxy_redirect ~^(https?://[^/]+)?(/.*)$ /proxy/app-crm$2; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + } + location /proxy/app-mobile/callback { + ipass_api off; + proxy_pass http://app_mobile_backend/callback; + proxy_redirect ~^(https?://[^/]+)?(/.*)$ /proxy/app-mobile$2; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + } + location /proxy/app-mobile/ { + ipass_api off; + sso_iap on; + error_page 401 = @iap_oauth_login; + proxy_pass http://app_mobile_backend/; + proxy_redirect ~^(https?://[^/]+)?(/.*)$ /proxy/app-mobile$2; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + } + + # ---- IAP 401 兜底:跳企微登录,redirect 保留原 URL ---- + # 必须放在 server 块内(named location 不能在 http {} 顶层) + location @iap_oauth_login { + return 302 "/portal/wxwork/login?redirect=$request_uri"; + } } } \ No newline at end of file