diff --git a/ext/web/web.mq.md b/ext/web/web.mq.md index 4cb76d1..c0ef8e2 100644 --- a/ext/web/web.mq.md +++ b/ext/web/web.mq.md @@ -817,7 +817,7 @@ Register a WebSocket endpoint at `path` (e.g. `/live` or `/chat/{id}`). `mode` i + `default_role`="member" + `session_url`=None -Keep the app's `admin=True`, and gate `{admin_prefix}` (segment-boundary prefix) behind a login page (default `/admin`). Unauthenticated requests redirect to `login_path` (default `{admin_prefix}/login`, auto-excluded). Does not match `/admin-publish`-style siblings. With `register=True` and `enable_rbac`, exposes `register_path` (writes `web_users` + default role). Optional `session_url` (`redis://…` / `rediss://…`) stores sessions in Redis separately from the Postgres/SQLite app DB; omit to keep `_marqdo_sessions` (or in-memory). +Keep the app's `admin=True`, and gate `{admin_prefix}` (segment-boundary prefix) behind a login page (default `/admin`). Unauthenticated requests redirect to `login_path` (default `{admin_prefix}/login`, auto-excluded). Does not match `/admin-publish`-style siblings. With `register=True` and `enable_rbac`, exposes `register_path` (writes `web_users` + default role). Optional `session_url` (`redis://…` / `rediss://…`) stores sessions in Redis separately from the Postgres/SQLite app DB; omit to keep `_marqdo_sessions` (or in-memory). With OIDC, do not set `logout_redirect` to a login path (it would bounce to the IdP); conflicting values fall back to `/`. *> web_app_auth app=`self` users=`users` session_ttl=`session_ttl` admin_prefix=`admin_prefix` login_redirect=`login_redirect` logout_redirect=`logout_redirect` login_path=`login_path` register=`register` register_path=`register_path` default_role=`default_role` session_url=`session_url`* diff --git a/ext/web/网页.mq.md b/ext/web/网页.mq.md index 8a2d397..9831d65 100644 --- a/ext/web/网页.mq.md +++ b/ext/web/网页.mq.md @@ -785,7 +785,7 @@ SSR 顶栏刊名 Logo、主题切换钮与目录抽屉钮。交互写在 `client + `默认角色`="member" + `会话地址`=None -在保持 `后台=真` 的同时,为 `{后台前缀}` 加段边界前缀门禁(默认 `/admin`)。未登录 重定向 到 `登录路径`(默认 `{前缀}/login`,自动排除)。不会匹配 `/admin-publish` 这类旁系路径。`注册=真` 且已 `启用权限` 时开放 `注册路径`(写入 `web_users` 并赋默认角色)。`会话地址` 可选:`redis://…` / `rediss://…` 将会话存 Redis(与 Postgres/SQLite 业务库分离);缺省仍落在业务库的 `_marqdo_sessions` 或内存。 +在保持 `后台=真` 的同时,为 `{后台前缀}` 加段边界前缀门禁(默认 `/admin`)。未登录 重定向 到 `登录路径`(默认 `{前缀}/login`,自动排除)。不会匹配 `/admin-publish` 这类旁系路径。`注册=真` 且已 `启用权限` 时开放 `注册路径`(写入 `web_users` 并赋默认角色)。`会话地址` 可选:`redis://…` / `rediss://…` 将会话存 Redis(与 Postgres/SQLite 业务库分离);缺省仍落在业务库的 `_marqdo_sessions` 或内存。启用统一身份时,`登出回跳` 勿设为登录页(会立刻再跳 IdP);默认/冲突时落首页 `/`。 *> web_app_auth app=`self` users=`用户表` session_ttl=`会话时长` admin_prefix=`后台前缀` login_redirect=`登录回跳` logout_redirect=`登出回跳` login_path=`登录路径` register=`注册` register_path=`注册路径` default_role=`默认角色` session_url=`会话地址`* diff --git a/plugins/web/internal/httpx/auth.go b/plugins/web/internal/httpx/auth.go index f5c3f0c..9612fde 100644 --- a/plugins/web/internal/httpx/auth.go +++ b/plugins/web/internal/httpx/auth.go @@ -250,6 +250,10 @@ func pathExcluded(path string, exclude []string, loginPath string) bool { if strings.HasPrefix(path, "/oidc/") { return true } + // Local logout must always run; never bounce visitors to login→IdP first. + if path == "/logout" || strings.HasSuffix(path, "/logout") { + return true + } for _, ex := range exclude { ex = strings.TrimRight(strings.TrimSuffix(ex, "*"), "/") if ex == "" { @@ -544,7 +548,13 @@ func (st *state) handleLogout(w http.ResponseWriter, r *http.Request) { auth.Logout(sid) } w.Header().Add("Set-Cookie", session.ClearCookie()) - http.Redirect(w, r, st.auth.logoutRedirect, http.StatusSeeOther) + dest := strings.TrimSpace(st.auth.logoutRedirect) + // With OIDC, /login (and siblings) immediately bounce to the IdP — that is + // re-auth, not logout. Land on a public page instead. + if dest == "" || (st.oidcEnabled() && st.isOIDCEntryPath(dest)) { + dest = "/" + } + http.Redirect(w, r, dest, http.StatusSeeOther) } func (st *state) handleAdminHome(w http.ResponseWriter, r *http.Request) { diff --git a/plugins/web/internal/httpx/auth_test.go b/plugins/web/internal/httpx/auth_test.go index f11f145..0798144 100644 --- a/plugins/web/internal/httpx/auth_test.go +++ b/plugins/web/internal/httpx/auth_test.go @@ -70,3 +70,25 @@ func TestWithNavAuth(t *testing.T) { t.Fatalf("nav user=%v", page["_nav_user"]) } } + +func TestLogoutPathExcludedFromGate(t *testing.T) { + gates := []gate{{ + path: "/admin", + permissions: []string{"desk:access"}, + matchMode: gateMatchPrefix, + onDeny: onDenyRedirect, + exclude: []string{"/admin/login"}, + }} + mux := http.NewServeMux() + mux.HandleFunc("GET /admin/logout", func(w http.ResponseWriter, r *http.Request) { + w.WriteHeader(http.StatusNoContent) + }) + handler := withRBAC(mux, gates, "/login") + + req := httptest.NewRequest(http.MethodGet, "/admin/logout", nil) + rec := httptest.NewRecorder() + handler.ServeHTTP(rec, req) + if rec.Code != http.StatusNoContent { + t.Fatalf("visitor /admin/logout should reach handler, got %d loc=%s", rec.Code, rec.Header().Get("Location")) + } +}