Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

fix: improve domain safety

Marc Seitz39f7db263e15
diff --git a/app/api/cron/domains/route.ts b/app/api/cron/domains/route.ts
index 156251bf..f41fa73c 100644
--- a/app/api/cron/domains/route.ts
+++ b/app/api/cron/domains/route.ts
@@ -38,7 +38,9 @@ export async function POST(req: Request) {
where: {
slug: {
// exclude domains that belong to us
- notIn: ["papermark.io"],
+ not: {
+ contains: "papermark.io",
+ },
},
},
select: {
diff --git a/components/domains/add-domain-modal.tsx b/components/domains/add-domain-modal.tsx
index eccef3bd..82895086 100644
--- a/components/domains/add-domain-modal.tsx
+++ b/components/domains/add-domain-modal.tsx
@@ -49,6 +49,12 @@ export function AddDomainModal({
if (domain == "") return;
+ // Add validation for papermark
+ if (domain.toLowerCase().includes("papermark")) {
+ toast.error("Domain cannot contain 'papermark'");
+ return;
+ }
+
setLoading(true);
const response = await fetch(
`/api/teams/${teamInfo?.currentTeam?.id}/domains`,
diff --git a/pages/api/teams/[teamId]/domains/[domain]/index.ts b/pages/api/teams/[teamId]/domains/[domain]/index.ts
index e58114b1..f79303b4 100644
--- a/pages/api/teams/[teamId]/domains/[domain]/index.ts
+++ b/pages/api/teams/[teamId]/domains/[domain]/index.ts
@@ -121,12 +121,7 @@ export default async function handle(
},
});
- const response = await Promise.all([
- updateDefaultPromise,
- updateNonDefaultPromise,
- ]);
-
- console.log("promise response", response);
+ await Promise.all([updateDefaultPromise, updateNonDefaultPromise]);
return res.status(200).json({ message: "Domain set to default" }); // 204 No Content response for successful deletes
} catch (error) {
diff --git a/pages/api/teams/[teamId]/domains/index.ts b/pages/api/teams/[teamId]/domains/index.ts
index 6d799a24..26974e53 100644
--- a/pages/api/teams/[teamId]/domains/index.ts
+++ b/pages/api/teams/[teamId]/domains/index.ts
@@ -71,20 +71,45 @@ export default async function handle(
// Assuming data is an object with `domain` properties
const { domain } = req.body;
- // TODO: Add check for if the domain already exists on another user
- const validDomain = validDomainRegex.test(domain);
+ // Sanitize domain by removing whitespace, protocol, and paths
+ const sanitizedDomain = domain
+ .trim()
+ .toLowerCase()
+ .replace(/^(?:https?:\/\/)?(?:www\.)?/i, "")
+ .split("/")[0];
+
+ // Check if domain is valid
+ const validDomain = validDomainRegex.test(sanitizedDomain);
if (validDomain !== true) {
return res.status(422).json("Invalid domain");
}
+ // Check if domain contains papermark
+ if (sanitizedDomain.toLowerCase().includes("papermark")) {
+ return res
+ .status(400)
+ .json({ message: "Domain cannot contain 'papermark'" });
+ }
+
+ // Check if domain already exists
+ const existingDomain = await prisma.domain.findFirst({
+ where: {
+ slug: sanitizedDomain,
+ },
+ });
+
+ if (existingDomain) {
+ return res.status(400).json({ message: "Domain already exists" });
+ }
+
const response = await prisma.domain.create({
data: {
- slug: domain,
+ slug: sanitizedDomain,
userId,
teamId,
},
});
- await addDomainToVercel(domain);
+ await addDomainToVercel(sanitizedDomain);
return res.status(201).json(response);
} catch (error) {