diff --git a/.workbuddy/skills/ipass-core-add-plugin/SKILL.md b/.workbuddy/skills/ipass-core-add-plugin/SKILL.md index 0f5536e..64734f8 100644 --- a/.workbuddy/skills/ipass-core-add-plugin/SKILL.md +++ b/.workbuddy/skills/ipass-core-add-plugin/SKILL.md @@ -293,6 +293,50 @@ _ => { --- +## UI 层:管理台单页 + 终端用户页面(后端做完 ≠ 能力可用) + +**后端端点不是交付终点**。本仓 2026-09-14 的 P1/P2 首轮就只做了 API + e2e,管理台一行没动, +用户找不到入口。新增能力时**必须同步问一句「UI 在哪」**。 + +### 管理台(`source/www/admin.html`) + +单文件、纯静态 + `fetch`,无构建步骤。页签机制是「按钮 `data-tab` + ` + + + + + + @@ -414,6 +516,7 @@ export OAUTH_ISSUER=https://sso.example.com var state = { me: null, users: [], departments: [], groups: [], oauthClients: [], endpoints: {}, + sessions: [], auditItems: [], syncRuns: [], filter: { keyword: "", role: "", department: "", group: "", locked: false }, // 用 Set 存勾选:账号名是主键,天然唯一;渲染时按当前筛选结果取交集 selected: new Set() @@ -517,7 +620,8 @@ export OAUTH_ISSUER=https://sso.example.com }).then(function () { return Promise.all([ api("GET", "/api/admin/users"), - api("GET", "/api/admin/oauth-clients") + api("GET", "/api/admin/oauth-clients"), + api("GET", "/api/admin/sessions") ]); }).then(function (res) { state.users = arr(res[0].data.items); @@ -525,6 +629,7 @@ export OAUTH_ISSUER=https://sso.example.com state.groups = arr(res[0].data.groups); state.oauthClients = arr(res[1].data.items); state.endpoints = res[1].data.endpoints || {}; + state.sessions = arr(res[2].data.items); render(); }).catch(function (err) { toast(err.message, true); @@ -539,10 +644,14 @@ export OAUTH_ISSUER=https://sso.example.com $("statDepts").textContent = state.departments.length; $("statGroups").textContent = state.groups.length; + $("statSessions").textContent = state.sessions.length; + renderFilters(); renderUsers(); renderEndpoints(); renderOAuthClients(); + renderSessions(); + renderProtocolEndpoints(); } // ---------------- 筛选 ---------------- @@ -650,6 +759,9 @@ export OAUTH_ISSUER=https://sso.example.com "" + "
" + "" + + "" + "" + (u.locked ? "" : "") + "" + @@ -893,6 +1005,24 @@ export OAUTH_ISSUER=https://sso.example.com req = api("POST", "/api/admin/users/display", { username: user, display_name: dn.trim() }); } else if (act === "unlock") { req = api("POST", "/api/admin/users/unlock", { username: user }); + } else if (act === "totp") { + if (btn.getAttribute("data-on")) { + if (!confirm("解绑 " + user + " 的双因子?解绑后该账号仅凭口令即可登录。")) return; + req = api("POST", "/api/admin/users/totp/disable", { username: user }); + } else { + // 两步:先出种子(扫码 / 导入验证器),再回填动态码启用 + api("POST", "/api/admin/users/totp/setup", { username: user }).then(function (r) { + var d = r.data || {}; + window.prompt("把下面的 otpauth 链接导入验证器 App(Google / Microsoft Authenticator、1Password 等):\n种子:" + + (d.secret || ""), d.otpauth || ""); + var code = window.prompt("请输入验证器当前显示的 6 位动态码(取消 = 稍后再绑):"); + if (!code) { toast("已生成种子但未启用,可再次点「双因子」重来"); return; } + return api("POST", "/api/admin/users/totp/enable", { username: user, code: code.trim() }) + .then(function (r2) { toast(r2.msg); return loadAll(); }) + .catch(function (e) { toast(e.message, true); }); + }).catch(function (e) { toast(e.message, true); }); + return; + } } else if (act === "del-user") { if (!confirm("删除账号 " + user + "?删除后该账号无法登录,已签发的令牌在过期前仍然有效。")) return; req = api("POST", "/api/admin/users/delete", { username: user }); @@ -1013,12 +1143,6 @@ export OAUTH_ISSUER=https://sso.example.com }); // ---------------- 事件:OAuth 接入方 ---------------- - $("oauthEndpointsBody").addEventListener("click", function (e) { - var btn = e.target.closest("button[data-act='copy-text']"); - if (!btn) return; - copyText(btn.getAttribute("data-text") || "", "端点地址已复制"); - }); - $("oauthClientsBody").addEventListener("click", function (e) { var btn = e.target.closest("button[data-act]"); if (!btn) return; @@ -1131,14 +1255,225 @@ export OAUTH_ISSUER=https://sso.example.com }).catch(function (err) { toast(err.message, true); }); }); + // ---------------- 身份同步(钉钉 / 企微 / 飞书) ---------------- + // 网关不常驻后台进程:同步由这里手动触发,外部 cron 也调同一个端点。 + var SYNC_LABELS = { dingtalk: "钉钉", workwechat: "企业微信", feishu: "飞书" }; + + function runSync(provider) { + var label = SYNC_LABELS[provider] || provider; + if (!confirm("立即从「" + label + "」拉取账号并同步?\n已存在的账号按账号名更新资料,不存在的自动新建。")) return; + toast("正在同步" + label + "…"); + api("POST", "/api/admin/sync/" + provider, {}).then(function (r) { + var d = r.data || {}; + state.syncRuns.unshift({ + at: new Date().toLocaleTimeString(), + provider: label, + created: d.created || 0, + updated: d.updated || 0, + skipped: arr(d.skipped) + }); + renderSyncLog(); + toast(r.msg || "同步完成"); + return loadAll(); + }).catch(function (err) { toast(err.message, true); }); + } + + function renderSyncLog() { + var body = $("syncBody"); + if (!state.syncRuns.length) { + body.innerHTML = '还没有执行过同步'; + return; + } + body.innerHTML = state.syncRuns.map(function (s) { + var n = s.created + s.updated + s.skipped.length; + var skipCell = s.skipped.length + ? "" + s.skipped.length + " " + + esc(s.skipped.slice(0, 3).join(";")) + (s.skipped.length > 3 ? " …" : "") + "" + : "0"; + return "" + + "" + esc(s.at) + "" + + "" + esc(s.provider) + "" + + "" + n + "" + + "" + (s.created ? "" + s.created + "" : "0") + "" + + "" + (s.updated ? "" + s.updated + "" : "0") + "" + + "" + skipCell + "" + + ""; + }).join(""); + } + + // ---------------- 会话 / 审计 ---------------- + function maskToken(t) { + if (!t) return "-"; + return t.length <= 10 ? t : t.slice(0, 6) + "…" + t.slice(-4); + } + + function renderSessions() { + var items = state.sessions || []; + var admins = items.filter(function (s) { return s.type === "admin"; }).length; + $("sessHint").textContent = items.length + ? "(管理台 " + admins + " · 终端用户 " + (items.length - admins) + ")" : ""; + var body = $("sessionsBody"); + if (!items.length) { + body.innerHTML = '暂无在线会话'; + return; + } + body.innerHTML = items.map(function (s) { + return "" + + "" + (s.type === "admin" + ? "管理台" + : "终端用户") + "" + + "" + esc(s.username) + "" + + "" + esc(maskToken(s.token)) + "" + + "" + esc(s.expires_at_text || "-") + "" + + "
" + + "" + + "" + + "
" + + ""; + }).join(""); + } + + function loadAudit() { + var q = "?limit=" + encodeURIComponent($("aLimit").value); + var actor = $("aActor").value.trim(); + var action = $("aAction").value; + if (actor) q += "&actor=" + encodeURIComponent(actor); + if (action) q += "&action=" + encodeURIComponent(action); + return api("GET", "/api/admin/audit" + q).then(function (r) { + var d = r.data || {}; + state.auditItems = arr(d.items); + var known = arr(d.known_actions); + // 动作下拉只在首次(或数量变化时)重建,避免把用户当前选择冲掉 + if (known.length && $("aAction").options.length - 1 !== known.length) { + var cur = $("aAction").value; + $("aAction").innerHTML = "" + known.map(function (a) { + return ""; + }).join(""); + $("aAction").value = cur; + } + renderAudit(); + }).catch(function (err) { toast(err.message, true); }); + } + + function renderAudit() { + var items = state.auditItems || []; + $("auditHint").textContent = items.length ? "(显示 " + items.length + " 条)" : ""; + var body = $("auditBody"); + if (!items.length) { + body.innerHTML = '暂无日志'; + return; + } + body.innerHTML = items.map(function (a) { + var r = a.region || ""; + var badge = !r ? "-" + : r.indexOf("内网") === 0 ? "" + esc(r) + "" + : r.indexOf("中国") === 0 ? "" + esc(r) + "" + : "" + esc(r) + ""; + return "" + + "" + esc(a.ts_text || "") + "" + + "" + esc(a.action) + "" + + "" + esc(a.actor || "-") + "" + + "" + esc(a.target || "-") + "" + + "" + (a.ok ? "成功" : "失败") + "" + + "" + esc(a.ip || "-") + "
" + badge + "" + + "" + esc(a.detail || "-") + "" + + ""; + }).join(""); + } + + // SCIM / CAS 端点表:管理台与网关同源,直接用 location.origin 拼绝对地址, + // 免得后端再为「展示用 URL」专门开一个接口。 + function renderProtocolEndpoints() { + var o = location.origin; + function fill(id, list) { + $(id).innerHTML = list.map(function (r) { + return "" + esc(r[0]) + "" + esc(r[1]) + " " + + ""; + }).join(""); + } + fill("casEndpointsBody", [ + ["登录(签发 ST 并回跳)", o + "/cas/login?service={应用回调地址}"], + ["校验票据 CAS 1.0(纯文本)", o + "/cas/validate?service={回调地址}&ticket={ST}"], + ["校验票据 CAS 2.0(XML)", o + "/cas/serviceValidate?service={回调地址}&ticket={ST}"], + ["代理校验(同 2.0)", o + "/cas/proxyValidate?service={回调地址}&ticket={ST}"], + ["注销", o + "/cas/logout"] + ]); + fill("scimEndpointsBody", [ + ["服务能力声明", o + "/scim/v2/ServiceProviderConfig"], + ["支持的 Schema", o + "/scim/v2/Schemas"], + ["资源类型", o + "/scim/v2/ResourceTypes"], + ["账号列表 / 创建账号", o + "/scim/v2/Users"], + ["账号查询 / 增量修改 / 删除", o + "/scim/v2/Users/{id}"], + ["用户组(派生自账号用户组)", o + "/scim/v2/Groups"] + ]); + } + + // ---------------- 事件:身份同步 ---------------- + document.querySelectorAll("button[data-sync]").forEach(function (b) { + b.addEventListener("click", function () { runSync(b.getAttribute("data-sync")); }); + }); + + // ---------------- 事件:会话 ---------------- + $("sessReload").addEventListener("click", function () { + loadAll().then(function () { toast("会话列表已刷新"); }); + }); + + $("kickAll").addEventListener("click", function () { + if (!confirm("清空全部在线会话?(你自己的管理台登录会保留)")) return; + api("POST", "/api/admin/sessions/kick", { all: "1" }) + .then(function (r) { toast(r.msg); return loadAll(); }) + .catch(function (err) { toast(err.message, true); }); + }); + + $("sessionsBody").addEventListener("click", function (e) { + var btn = e.target.closest("button[data-act]"); + if (!btn) return; + var act = btn.getAttribute("data-act"); + var payload = null; + if (act === "kick-token") { + if (!confirm("踢掉这个会话?该会话立即失效。")) return; + payload = { token: btn.getAttribute("data-token") }; + } else if (act === "kick-user") { + var u = btn.getAttribute("data-user"); + if (!confirm("踢掉 " + u + " 的全部会话(管理台 + 终端用户)?")) return; + payload = { username: u }; + } + if (!payload) return; + btn.disabled = true; + api("POST", "/api/admin/sessions/kick", payload) + .then(function (r) { toast(r.msg); return loadAll(); }) + .catch(function (err) { toast(err.message, true); btn.disabled = false; }); + }); + + // ---------------- 事件:审计 ---------------- + $("aReload").addEventListener("click", function () { + loadAudit().then(function () { toast("日志已刷新"); }); + }); + $("aAction").addEventListener("change", loadAudit); + $("aLimit").addEventListener("change", loadAudit); + var auditTimer = null; + $("aActor").addEventListener("input", function () { + clearTimeout(auditTimer); + auditTimer = setTimeout(loadAudit, 300); + }); + + // ---------------- 事件:复制(OAuth / SCIM / CAS 端点表共用) ---------------- + document.addEventListener("click", function (e) { + var btn = e.target.closest("button[data-act='copy-text']"); + if (!btn) return; + copyText(btn.getAttribute("data-text") || "", "已复制到剪贴板"); + }); + // ---------------- 事件:Tab ---------------- - var TAB_NAMES = ["accounts", "oauth", "guide"]; + var TAB_NAMES = ["accounts", "oauth", "sync", "ops", "guide"]; document.querySelectorAll(".tab").forEach(function (tab) { tab.addEventListener("click", function () { document.querySelectorAll(".tab").forEach(function (t) { t.classList.remove("active"); }); tab.classList.add("active"); var want = tab.getAttribute("data-tab"); TAB_NAMES.forEach(function (name) { $("tab-" + name).hidden = (name !== want); }); + // 审计是「按需拉取」:不进 loadAll,避免每次刷新都读日志文件 + if (want === "ops") loadAudit(); }); }); diff --git a/tests/maxkey-p1p2-e2e.sh b/tests/maxkey-p1p2-e2e.sh index 3f638df..8cd2ab2 100644 --- a/tests/maxkey-p1p2-e2e.sh +++ b/tests/maxkey-p1p2-e2e.sh @@ -10,6 +10,7 @@ # - 自助密码重置:forgot →(token 落 sink 文件)→ reset → 用新口令登录成功 # - 同步连接器:本地 mock 用户目录 → /api/admin/sync/dingtalk → 账号 upsert # - LDAP:禁用时管理员登录正常、未知账号 401(不 panic、不尝试 bind) +# - 界面:管理台单页含新增页签/按钮、终端用户 /forgot 与 /reset 页面可访问 # # 前置:网关以 source/conf/nginx.test.conf 运行(见 scripts/run-local-e2e.sh) # 依赖:curl、python3 @@ -193,6 +194,51 @@ code="$(curl -s -o /dev/null -w '%{http_code}' -X POST "$BASE/api/admin/login" - code="$(curl -s -o /dev/null -w '%{http_code}' -X POST "$BASE/api/admin/login" -d "username=no_such_ldap_user&password=whatever")" [ "$code" = "401" ] && ok "未知账号登录 → 401(未启用 LDAP,无 bind 尝试)" || bad "未知账号登录应为 401,实际 $code" +# =========================================================================== +echo +echo "############ [F] 界面:管理台单页 + 终端用户找回页 ############" + +# --- 管理台单页(nginx alias 到 source/www/admin.html)--- +adm="$(curl -s "$BASE/admin")" +[[ "$adm" == *'data-tab="sync"'* ]] && ok "管理台含「身份同步」页签" || bad "管理台缺少身份同步页签" +[[ "$adm" == *'data-tab="ops"'* ]] && ok "管理台含「会话 / 审计」页签" || bad "管理台缺少会话/审计页签" +[[ "$adm" == *"syncBody"* ]] && ok "管理台含同步结果表" || bad "管理台缺少同步结果表" +[[ "$adm" == *"casEndpointsBody"* ]] && ok "管理台接入指南含 CAS 端点表" || bad "管理台缺少 CAS 端点表" +[[ "$adm" == *"scimEndpointsBody"* ]] && ok "管理台接入指南含 SCIM 端点表" || bad "管理台缺少 SCIM 端点表" +[[ "$adm" == *"data-act='totp'"* ]] && ok "管理台账号行含双因子按钮" || bad "管理台缺少双因子按钮" +[[ "$adm" == *"auditBody"* ]] && ok "管理台含审计日志表" || bad "管理台缺少审计日志表" + +# --- 终端用户页面:自助密码重置的真正入口 --- +# 只有 API 没有页面时,发给用户的邮件链接会指向 POST 端点(点开必然失败)。 +code="$(curl -s -o /tmp/sso-forgot.html -w '%{http_code}' "$BASE/forgot")" +[ "$code" = "200" ] && ok "GET /forgot → 200" || bad "/forgot 应为 200,实际 $code" +grep -q "forgot-password" /tmp/sso-forgot.html && ok "/forgot 页面提交到 forgot-password" || bad "/forgot 页面缺少提交逻辑" + +code="$(curl -s -o /tmp/sso-reset.html -w '%{http_code}' "$BASE/reset?token=probe")" +[ "$code" = "200" ] && ok "GET /reset?token=… → 200" || bad "/reset 应为 200,实际 $code" +grep -q "reset-password" /tmp/sso-reset.html && ok "/reset 页面提交到 reset-password" || bad "/reset 页面缺少提交逻辑" +if grep -q "链接不完整或已失效" /tmp/sso-reset.html; then + bad "/reset 带了 token 却提示链接失效" +else + ok "/reset 带 token 时正常渲染表单" +fi +curl -s "$BASE/reset" | grep -q "链接不完整或已失效" && ok "/reset 无 token 时给出失效提示" || bad "/reset 无 token 未提示" + +# --- 登录页有找回入口 --- +curl -s "$BASE/login" | grep -q 'href="/forgot"' && ok "登录页含「忘记密码?」入口" || bad "登录页缺少找回入口" + +# --- 重置链接形态:必须是可点开的页面(不是 POST 端点)--- +# 注意:这里只申请 token、不消费,因此不会改动 admin 口令。 +: > "$PWD_SINK" +curl -s -o /dev/null -X POST "$BASE/api/public/forgot-password" -d "username=$ADMIN_USER" +TK="$(tr -d '[:space:]' < "$PWD_SINK")" +if [ -n "$TK" ]; then + code="$(curl -s -o /dev/null -w '%{http_code}' "$BASE/reset?token=$TK")" + [ "$code" = "200" ] && ok "重置链接指向的页面可点开(200)" || bad "重置页不可访问,code=$code" +else + bad "sink 未取到 token(无法验证重置链接形态)" +fi + # =========================================================================== echo echo "## [summary] P1/P2 新增能力:PASS=$PASS FAIL=$FAIL"