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
Add project domain validations (#1675)
Ivan Starkov25255cbfa5f4
diff --git a/apps/builder/app/builder/features/topbar/publish.tsx b/apps/builder/app/builder/features/topbar/publish.tsxindex 4a34098c35..5dffe0f673 100644--- a/apps/builder/app/builder/features/topbar/publish.tsx+++ b/apps/builder/app/builder/features/topbar/publish.tsx@@ -18,7 +18,7 @@ import {ScrollArea,} from "@webstudio-is/design-system";import { useIsPublishDialogOpen } from "../../shared/nano-states";-import type { Project } from "@webstudio-is/project";+import { validateProjectDomain, type Project } from "@webstudio-is/project";import { getPublishedUrl } from "~/shared/router-utils";import { theme } from "@webstudio-is/design-system";import { useAuthPermit } from "~/shared/nano-states";@@ -51,6 +51,7 @@ const ChangeProjectDomain = (props: PublishButtonProps) => {const {load: loadProject,data: projectData,+ state: projectState,error: projectSystemError,} = trpc.project.useQuery();@@ -67,7 +68,10 @@ const ChangeProjectDomain = (props: PublishButtonProps) => {loadProject({ projectId: props.project.id }, (projectData) => {if (projectData?.success === false) {setError(projectData.error);+ return;}++ setDomain(projectData.project.domain);}),[loadProject, props.project.id]);@@ -79,6 +83,13 @@ const ChangeProjectDomain = (props: PublishButtonProps) => {const publishedUrl = new URL(getPublishedUrl(project.domain));const handleUpdateProjectDomain = () => {+ const validationResult = validateProjectDomain(domain);++ if (validationResult.success === false) {+ setError(validationResult.error);+ return;+ }+if (updateProjectDomainState !== "idle") {return;}@@ -91,6 +102,7 @@ const ChangeProjectDomain = (props: PublishButtonProps) => {setError(data.error);return;}+refreshProject();});};@@ -159,7 +171,9 @@ const ChangeProjectDomain = (props: PublishButtonProps) => {id={id}placeholder="Domain"value={domain}- disabled={updateProjectDomainState !== "idle"}+ disabled={+ updateProjectDomainState !== "idle" || projectState !== "idle"+ }onChange={(event) => {setError(undefined);setDomain(event.target.value);diff --git a/packages/domain/src/trpc/domain.ts b/packages/domain/src/trpc/domain.tsindex de17479e54..9e2795ed1f 100644--- a/packages/domain/src/trpc/domain.ts+++ b/packages/domain/src/trpc/domain.ts@@ -98,6 +98,7 @@ export const domainRouter = router({},ctx);+return { success: true } as const;} catch (error) {return {diff --git a/packages/project/src/db/project-domain.ts b/packages/project/src/db/project-domain.tsnew file mode 100644index 0000000000..31002d94ab--- /dev/null+++ b/packages/project/src/db/project-domain.ts@@ -0,0 +1,79 @@+import { customAlphabet } from "nanoid";+import slugify from "slugify";++const nanoid = customAlphabet("1234567890abcdefghijklmnopqrstuvwxyz");++const slugifyOptions = { lower: true, strict: true };+const MIN_DOMAIN_LENGTH = 10;++// MIN_DOMAIN_LENGTH doesn't allow to use "assets" as a domain,+// but in case it will be changed in the future, we reserve even short names+const reservedDomains = [+ // Reserved for SaaS support+ "customer",+ "customers",+ "proxy-fallback",+ // Reserved for local development+ "local",+ // Reserved for image transforms+ "image-transform",+ "image-transforms",+ "images-transform",+ "images-transforms",+ // Assets+ "assets",+ "fonts",+ "images",+];++// For the future use, reserve prefixes we can use for internal services+const reservedPrefixes = ["wstd_sys_", "wstd-sys-"];++export const validateProjectDomain = (+ domainInput: string+): { success: false; error: string } | { success: true; domain: string } => {+ try {+ const domain = slugify(domainInput, slugifyOptions);++ if (domain.length < MIN_DOMAIN_LENGTH) {+ return {+ success: false,+ error: `Minimum ${MIN_DOMAIN_LENGTH} characters required`,+ };+ }++ if (reservedDomains.includes(domain)) {+ return {+ success: false,+ error: `Domain ${domain} is reserved`,+ };+ }++ if (reservedPrefixes.some((prefix) => domain.startsWith(prefix))) {+ return {+ success: false,+ error: `Domain ${domain} is reserved`,+ };+ }++ return {+ success: true,+ domain,+ };+ } catch {+ return {+ success: false,+ error: `Invalid domain ${domainInput}`,+ };+ }+};++export const generateDomain = (title: string) => {+ const slugifiedTitle = slugify(title, slugifyOptions);+ const domain = `${slugifiedTitle}-${nanoid(+ // If user entered a long title already, we just add 5 chars generated id+ // Otherwise we add the amount of chars to satisfy min length+ Math.max(MIN_DOMAIN_LENGTH - slugifiedTitle.length - 1, 5)+ )}`;+ return domain;+};diff --git a/packages/project/src/db/project.ts b/packages/project/src/db/project.tsindex 9682cfc24c..e85993441e 100644--- a/packages/project/src/db/project.ts+++ b/packages/project/src/db/project.ts@@ -1,5 +1,3 @@-import slugify from "slugify";-import { customAlphabet } from "nanoid";import { v4 as uuid } from "uuid";import { prisma, Prisma } from "@webstudio-is/prisma-client";import { cloneAssets } from "@webstudio-is/asset-uploader/index.server";@@ -13,8 +11,7 @@ import {loadBuildByProjectId,} from "@webstudio-is/project-build/index.server";import { Project, Title } from "../shared/schema";--const nanoid = customAlphabet("1234567890abcdefghijklmnopqrstuvwxyz");+import { generateDomain, validateProjectDomain } from "./project-domain";export const loadByParams = async (params: { projectId: string } | { projectDomain: string },@@ -70,20 +67,6 @@ export const loadByDomain = async (return await loadById(projectWithId.id, context);};-const slugifyOptions = { lower: true, strict: true };--const MIN_DOMAIN_LENGTH = 10;--const generateDomain = (title: string) => {- const slugifiedTitle = slugify(title, slugifyOptions);- const domain = `${slugifiedTitle}-${nanoid(- // If user entered a long title already, we just add 5 chars generated id- // Otherwise we add the amount of chars to satisfy min length- Math.max(MIN_DOMAIN_LENGTH - slugifiedTitle.length - 1, 5)- )}`;- return domain;-};-export const create = async ({ title }: { title: string },context: AppContext@@ -263,12 +246,14 @@ export const updateDomain = async (},context: AppContext) => {- const domain = slugify(input.domain, slugifyOptions);+ const domainValidation = validateProjectDomain(input.domain);- if (domain.length < MIN_DOMAIN_LENGTH) {- throw new Error(`Minimum ${MIN_DOMAIN_LENGTH} characters required`);+ if (domainValidation.success === false) {+ throw new Error(domainValidation.error);}+ const { domain } = domainValidation;+const canEdit = await authorizeProject.hasProjectPermit({ projectId: input.id, permit: "edit" },contextdiff --git a/packages/project/src/index.ts b/packages/project/src/index.tsindex ec0e2d2011..e39f6835d8 100644--- a/packages/project/src/index.ts+++ b/packages/project/src/index.ts@@ -1,2 +1,3 @@export * from "./shared/schema";export type { ProjectRouter } from "./trpc";+export { validateProjectDomain } from "./db/project-domain";