Refresh HiveGrid Cloud reference snapshot
This commit is contained in:
1 parent
5e99e14772
commit
7f88026f79
5955 files changed
+1177325
-188362
No files matched your search
+38
-19
@@ -13,7 +13,7 @@ vi.mock("~/modules/admin-sso", () => ({
|
||||
}));
|
||||
|
||||
vi.mock("~/modules/admin-sso/logout.server", () => ({
|
||||
clearIdTokenCookie: vi.fn(() => "hivegrid_admin_sso_id_token=; Path=/auth/admin; HttpOnly; SameSite=Lax; Max-Age=0"),
|
||||
clearIdTokenCookie: vi.fn(() => "__Host-hivegrid_admin_sso_id_token=; Path=/; HttpOnly; SameSite=Lax; Max-Age=0; Secure"),
|
||||
readIdTokenFromRequest: vi.fn(),
|
||||
}));
|
||||
|
||||
@@ -22,23 +22,26 @@ vi.mock("~/modules/admin-sso/audit.server", () => ({
|
||||
}));
|
||||
|
||||
vi.mock("~/utils/session.server", () => ({
|
||||
commitSession: vi.fn(),
|
||||
getUserInfo: vi.fn(),
|
||||
getUserSession: vi.fn(),
|
||||
storage: { destroySession: vi.fn() },
|
||||
validateCSRFToken: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/services/auth/sessionLifecycle.server", () => ({ endServerSession: vi.fn() }));
|
||||
|
||||
import { getAdminSsoClient, readAdminSsoEnv } from "~/modules/admin-sso";
|
||||
import { clearIdTokenCookie, readIdTokenFromRequest } from "~/modules/admin-sso/logout.server";
|
||||
import { writeAdminSsoAuditEvent } from "~/modules/admin-sso/audit.server";
|
||||
import { commitSession, getUserInfo, getUserSession } from "~/utils/session.server";
|
||||
import { getUserInfo, getUserSession, storage, validateCSRFToken } from "~/utils/session.server";
|
||||
import { endServerSession } from "~/services/auth/sessionLifecycle.server";
|
||||
import { action, loader } from "./auth.admin.logout";
|
||||
|
||||
type SessionMock = {
|
||||
unset: ReturnType<typeof vi.fn>;
|
||||
get: ReturnType<typeof vi.fn>;
|
||||
};
|
||||
|
||||
function sessionMock(): SessionMock {
|
||||
return { unset: vi.fn() };
|
||||
return { get: vi.fn((key: string) => (key === "sessionToken" ? "session-token-1" : undefined)) };
|
||||
}
|
||||
|
||||
function request(init?: RequestInit) {
|
||||
@@ -61,9 +64,12 @@ describe("auth admin logout route", () => {
|
||||
session = sessionMock();
|
||||
vi.mocked(getUserInfo).mockResolvedValue({ userId: "admin-user-1" } as Awaited<ReturnType<typeof getUserInfo>>);
|
||||
vi.mocked(getUserSession).mockResolvedValue(session as Awaited<ReturnType<typeof getUserSession>>);
|
||||
vi.mocked(commitSession).mockResolvedValue("app_session=; Path=/; HttpOnly" as Awaited<ReturnType<typeof commitSession>>);
|
||||
vi.mocked(storage.destroySession).mockResolvedValue("app_session=; Path=/; HttpOnly; Max-Age=0" as never);
|
||||
vi.mocked(endServerSession).mockResolvedValue(undefined as never);
|
||||
vi.mocked(readIdTokenFromRequest).mockReturnValue(null);
|
||||
vi.mocked(readAdminSsoEnv).mockReturnValue({ postLogoutRedirectUri: "https://admin.example.test/login?logged_out=1" } as ReturnType<typeof readAdminSsoEnv>);
|
||||
vi.mocked(readAdminSsoEnv).mockReturnValue({ postLogoutRedirectUri: "https://admin.example.test/login?logged_out=1" } as ReturnType<
|
||||
typeof readAdminSsoEnv
|
||||
>);
|
||||
vi.mocked(getAdminSsoClient).mockResolvedValue({
|
||||
endSessionUrl: vi.fn(() => "https://idp.example.test/end-session?id_token_hint=id-token-value"),
|
||||
} as Awaited<ReturnType<typeof getAdminSsoClient>>);
|
||||
@@ -73,16 +79,16 @@ describe("auth admin logout route", () => {
|
||||
const response = await callAction();
|
||||
|
||||
expect(response.status).toBe(302);
|
||||
expect(validateCSRFToken).toHaveBeenCalledWith(expect.any(Request));
|
||||
expect(response.headers.get("Location")).toBe("/login?logged_out=1");
|
||||
expect(readAdminSsoEnv).not.toHaveBeenCalled();
|
||||
expect(getAdminSsoClient).not.toHaveBeenCalled();
|
||||
expect(session.unset).toHaveBeenCalledWith("userId");
|
||||
expect(session.unset).toHaveBeenCalledWith("impersonatingFromUserId");
|
||||
expect(commitSession).toHaveBeenCalledWith(session);
|
||||
expect(endServerSession).toHaveBeenCalledWith("session-token-1");
|
||||
expect(storage.destroySession).toHaveBeenCalledWith(session);
|
||||
expect(clearIdTokenCookie).toHaveBeenCalledOnce();
|
||||
const setCookie = response.headers.get("Set-Cookie") ?? "";
|
||||
expect(setCookie).toContain("app_session=");
|
||||
expect(setCookie).toContain("hivegrid_admin_sso_id_token=");
|
||||
expect(setCookie).toContain("__Host-hivegrid_admin_sso_id_token=");
|
||||
expect(setCookie).toContain("Max-Age=0");
|
||||
expect(writeAdminSsoAuditEvent).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
@@ -105,8 +111,8 @@ describe("auth admin logout route", () => {
|
||||
id_token_hint: "id-token-value",
|
||||
post_logout_redirect_uri: "https://admin.example.test/login?logged_out=1",
|
||||
});
|
||||
expect(commitSession).toHaveBeenCalledWith(session);
|
||||
expect(response.headers.get("Set-Cookie")).toContain("hivegrid_admin_sso_id_token=");
|
||||
expect(storage.destroySession).toHaveBeenCalledWith(session);
|
||||
expect(response.headers.get("Set-Cookie")).toContain("__Host-hivegrid_admin_sso_id_token=");
|
||||
expect(writeAdminSsoAuditEvent).toHaveBeenCalledWith(expect.objectContaining({ meta: { hadIdToken: true } }));
|
||||
});
|
||||
|
||||
@@ -121,16 +127,29 @@ describe("auth admin logout route", () => {
|
||||
expect(response.status).toBe(302);
|
||||
expect(response.headers.get("Location")).toBe("/login?logged_out=1");
|
||||
expect(getAdminSsoClient).not.toHaveBeenCalled();
|
||||
expect(commitSession).toHaveBeenCalledWith(session);
|
||||
expect(storage.destroySession).toHaveBeenCalledWith(session);
|
||||
expect(response.headers.get("Set-Cookie")).toContain("Max-Age=0");
|
||||
});
|
||||
|
||||
it("also clears session state for GET logout requests", async () => {
|
||||
it("rejects GET logout without changing session state", async () => {
|
||||
const response = await callLoader();
|
||||
|
||||
expect(response.status).toBe(302);
|
||||
expect(response.headers.get("Location")).toBe("/login?logged_out=1");
|
||||
expect(commitSession).toHaveBeenCalledWith(session);
|
||||
expect(clearIdTokenCookie).toHaveBeenCalledOnce();
|
||||
expect(response.status).toBe(405);
|
||||
expect(response.headers.get("Allow")).toBe("POST");
|
||||
expect(response.headers.get("Cache-Control")).toBe("no-store");
|
||||
expect(getUserInfo).not.toHaveBeenCalled();
|
||||
expect(getUserSession).not.toHaveBeenCalled();
|
||||
expect(storage.destroySession).not.toHaveBeenCalled();
|
||||
expect(clearIdTokenCookie).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("rejects a forged POST before reading or clearing authentication state", async () => {
|
||||
vi.mocked(validateCSRFToken).mockRejectedValueOnce(new Error("CSRF tokens do not match"));
|
||||
|
||||
await expect(callAction()).rejects.toThrow("CSRF tokens do not match");
|
||||
|
||||
expect(getUserInfo).not.toHaveBeenCalled();
|
||||
expect(getUserSession).not.toHaveBeenCalled();
|
||||
expect(storage.destroySession).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user