From 2bb093a57431ef3dde98984f83a241876c0cdf61 Mon Sep 17 00:00:00 2001 From: Charly Gomez Date: Tue, 17 Nov 2026 10:28:45 +0100 Subject: [PATCH 1/2] test(tanstackstart-react): Add CSRF middleware to the e2e fixtures TanStack Start only installs CSRF protection for server functions when the app has no `start.ts`. Our setup needs one for the Sentry middleware. Co-Authored-By: Claude Fable 5.2 --- .../src/start.ts | 7 ++- .../tanstackstart-react-static/app/start.ts | 7 ++- .../tanstackstart-react/src/start.ts | 7 ++- .../tanstackstart-react/tests/csrf.test.ts | 44 +++++++++++++++++++ 4 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/csrf.test.ts 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..1727bc3446da --- /dev/null +++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/csrf.test.ts @@ -0,0 +1,44 @@ +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.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' }); +}); From f0551de3bb1d192b5827062ab3736579f96c6a0c Mon Sep 17 00:00:00 2001 From: Charly Gomez Date: Tue, 17 Nov 2026 10:35:03 +0100 Subject: [PATCH 2/2] test(tanstackstart-react): Wait for hydration before calling the server function Co-Authored-By: Claude Fable 5.2 --- .../test-applications/tanstackstart-react/tests/csrf.test.ts | 1 + 1 file changed, 1 insertion(+) 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 index 1727bc3446da..2fff5cab5864 100644 --- 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 @@ -7,6 +7,7 @@ async function captureServerFnRequest(page: Page): Promise { ); await page.goto('/test-serverFn'); + await page.locator('html[data-hydrated="true"]').waitFor(); await page.getByText('Call server function', { exact: true }).click(); return serverFnRequestPromise;