diff --git a/src/azure/directory.ts b/src/azure/directory.ts index 6db3c51..046b3c9 100644 --- a/src/azure/directory.ts +++ b/src/azure/directory.ts @@ -1,6 +1,6 @@ import { logger } from "@/logger" import { azureCredentials } from "./config" -import { addGroupMember, getAllGroups, removeGroupMember } from "./functions/groups" +import { getAllGroups } from "./functions/groups" import { createMember, findByMail, @@ -20,8 +20,6 @@ const graphAzureDirectory: AzureDirectory = { setMemberNumber, createMember, getAllGroups, - addGroupMember, - removeGroupMember, } export const azureDirectory: AzureDirectory = azureCredentials ? graphAzureDirectory : createMockAzureDirectory() diff --git a/src/azure/functions/groups.ts b/src/azure/functions/groups.ts index 821ab78..7714e6b 100644 --- a/src/azure/functions/groups.ts +++ b/src/azure/functions/groups.ts @@ -1,6 +1,5 @@ import type { Group as TGroup, User as TUser } from "@microsoft/microsoft-graph-types" import { logger } from "@/logger" -import { withRetry } from "@/utils/wait" import { getAzureClient } from "../client" import type { ParsedGroup } from "../types" @@ -26,30 +25,3 @@ export async function getAllGroups(): Promise { return [] } } - -export async function addGroupMember(groupId: string, userId: string): Promise { - try { - const client = getAzureClient() - await withRetry(() => - client.api(`/groups/${groupId}/members/$ref`).post({ - "@odata.id": `https://graph.microsoft.com/v1.0/directoryObjects/${userId}`, - }) - ) - logger.debug({ userId, groupId }, "[MS Graph API] OK addGroupMember call") - return true - } catch (error) { - logger.error({ error, userId, groupId }, "[MS Graph API] Error in addGroupMember call") - return false - } -} -export async function removeGroupMember(groupId: string, userId: string): Promise { - try { - const client = getAzureClient() - await withRetry(() => client.api(`/groups/${groupId}/members/${userId}/$ref`).delete()) - logger.debug({ userId, groupId }, "[MS Graph API] OK removeGroupMember call") - return true - } catch (error) { - logger.error({ error, userId, groupId }, "[MS Graph API] Error in removeGroupMember call") - return false - } -} diff --git a/src/azure/mock-directory.ts b/src/azure/mock-directory.ts index 75a2bb9..cdd39d6 100644 --- a/src/azure/mock-directory.ts +++ b/src/azure/mock-directory.ts @@ -132,28 +132,5 @@ export function createMockAzureDirectory(): AzureDirectory { async getAllGroups() { return cloneGroups(groups) }, - - async addGroupMember(groupId, userId) { - const group = groups.find((candidate) => candidate.id === groupId) - const member = members.find((candidate) => candidate.id === userId) - if (!group || !member || group.members.some((candidate) => candidate.id === userId)) return false - - group.members.push({ id: member.id, displayName: member.displayName ?? member.mail ?? "Unnamed member" }) - if (group.id === ASSOCIATION_GROUP_ID) member.isMember = true - return true - }, - - async removeGroupMember(groupId, userId) { - const group = groups.find((candidate) => candidate.id === groupId) - const memberIndex = group?.members.findIndex((candidate) => candidate.id === userId) ?? -1 - if (!group || memberIndex === -1) return false - - group.members.splice(memberIndex, 1) - if (group.id === ASSOCIATION_GROUP_ID) { - const member = members.find((candidate) => candidate.id === userId) - if (member) member.isMember = false - } - return true - }, } } diff --git a/src/azure/types.ts b/src/azure/types.ts index 60021d4..3e53196 100644 --- a/src/azure/types.ts +++ b/src/azure/types.ts @@ -73,6 +73,4 @@ export type AzureDirectory = { setMemberNumber(userId: string, assocNumber: number): Promise<{ error: string | null }> createMember(input: CreateMemberInput): Promise getAllGroups(): Promise - addGroupMember(groupId: string, userId: string): Promise - removeGroupMember(groupId: string, userId: string): Promise } diff --git a/src/routers/azure/groups.ts b/src/routers/azure/groups.ts index 8250921..dc69b7c 100644 --- a/src/routers/azure/groups.ts +++ b/src/routers/azure/groups.ts @@ -1,20 +1,13 @@ -import { z } from "zod" import { azureDirectory } from "@/azure/directory" import { dashboard } from "@/idp/policies" import { createTRPCRouter, policy } from "@/trpc" +/** + * Read-only. Group membership is never changed through the API (RFC v3 ยง4 decision 9): the only group write is + * `azure.members.create` adding the user it just created to Soci, from which the IdP derives the Socio role. + */ export default createTRPCRouter({ getAll: policy(dashboard("azure:groups:read")).query(async () => { return await azureDirectory.getAllGroups() }), - addMember: policy(dashboard("azure:groups:write")) - .input(z.object({ groupId: z.string(), userId: z.string() })) - .mutation(async ({ input }) => { - return await azureDirectory.addGroupMember(input.groupId, input.userId) - }), - removeMember: policy(dashboard("azure:groups:write")) - .input(z.object({ groupId: z.string(), userId: z.string() })) - .mutation(async ({ input }) => { - return await azureDirectory.removeGroupMember(input.groupId, input.userId) - }), }) diff --git a/tests/azure-router.test.ts b/tests/azure-router.test.ts index 59f6403..8d1024a 100644 --- a/tests/azure-router.test.ts +++ b/tests/azure-router.test.ts @@ -49,7 +49,7 @@ beforeEach(() => { }) /** A dashboard user holding every Azure permission the routers check. */ -const ALL_AZURE = ["azure:members:read", "azure:members:create", "azure:groups:read", "azure:groups:write"] +const ALL_AZURE = ["azure:members:read", "azure:members:create", "azure:groups:read"] describe("Azure tRPC routes without credentials", () => { it("reserves the number of an incomplete account while directory searches are stale", async () => { @@ -272,20 +272,6 @@ describe("Azure tRPC routes without credentials", () => { caller.members.setAssocNumber({ userId: "mock-member-grace", assocNumber: 2042 }) ).rejects.toMatchObject({ code: "UNAUTHORIZED" }) }) - - it("adds and removes group memberships", async () => { - const caller = await createCaller(tokenContext(ALL_AZURE)) - const input = { groupId: "mock-group-empty", userId: "mock-member-grace" } - - await expect(caller.groups.addMember(input)).resolves.toBe(true) - expect((await caller.groups.getAll()).find((group) => group.id === input.groupId)?.members).toContainEqual({ - id: input.userId, - displayName: "Grace Hopper", - }) - - await expect(caller.groups.removeMember(input)).resolves.toBe(true) - expect((await caller.groups.getAll()).find((group) => group.id === input.groupId)?.members).toEqual([]) - }) }) function tokenContext( @@ -678,30 +664,18 @@ describe("Azure member number changes", () => { }) describe("Azure group token authorization", () => { - const membership = { groupId: "mock-group-empty", userId: "mock-member-grace" } - - it("lets group readers list groups but not change memberships", async () => { + it("lets group readers list groups", async () => { const caller = await createCaller(tokenContext(["azure:groups:read"])) expect(await caller.groups.getAll()).not.toHaveLength(0) - await expect(caller.groups.addMember(membership)).rejects.toMatchObject({ code: "FORBIDDEN" }) - await expect(caller.groups.removeMember(membership)).rejects.toMatchObject({ code: "FORBIDDEN" }) - }) - - it("lets group writers add and remove members without reading groups", async () => { - const caller = await createCaller(tokenContext(["azure:groups:write"])) - await expect(caller.groups.addMember(membership)).resolves.toBe(true) - await expect(caller.groups.removeMember(membership)).resolves.toBe(true) - await expect(caller.groups.getAll()).rejects.toMatchObject({ code: "FORBIDDEN" }) }) it.each([ ["no permission", tokenContext([])], ["member permissions alone", tokenContext(["azure:members:read", "azure:members:create"])], - ["no admin scope", tokenContext(["azure:groups:write"], undefined, [])], - ["service actor", tokenContext(["azure:groups:write"], { kind: "service", client: "telegram-bot" })], - ])("refuses membership changes with %s", async (_, context) => { + ["no admin scope", tokenContext(["azure:groups:read"], undefined, [])], + ["service actor", tokenContext(["azure:groups:read"], { kind: "service", client: "telegram-bot" })], + ])("refuses listing groups with %s", async (_, context) => { const caller = await createCaller(context) - await expect(caller.groups.addMember(membership)).rejects.toMatchObject({ code: "FORBIDDEN" }) - await expect(caller.groups.removeMember(membership)).rejects.toMatchObject({ code: "FORBIDDEN" }) + await expect(caller.groups.getAll()).rejects.toMatchObject({ code: "FORBIDDEN" }) }) }) diff --git a/tests/idp-router.test.ts b/tests/idp-router.test.ts index 5ec4307..184ff61 100644 --- a/tests/idp-router.test.ts +++ b/tests/idp-router.test.ts @@ -131,8 +131,12 @@ describe("app router", () => { expect(policyOf("azure.groups.getAll")?.policy).toEqual({ user: { scope: "backend:admin", permission: "azure:groups:read" }, }) - for (const path of ["azure.groups.addMember", "azure.groups.removeMember"]) - expect(policyOf(path)?.policy).toEqual({ user: { scope: "backend:admin", permission: "azure:groups:write" } }) + // Group membership is read-only: no procedure may add or remove members of an arbitrary group. + expect( + procedures() + .filter(([name]) => name.startsWith("azure.groups.")) + .map(([name]) => name) + ).toEqual(["azure.groups.getAll"]) expect(policyOf("tg.groups.leaveChat")?.policy).toEqual({ user: { scope: "backend:admin", permission: "tg:groups:manage" }, })