Skip to content

Open-source status page, incident response and uptime monitoring

fix: secure custom domain (#1101)

Maximilian Kaske399d791111a5
diff --git a/apps/server/src/v1/pages/post.ts b/apps/server/src/v1/pages/post.ts
index 0d3f93a2e..d697fe28f 100644
--- a/apps/server/src/v1/pages/post.ts
+++ b/apps/server/src/v1/pages/post.ts
@@ -45,6 +45,18 @@ export function registerPostPage(api: typeof pagesApi) {
const limits = c.get("limits");
const input = c.req.valid("json");
+ if (input.customDomain && !limits["custom-domain"]) {
+ throw new HTTPException(403, {
+ message: "Upgrade for custom domains",
+ });
+ }
+
+ if (input.customDomain?.toLowerCase().includes("openstatus")) {
+ throw new HTTPException(400, {
+ message: "Domain cannot contain 'openstatus'",
+ });
+ }
+
const count = (
await db
.select({ count: sql<number>`count(*)` })
diff --git a/apps/server/src/v1/pages/put.ts b/apps/server/src/v1/pages/put.ts
index 8fac276b5..472f4657f 100644
--- a/apps/server/src/v1/pages/put.ts
+++ b/apps/server/src/v1/pages/put.ts
@@ -46,6 +46,18 @@ export function registerPutPage(api: typeof pagesApi) {
const { id } = c.req.valid("param");
const input = c.req.valid("json");
+ if (input.customDomain && !limits["custom-domain"]) {
+ throw new HTTPException(403, {
+ message: "Upgrade for custom domains",
+ });
+ }
+
+ if (input.customDomain?.toLowerCase().includes("openstatus")) {
+ throw new HTTPException(400, {
+ message: "Domain cannot contain 'openstatus'",
+ });
+ }
+
if (
limits["password-protection"] === false &&
input?.passwordProtected === true
diff --git a/apps/web/src/components/forms/custom-domain-form.tsx b/apps/web/src/components/forms/custom-domain-form.tsx
index 081450c99..fd7e8d3ca 100644
--- a/apps/web/src/components/forms/custom-domain-form.tsx
+++ b/apps/web/src/components/forms/custom-domain-form.tsx
@@ -6,7 +6,7 @@ import { useTransition } from "react";
import { useForm } from "react-hook-form";
import type * as z from "zod";
-import { insertPageSchema } from "@openstatus/db/src/schema";
+import { selectPageSchema } from "@openstatus/db/src/schema";
import {
Button,
Form,
@@ -20,13 +20,13 @@ import {
} from "@openstatus/ui";
import { useDomainStatus } from "@/hooks/use-domain-status";
-import { toastAction } from "@/lib/toast";
+import { toast, toastAction } from "@/lib/toast";
import { api } from "@/trpc/client";
import DomainConfiguration from "../domains/domain-configuration";
import DomainStatusIcon from "../domains/domain-status-icon";
import { LoadingAnimation } from "../loading-animation";
-const customDomain = insertPageSchema.pick({
+const customDomain = selectPageSchema.pick({
customDomain: true,
id: true,
});
@@ -48,12 +48,16 @@ export function CustomDomainForm({ defaultValues }: { defaultValues: Schema }) {
async function onSubmit(data: Schema) {
startTransition(async () => {
try {
- if (defaultValues.id) {
- await api.page.addCustomDomain.mutate({
- customDomain: data.customDomain,
- pageId: defaultValues?.id,
- });
+ if (data.customDomain.toLowerCase().includes("openstatus")) {
+ toast.error("Domain cannot contain 'openstatus'");
+ return;
}
+
+ await api.page.addCustomDomain.mutate({
+ customDomain: data.customDomain,
+ pageId: defaultValues?.id,
+ });
+
if (data.customDomain && !defaultValues.customDomain) {
await api.domain.addDomainToVercel.mutate({
domain: data.customDomain,
diff --git a/packages/api/src/router/domain.ts b/packages/api/src/router/domain.ts
index 1b7c52ae0..799af9275 100644
--- a/packages/api/src/router/domain.ts
+++ b/packages/api/src/router/domain.ts
@@ -1,5 +1,6 @@
import { z } from "zod";
+import { TRPCError } from "@trpc/server";
import { env } from "../env";
import { createTRPCRouter, protectedProcedure } from "../trpc";
@@ -54,6 +55,13 @@ export const domainRouter = createTRPCRouter({
addDomainToVercel: protectedProcedure
.input(z.object({ domain: z.string() }))
.mutation(async (opts) => {
+ if (opts.input.domain.toLowerCase().includes("openstatus")) {
+ throw new TRPCError({
+ code: "BAD_REQUEST",
+ message: "Domain cannot contain 'openstatus'",
+ });
+ }
+
const data = await fetch(
`https://api.vercel.com/v9/projects/${env.PROJECT_ID_VERCEL}/domains?teamId=${env.TEAM_ID_VERCEL}`,
{