diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react-cloudflare/src/start.ts b/dev-packages/e2e-tests/test-applications/tanstackstart-react-cloudflare/src/start.ts index 719869f235ef..29202b760fb4 100644 --- a/dev-packages/e2e-tests/test-applications/tanstackstart-react-cloudflare/src/start.ts +++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react-cloudflare/src/start.ts @@ -1,9 +1,12 @@ import { sentryGlobalFunctionMiddleware, sentryGlobalRequestMiddleware } from '@sentry/tanstackstart-react'; -import { createStart } from '@tanstack/react-start'; +import { createCsrfMiddleware, createStart } from '@tanstack/react-start'; + +// A custom `start.ts` turns off the CSRF protection that Start installs for server functions by default. +const csrfMiddleware = createCsrfMiddleware({ filter: ctx => ctx.handlerType === 'serverFn' }); export const startInstance = createStart(() => { return { - requestMiddleware: [sentryGlobalRequestMiddleware], + requestMiddleware: [sentryGlobalRequestMiddleware, csrfMiddleware], functionMiddleware: [sentryGlobalFunctionMiddleware], }; }); diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react-static/app/start.ts b/dev-packages/e2e-tests/test-applications/tanstackstart-react-static/app/start.ts index 110e3602b1c9..d125df360f6f 100644 --- a/dev-packages/e2e-tests/test-applications/tanstackstart-react-static/app/start.ts +++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react-static/app/start.ts @@ -1,11 +1,14 @@ import { sentryGlobalFunctionMiddleware, sentryGlobalRequestMiddleware } from '@sentry/tanstackstart-react'; -import { createStart } from '@tanstack/react-start'; +import { createCsrfMiddleware, createStart } from '@tanstack/react-start'; // NOTE: These are NOT wrapped - auto-instrumentation via the Vite plugin will wrap them import { globalFunctionMiddleware, globalRequestMiddleware } from './middleware'; +// A custom `start.ts` turns off the CSRF protection that Start installs for server functions by default. +const csrfMiddleware = createCsrfMiddleware({ filter: ctx => ctx.handlerType === 'serverFn' }); + export const startInstance = createStart(() => { return { - requestMiddleware: [sentryGlobalRequestMiddleware, globalRequestMiddleware], + requestMiddleware: [sentryGlobalRequestMiddleware, csrfMiddleware, globalRequestMiddleware], functionMiddleware: [sentryGlobalFunctionMiddleware, globalFunctionMiddleware], }; }); diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/start.ts b/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/start.ts index 110e3602b1c9..d125df360f6f 100644 --- a/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/start.ts +++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/start.ts @@ -1,11 +1,14 @@ import { sentryGlobalFunctionMiddleware, sentryGlobalRequestMiddleware } from '@sentry/tanstackstart-react'; -import { createStart } from '@tanstack/react-start'; +import { createCsrfMiddleware, createStart } from '@tanstack/react-start'; // NOTE: These are NOT wrapped - auto-instrumentation via the Vite plugin will wrap them import { globalFunctionMiddleware, globalRequestMiddleware } from './middleware'; +// A custom `start.ts` turns off the CSRF protection that Start installs for server functions by default. +const csrfMiddleware = createCsrfMiddleware({ filter: ctx => ctx.handlerType === 'serverFn' }); + export const startInstance = createStart(() => { return { - requestMiddleware: [sentryGlobalRequestMiddleware, globalRequestMiddleware], + requestMiddleware: [sentryGlobalRequestMiddleware, csrfMiddleware, globalRequestMiddleware], functionMiddleware: [sentryGlobalFunctionMiddleware, globalFunctionMiddleware], }; }); diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/csrf.test.ts b/dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/csrf.test.ts new file mode 100644 index 000000000000..2fff5cab5864 --- /dev/null +++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/csrf.test.ts @@ -0,0 +1,45 @@ +import { expect, test } from '@playwright/test'; +import type { APIRequestContext, Page, Request } from '@playwright/test'; + +async function captureServerFnRequest(page: Page): Promise { + const serverFnRequestPromise = page.waitForRequest(request => + new URL(request.url()).pathname.startsWith('/_serverFn/'), + ); + + await page.goto('/test-serverFn'); + await page.locator('html[data-hydrated="true"]').waitFor(); + await page.getByText('Call server function', { exact: true }).click(); + + return serverFnRequestPromise; +} + +async function replayWithFetchSite(request: APIRequestContext, serverFnRequest: Request, fetchSite: string) { + return request.fetch(serverFnRequest.url(), { + method: serverFnRequest.method(), + headers: { ...(await serverFnRequest.allHeaders()), 'sec-fetch-site': fetchSite }, + data: serverFnRequest.postDataBuffer() ?? undefined, + }); +} + +test('Blocks a cross-site server function request', async ({ page, request }) => { + const serverFnRequest = await captureServerFnRequest(page); + + const response = await replayWithFetchSite(request, serverFnRequest, 'cross-site'); + + expect(response.status()).toBe(403); +}); + +test('Allows a same-origin server function request', async ({ page, request }) => { + const serverFnRequest = await captureServerFnRequest(page); + + const response = await replayWithFetchSite(request, serverFnRequest, 'same-origin'); + + expect(response.status()).toBe(200); +}); + +test('Does not block a cross-site request to a server route', async ({ request }) => { + const response = await request.get('/api/user/123', { headers: { 'sec-fetch-site': 'cross-site' } }); + + expect(response.status()).toBe(200); + expect(await response.json()).toEqual({ id: '123' }); +});