From cf578accf99f8843b4cc67e5e9e17fcbc0299e23 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Thu, 22 Oct 2026 07:27:12 -0400 Subject: [PATCH] chore: Consistent policy checks in integration callbacks (#14221) --- plugins/github/server/api/github.test.ts | 19 ++++++++++++++++++- plugins/github/server/api/github.ts | 2 ++ plugins/gitlab/server/api/gitlab.test.ts | 19 ++++++++++++++++++- plugins/gitlab/server/api/gitlab.ts | 1 + plugins/linear/server/api/linear.test.ts | 19 ++++++++++++++++++- plugins/linear/server/api/linear.ts | 2 ++ plugins/notion/server/api/notion.test.ts | 19 ++++++++++++++++++- plugins/notion/server/api/notion.ts | 2 ++ 8 files changed, 79 insertions(+), 4 deletions(-) diff --git a/plugins/github/server/api/github.test.ts b/plugins/github/server/api/github.test.ts index bea3ca199a..9c66856709 100644 --- a/plugins/github/server/api/github.test.ts +++ b/plugins/github/server/api/github.test.ts @@ -1,4 +1,4 @@ -import { buildUser } from "@server/test/factories"; +import { buildUser, buildViewer } from "@server/test/factories"; import { getTestServer } from "@server/test/support"; import { SetupAction } from "./schema"; @@ -74,4 +74,21 @@ describe("#github.callback", () => { ); expect(res.status).toEqual(400); }); + + it.each([ + ["member", buildUser], + ["viewer", buildViewer], + ])("should not allow a %s to create an integration", async (_, build) => { + const user = await build(); + const state = JSON.stringify({ teamId: user.teamId, nonce: "nonce" }); + const res = await server.get( + `/api/github.callback?state=${encodeURIComponent(state)}&code=123&setup_action=${SetupAction.install}&installation_id=1`, + user, + { + redirect: "manual", + headers: { Cookie: "githubOAuthNonce=nonce" }, + } + ); + expect(res.status).toEqual(403); + }); }); diff --git a/plugins/github/server/api/github.ts b/plugins/github/server/api/github.ts index 3ee249a5c7..5903e82e3e 100644 --- a/plugins/github/server/api/github.ts +++ b/plugins/github/server/api/github.ts @@ -9,6 +9,7 @@ import { transaction } from "@server/middlewares/transaction"; import validate from "@server/middlewares/validate"; import validateWebhook from "@server/middlewares/validateWebhook"; import { IntegrationAuthentication, Integration } from "@server/models"; +import { authorize } from "@server/policies"; import type { APIContext } from "@server/types"; import { verifyOAuthStateNonce } from "@server/utils/oauth"; import { RequestHelper } from "@server/utils/RequestHelper"; @@ -61,6 +62,7 @@ router.get( } verifyOAuthStateNonce(ctx, GitHubOAuthNonceCookie, parsedState.nonce); + authorize(user, "createIntegration", user.team); const client = await GitHub.authenticateAsUser(code!, state); const installationsByUser = await client.requestAppInstallations(); diff --git a/plugins/gitlab/server/api/gitlab.test.ts b/plugins/gitlab/server/api/gitlab.test.ts index 30afd7fe62..c86d69a611 100644 --- a/plugins/gitlab/server/api/gitlab.test.ts +++ b/plugins/gitlab/server/api/gitlab.test.ts @@ -1,4 +1,4 @@ -import { buildUser } from "@server/test/factories"; +import { buildUser, buildViewer } from "@server/test/factories"; import { getTestServer } from "@server/test/support"; const server = getTestServer(); @@ -40,4 +40,21 @@ describe("#gitlab.callback", () => { ); expect(res.status).toEqual(400); }); + + it.each([ + ["member", buildUser], + ["viewer", buildViewer], + ])("should not allow a %s to create an integration", async (_, build) => { + const user = await build(); + const state = JSON.stringify({ teamId: user.teamId, nonce: "nonce" }); + const res = await server.get( + `/api/gitlab.callback?state=${encodeURIComponent(state)}&code=123`, + user, + { + redirect: "manual", + headers: { Cookie: "gitlabOAuthNonce=nonce" }, + } + ); + expect(res.status).toEqual(403); + }); }); diff --git a/plugins/gitlab/server/api/gitlab.ts b/plugins/gitlab/server/api/gitlab.ts index f8814e32b6..79043a6fe2 100644 --- a/plugins/gitlab/server/api/gitlab.ts +++ b/plugins/gitlab/server/api/gitlab.ts @@ -166,6 +166,7 @@ router.get( } verifyOAuthStateNonce(ctx, GitLabOAuthNonceCookie, parsedState.nonce); + authorize(user, "createIntegration", user.team); try { // Check for a pending IntegrationAuthentication with custom credentials diff --git a/plugins/linear/server/api/linear.test.ts b/plugins/linear/server/api/linear.test.ts index 639043446b..9b9d51fa77 100644 --- a/plugins/linear/server/api/linear.test.ts +++ b/plugins/linear/server/api/linear.test.ts @@ -1,4 +1,4 @@ -import { buildUser } from "@server/test/factories"; +import { buildUser, buildViewer } from "@server/test/factories"; import { getTestServer } from "@server/test/support"; const server = getTestServer(); @@ -40,4 +40,21 @@ describe("#linear.callback", () => { ); expect(res.status).toEqual(400); }); + + it.each([ + ["member", buildUser], + ["viewer", buildViewer], + ])("should not allow a %s to create an integration", async (_, build) => { + const user = await build(); + const state = JSON.stringify({ teamId: user.teamId, nonce: "nonce" }); + const res = await server.get( + `/api/linear.callback?state=${encodeURIComponent(state)}&code=123`, + user, + { + redirect: "manual", + headers: { Cookie: "linearOAuthNonce=nonce" }, + } + ); + expect(res.status).toEqual(403); + }); }); diff --git a/plugins/linear/server/api/linear.ts b/plugins/linear/server/api/linear.ts index 57fc6bfb1f..4de36de834 100644 --- a/plugins/linear/server/api/linear.ts +++ b/plugins/linear/server/api/linear.ts @@ -8,6 +8,7 @@ import auth from "@server/middlewares/authentication"; import { transaction } from "@server/middlewares/transaction"; import validate from "@server/middlewares/validate"; import { IntegrationAuthentication, Integration } from "@server/models"; +import { authorize } from "@server/policies"; import type { APIContext } from "@server/types"; import { verifyOAuthStateNonce } from "@server/utils/oauth"; import { Linear } from "../linear"; @@ -54,6 +55,7 @@ router.get( } verifyOAuthStateNonce(ctx, LinearOAuthNonceCookie, parsedState.nonce); + authorize(user, "createIntegration", user.team); try { // validation middleware ensures that code is non-null at this point. diff --git a/plugins/notion/server/api/notion.test.ts b/plugins/notion/server/api/notion.test.ts index ebad72c14c..845e7c3d8e 100644 --- a/plugins/notion/server/api/notion.test.ts +++ b/plugins/notion/server/api/notion.test.ts @@ -1,4 +1,4 @@ -import { buildUser } from "@server/test/factories"; +import { buildUser, buildViewer } from "@server/test/factories"; import { getTestServer } from "@server/test/support"; const server = getTestServer(); @@ -40,4 +40,21 @@ describe("#notion.callback", () => { ); expect(res.status).toEqual(400); }); + + it.each([ + ["member", buildUser], + ["viewer", buildViewer], + ])("should not allow a %s to create an integration", async (_, build) => { + const user = await build(); + const state = JSON.stringify({ teamId: user.teamId, nonce: "nonce" }); + const res = await server.get( + `/api/notion.callback?state=${encodeURIComponent(state)}&code=123`, + user, + { + redirect: "manual", + headers: { Cookie: "notionOAuthNonce=nonce" }, + } + ); + expect(res.status).toEqual(403); + }); }); diff --git a/plugins/notion/server/api/notion.ts b/plugins/notion/server/api/notion.ts index 4a50a81a38..9d4e0ee18a 100644 --- a/plugins/notion/server/api/notion.ts +++ b/plugins/notion/server/api/notion.ts @@ -6,6 +6,7 @@ import auth from "@server/middlewares/authentication"; import { transaction } from "@server/middlewares/transaction"; import validate from "@server/middlewares/validate"; import { Integration, IntegrationAuthentication } from "@server/models"; +import { authorize } from "@server/policies"; import type { APIContext } from "@server/types"; import { verifyOAuthStateNonce } from "@server/utils/oauth"; import { NotionClient } from "../notion"; @@ -48,6 +49,7 @@ router.get( } verifyOAuthStateNonce(ctx, NotionOAuthNonceCookie, parsedState.nonce); + authorize(user, "createIntegration", user.team); // validation middleware ensures that code is non-null at this point. const data = await NotionClient.oauthAccess(code!);