Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix(admin): close archived workspace lookup bypasses

Tin2e7fc2e5f4df
diff --git a/apps/api/src/task/controllers/get-task-by-ticket-id.ts b/apps/api/src/task/controllers/get-task-by-ticket-id.ts
index 801ba3702..19e6751a0 100644
--- a/apps/api/src/task/controllers/get-task-by-ticket-id.ts
+++ b/apps/api/src/task/controllers/get-task-by-ticket-id.ts
@@ -9,6 +9,7 @@ import {
import { projectAccessCondition } from "../../project-access/project-access-condition";
import type { PermissionMap } from "../../utils/role-permissions";
import { workspacePermissionGrants } from "../../utils/workspace-permission-grants";
+import { workspaceIsActive } from "../../workspace/archive/active-workspace-sql";
import { TICKET_ID_PATTERN } from "../ticket-id";
import getTask from "./get-task";
@@ -75,6 +76,7 @@ export default async function getTaskByTicketId(
.where(
and(
eq(taskTable.number, number),
+ workspaceIsActive(projectTable.workspaceId),
mayMatchProjectKey(projectKey),
workspaceId ? eq(projectTable.workspaceId, workspaceId) : undefined,
slugWorkspaceIds
diff --git a/apps/api/src/workspace/archive/assert-native-organization-active.ts b/apps/api/src/workspace/archive/assert-native-organization-active.ts
index 23f925cd2..1668d8b17 100644
--- a/apps/api/src/workspace/archive/assert-native-organization-active.ts
+++ b/apps/api/src/workspace/archive/assert-native-organization-active.ts
@@ -17,6 +17,31 @@ const UNSCOPED_PATHS = new Set([
"/organization/list-user-teams",
]);
+const QUERY_PATHS = new Set([
+ "/organization/get-full-organization",
+ "/organization/list-members",
+ "/organization/get-active-member-role",
+ "/organization/get-invitation",
+ "/organization/list-invitations",
+ "/organization/list-teams",
+ "/organization/list-team-members",
+ "/organization/list-roles",
+ "/organization/get-role",
+]);
+
+const INVITATION_PATHS = new Set([
+ "/organization/accept-invitation",
+ "/organization/reject-invitation",
+ "/organization/cancel-invitation",
+]);
+
+const SLUG_PATHS = new Set([
+ "/organization/get-full-organization",
+ "/organization/list-members",
+ "/organization/get-active-member-role",
+ "/organization/set-active",
+]);
+
type OrganizationContext = {
path?: string;
body?: Record<string, unknown> | null;
@@ -25,7 +50,7 @@ type OrganizationContext = {
type OrganizationViewer = {
user: { id: string };
- session: { activeOrganizationId?: unknown };
+ session: { activeOrganizationId?: unknown; activeTeamId?: unknown };
} | null;
type Target = { workspaceId: string; viaInvitation: boolean };
@@ -57,19 +82,33 @@ async function resolveTarget(
ctx: OrganizationContext,
viewer: NonNullable<OrganizationViewer>,
): Promise<Target | null> {
- const input =
- ctx.path === "/organization/get-active-member"
- ? {}
- : { ...ctx.query, ...ctx.body };
+ // Match the provider's actual input, including ignored fields. A query
+ // parameter must never redirect a body-based mutation's archive check.
+ const path = ctx.path ?? "";
+ let input = (QUERY_PATHS.has(path) ? ctx.query : ctx.body) ?? {};
+ if (path === "/organization/update-team") {
+ input =
+ ctx.body?.data && typeof ctx.body.data === "object"
+ ? (ctx.body.data as Record<string, unknown>)
+ : {};
+ }
+ if (path === "/organization/get-active-member") input = {};
+ if (path === "/organization/set-active-team") {
+ if (ctx.body?.teamId === null) return null;
+ // The provider always scopes this operation to the active organization.
+ input = {};
+ }
const text = (key: string) =>
typeof input[key] === "string" && input[key] ? input[key] : undefined;
if (ctx.path === "/organization/set-active" && input.organizationId === null)
return null;
- const invitationId =
- text("invitationId") ??
- (ctx.path === "/organization/get-invitation" ? text("id") : undefined);
+ const invitationId = INVITATION_PATHS.has(path)
+ ? text("invitationId")
+ : path === "/organization/get-invitation"
+ ? text("id")
+ : undefined;
if (invitationId) {
const [invitation] = await db
.select({ workspaceId: schema.invitationTable.workspaceId })
@@ -81,29 +120,31 @@ async function resolveTarget(
: null;
}
+ if (path === "/organization/list-team-members") {
+ const teamId = text("teamId") ?? viewer.session.activeTeamId;
+ const workspaceId =
+ typeof teamId === "string" ? await workspaceIdByTeam(teamId) : undefined;
+ return workspaceId ? { workspaceId, viaInvitation: false } : null;
+ }
+
const slugWins =
- [
- "/organization/get-full-organization",
- "/organization/list-members",
- "/organization/get-active-member-role",
- ].includes(ctx.path ?? "") && text("organizationSlug");
+ SLUG_PATHS.has(path) &&
+ path !== "/organization/set-active" &&
+ text("organizationSlug");
const organizationId = slugWins ? undefined : text("organizationId");
- const organizationSlug = text("organizationSlug");
- const teamId = text("teamId");
- const explicit = organizationId ?? organizationSlug ?? teamId;
+ const organizationSlug = SLUG_PATHS.has(path)
+ ? text("organizationSlug")
+ : undefined;
+ const explicit = organizationId ?? organizationSlug;
const workspaceId = organizationId
? organizationId
: organizationSlug
? await workspaceIdBySlug(organizationSlug)
- : teamId
- ? await workspaceIdByTeam(teamId)
- : undefined;
+ : undefined;
if (explicit) {
return workspaceId ? { workspaceId, viaInvitation: false } : null;
}
- if (ctx.path === "/organization/set-active-team" && input.teamId === null)
- return null;
const active = viewer.session.activeOrganizationId;
return typeof active === "string" && active
? { workspaceId: active, viaInvitation: false }
diff --git a/tests/api-integration/workspace-archive-access.test.ts b/tests/api-integration/workspace-archive-access.test.ts
index 3b867c34a..f75714be1 100644
--- a/tests/api-integration/workspace-archive-access.test.ts
+++ b/tests/api-integration/workspace-archive-access.test.ts
@@ -151,6 +151,41 @@ describe("an archived workspace over HTTP", () => {
await setArchived(workspace.id, false);
expect(await count()).toBe(1);
});
+
+ it("hides ticket-ID lookups from members and API keys until restore", async () => {
+ const { member, workspace, project, task } = await seed();
+ const { key } = await auth.api.createApiKey({
+ body: { userId: member.id },
+ });
+ mockAuthenticatedSession(member);
+ const { app } = createApp();
+ const path = `/api/task/by-ticket-id/${project.slug}-1`;
+ const headers = [
+ {},
+ { "x-api-key": key },
+ { authorization: `Bearer ${key}` },
+ ];
+ const selectors = [
+ "",
+ `?workspaceId=${workspace.id}`,
+ `?workspaceSlug=${workspace.slug}`,
+ `?projectId=${project.id}`,
+ ];
+ for (const archived of [false, true, false]) {
+ await setArchived(workspace.id, archived);
+ for (const credential of headers) {
+ for (const selector of selectors) {
+ const response = await app.request(`${path}${selector}`, {
+ headers: credential,
+ });
+ expect(response.status).toBe(archived ? 404 : 200);
+ expect(await response.json()).toMatchObject(
+ archived ? { message: "Task not found" } : { id: task.id },
+ );
+ }
+ }
+ }
+ });
});
describe("an archived workspace's public links", () => {
@@ -495,4 +530,75 @@ describe("an archived workspace through Better Auth organization endpoints", ()
.status,
).toBe(200);
});
+
+ it("ignores unrelated fields when resolving an archived organization target", async () => {
+ const { member, invitee, workspace, invitation, call } =
+ await organizationFixture();
+ const [active] = await db
+ .insert(schema.workspaceTable)
+ .values({ name: "Active org", slug: randomUUID(), createdAt: new Date() })
+ .returning();
+ const [otherInvitation] = await db
+ .insert(schema.invitationTable)
+ .values({
+ workspaceId: active.id,
+ inviterId: member.userId,
+ email: "[email protected]",
+ role: "member",
+ status: "pending",
+ expiresAt: new Date(Date.now() + 86_400_000),
+ })
+ .returning();
+ expect(
+ (
+ await call(member.cookies, "/auth/organization/set-active", {
+ organizationId: workspace.id,
+ })
+ ).status,
+ ).toBe(200);
+ await setArchived(workspace.id, true);
+
+ const unrelated = {
+ invitationId: otherInvitation.id,
+ organizationSlug: active.slug,
+ teamId: "missing-team",
+ };
+ const query = new URLSearchParams({
+ ...unrelated,
+ organizationId: active.id,
+ });
+ for (const response of [
+ await call(member.cookies, `/auth/organization/update?${query}`, {
+ organizationId: workspace.id,
+ data: { name: "Should not change" },
+ }),
+ await call(member.cookies, "/auth/organization/update", {
+ ...unrelated,
+ data: { name: "Should not change" },
+ }),
+ await call(
+ member.cookies,
+ `/auth/organization/get-full-organization?organizationId=${workspace.id}&invitationId=missing`,
+ ),
+ await call(
+ invitee.cookies,
+ `/auth/organization/get-invitation?id=${invitation.id}&invitationId=${otherInvitation.id}`,
+ ),
+ await call(
+ member.cookies,
+ "/auth/organization/delete?invitationId=missing",
+ {
+ organizationId: workspace.id,
+ },
+ ),
+ ]) {
+ expect(response.status).toBe(403);
+ expect(await codeOf(response)).toBe("WORKSPACE_ARCHIVED");
+ }
+ const [stored] = await db
+ .select({ name: schema.workspaceTable.name })
+ .from(schema.workspaceTable)
+ .where(eq(schema.workspaceTable.id, workspace.id));
+ expect(stored?.name).toBe(workspace.name);
+ });
});