feat(sso): MaxKey 迁移 P1/P2 —— SCIM/CAS/LDAP/同步连接器/自助密码重置/归属地
- 新增 plugin-sso 模块(零新增 crate):scim.rs(SCIM 2.0)、cas.rs(CAS 1.0/2.0)、 ldap.rs(LDAP/AD,手写 BER/ASN.1 Simple Bind)、sync.rs(钉钉/企微/飞书手动触发同步)、 reset.rs(自助密码重置)、geo.rs(登录 IP 归属地) - api.rs 兜底路由按 scim→cas→reset→sync 分发兄弟模块;h_login 集成 LDAP(未启用零行为变化) - 修 http::redirect 空 body 触发 NGX_ERROR(CAS 302 无 Location 的根因) - nginx.conf / nginx.test.conf 补 env SYNC_* / PASSWORD_RESET_*(worker 可见) - 新增第 7 套 e2e tests/maxkey-p1p2-e2e.sh(21 项),harness 接入 [7/7];七套全绿 rc=0 - 修脚本 $var 紧跟全角字符被并入变量名的 shell 坑(tests + scripts) - 文档同步:maxkey-migration-analysis(P1/P2 状态) / roadmap(v4) / CLAUDE.md / README.md
This commit is contained in:
1 parent
f3aabb3405
commit
4a780a4ce7
20 files changed
+1986
-37
No files matched your search
+1
-1
@@ -44,7 +44,7 @@ if [ -f "$_LOAD_ENV_FILE" ]; then
|
||||
done < "$_LOAD_ENV_FILE"
|
||||
unset _line _kv _k _v
|
||||
else
|
||||
echo " [env] 未找到 $_LOAD_ENV_FILE(可选):cp .env.example .env 后按需修改" >&2
|
||||
echo " [env] 未找到 ${_LOAD_ENV_FILE}(可选):cp .env.example .env 后按需修改" >&2
|
||||
fi
|
||||
|
||||
unset _LOAD_ENV_DIR _LOAD_ENV_ROOT _LOAD_ENV_FILE
|
||||
@@ -53,10 +53,10 @@ case "${1:-start}" in
|
||||
esac
|
||||
|
||||
[ -x "$NGINX_BIN" ] || { echo "!! nginx 二进制缺失:$NGINX_BIN" >&2; exit 1; }
|
||||
[ -f "$MODULE" ] || { echo "!! Rust 模块缺失:$MODULE(先 cargo build --release)" >&2; exit 1; }
|
||||
[ -f "$MODULE" ] || { echo "!! Rust 模块缺失:${MODULE}(先 cargo build --release)" >&2; exit 1; }
|
||||
[ -f "$CONF" ] || {
|
||||
# 没现成配置就复用 run-local-e2e.sh 的生成逻辑(它会连带物化种子数据)
|
||||
echo "## 没有 $CONF,先跑一次 run-local-e2e.sh 生成配置 ..."
|
||||
echo "## 没有 ${CONF},先跑一次 run-local-e2e.sh 生成配置 ..."
|
||||
bash "$HERE/run-local-e2e.sh" --keep > /dev/null 2>&1 || true
|
||||
if [ -f "$PID" ]; then kill "$(cat "$PID")" 2>/dev/null || true; fi
|
||||
pkill -f "demo-system/app.py" 2>/dev/null || true
|
||||
@@ -73,7 +73,7 @@ for i in $(seq 1 20); do
|
||||
done
|
||||
code="$(curl -s -o /dev/null -w '%{http_code}' "${OAUTH_ISSUER}/.well-known/openid-configuration" || true)"
|
||||
if [ "$code" != "200" ]; then
|
||||
echo "!! 网关未就绪(HTTP $code),日志:" >&2; tail -30 "$ERR_LOG" >&2; exit 1
|
||||
echo "!! 网关未就绪(HTTP ${code}),日志:" >&2; tail -30 "$ERR_LOG" >&2; exit 1
|
||||
fi
|
||||
|
||||
echo "started: $OAUTH_ISSUER (discovery=$code)"
|
||||
|
||||
@@ -148,6 +148,13 @@ export ADMIN_USER="${ADMIN_USER:-admin}"
|
||||
export ADMIN_PASSWORD="${ADMIN_PASSWORD:-123456}"
|
||||
export ALICE_PASSWORD="${ALICE_PASSWORD:-alice123}"
|
||||
|
||||
# P1/P2 新增能力的本地联调开关(缺省值即可离线跑通,无需真实目录/邮件服务):
|
||||
# - 同步连接器拉取的目录源地址(e2e 起本地 mock 服务在该端口;注意 18097 已被
|
||||
# echo-backend 占用,故 mock 用 18088,避免端口冲突导致 nginx 回显后端吞掉同步拉取)
|
||||
export SYNC_DINGTALK_URL="${SYNC_DINGTALK_URL:-http://127.0.0.1:18088/users}"
|
||||
# - 自助密码重置:把一次性 token 落到本地文件(e2e 取用,不含 PII)
|
||||
export PASSWORD_RESET_TOKEN_SINK="${PASSWORD_RESET_TOKEN_SINK:-/tmp/sso-pwdreset-token.txt}"
|
||||
|
||||
# 关掉可能残留的旧实例
|
||||
if [ -f "$PID" ]; then kill "$(cat "$PID")" 2>/dev/null || true; sleep 0.5; fi
|
||||
pkill -f "demo-system/app.py" 2>/dev/null || true
|
||||
@@ -235,6 +242,10 @@ echo
|
||||
echo "############### [6/6] 域名插件:申请 / 审核 / 转发 ###############"
|
||||
bash "$ROOT/tests/domain-e2e.sh" "$HOST_IDP" "$HOST_DOMAIN" "$DATA_DIR"
|
||||
RC6=$?
|
||||
echo
|
||||
echo "############### [7/7] MaxKey P1/P2 新增能力(SCIM/CAS/密码重置/同步/LDAP) ###############"
|
||||
bash "$ROOT/tests/maxkey-p1p2-e2e.sh" "$HOST_IDP" "$DATA_DIR"
|
||||
RC7=$?
|
||||
set -e
|
||||
[ "$RC1" != "0" ] && RC=1
|
||||
[ "$RC2" != "0" ] && RC=1
|
||||
@@ -242,9 +253,10 @@ set -e
|
||||
[ "$RC4" != "0" ] && RC=1
|
||||
[ "$RC5" != "0" ] && RC=1
|
||||
[ "$RC6" != "0" ] && RC=1
|
||||
[ "$RC7" != "0" ] && RC=1
|
||||
|
||||
echo
|
||||
echo "## [summary] 基线 rc=$RC1 互通/接入 rc=$RC2 管理接口 rc=$RC3 RS256/JWKS rc=$RC4 账号批量维护 rc=$RC5 域名插件 rc=$RC6"
|
||||
echo "## [summary] 基线 rc=$RC1 互通/接入 rc=$RC2 管理接口 rc=$RC3 RS256/JWKS rc=$RC4 账号批量维护 rc=$RC5 域名插件 rc=$RC6 P1/P2 新增 rc=$RC7"
|
||||
if [ "$KEEP" = "1" ]; then
|
||||
echo "## [done] 测试完成 (rc=$RC);进程保留,手动排查:"
|
||||
echo " kill $NGX_PID $DEMO_PID"
|
||||
|
||||
Reference in new issue
Block a user