Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
chore: Add CSRF protection to prevent Canvas script execution vulnerability (#4047)
Ivan Starkov766d7eb95f97
diff --git a/apps/builder/app/builder/features/ai/ai-fetch-result.ts b/apps/builder/app/builder/features/ai/ai-fetch-result.tsindex c7058e21e0..adc78c12c0 100644--- a/apps/builder/app/builder/features/ai/ai-fetch-result.ts+++ b/apps/builder/app/builder/features/ai/ai-fetch-result.ts@@ -36,6 +36,7 @@ import {textToRateLimitMeta,} from "./api-exceptions";import { isFeatureEnabled } from "@webstudio-is/feature-flags";+import { fetch } from "~/shared/fetch.client";const unknownArray = z.array(z.unknown());diff --git a/apps/builder/app/builder/features/ai/ai-fetch-transcription.ts b/apps/builder/app/builder/features/ai/ai-fetch-transcription.tsindex d0004e3081..02d69e9525 100644--- a/apps/builder/app/builder/features/ai/ai-fetch-transcription.ts+++ b/apps/builder/app/builder/features/ai/ai-fetch-transcription.ts@@ -5,6 +5,7 @@ import {RateLimitException,textToRateLimitMeta,} from "./api-exceptions";+import { fetch } from "~/shared/fetch.client";export const fetchTranscription = async (file: File) => {const formData = new FormData();diff --git a/apps/builder/app/builder/shared/assets/use-assets.tsx b/apps/builder/app/builder/shared/assets/use-assets.tsxindex cbbd6de89f..a36993fab4 100644--- a/apps/builder/app/builder/shared/assets/use-assets.tsx+++ b/apps/builder/app/builder/shared/assets/use-assets.tsx@@ -32,6 +32,7 @@ import {import { Image } from "@webstudio-is/image";import invariant from "tiny-invariant";import { $imageLoader } from "~/shared/nano-states";+import { fetch } from "~/shared/fetch.client";export const deleteAssets = (assetIds: Asset["id"][]) => {serverSyncStore.createTransaction([$assets], (assets) => {diff --git a/apps/builder/app/builder/shared/sync/sync-server.ts b/apps/builder/app/builder/shared/sync/sync-server.tsindex 7685eb8bdc..21d1e6c52e 100644--- a/apps/builder/app/builder/shared/sync/sync-server.ts+++ b/apps/builder/app/builder/shared/sync/sync-server.ts@@ -7,6 +7,7 @@ import * as commandQueue from "./command-queue";import { restPatchPath } from "~/shared/router-utils";import { toast } from "@webstudio-is/design-system";import { serverSyncStore } from "~/shared/sync";+import { fetch } from "~/shared/fetch.client";// Periodic check for new entries to group them into one job/call in sync queue.const NEW_ENTRIES_INTERVAL = 1000;diff --git a/apps/builder/app/root.tsx b/apps/builder/app/root.tsxindex f624895be6..be290602a4 100644--- a/apps/builder/app/root.tsx+++ b/apps/builder/app/root.tsx@@ -14,5 +14,6 @@ export default function App() {const { features } = useLoaderData<typeof loader>();setEnv(features);useSetFeatures();+return <Outlet />;}diff --git a/apps/builder/app/routes/$.tsx b/apps/builder/app/routes/$.tsxindex 9d684d72a1..49c03a26ef 100644--- a/apps/builder/app/routes/$.tsx+++ b/apps/builder/app/routes/$.tsx@@ -10,6 +10,8 @@ import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";export const loader = async ({ request }: LoaderFunctionArgs) => {preventCrossOriginCookie(request);+ // No data to protect with CSRF token+const url = new URL(request.url);// Redirecting asset files (e.g., .js, .css) to the dashboard should be avoided.diff --git a/apps/builder/app/routes/_ui.(builder).tsx b/apps/builder/app/routes/_ui.(builder).tsxindex 378cc7b89a..6179ee1b09 100644--- a/apps/builder/app/routes/_ui.(builder).tsx+++ b/apps/builder/app/routes/_ui.(builder).tsx@@ -6,7 +6,11 @@import { lazy } from "react";import { useLoaderData } from "@remix-run/react";import type { MetaFunction, ShouldRevalidateFunction } from "@remix-run/react";-import { json, type LoaderFunctionArgs } from "@remix-run/server-runtime";+import {+ json,+ type HeadersArgs,+ type LoaderFunctionArgs,+} from "@remix-run/server-runtime";import { loadBuildIdAndVersionByProjectId } from "@webstudio-is/project-build/index.server";import { db } from "@webstudio-is/project/index.server";@@ -28,6 +32,10 @@ import { parseBuilderUrl } from "@webstudio-is/http-client";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";import { redirect } from "~/services/no-store-redirect";import { builderSessionStorage } from "~/services/builder-session.server";+import {+ allowedDestinations,+ isFetchDestination,+} from "~/services/destinations.server";export const links = () => {return [@@ -53,6 +61,7 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => {export const loader = async ({ request }: LoaderFunctionArgs) => {preventCrossOriginCookie(request);+ allowedDestinations(request, ["document", "empty"]);if (isDashboard(request)) {throw redirect(dashboardPath());@@ -65,6 +74,13 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {});}+ if (isFetchDestination(request)) {+ // Remix does not provide a built-in way to add CSRF tokens to data fetches,+ // such as client-side navigation or data refreshes.+ // Therefore, ensure that all data fetched here is not sensitive and does not require CSRF protection.+ // await checkCsrf(request);+ }+const context = await createContext(request);if (@@ -181,6 +197,15 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {);}+ headers.set(+ // Disallowing iframes from loading any content except the canvas+ // Still possible create iframes on canvas itself (but we use credentialless attribute)+ // Still possible create iframe without src attribute+ // Disable workers on builder+ "Content-Security-Policy",+ `frame-src ${url.origin}/canvas; worker-src 'none'`+ );+return json({project,@@ -216,9 +241,10 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {* https://web.dev/articles/bfcache**/-export const headers = () => {+export const headers = ({ loaderHeaders }: HeadersArgs) => {return {"Cache-Control": "no-store",+ "Content-Security-Policy": loaderHeaders.get("Content-Security-Policy"),};};diff --git a/apps/builder/app/routes/_ui.dashboard.tsx b/apps/builder/app/routes/_ui.dashboard.tsxindex f1be25a595..8a2d72acfc 100644--- a/apps/builder/app/routes/_ui.dashboard.tsx+++ b/apps/builder/app/routes/_ui.dashboard.tsx@@ -12,6 +12,7 @@ import { createCallerFactory } from "@webstudio-is/trpc-interface/index.server";import { redirect } from "~/services/no-store-redirect";import { preconnect, prefetchDNS } from "react-dom";import { parseBuilderUrl } from "@webstudio-is/http-client";+import { allowedDestinations } from "~/services/destinations.server";const dashboardProjectCaller = createCallerFactory(dashboardProjectRouter);@@ -24,8 +25,6 @@ export const meta: MetaFunction<typeof loader> = () => {};export const loader = async ({ request }: LoaderFunctionArgs) => {- preventCrossOriginCookie(request);-if (false === isDashboard(request)) {throw new Response(null, {status: 404,@@ -33,6 +32,12 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {});}+ preventCrossOriginCookie(request);+ allowedDestinations(request, ["document", "empty"]);+ // CSRF token checks are not necessary for dashboard-only pages.+ // All requests from the builder or canvas app are safeguarded either by preventCrossOriginCookie for fetch requests+ // or by allowedDestinations for iframe requests.+const user = await findAuthenticatedUser(request);if (user === null) {diff --git a/apps/builder/app/routes/_ui.login._index.tsx b/apps/builder/app/routes/_ui.login._index.tsxindex 98076cdef6..de95b23b59 100644--- a/apps/builder/app/routes/_ui.login._index.tsx+++ b/apps/builder/app/routes/_ui.login._index.tsx@@ -19,6 +19,7 @@ import { ClientOnly } from "~/shared/client-only";import { lazy } from "react";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";import { redirect } from "~/services/no-store-redirect";+import { allowedDestinations } from "~/services/destinations.server";export const links: LinksFunction = () => {return [@@ -50,8 +51,6 @@ export const meta: MetaFunction<typeof loader> = () => {export const loader = async ({request,}: LoaderFunctionArgs): Promise<TypedResponse<LoginProps>> => {- preventCrossOriginCookie(request);-if (false === isDashboard(request)) {throw new Response(null, {status: 404,@@ -59,6 +58,12 @@ export const loader = async ({});}+ preventCrossOriginCookie(request);+ allowedDestinations(request, ["document", "empty"]);+ // CSRF token checks are not necessary for dashboard-only pages.+ // All requests from the builder or canvas app are safeguarded either by preventCrossOriginCookie for fetch requests+ // or by allowedDestinations for iframe requests.+const user = await findAuthenticatedUser(request);const url = new URL(request.url);diff --git a/apps/builder/app/routes/_ui.logout.tsx b/apps/builder/app/routes/_ui.logout.tsxindex 94d71347f0..5513a8641c 100644--- a/apps/builder/app/routes/_ui.logout.tsx+++ b/apps/builder/app/routes/_ui.logout.tsx@@ -10,6 +10,7 @@ import { redirect, type ActionFunctionArgs } from "react-router-dom";import { ClientOnly } from "~/shared/client-only";import { useLoaderData, type MetaFunction } from "@remix-run/react";import { lazy, useRef } from "react";+import { allowedDestinations } from "~/services/destinations.server";const logoutCaller = createCallerFactory(logoutRouter);@@ -29,6 +30,10 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {}preventCrossOriginCookie(request);+ allowedDestinations(request, ["document", "empty"]);+ // CSRF token checks are not necessary for dashboard-only pages.+ // All requests from the builder or canvas app are safeguarded either by preventCrossOriginCookie for fetch requests+ // or by allowedDestinations for iframe requests.const context = await createContext(request);diff --git a/apps/builder/app/routes/_ui.tsx b/apps/builder/app/routes/_ui.tsxindex 8c85e64eff..e592a048be 100644--- a/apps/builder/app/routes/_ui.tsx+++ b/apps/builder/app/routes/_ui.tsx@@ -6,13 +6,24 @@ import {Scripts,ScrollRestoration,useRouteError,+ type ClientLoaderFunctionArgs,} from "@remix-run/react";import interFont from "@fontsource-variable/inter/index.css?url";import manropeVariableFont from "@fontsource-variable/manrope/index.css?url";import robotoMonoFont from "@fontsource/roboto-mono/index.css?url";import appCss from "../shared/app.css?url";-import type { LinksFunction } from "@remix-run/server-runtime";+import {+ json,+ type LinksFunction,+ type LoaderFunctionArgs,+} from "@remix-run/server-runtime";import { ErrorMessage } from "~/shared/error/error-message";+import { getCsrfTokenAndCookie } from "~/services/csrf-session.server";+import invariant from "tiny-invariant";+import {+ csrfToken as clientCsrfToken,+ updateCsrfToken,+} from "~/shared/csrf.client";export const links: LinksFunction = () => {// `links` returns an array of objects whose@@ -43,6 +54,44 @@ const Document = (props: { children: React.ReactNode }) => {);};+export const loader = async ({ request }: LoaderFunctionArgs) => {+ const [csrfToken, setCookieValue] = await getCsrfTokenAndCookie(request);++ if (request.headers.get("sec-fetch-mode") !== "navigate") {+ return json({ csrfToken: "" });+ }++ const headers = new Headers();++ if (setCookieValue !== undefined) {+ headers.set("Set-Cookie", setCookieValue);+ }++ return json(+ { csrfToken },+ {+ headers,+ }+ );+};++export const clientLoader = async ({+ serverLoader,+}: ClientLoaderFunctionArgs) => {+ const serverData = await serverLoader<typeof loader>();+ if (clientCsrfToken === undefined) {+ const { csrfToken } = serverData;+ invariant(csrfToken !== "", "CSRF token is empty");+ updateCsrfToken(csrfToken);+ }++ // Hide real CSRF token from window.__remixContext+ serverData.csrfToken = "";+ return serverData;+};++clientLoader.hydrate = true;+export const ErrorBoundary = () => {const error = useRouteError();diff --git a/apps/builder/app/routes/auth.github.tsx b/apps/builder/app/routes/auth.github.tsxindex 52573df910..852dd1a6e7 100644--- a/apps/builder/app/routes/auth.github.tsx+++ b/apps/builder/app/routes/auth.github.tsx@@ -11,8 +11,6 @@ export default function GH() {}export const action = async ({ request }: ActionFunctionArgs) => {- preventCrossOriginCookie(request);-if (false === isDashboard(request)) {throw new Response(null, {status: 404,@@ -20,6 +18,10 @@ export const action = async ({ request }: ActionFunctionArgs) => {});}+ preventCrossOriginCookie(request);+ // CSRF token checks are not necessary for dashboard-only pages.+ // All POST requests from the builder or canvas app are safeguarded by preventCrossOriginCookie+const returnTo = (await returnToPath(request)) ?? dashboardPath();try {diff --git a/apps/builder/app/routes/auth.github_.callback.tsx b/apps/builder/app/routes/auth.github_.callback.tsxindex a4fffbf868..ee326ecc1c 100644--- a/apps/builder/app/routes/auth.github_.callback.tsx+++ b/apps/builder/app/routes/auth.github_.callback.tsx@@ -5,16 +5,21 @@ import { AUTH_PROVIDERS } from "~/shared/session";import { clearReturnToCookie, returnToPath } from "~/services/cookie.server";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";import { redirect, setNoStoreToRedirect } from "~/services/no-store-redirect";+import { allowedDestinations } from "~/services/destinations.server";export const loader = async ({ request }: LoaderFunctionArgs) => {- preventCrossOriginCookie(request);-if (false === isDashboard(request)) {throw new Response(null, {status: 404,statusText: "Not Found",});}+ preventCrossOriginCookie(request);++ allowedDestinations(request, ["document"]);+ // CSRF token checks are not necessary for dashboard-only pages.+ // All requests from the builder or canvas app are safeguarded either by preventCrossOriginCookie for fetch requests+ // or by allowedDestinations for iframe requests.const returnTo = (await returnToPath(request)) ?? dashboardPath();diff --git a/apps/builder/app/routes/auth.google.tsx b/apps/builder/app/routes/auth.google.tsxindex 76906a315e..08a066743d 100644--- a/apps/builder/app/routes/auth.google.tsx+++ b/apps/builder/app/routes/auth.google.tsx@@ -16,8 +16,6 @@ export default function Google() {export const loader = (_args: LoaderFunctionArgs) => redirect("/login");export const action = async ({ request }: ActionFunctionArgs) => {- preventCrossOriginCookie(request);-if (false === isDashboard(request)) {throw new Response(null, {status: 404,@@ -25,6 +23,10 @@ export const action = async ({ request }: ActionFunctionArgs) => {});}+ preventCrossOriginCookie(request);+ // CSRF token checks are not necessary for dashboard-only pages.+ // All POST requests from the builder or canvas app are safeguarded by preventCrossOriginCookie+const returnTo = (await returnToPath(request)) ?? dashboardPath();try {diff --git a/apps/builder/app/routes/auth.google_.callback.tsx b/apps/builder/app/routes/auth.google_.callback.tsxindex 67878c8e8b..20b5129b91 100644--- a/apps/builder/app/routes/auth.google_.callback.tsx+++ b/apps/builder/app/routes/auth.google_.callback.tsx@@ -5,10 +5,9 @@ import { clearReturnToCookie, returnToPath } from "~/services/cookie.server";import { AUTH_PROVIDERS } from "~/shared/session";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";import { redirect, setNoStoreToRedirect } from "~/services/no-store-redirect";+import { allowedDestinations } from "~/services/destinations.server";export const loader = async ({ request }: LoaderFunctionArgs) => {- preventCrossOriginCookie(request);-if (false === isDashboard(request)) {throw new Response(null, {status: 404,@@ -16,6 +15,12 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {});}+ preventCrossOriginCookie(request);+ allowedDestinations(request, ["document"]);+ // CSRF token checks are not necessary for dashboard-only pages.+ // All requests from the builder or canvas app are safeguarded either by preventCrossOriginCookie for fetch requests+ // or by allowedDestinations for iframe requests.+const returnTo = (await returnToPath(request)) ?? dashboardPath();try {diff --git a/apps/builder/app/routes/auth.ws.ts b/apps/builder/app/routes/auth.ws.tsindex e0737da439..e683e8e248 100644--- a/apps/builder/app/routes/auth.ws.ts+++ b/apps/builder/app/routes/auth.ws.ts@@ -5,22 +5,25 @@ import { comparePathnames, isBuilder } from "~/shared/router-utils";import { isRedirectResponse, returnToCookie } from "~/services/cookie.server";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";import { setNoStoreToRedirect } from "~/services/no-store-redirect";+import { allowedDestinations } from "~/services/destinations.server";const debug = createDebug(import.meta.url);// Endpoint to force user reloginexport const loader: LoaderFunction = async ({ request }) => {- preventCrossOriginCookie(request);+ if (false === isBuilder(request)) {+ debug(`Request url is not the builder URL ${request.url}`);- try {- if (false === isBuilder(request)) {- debug(`Request url is not the builder URL ${request.url}`);+ return new Response(null, {+ status: 404,+ statusText: "Only builder URL is allowed",+ });+ }- return new Response(null, {- status: 404,- statusText: "Only builder URL is allowed",- });- }+ try {+ preventCrossOriginCookie(request);+ allowedDestinations(request, ["document"]);+ // CSRF is not needed for document only routesdebug("Authenticate request received, starting authentication and authorization process"@@ -33,7 +36,8 @@ export const loader: LoaderFunction = async ({ request }) => {// all redirects are basically errors and in that case we don't want to catch itif (error instanceof Response) {if (isRedirectResponse(error)) {- const response = setNoStoreToRedirect(error).clone();+ const noStoreResponse = setNoStoreToRedirect(error);+ const response = new Response(noStoreResponse.body, noStoreResponse);const url = new URL(request.url);let returnTo = url.searchParams.get("returnTo");diff --git a/apps/builder/app/routes/auth.ws_.callback.ts b/apps/builder/app/routes/auth.ws_.callback.tsindex 92fa88f65f..ff79b2e179 100644--- a/apps/builder/app/routes/auth.ws_.callback.ts+++ b/apps/builder/app/routes/auth.ws_.callback.ts@@ -8,21 +8,24 @@ import { builderSessionStorage } from "~/services/builder-session.server";import { builderPath, isBuilder } from "~/shared/router-utils";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";import { redirect, setNoStoreToRedirect } from "~/services/no-store-redirect";+import { allowedDestinations } from "~/services/destinations.server";const debug = createDebug(import.meta.url);export const loader: LoaderFunction = async ({ request }) => {- preventCrossOriginCookie(request);+ if (false === isBuilder(request)) {+ debug(`Request url is not the builder URL ${request.url}`);- try {- if (false === isBuilder(request)) {- debug(`Request url is not the builder URL ${request.url}`);+ return new Response(null, {+ status: 404,+ statusText: "Only builder URL is allowed",+ });+ }- return new Response(null, {- status: 404,- statusText: "Only builder URL is allowed",- });- }+ try {+ preventCrossOriginCookie(request);+ allowedDestinations(request, ["document"]);+ // CSRF is not needed for document only routesconst returnTo = (await returnToPath(request)) ?? builderPath({});@@ -46,7 +49,8 @@ export const loader: LoaderFunction = async ({ request }) => {const sessionCodeVerifierKey = "oauth2:codeVerifier";session.unset(sessionStateKey);session.unset(sessionCodeVerifierKey);- const response = error.clone();++ const response = new Response(error.body, error);// Use set instead of append to overwrite the cookieresponse.headers.set("Set-Cookie",diff --git a/apps/builder/app/routes/builder-logout.ts b/apps/builder/app/routes/builder-logout.tsindex 0c365e48dc..a74ec7ad41 100644--- a/apps/builder/app/routes/builder-logout.ts+++ b/apps/builder/app/routes/builder-logout.ts@@ -26,6 +26,11 @@ export const action = async ({ request }: ActionFunctionArgs) => {);}+ if (request.headers.get("sec-fetch-site") === "same-origin") {+ // To prevent logout initiated from the builder iframe+ throw new Error("Only cross-origin requests are allowed");+ }+if (false === request.headers.get("Content-Type")?.includes("application/json")) {diff --git a/apps/builder/app/routes/leak.ts b/apps/builder/app/routes/leak.tsdeleted file mode 100644index 69b08581e6..0000000000--- a/apps/builder/app/routes/leak.ts+++ /dev/null@@ -1,43 +0,0 @@-import { json, type LoaderFunction } from "@remix-run/server-runtime";-import { authenticator } from "~/services/auth.server";-import { builderAuthenticator } from "~/services/builder-auth.server";-import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";-import { isBuilder } from "~/shared/router-utils";-import { sessionStorage } from "~/services/session.server";-import { builderSessionStorage } from "~/services/builder-session.server";-import env from "~/env/env.server";--/**- * This route is designed to test for potential data leakage.- * Will be removed.- * @todo Remove this route- */-export const loader: LoaderFunction = async ({ request }) => {- if (env.DEPLOYMENT_ENVIRONMENT === "production") {- throw new Error("This route is only for development");- }-- preventCrossOriginCookie(request);-- const authenticatorService = isBuilder(request)- ? builderAuthenticator- : authenticator;-- const user = authenticatorService.isAuthenticated(request);-- const session = await sessionStorage.getSession(- request.headers.get("Cookie")- );- console.info("session", session.data);-- const builderSession = await builderSessionStorage.getSession(- request.headers.get("Cookie")- );-- return json({- message: "If you see other user then data leaked",- leak: user,- data: session.data,- builderData: builderSession.data,- });-};diff --git a/apps/builder/app/routes/n8n.$.tsx b/apps/builder/app/routes/n8n.$.tsxindex 95923a4fbb..3ba77342a9 100644--- a/apps/builder/app/routes/n8n.$.tsx+++ b/apps/builder/app/routes/n8n.$.tsx@@ -7,6 +7,7 @@ import env from "~/env/env.server";import cookie from "cookie";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";import { redirect } from "~/services/no-store-redirect";+import { allowedDestinations } from "~/services/destinations.server";const zN8NResponse = z.union([z.object({@@ -25,8 +26,6 @@ const zWebhookEnv = z.object({});export const loader = async ({ request, params }: LoaderFunctionArgs) => {- preventCrossOriginCookie(request);-if (isDashboard(request) === false) {throw new Response(null, {status: 404,@@ -34,6 +33,12 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {});}+ preventCrossOriginCookie(request);+ allowedDestinations(request, ["document", "empty"]);+ // CSRF token checks are not necessary for dashboard-only pages.+ // All requests from the builder or canvas app are safeguarded either by preventCrossOriginCookie for fetch requests+ // or by allowedDestinations for iframe requests.+const user = await findAuthenticatedUser(request);if (user === null) {diff --git a/apps/builder/app/routes/oauth.ws.authorize.tsx b/apps/builder/app/routes/oauth.ws.authorize.tsxindex bfe6233321..8cc5a5c81b 100644--- a/apps/builder/app/routes/oauth.ws.authorize.tsx+++ b/apps/builder/app/routes/oauth.ws.authorize.tsx@@ -7,10 +7,11 @@ import env from "~/env/env.server";import { authenticator } from "~/services/auth.server";import { createCodeToken } from "~/services/token.server";import { isUserAuthorizedForProject } from "~/services/builder-access.server";-import { loginPath } from "~/shared/router-utils";+import { isDashboard, loginPath } from "~/shared/router-utils";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";import * as session from "~/services/session.server";import { redirect } from "~/services/no-store-redirect";+import { allowedDestinations } from "~/services/destinations.server";const debug = createDebug(import.meta.url);@@ -71,7 +72,18 @@ const OAuthRedirectUri = z.object({* https://datatracker.ietf.org/doc/html/rfc7636*/export const loader: LoaderFunction = async ({ request }) => {+ if (false === isDashboard(request)) {+ throw new Response(null, {+ status: 404,+ statusText: "Not Found",+ });+ }+preventCrossOriginCookie(request);+ allowedDestinations(request, ["document"]);+ // CSRF token checks are not necessary for dashboard-only pages.+ // All requests from the builder or canvas app are safeguarded either by preventCrossOriginCookie for fetch requests+ // or by allowedDestinations for iframe requests.try {debug("Authorize request received", request.url);diff --git a/apps/builder/app/routes/oauth.ws.token.ts b/apps/builder/app/routes/oauth.ws.token.tsindex 752fccea65..8351f39e3d 100644--- a/apps/builder/app/routes/oauth.ws.token.ts+++ b/apps/builder/app/routes/oauth.ws.token.ts@@ -12,6 +12,7 @@ import {} from "~/services/token.server";import { isUserAuthorizedForProject } from "~/services/builder-access.server";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";+import { isDashboard } from "~/shared/router-utils";/*** OAuth 2.0 Token Request@@ -38,7 +39,16 @@ const debug = createDebug(import.meta.url);* https://datatracker.ietf.org/doc/html/rfc6749*/export const action = async ({ request }: ActionFunctionArgs) => {+ if (false === isDashboard(request)) {+ throw new Response(null, {+ status: 404,+ statusText: "Not Found",+ });+ }+preventCrossOriginCookie(request);+ // CSRF token checks are not necessary for dashboard-only pages.+ // All POST requests from the builder or canvas app are safeguarded by preventCrossOriginCookiedebug("Token request received");diff --git a/apps/builder/app/routes/rest.ai._index.ts b/apps/builder/app/routes/rest.ai._index.tsindex 8596ca66ff..d5a260c137 100644--- a/apps/builder/app/routes/rest.ai._index.ts+++ b/apps/builder/app/routes/rest.ai._index.ts@@ -19,6 +19,7 @@ import { createContext } from "~/shared/context.server";import { authorizeProject } from "@webstudio-is/trpc-interface/index.server";import { loadDevBuildByProjectId } from "@webstudio-is/project-build/index.server";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";+import { checkCsrf } from "~/services/csrf-session.server";export const RequestParams = z.object({projectId: z.string().min(1, "nonempty"),@@ -43,6 +44,7 @@ export const config = {export const action = async ({ request }: ActionFunctionArgs) => {preventCrossOriginCookie(request);+ await checkCsrf(request);const context = await createContext(request);// @todo Reinstate isFeatureEnabled('ai')diff --git a/apps/builder/app/routes/rest.ai.audio.transcriptions.ts b/apps/builder/app/routes/rest.ai.audio.transcriptions.tsindex 08b9d6ef49..c8eaf08608 100644--- a/apps/builder/app/routes/rest.ai.audio.transcriptions.ts+++ b/apps/builder/app/routes/rest.ai.audio.transcriptions.ts@@ -1,5 +1,6 @@import type { ActionFunctionArgs } from "@remix-run/server-runtime";import { z } from "zod";+import { checkCsrf } from "~/services/csrf-session.server";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";const zTranscription = z.object({@@ -9,6 +10,7 @@ const zTranscription = z.object({// @todo: move to AI packageexport const action = async ({ request }: ActionFunctionArgs) => {preventCrossOriginCookie(request);+ await checkCsrf(request);// @todo: validate requestconst formData = await request.formData();diff --git a/apps/builder/app/routes/rest.ai.detect.ts b/apps/builder/app/routes/rest.ai.detect.tsindex 132b8ba810..ffc8648df0 100644--- a/apps/builder/app/routes/rest.ai.detect.ts+++ b/apps/builder/app/routes/rest.ai.detect.ts@@ -12,6 +12,7 @@ import {import env from "~/env/env.server";import { createContext } from "~/shared/context.server";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";+import { checkCsrf } from "~/services/csrf-session.server";export const RequestParams = z.object({prompt: z.string().max(1200),@@ -19,6 +20,7 @@ export const RequestParams = z.object({export const action = async ({ request }: ActionFunctionArgs) => {preventCrossOriginCookie(request);+ await checkCsrf(request);// @todo Reinstate isFeatureEnabled('ai')diff --git a/apps/builder/app/routes/rest.assets.tsx b/apps/builder/app/routes/rest.assets.tsxindex 29aecf63ae..9e37c996a8 100644--- a/apps/builder/app/routes/rest.assets.tsx+++ b/apps/builder/app/routes/rest.assets.tsx@@ -11,6 +11,7 @@ import {import { createContext } from "~/shared/context.server";import env from "~/env/env.server";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";+import { checkCsrf } from "~/services/csrf-session.server";export const loader = async ({params,@@ -24,13 +25,14 @@ export const loader = async ({};export const action = async (props: ActionFunctionArgs) => {- preventCrossOriginCookie(props.request);+ try {+ preventCrossOriginCookie(props.request);+ await checkCsrf(props.request);- const { request } = props;+ const { request } = props;- const context = await createContext(request);+ const context = await createContext(request);- try {if (request.method === "POST") {const formData = await request.formData();const projectId = formData.get("projectId") as string;diff --git a/apps/builder/app/routes/rest.assets_.$name.tsx b/apps/builder/app/routes/rest.assets_.$name.tsxindex eb874ea524..9e14047fe5 100644--- a/apps/builder/app/routes/rest.assets_.$name.tsx+++ b/apps/builder/app/routes/rest.assets_.$name.tsx@@ -6,6 +6,7 @@ import type { ActionData } from "~/builder/shared/assets";import { createAssetClient } from "~/shared/asset-client";import { createContext } from "~/shared/context.server";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";+import { checkCsrf } from "~/services/csrf-session.server";const UrlBody = z.object({url: z.string(),@@ -15,6 +16,7 @@ export const action = async (props: ActionFunctionArgs): Promise<ActionData | Array<Asset> | undefined> => {preventCrossOriginCookie(props.request);+ await checkCsrf(props.request);const { request, params } = props;diff --git a/apps/builder/app/routes/rest.build.$buildId.tsx b/apps/builder/app/routes/rest.build.$buildId.tsxindex 2455aec99f..bfded9cd6c 100644--- a/apps/builder/app/routes/rest.build.$buildId.tsx+++ b/apps/builder/app/routes/rest.build.$buildId.tsx@@ -5,6 +5,8 @@ import { loadProductionCanvasData } from "~/shared/db";import { createContext } from "~/shared/context.server";import { getUserById, type User } from "~/shared/db/user.server";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";+import { allowedDestinations } from "~/services/destinations.server";+import { isDashboard } from "~/shared/router-utils";export const loader = async ({params,@@ -15,7 +17,18 @@ export const loader = async ({projectTitle: string;}> => {+ if (false === isDashboard(request)) {+ throw new Response(null, {+ status: 404,+ statusText: "Not Found",+ });+ }+preventCrossOriginCookie(request);+ allowedDestinations(request, ["document", "empty"]);+ // CSRF token checks are not necessary for dashboard-only pages.+ // All requests from the builder or canvas app are safeguarded either by preventCrossOriginCookie for fetch requests+ // or by allowedDestinations for iframe requests.try {const buildId = params.buildId;diff --git a/apps/builder/app/routes/rest.buildId.$projectId.tsx b/apps/builder/app/routes/rest.buildId.$projectId.tsxindex fde81395e1..ab2ab182ab 100644--- a/apps/builder/app/routes/rest.buildId.$projectId.tsx+++ b/apps/builder/app/routes/rest.buildId.$projectId.tsx@@ -1,13 +1,28 @@import { json, type LoaderFunctionArgs } from "@remix-run/server-runtime";import { db as projectDb } from "@webstudio-is/project/index.server";+import { allowedDestinations } from "~/services/destinations.server";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";import { createContext } from "~/shared/context.server";+import { isDashboard } from "~/shared/router-utils";+// This loader is only accessible from the dashboard origin+// and is used exclusively for the CLI.export const loader = async ({params,request,}: LoaderFunctionArgs): Promise<{ buildId: string | null }> => {+ if (false === isDashboard(request)) {+ throw new Response(null, {+ status: 404,+ statusText: "Not Found",+ });+ }+preventCrossOriginCookie(request);+ allowedDestinations(request, ["document", "empty"]);+ // CSRF token checks are not necessary for dashboard-only pages.+ // All requests from the builder or canvas app are safeguarded either by preventCrossOriginCookie for fetch requests+ // or by allowedDestinations for iframe requests.try {const projectId = params.projectId;@@ -16,6 +31,7 @@ export const loader = async ({throw json("Required project id", { status: 400 });}+ // @todo Create a context without user authentication information.const context = await createContext(request);const project = await projectDb.project.loadById(projectId, context);diff --git a/apps/builder/app/routes/rest.current.products.ts b/apps/builder/app/routes/rest.current.products.tsindex 129c3f58e0..02dc07a368 100644--- a/apps/builder/app/routes/rest.current.products.ts+++ b/apps/builder/app/routes/rest.current.products.ts@@ -4,6 +4,8 @@ import { loginPath } from "~/shared/router-utils";import { prisma } from "@webstudio-is/prisma-client";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";import { redirect } from "~/services/no-store-redirect";+import { checkCsrf } from "~/services/csrf-session.server";+import { allowedDestinations } from "~/services/destinations.server";/*** Created for ebugging purposes, to check that payments and products are working@@ -11,6 +13,8 @@ import { redirect } from "~/services/no-store-redirect";*/export const loader = async ({ request }: LoaderFunctionArgs) => {preventCrossOriginCookie(request);+ allowedDestinations(request, ["document", "empty"]);+ await checkCsrf(request);const user = await findAuthenticatedUser(request);diff --git a/apps/builder/app/routes/rest.data.$projectId.ts b/apps/builder/app/routes/rest.data.$projectId.tsindex 62e079e86d..cc90ec0a82 100644--- a/apps/builder/app/routes/rest.data.$projectId.ts+++ b/apps/builder/app/routes/rest.data.$projectId.ts@@ -4,9 +4,13 @@ import { loadDevBuildByProjectId } from "@webstudio-is/project-build/index.serveimport { loadAssetsByProject } from "@webstudio-is/asset-uploader/index.server";import { createContext } from "~/shared/context.server";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";+import { checkCsrf } from "~/services/csrf-session.server";+import { allowedDestinations } from "~/services/destinations.server";export const loader = async ({ params, request }: LoaderFunctionArgs) => {preventCrossOriginCookie(request);+ allowedDestinations(request, ["document", "empty"]);+ await checkCsrf(request);if (params.projectId === undefined) {throw new Error("Project id undefined");diff --git a/apps/builder/app/routes/rest.patch.ts b/apps/builder/app/routes/rest.patch.tsindex 3fc2a8fa77..9b5798f068 100644--- a/apps/builder/app/routes/rest.patch.ts+++ b/apps/builder/app/routes/rest.patch.ts@@ -43,6 +43,7 @@ import { db } from "@webstudio-is/project/index.server";import type { Database } from "@webstudio-is/postrest/index.server";import { publicStaticEnv } from "~/env/env.static";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";+import { checkCsrf } from "~/services/csrf-session.server";type PatchData = {transactions: Array<SyncItem>;@@ -59,12 +60,14 @@ export const action = async ({| { status: "authorization_error"; errors: string }| { status: "error"; errors: string }> => {- preventCrossOriginCookie(request);+ try {+ preventCrossOriginCookie(request);- enableMapSet();- enablePatches();+ enableMapSet();+ enablePatches();++ await checkCsrf(request);- try {const {buildId,projectId,@@ -104,9 +107,7 @@ export const action = async ({context.authorization.authToken === undefined) {return {- // We use version_mismatched here to support older browser client- // @todo change on authorization_error after 15/09/2024- status: "version_mismatched",+ status: "authorization_error",errors:"Due to a recent update or a possible logout, you may need to log in again. Please reload the page and sign in to continue.",};@@ -388,6 +389,20 @@ export const action = async ({};}+ if (error instanceof Response && error.ok === false) {+ return {+ status: "authorization_error",+ errors: error.statusText,+ };+ }++ if (error instanceof Response) {+ return {+ status: "error",+ errors: await error.text(),+ };+ }+console.error(error);return {status: "error",diff --git a/apps/builder/app/routes/rest.resources-loader.ts b/apps/builder/app/routes/rest.resources-loader.tsindex 63f5c4c77e..ee8afafc59 100644--- a/apps/builder/app/routes/rest.resources-loader.ts+++ b/apps/builder/app/routes/rest.resources-loader.ts@@ -7,9 +7,11 @@ import {} from "@webstudio-is/sdk";import { loader as siteMapLoader } from "../shared/$resources/sitemap.xml.server";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";+import { checkCsrf } from "~/services/csrf-session.server";export const action = async ({ request }: ActionFunctionArgs) => {preventCrossOriginCookie(request);+ await checkCsrf(request);// Hope Remix will have customFetch by default, see https://kit.svelte.dev/docs/load#making-fetch-requestsconst customFetch: typeof fetch = (input, init) => {diff --git a/apps/builder/app/routes/trpc.$.ts b/apps/builder/app/routes/trpc.$.tsindex e25f5351df..c68ce8b4a2 100644--- a/apps/builder/app/routes/trpc.$.ts+++ b/apps/builder/app/routes/trpc.$.ts@@ -3,9 +3,11 @@ import type { ActionFunctionArgs } from "@remix-run/server-runtime";import { createContext } from "~/shared/context.server";import { appRouter } from "~/services/trcp-router.server";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";+import { checkCsrf } from "~/services/csrf-session.server";export const action = async ({ request }: ActionFunctionArgs) => {preventCrossOriginCookie(request);+ await checkCsrf(request);// https://trpc.io/docs/server/adapters/fetchconst response = await fetchRequestHandler({diff --git a/apps/builder/app/services/cookie.server.ts b/apps/builder/app/services/cookie.server.tsindex 0fa8522027..7344af347b 100644--- a/apps/builder/app/services/cookie.server.ts+++ b/apps/builder/app/services/cookie.server.ts@@ -48,7 +48,7 @@ export const clearReturnToCookie = async (return response;}- const resultResponse = response.clone();+ const resultResponse = new Response(response.body, response);resultResponse.headers.append("Set-Cookie",await returnToCookie.serialize(null, { maxAge: -1 })diff --git a/apps/builder/app/services/csrf-session.server.ts b/apps/builder/app/services/csrf-session.server.tsnew file mode 100644index 0000000000..63d51f828b--- /dev/null+++ b/apps/builder/app/services/csrf-session.server.ts@@ -0,0 +1,127 @@+import { createCookieSessionStorage } from "@remix-run/node";+import env from "~/env/env.server";+import { extractAuthFromRequest } from "~/shared/context.server";+import { allowedDestinations } from "./destinations.server";++type CsrfSessionData = {+ hash: string;+ token: string;+};++const getCsrfSessionCookieNameVersion = () => {+ // IMPORTANT: If you see an error here, you need to increase the version number.+ // Explanation:+ // Changing the CsrfSessionData type will cause all existing user sessions to not work as expected.+ // There is no logic to validate or clean up sessions, so we avoid session migration issues by changing the session cookie name.+ // This ensures that old sessions are invalidated and new sessions are created with the updated structure.+ const obj: CsrfSessionData = { token: "", hash: "" };+ obj.hash = "";++ // IMPORTANT: Change version in the SaaS platform as well!+ // IMPORTANT: Changing the version will cause all users to be logged out.+ return "1";+};++const csrfSessionStorage = createCookieSessionStorage({+ cookie: {+ // Using the __Host- prefix to prevent a malicious user from setting another person's session cookie+ // on all subdomains of apps.webstudio.is, e.g., setting Domain=.apps.webstudio.is.+ // For more information, see: https://developer.mozilla.org/en-US/docs/Web/Security/Practical_implementation_guides/Cookies#name+ name: `__Host-_csrf_${getCsrfSessionCookieNameVersion()}`,+ sameSite: "lax",+ path: "/",+ httpOnly: true,+ secrets: env.AUTH_WS_CLIENT_SECRET+ ? [env.AUTH_WS_CLIENT_SECRET]+ : undefined,+ secure: true,+ },+});++const toBase64Url = (buffer: ArrayBuffer) => {+ return Buffer.from(buffer).toString("base64url");+};++export const getRequestAuthHash = async (request: Request) => {+ const data = await extractAuthFromRequest(request);++ if (data.isServiceCall) {+ throw new Error("Service calls are not allowed to use CSRF tokens.");+ }++ // Because of cookie session we don't have session id in the request, so we derive it from the auth credentials data.+ const sessionId = data.authToken ?? data.sessionData?.userId ?? "anonymous";++ const encoder = new TextEncoder();+ const dataBuffer = encoder.encode(sessionId);+ const hashBuffer = await crypto.subtle.digest("SHA-256", dataBuffer);+ return toBase64Url(hashBuffer.slice(0, 16));+};++/**+ * We use a hash to ensure that any change in authentication credentials also changes the CSRF token.+ *+ * If setCookieValue is defined, it means that we need to set the cookie.+ */+export const getCsrfTokenAndCookie = async (+ request: Request+): Promise<[csrfToken: string, setCookieValue: string | undefined]> => {+ const hash = await getRequestAuthHash(request);++ const csrfSession = await csrfSessionStorage.getSession(+ request.headers.get("Cookie")+ );++ let sessionCreateCookieValue: string | undefined = undefined;++ if (csrfSession.get("hash") !== hash) {+ const csrfTokenLength = 16;+ const array = new Uint8Array(csrfTokenLength);+ crypto.getRandomValues(array);+ const token = toBase64Url(array);++ csrfSession.set("hash", hash);+ csrfSession.set("token", token);+ sessionCreateCookieValue =+ await csrfSessionStorage.commitSession(csrfSession);+ }++ return [csrfSession.get("token"), sessionCreateCookieValue];+};++export const checkCsrf = async (request: Request) => {+ if (+ request.headers.get("sec-fetch-mode") === "navigate" &&+ request.method === "GET"+ ) {+ // Do not check CSRF for GET navigation requests to allow logged-in users to view the data.+ // However, prevent loading the data from an iframe.+ allowedDestinations(request, ["document"]);+ return;+ }++ const [token, setCookieValue] = await getCsrfTokenAndCookie(request);++ if (setCookieValue) {+ throw new Response(+ "Authentication credentials have changed. Please reload and try again.",+ {+ status: 403,+ statusText:+ "Authentication credentials have changed. Please reload and try again.",+ }+ );+ }++ const csrfToken = request.headers.get("X-CSRF-Token");++ if (token !== csrfToken) {+ throw new Response(+ `Forbidden: "The CSRF token is invalid. Please reload and try again.`,+ {+ status: 403,+ statusText: `Forbidden: "The CSRF token is invalid. Please reload and try again.`,+ }+ );+ }+};diff --git a/apps/builder/app/services/destinations.server.ts b/apps/builder/app/services/destinations.server.tsnew file mode 100644index 0000000000..3fe1ac32e3--- /dev/null+++ b/apps/builder/app/services/destinations.server.ts@@ -0,0 +1,35 @@+type Destinations = RequestDestination | "empty";++/**+ * Prevent loaders of iframe injections like `<iframe src="/rest/data/98b712e5-247c-448d-b68c-8c1681125998">`+ * or even cross domain injections like `<iframe src="https://example.com">`+ *+ * - document: The request is intended to obtain a document or an embedded resource.+ * - empty: The request is intended to obtain a resource that is not associated with a document i.e. fetch etc+ * - iframe: The request is intended to obtain a resource that is to be embedded in an iframe.+ *+ * IMPORTANT!!!: In most cases must be used in loaders only.+ **/+export const allowedDestinations = (+ request: Request,+ destinations: Destinations[]+) => {+ const destination = request.headers.get("sec-fetch-dest");++ if (destination === null) {+ return;+ }++ if (destinations.includes(destination as Destinations)) {+ return;+ }++ throw new Response(null, {+ status: 403,+ statusText: `Forbidden: Destination ${destination} not allowed`,+ });+};++export const isFetchDestination = (request: Request) => {+ return request.headers.get("sec-fetch-dest") === "empty";+};diff --git a/apps/builder/app/services/no-store-redirect.ts b/apps/builder/app/services/no-store-redirect.tsindex 053f38725f..4a838d0a2c 100644--- a/apps/builder/app/services/no-store-redirect.ts+++ b/apps/builder/app/services/no-store-redirect.ts@@ -34,7 +34,7 @@ export const redirect: typeof remixRedirect = (url, init) => {*/export const setNoStoreToRedirect = (response: Response) => {if (isRedirectResponse(response)) {- const newResponse = response.clone();+ const newResponse = new Response(response.body, response);newResponse.headers.set("Cache-Control", "no-store");return newResponse;}diff --git a/apps/builder/app/services/session.server.ts b/apps/builder/app/services/session.server.tsindex 915a75d2b5..2bbe2ade75 100644--- a/apps/builder/app/services/session.server.ts+++ b/apps/builder/app/services/session.server.ts@@ -53,7 +53,7 @@ export const writeLoginSessionBloomFilter = async (session.set(bloomFilterKey, bloomFilter.serialize());- const result = response.clone();+ const result = new Response(response.body, response);result.headers.append("Set-Cookie",diff --git a/apps/builder/app/shared/builder-data.ts b/apps/builder/app/shared/builder-data.tsindex 8382e4f9ed..4745f48c23 100644--- a/apps/builder/app/shared/builder-data.ts+++ b/apps/builder/app/shared/builder-data.ts@@ -14,6 +14,7 @@ import {$styleSources,$styles,} from "./nano-states";+import { fetch } from "~/shared/fetch.client";export type BuilderData = WebstudioData & {marketplaceProduct: undefined | MarketplaceProduct;@@ -71,6 +72,7 @@ export const loadBuilderData = async ({url.searchParams.set("authToken", authToken);}const response = await fetch(url, { signal });+if (response.ok) {const data: Awaited<ReturnType<typeof loader>> = await response.json();return {@@ -90,5 +92,15 @@ export const loadBuilderData = async ({marketplaceProduct: data.marketplaceProduct,} satisfies BuilderData & { version: number };}- throw Error("Unable to load builder data");++ const text = await response.text();++ // No toasts available in this context+ alert(+ `Unable to load builder data. Response status: ${response.status}. Response text: ${text}`+ );++ throw Error(+ `Unable to load builder data. Response status: ${response.status}. Response text: ${text}`+ );};diff --git a/apps/builder/app/shared/context.server.ts b/apps/builder/app/shared/context.server.tsindex 91152126f5..657fcaf07c 100644--- a/apps/builder/app/shared/context.server.ts+++ b/apps/builder/app/shared/context.server.ts@@ -14,14 +14,11 @@ import type { BloomFilter } from "~/services/bloom-filter.server";import { isBuilder, isCanvas, isDashboard } from "./router-utils";import { parseBuilderUrl } from "@webstudio-is/http-client";-const createAuthorizationContext = async (- request: Request-): Promise<AppContext["authorization"]> => {- const url = new URL(request.url);-+export const extractAuthFromRequest = async (request: Request) => {if (isCanvas(request)) {throw new Error("Canvas requests can't have authorization context");}+ const url = new URL(request.url);const authToken =url.searchParams.get("authToken") ??@@ -36,6 +33,23 @@ const createAuthorizationContext = async (request.headers.has("Authorization") &&request.headers.get("Authorization") === env.TRPC_SERVER_API_TOKEN;+ return {+ authToken,+ sessionData,+ isServiceCall,+ };+};++const createAuthorizationContext = async (+ request: Request+): Promise<AppContext["authorization"]> => {+ if (isCanvas(request)) {+ throw new Error("Canvas requests can't have authorization context");+ }++ const { authToken, isServiceCall, sessionData } =+ await extractAuthFromRequest(request);+let ownerId = sessionData?.userId;if (authToken != null) {diff --git a/apps/builder/app/shared/csrf.client.ts b/apps/builder/app/shared/csrf.client.tsnew file mode 100644index 0000000000..e0096baba2--- /dev/null+++ b/apps/builder/app/shared/csrf.client.ts@@ -0,0 +1,5 @@+export let csrfToken: string | undefined = undefined;++export const updateCsrfToken = (token: string) => {+ csrfToken = token;+};diff --git a/apps/builder/app/shared/fetch.client.ts b/apps/builder/app/shared/fetch.client.tsnew file mode 100644index 0000000000..45c66ac1df--- /dev/null+++ b/apps/builder/app/shared/fetch.client.ts@@ -0,0 +1,29 @@+import { toast } from "@webstudio-is/design-system";+import { csrfToken } from "./csrf.client";++/**+ * To avoid fetch interception from the canvas, i.e., `globalThis.fetch = () => console.log('INTERCEPTED');`,+ */+const _fetch = globalThis.fetch;++/**+ * To avoid fetch interception from the canvas, i.e., `globalThis.fetch = () => console.log('INTERCEPTED');`,+ * To add csrf token to the headers.+ */+export const fetch: typeof globalThis.fetch = (requestInfo, requestInit) => {+ if (csrfToken === undefined) {+ toast.error("CSRF token is not set.");+ throw new Error("CSRF token is not set.");+ }++ const headers = new Headers(requestInit?.headers);++ headers.set("X-CSRF-Token", csrfToken);++ const modifiedInit: RequestInit = {+ ...requestInit,+ headers,+ };++ return _fetch(requestInfo, modifiedInit);+};diff --git a/apps/builder/app/shared/nano-states/props.ts b/apps/builder/app/shared/nano-states/props.tsindex 6ff58b9c29..b3fd6630d0 100644--- a/apps/builder/app/shared/nano-states/props.ts+++ b/apps/builder/app/shared/nano-states/props.ts@@ -44,6 +44,7 @@ import {mergeSystem,} from "./variables";import { uploadingFileDataToAsset } from "~/builder/shared/assets/asset-utils";+import { fetch } from "~/shared/fetch.client";export const getIndexedInstanceId = (instanceId: Instance["id"],diff --git a/apps/builder/app/shared/trpc/trpc-client.ts b/apps/builder/app/shared/trpc/trpc-client.tsindex d41de23e4b..495ed54e05 100644--- a/apps/builder/app/shared/trpc/trpc-client.ts+++ b/apps/builder/app/shared/trpc/trpc-client.ts@@ -10,10 +10,12 @@ import type {import { createRecursiveProxy } from "@trpc/server/shared";import { useMemo, useState } from "react";import { $authToken } from "../nano-states";+import { fetch } from "~/shared/fetch.client";export const nativeClient = createTRPCProxyClient<AppRouter>({links: [httpBatchLink({+ fetch,url: "/trpc",// You can pass any HTTP headers you wish hereasync headers(_opts) {diff --git a/packages/http-client/src/index.ts b/packages/http-client/src/index.tsindex d2bbce3248..7c005bb965 100644--- a/packages/http-client/src/index.ts+++ b/packages/http-client/src/index.ts@@ -44,7 +44,10 @@ const getLatestBuildUsingProjectId = async (params: {authToken: string;}): Promise<{ buildId: string | null }> => {const { origin, projectId, authToken } = params;- const url = new URL(origin);++ const { sourceOrigin } = parseBuilderUrl(origin);++ const url = new URL(sourceOrigin);url.pathname = `/rest/buildId/${projectId}`;const headers = new Headers();@@ -71,7 +74,10 @@ export const loadProjectDataByBuildId = async (| { authToken: string })): Promise<Data> => {- const url = new URL(params.origin);+ const { sourceOrigin } = parseBuilderUrl(params.origin);++ const url = new URL(sourceOrigin);+url.pathname = `/rest/build/${params.buildId}`;const headers = new Headers();