diff --git a/deploy/Dockerfile b/deploy/Dockerfile index f7e44f0..f92c735 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -93,7 +93,9 @@ COPY deploy/nginx.conf /usr/local/nginx/conf/nginx.conf COPY deploy/shell/ /usr/local/nginx/www/ COPY deploy/static-plugins/ /usr/local/nginx/static-plugins/ # 装配层自定义页清单(精简版不挂自定义页,无 deploy/custom/) -# 老管理台多页应用(精简版不集成老管理台,无 deploy/legacy/) +# 老管理台 sso 五 tab 单页(精简版只搬这一页,sso 插件 UMD 的 5 个 tab 全指它; +# 全自包含 inline css+js,零外部资产,nginx 走 /legacy/ 静态段) +COPY deploy/legacy/ /usr/local/nginx/legacy/ # 种子数据(admin/alice + OAuth 接入方 + 插件启停注册表) COPY data-seed/ /usr/local/nginx/data-seed/ diff --git a/deploy/k8s/ipass-sso.yaml b/deploy/k8s/ipass-sso.yaml index a6024e9..4d917e7 100644 --- a/deploy/k8s/ipass-sso.yaml +++ b/deploy/k8s/ipass-sso.yaml @@ -42,7 +42,7 @@ spec: # 之后业务写盘才炸,最难查)。幂等,每次滚动都会跑。 initContainers: - name: init-data-dir - image: crpi-yscq976uwza88qap.cn-shenzhen.personal.cr.aliyuncs.com/ssw188/nginx:ipass-sso-v0.7.3 + image: crpi-yscq976uwza88qap.cn-shenzhen.personal.cr.aliyuncs.com/ssw188/nginx:ipass-sso-v0.7.9 imagePullPolicy: IfNotPresent command: ["bash", "-c", "mkdir -p /persist/sso && ls -la /persist"] securityContext: @@ -54,7 +54,7 @@ spec: mountPath: /persist containers: - name: ipass-sso - image: crpi-yscq976uwza88qap.cn-shenzhen.personal.cr.aliyuncs.com/ssw188/nginx:ipass-sso-v0.7.3 + image: crpi-yscq976uwza88qap.cn-shenzhen.personal.cr.aliyuncs.com/ssw188/nginx:ipass-sso-v0.7.9 imagePullPolicy: IfNotPresent ports: - name: http diff --git a/deploy/legacy/sso.html b/deploy/legacy/sso.html new file mode 100644 index 0000000..2962789 --- /dev/null +++ b/deploy/legacy/sso.html @@ -0,0 +1,1565 @@ + + + + + +统一认证 · 管理台 + + + + + +
+
+

统一认证

+
SSO 网关管理控制台 · 仅管理员可登录
+ +
+ + +
+
+ + +
+ + +
+ +
初始账号为 admin,首次登录后请在「账号管理」中修改密码。
+
+
+ + + + +
+ + + + diff --git a/deploy/nginx.conf b/deploy/nginx.conf index 4388ad2..d3fa21a 100644 --- a/deploy/nginx.conf +++ b/deploy/nginx.conf @@ -138,7 +138,13 @@ http { add_header Cache-Control "no-store" always; } # 装配层自定义页清单(精简版不挂自定义页,无 /static/custom/) - # 老管理台多页应用(精简版不集成老管理台,无 /legacy/) + # 老管理台 sso 五 tab 单页(精简版只挂 sso.html 一张;自包含,零外部资产) + # 默认 api=false 即可:merge_loc_conf 已不继承父 location / 的 ipass_api on + # (见 gateway/src/lib.rs::Merge 注释),无需显式 `ipass_api off;` + location /legacy/ { + alias /usr/local/nginx/legacy/; + add_header Cache-Control "no-store" always; + } # ---- 企微域名校验文件(v0.7.0+)---- # 文件在 PVC 的 verify/ 目录(/usr/local/nginx/data/verify/WW_verify_*.txt), diff --git a/rust/gateway/src/lib.rs b/rust/gateway/src/lib.rs index 2465842..7d035b5 100644 --- a/rust/gateway/src/lib.rs +++ b/rust/gateway/src/lib.rs @@ -172,9 +172,12 @@ unsafe impl HttpModuleLocationConf for Module { impl Merge for ModuleConfig { fn merge(&mut self, prev: &ModuleConfig) -> Result<(), MergeConfigError> { - if prev.api { - self.api = true; - } + // ⚠️ 不从父 location 继承 api:父 location / { ipass_api on; } 会让同 server + // 的所有兄弟 location(/admin/ /plugin- /manage/ /assets/ /static/plugins/ /legacy/ + // 等静态段)被强制接管,dispatch 抢回 {"code":404,"msg":"接口不存在"}。 + // 想要 API 兜底的子 location 必须显式 `ipass_api on;`(/api/ 与 / 已经显式开了)。 + // iap 仍按父继承:access 阶段的身份门禁按 server 级默认更符合 MaxKey/OAuth2 Proxy + // 的心智(子 location 多是反向代理,继承省得每处再写)。 if prev.iap { self.iap = true; }