@@ -835,6 +865,17 @@ env LDAP_AUTO_CREATE; # 1 = LDAP 认证成功后自动建号
if (ep.discovery) $("guideDiscovery").textContent = ep.discovery;
}
+ // 可见范围提示:三项全空 = 全员可见,不显示;否则列出限制项。
+ // 放在名称下方而不是单独一列——列表已经有 8 列了。
+ function visibleCell(c) {
+ var parts = [];
+ if (arr(c.visible_roles).length) parts.push("角色:" + arr(c.visible_roles).join("/"));
+ if (arr(c.visible_depts).length) parts.push("部门:" + arr(c.visible_depts).join("/"));
+ if (arr(c.visible_groups).length) parts.push("用户组:" + arr(c.visible_groups).join("/"));
+ if (!parts.length) return "";
+ return "
限 " + esc(parts.join(" · ")) + "
";
+ }
+
function renderOAuthClients() {
var body = $("oauthClientsBody");
if (!state.oauthClients.length) {
@@ -867,8 +908,10 @@ env LDAP_AUTO_CREATE; # 1 = LDAP 认证成功后自动建号
return "
" +
"| " + esc(c.client_id) + " | " +
- "" + esc(c.name || "-") + " | " +
- "" + (c.confidential
+ " | " + esc(c.name || "-") + visibleCell(c) + " | " +
+ "" + (c.protocol === "cas"
+ ? "CAS"
+ : "OAuth2") + " " + (c.confidential
? "机密"
: "公开") + " | " +
"" + redirectCell + " | " +
@@ -918,6 +961,13 @@ env LDAP_AUTO_CREATE; # 1 = LDAP 认证成功后自动建号
$("ocGCred").checked = grants.indexOf("client_credentials") !== -1;
$("ocGPass").checked = grants.indexOf("password") !== -1;
$("ocScopes").value = arr(c.scopes).join(" ");
+ $("ocProto").value = c.protocol === "cas" ? "cas" : "oauth2";
+ $("ocHome").value = c.home_url || "";
+ $("ocDesc").value = c.description || "";
+ $("ocLogo").value = c.logo_url || "";
+ $("ocVisRoles").value = arr(c.visible_roles).join(" ");
+ $("ocVisDepts").value = arr(c.visible_depts).join(" ");
+ $("ocVisGroups").value = arr(c.visible_groups).join(" ");
syncClientTypeUI();
}
@@ -933,6 +983,13 @@ env LDAP_AUTO_CREATE; # 1 = LDAP 认证成功后自动建号
$("ocGCred").checked = false;
$("ocGPass").checked = false;
$("ocScopes").value = "openid profile email";
+ $("ocProto").value = "oauth2";
+ $("ocHome").value = "";
+ $("ocDesc").value = "";
+ $("ocLogo").value = "";
+ $("ocVisRoles").value = "";
+ $("ocVisDepts").value = "";
+ $("ocVisGroups").value = "";
syncClientTypeUI();
}
@@ -1237,7 +1294,14 @@ env LDAP_AUTO_CREATE; # 1 = LDAP 认证成功后自动建号
redirect_uris: $("ocRedirects").value,
grant_types: grants.join(","),
scopes: $("ocScopes").value,
- confidential: $("ocType").value === "confidential"
+ confidential: $("ocType").value === "confidential",
+ protocol: $("ocProto").value,
+ home_url: $("ocHome").value.trim(),
+ description: $("ocDesc").value.trim(),
+ logo_url: $("ocLogo").value.trim(),
+ visible_roles: $("ocVisRoles").value,
+ visible_depts: $("ocVisDepts").value,
+ visible_groups: $("ocVisGroups").value
};
// 密钥留空就不传这个字段:新建时后端自动生成,更新时保留原值
var secret = $("ocSecret").value.trim();
diff --git a/tests/maxkey-p1p2-e2e.sh b/tests/maxkey-p1p2-e2e.sh
index 8cd2ab2..4c4b7c7 100644
--- a/tests/maxkey-p1p2-e2e.sh
+++ b/tests/maxkey-p1p2-e2e.sh
@@ -6,11 +6,12 @@
# 这是第 7 套(在原有 6 套之后跑),只新增断言,不改既有 6 套行为。
# 覆盖:
# - SCIM 2.0:ServiceProviderConfig / Users 全 CRUD + PATCH(管理员会话)
-# - CAS 1.0/2.0:登录签发 ST → serviceValidate 返回 XML / validate 返回纯文本
+# - CAS 1.0/2.0:service 白名单(未登记一律拒)+ 签发 ST → serviceValidate XML / validate 纯文本
# - 自助密码重置:forgot →(token 落 sink 文件)→ reset → 用新口令登录成功
# - 同步连接器:本地 mock 用户目录 → /api/admin/sync/dingtalk → 账号 upsert
# - LDAP:禁用时管理员登录正常、未知账号 401(不 panic、不尝试 bind)
# - 界面:管理台单页含新增页签/按钮、终端用户 /forgot 与 /reset 页面可访问
+# - 应用管理:协议类型 / 门户字段 / 可见范围;用户门户 /apps 按可见范围过滤
#
# 前置:网关以 source/conf/nginx.test.conf 运行(见 scripts/run-local-e2e.sh)
# 依赖:curl、python3
@@ -32,7 +33,7 @@ SYNC_MOCK_PORT="${SYNC_MOCK_PORT:-18088}"
JAR="$(mktemp -t sso_p1p2_cookies.XXXXXX.txt)"
JAR2="$(mktemp -t sso_p1p2_cookies2.XXXXXX.txt)"
-trap 'rm -f "$JAR" "$JAR2"; [ -n "${MOCK_PID:-}" ] && kill "$MOCK_PID" 2>/dev/null || true; [ -n "${RSTU:-}" ] && curl -s -o /dev/null -b "$JAR" -X POST "$BASE/api/admin/users/delete" -d "username=$RSTU" >/dev/null 2>&1 || true' EXIT
+trap 'rm -f "$JAR" "$JAR2"; [ -n "${MOCK_PID:-}" ] && kill "$MOCK_PID" 2>/dev/null || true; [ -n "${RSTU:-}" ] && curl -s -o /dev/null -b "$JAR" -X POST "$BASE/api/admin/users/delete" -d "username=$RSTU" >/dev/null 2>&1 || true; for _a in "${CAS_APP:-}" "${HID_APP:-}"; do [ -n "$_a" ] && curl -s -o /dev/null -b "$JAR" -X POST "$BASE/api/admin/oauth-clients/delete" -d "client_id=$_a" >/dev/null 2>&1 || true; done' EXIT
PASS=0; FAIL=0
ok() { echo " ✅ $1"; PASS=$((PASS+1)); }
@@ -96,8 +97,29 @@ code="$(curl -s -o /dev/null -w '%{http_code}' -b "$JAR" -X DELETE "$BASE/scim/v
# ===========================================================================
echo
-echo "############ [B] CAS 1.0 / 2.0 协议 ############"
+echo "############ [B] CAS 1.0 / 2.0 协议(含 service 白名单) ############"
+# CAS 的 service 必须命中「应用管理」里登记过的回调地址,否则一律拒绝。
+# 缺了这道校验,/cas/login?service=https://evil 会把带票据的回跳引到外站,
+# 攻击者再拿票据换用户名(开放重定向 + 票据外泄)。
+# 所以先登记一个 protocol=cas 的应用,再用它声明的地址走完整流程。
+CAS_APP="cas_e2e_$(head -c4 /dev/urandom | xxd -p)"
SVC="http://app.example.com/cb"
+curl -s -o /dev/null -b "$JAR" -X POST "$BASE/api/admin/oauth-clients/delete" -d "client_id=$CAS_APP" >/dev/null 2>&1 || true
+sresp="$(curl -s -b "$JAR" -X POST "$BASE/api/admin/oauth-clients/save" \
+ --data-urlencode "client_id=$CAS_APP" --data-urlencode "name=CAS E2E 应用" \
+ --data-urlencode "protocol=cas" --data-urlencode "confidential=1" \
+ --data-urlencode "redirect_uris=$SVC" --data-urlencode "grant_types=authorization_code")"
+[ "$(jget "$sresp" data.protocol)" = "cas" ] \
+ && ok "登记 CAS 应用(protocol=cas)并回显 protocol" || bad "登记 CAS 应用失败:$sresp"
+
+# 未登记的 service:login 必须拒绝,且**不签发票据**
+code="$(curl -s -o /dev/null -w '%{http_code}' -b "$JAR" "$BASE/cas/login?service=http://evil.example.net/cb")"
+[ "$code" = "403" ] && ok "未登记 service 的 /cas/login → 403(白名单生效)" || bad "未登记 service 应 403,实际 $code"
+
+# 未登记的 service:serviceValidate 回 INVALID_SERVICE(与「票据过期」区分开)
+xbad="$(curl -s "$BASE/cas/serviceValidate?service=http://evil.example.net/cb&ticket=ST-nope")"
+echo "$xbad" | grep -q "INVALID_SERVICE" && ok "未登记 service 的 serviceValidate → INVALID_SERVICE" || bad "应回 INVALID_SERVICE:$xbad"
+
loc="$(curl -s -o /dev/null -w '%{redirect_url}' -b "$JAR" "$BASE/cas/login?service=$SVC")"
if echo "$loc" | grep -q "ticket="; then ok "CAS /cas/login 签发 ST 并 302 回跳"; else bad "CAS login 未返回带 ticket 的 302,loc=$loc"; fi
TICKET="$(echo "$loc" | sed -n 's/.*[?&]ticket=\([^&]*\).*/\1/p')"
@@ -115,6 +137,10 @@ t3="$(echo "$loc3" | sed -n 's/.*[?&]ticket=\([^&]*\).*/\1/p')"
ptext="$(curl -s -b "$JAR" "$BASE/cas/validate?service=$SVC&ticket=$t3")"
if echo "$ptext" | head -1 | grep -qx "yes"; then ok "CAS 1.0 /cas/validate 返回 yes"; else bad "CAS 1.0 应为 yes,实际:'$ptext'"; fi
+# service 归一化:带 query 的 service 只要基地址登记过就应放行
+loc4="$(curl -s -o /dev/null -w '%{redirect_url}' -b "$JAR" "$BASE/cas/login?service=http%3A%2F%2Fapp.example.com%2Fcb%3Ftab%3D1")"
+if echo "$loc4" | grep -q "ticket="; then ok "带 query 的 service 命中基地址白名单"; else bad "带 query 的 service 应放行,loc=$loc4"; fi
+
# ===========================================================================
echo
echo "############ [C] 自助密码重置 ############"
@@ -182,7 +208,7 @@ echo "$ulist" | grep -q "ding_e2e_1" && ok "同步账号 ding_e2e_1 已落地" |
# 清理:删除同步账号,保持 data 干净
curl -s -o /dev/null -b "$JAR" -X POST "$BASE/api/admin/users/delete" -d "username=ding_e2e_1" >/dev/null
-kill "$MOCK_PID" 2>/dev/null || true; MOCK_PID=""
+kill "$MOCK_PID" 2>/dev/null || true; wait "$MOCK_PID" 2>/dev/null || true; MOCK_PID=""
# ===========================================================================
echo
@@ -207,6 +233,10 @@ adm="$(curl -s "$BASE/admin")"
[[ "$adm" == *"scimEndpointsBody"* ]] && ok "管理台接入指南含 SCIM 端点表" || bad "管理台缺少 SCIM 端点表"
[[ "$adm" == *"data-act='totp'"* ]] && ok "管理台账号行含双因子按钮" || bad "管理台缺少双因子按钮"
[[ "$adm" == *"auditBody"* ]] && ok "管理台含审计日志表" || bad "管理台缺少审计日志表"
+[[ "$adm" == *'id="ocProto"'* ]] && ok "接入方表单含「协议类型」" || bad "接入方表单缺少协议类型"
+[[ "$adm" == *'id="ocHome"'* ]] && ok "接入方表单含「应用访问地址」" || bad "接入方表单缺少应用访问地址"
+[[ "$adm" == *'id="ocVisRoles"'* ]] && ok "接入方表单含「可见范围」" || bad "接入方表单缺少可见范围"
+[[ "$adm" == *"visibleCell"* ]] && ok "接入方列表渲染可见范围提示" || bad "接入方列表缺少可见范围提示"
# --- 终端用户页面:自助密码重置的真正入口 ---
# 只有 API 没有页面时,发给用户的邮件链接会指向 POST 端点(点开必然失败)。
@@ -239,6 +269,47 @@ else
bad "sink 未取到 token(无法验证重置链接形态)"
fi
+# ===========================================================================
+echo
+echo "############ [G] 应用管理:用户门户 /apps 与可见范围 ############"
+# 门户只列「该用户可访问」的应用。CAS_APP([B] 段登记、未设可见范围)应全员可见。
+code="$(curl -s -o /tmp/sso-apps.html -w '%{http_code}' -b "$JAR" "$BASE/apps")"
+[ "$code" = "200" ] && ok "已登录 GET /apps → 200" || bad "/apps 应为 200,实际 $code"
+grep -q "CAS E2E 应用" /tmp/sso-apps.html && ok "门户列出已登记的 CAS 应用" || bad "门户未列出 CAS 应用"
+grep -q ">CAS<" /tmp/sso-apps.html && ok "门户卡片标注协议(CAS)" || bad "门户卡片缺少协议标注"
+
+# 未登录:302 到登录页,且必须带**绝对**回跳(相对路径过不了回跳安全校验)
+locp="$(curl -s -o /dev/null -w '%{http_code} %{redirect_url}' "$BASE/apps")"
+case "$locp" in
+ 302*"/login"*"redirect="*) ok "未登录访问 /apps → 302 到登录页(带回跳)" ;;
+ *) bad "未登录 /apps 应 302 到 /login?redirect=…,实际:$locp" ;;
+esac
+
+# JSON 接口:未登录 401、已登录回显用户
+code="$(curl -s -o /dev/null -w '%{http_code}' "$BASE/api/portal/apps")"
+[ "$code" = "401" ] && ok "未登录 /api/portal/apps → 401" || bad "未登录应为 401,实际 $code"
+j="$(curl -s -b "$JAR" "$BASE/api/portal/apps")"
+[ "$(jget "$j" data.username)" = "$ADMIN_USER" ] && ok "/api/portal/apps 回显当前用户" || bad "JSON 未回显用户:$j"
+
+# 可见范围:登记一个只对「不存在的角色」可见的应用 → 不应出现在 admin 的门户里
+HID_APP="hid_e2e_$(head -c4 /dev/urandom | xxd -p)"
+hresp="$(curl -s -b "$JAR" -X POST "$BASE/api/admin/oauth-clients/save" \
+ --data-urlencode "client_id=$HID_APP" --data-urlencode "name=隐藏应用 E2E" \
+ --data-urlencode "protocol=oauth2" --data-urlencode "confidential=0" \
+ --data-urlencode "scopes=openid" --data-urlencode "visible_roles=no_such_role_xyz" \
+ --data-urlencode "grant_types=authorization_code" --data-urlencode "redirect_uris=http://hidden.example.com/cb")"
+[ -n "$(jget "$hresp" data.client_id)" ] && ok "登记受限应用(可见范围=不存在的角色)" || bad "登记受限应用失败:$hresp"
+j2="$(curl -s -b "$JAR" "$BASE/api/portal/apps")"
+if printf '%s' "$j2" | grep -q "$HID_APP"; then
+ bad "可见范围未生效:$HID_APP 不该对 admin 可见"
+else
+ ok "可见范围过滤生效(角色不匹配则不列出)"
+fi
+
+# 清理两个临时应用,保持 data 干净
+curl -s -o /dev/null -b "$JAR" -X POST "$BASE/api/admin/oauth-clients/delete" -d "client_id=$HID_APP"
+curl -s -o /dev/null -b "$JAR" -X POST "$BASE/api/admin/oauth-clients/delete" -d "client_id=$CAS_APP"
+
# ===========================================================================
echo
echo "## [summary] P1/P2 新增能力:PASS=$PASS FAIL=$FAIL"