From 1e14731b056b02bfe23aee07f1b35ffa79d6401b Mon Sep 17 00:00:00 2001 From: "sentry[bot]" <39604003+sentry[bot]@users.noreply.github.com> Date: Wed, 18 Nov 2026 10:47:22 +0000 Subject: [PATCH 1/2] fix(mcp): Allow empty or scheme-less organizationUrl for self-hosted Sentry --- .../mcp-core/src/api-client/schema.test.ts | 16 ++++++++++ packages/mcp-core/src/api-client/schema.ts | 4 ++- .../tools/catalog/find-organizations.test.ts | 31 +++++++++++++++++++ .../src/tools/catalog/find-organizations.ts | 8 ++++- 4 files changed, 57 insertions(+), 2 deletions(-) diff --git a/packages/mcp-core/src/api-client/schema.test.ts b/packages/mcp-core/src/api-client/schema.test.ts index d0b459d97b..3983522372 100644 --- a/packages/mcp-core/src/api-client/schema.test.ts +++ b/packages/mcp-core/src/api-client/schema.test.ts @@ -17,6 +17,7 @@ import { IssueSchema, IssueActivitySchema, IssueTagValuesSchema, + OrganizationListSchema, ProfileChunkResponseSchema, ProfileChunkSampleSchema, ProfileChunkSchema, @@ -29,6 +30,21 @@ import { TransactionProfileSchema, } from "./schema"; +describe("OrganizationListSchema", () => { + it.each([ + ["an absolute", { organizationUrl: "https://sentry.example.com" }], + ["an empty", { organizationUrl: "", regionUrl: "" }], + ["a scheme-less", { organizationUrl: "sentry.example.com" }], + ["a missing", { regionUrl: "" }], + ])("accepts %s organization URL", (_label, links) => { + expect( + OrganizationListSchema.safeParse([ + { id: "1", slug: "org", name: "Org", links }, + ]).success, + ).toBe(true); + }); +}); + describe("IssueActivitySchema", () => { it("types source metadata and the separate comment reference", () => { const activity = { diff --git a/packages/mcp-core/src/api-client/schema.ts b/packages/mcp-core/src/api-client/schema.ts index 70a658e71d..18ee068134 100644 --- a/packages/mcp-core/src/api-client/schema.ts +++ b/packages/mcp-core/src/api-client/schema.ts @@ -65,7 +65,9 @@ export const OrganizationSchema = z }, ) .optional(), - organizationUrl: z.string().url(), + // Self-hosted Sentry returns `system.url-prefix` here, which may be + // empty or lack a scheme, so this is not validated as a URL. + organizationUrl: z.string().optional(), }) .optional(), // Only returned by the organization details endpoint, not the list endpoint. diff --git a/packages/mcp-core/src/tools/catalog/find-organizations.test.ts b/packages/mcp-core/src/tools/catalog/find-organizations.test.ts index a8a5f25e14..b846d25c7b 100644 --- a/packages/mcp-core/src/tools/catalog/find-organizations.test.ts +++ b/packages/mcp-core/src/tools/catalog/find-organizations.test.ts @@ -158,6 +158,37 @@ describe("find_organizations", () => { assertStructuredOnlyResult(result); }); + it.each([ + ["an empty", ""], + ["a scheme-less", "sentry.example.com"], + ])( + "lists self-hosted organizations with %s organization URL", + async (_label, organizationUrl) => { + mockOrganizations([ + { + id: "1", + slug: "self-hosted-org", + name: "Self-Hosted Org", + links: { organizationUrl, regionUrl: "" }, + }, + ]); + + const result = await findOrganizations.handler( + { query: null, cursor: null }, + getServerContext(), + ); + + expect(getStructuredContent(result)).toEqual({ + organizations: [ + { slug: "self-hosted-org", webUrl: null, regionUrl: null }, + ], + hasMore: false, + nextCursor: null, + }); + assertStructuredOnlyResult(result); + }, + ); + it("preserves search and cursor while returning a page of 25 organizations", async () => { mockOrganizations( Array.from({ length: 25 }, (_, index) => ({ diff --git a/packages/mcp-core/src/tools/catalog/find-organizations.ts b/packages/mcp-core/src/tools/catalog/find-organizations.ts index 6fd5a83425..e46024bc25 100644 --- a/packages/mcp-core/src/tools/catalog/find-organizations.ts +++ b/packages/mcp-core/src/tools/catalog/find-organizations.ts @@ -31,7 +31,13 @@ type OrganizationResult = z.infer< >["organizations"][number]; function normalizeUrl(url: string | undefined): string | null { - return url?.trim() ? url : null; + const trimmed = url?.trim(); + if (!trimmed) { + return null; + } + // Self-hosted Sentry may return values that are not absolute URLs + // (e.g. a `system.url-prefix` without a scheme). + return z.string().url().safeParse(trimmed).success ? trimmed : null; } function toResult(organization: { From 82a593b0cb076695185d53d7c842028cb5ed8fbd Mon Sep 17 00:00:00 2001 From: dcramer <23610+dcramer@users.noreply.github.com> Date: Wed, 18 Nov 2026 17:25:23 +0000 Subject: [PATCH 2/2] revert(mcp): Require organizationUrl to be a valid URL Co-authored-by: sentry[bot] <39604003+sentry[bot]@users.noreply.github.com> --- .../mcp-core/src/api-client/schema.test.ts | 16 ---------- packages/mcp-core/src/api-client/schema.ts | 4 +-- .../tools/catalog/find-organizations.test.ts | 31 ------------------- .../src/tools/catalog/find-organizations.ts | 8 +---- 4 files changed, 2 insertions(+), 57 deletions(-) diff --git a/packages/mcp-core/src/api-client/schema.test.ts b/packages/mcp-core/src/api-client/schema.test.ts index 3983522372..d0b459d97b 100644 --- a/packages/mcp-core/src/api-client/schema.test.ts +++ b/packages/mcp-core/src/api-client/schema.test.ts @@ -17,7 +17,6 @@ import { IssueSchema, IssueActivitySchema, IssueTagValuesSchema, - OrganizationListSchema, ProfileChunkResponseSchema, ProfileChunkSampleSchema, ProfileChunkSchema, @@ -30,21 +29,6 @@ import { TransactionProfileSchema, } from "./schema"; -describe("OrganizationListSchema", () => { - it.each([ - ["an absolute", { organizationUrl: "https://sentry.example.com" }], - ["an empty", { organizationUrl: "", regionUrl: "" }], - ["a scheme-less", { organizationUrl: "sentry.example.com" }], - ["a missing", { regionUrl: "" }], - ])("accepts %s organization URL", (_label, links) => { - expect( - OrganizationListSchema.safeParse([ - { id: "1", slug: "org", name: "Org", links }, - ]).success, - ).toBe(true); - }); -}); - describe("IssueActivitySchema", () => { it("types source metadata and the separate comment reference", () => { const activity = { diff --git a/packages/mcp-core/src/api-client/schema.ts b/packages/mcp-core/src/api-client/schema.ts index 18ee068134..70a658e71d 100644 --- a/packages/mcp-core/src/api-client/schema.ts +++ b/packages/mcp-core/src/api-client/schema.ts @@ -65,9 +65,7 @@ export const OrganizationSchema = z }, ) .optional(), - // Self-hosted Sentry returns `system.url-prefix` here, which may be - // empty or lack a scheme, so this is not validated as a URL. - organizationUrl: z.string().optional(), + organizationUrl: z.string().url(), }) .optional(), // Only returned by the organization details endpoint, not the list endpoint. diff --git a/packages/mcp-core/src/tools/catalog/find-organizations.test.ts b/packages/mcp-core/src/tools/catalog/find-organizations.test.ts index b846d25c7b..a8a5f25e14 100644 --- a/packages/mcp-core/src/tools/catalog/find-organizations.test.ts +++ b/packages/mcp-core/src/tools/catalog/find-organizations.test.ts @@ -158,37 +158,6 @@ describe("find_organizations", () => { assertStructuredOnlyResult(result); }); - it.each([ - ["an empty", ""], - ["a scheme-less", "sentry.example.com"], - ])( - "lists self-hosted organizations with %s organization URL", - async (_label, organizationUrl) => { - mockOrganizations([ - { - id: "1", - slug: "self-hosted-org", - name: "Self-Hosted Org", - links: { organizationUrl, regionUrl: "" }, - }, - ]); - - const result = await findOrganizations.handler( - { query: null, cursor: null }, - getServerContext(), - ); - - expect(getStructuredContent(result)).toEqual({ - organizations: [ - { slug: "self-hosted-org", webUrl: null, regionUrl: null }, - ], - hasMore: false, - nextCursor: null, - }); - assertStructuredOnlyResult(result); - }, - ); - it("preserves search and cursor while returning a page of 25 organizations", async () => { mockOrganizations( Array.from({ length: 25 }, (_, index) => ({ diff --git a/packages/mcp-core/src/tools/catalog/find-organizations.ts b/packages/mcp-core/src/tools/catalog/find-organizations.ts index e46024bc25..6fd5a83425 100644 --- a/packages/mcp-core/src/tools/catalog/find-organizations.ts +++ b/packages/mcp-core/src/tools/catalog/find-organizations.ts @@ -31,13 +31,7 @@ type OrganizationResult = z.infer< >["organizations"][number]; function normalizeUrl(url: string | undefined): string | null { - const trimmed = url?.trim(); - if (!trimmed) { - return null; - } - // Self-hosted Sentry may return values that are not absolute URLs - // (e.g. a `system.url-prefix` without a scheme). - return z.string().url().safeParse(trimmed).success ? trimmed : null; + return url?.trim() ? url : null; } function toResult(organization: {