mirror of
https://github.com/andwati/dokploy.git
synced 2026-11-01 17:52:17 +00:00
Merge pull request #3146 from Dokploy/3013-trim-domain-input-in-server-domain-assignation
feat: enhance domain validation by trimming whitespace from host input
This commit is contained in:
@@ -46,7 +46,13 @@ export type CacheType = "fetch" | "cache";
|
|||||||
|
|
||||||
export const domain = z
|
export const domain = z
|
||||||
.object({
|
.object({
|
||||||
host: z.string().min(1, { message: "Add a hostname" }),
|
host: z
|
||||||
|
.string()
|
||||||
|
.min(1, { message: "Add a hostname" })
|
||||||
|
.refine((val) => val === val.trim(), {
|
||||||
|
message: "Domain name cannot have leading or trailing spaces",
|
||||||
|
})
|
||||||
|
.transform((val) => val.trim()),
|
||||||
path: z.string().min(1).optional(),
|
path: z.string().min(1).optional(),
|
||||||
internalPath: z.string().optional(),
|
internalPath: z.string().optional(),
|
||||||
stripPath: z.boolean().optional(),
|
stripPath: z.boolean().optional(),
|
||||||
|
|||||||
@@ -2,7 +2,13 @@ import { z } from "zod";
|
|||||||
|
|
||||||
export const domain = z
|
export const domain = z
|
||||||
.object({
|
.object({
|
||||||
host: z.string().min(1, { message: "Add a hostname" }),
|
host: z
|
||||||
|
.string()
|
||||||
|
.min(1, { message: "Add a hostname" })
|
||||||
|
.refine((val) => val === val.trim(), {
|
||||||
|
message: "Domain name cannot have leading or trailing spaces",
|
||||||
|
})
|
||||||
|
.transform((val) => val.trim()),
|
||||||
path: z.string().min(1).optional(),
|
path: z.string().min(1).optional(),
|
||||||
port: z
|
port: z
|
||||||
.number()
|
.number()
|
||||||
@@ -33,7 +39,13 @@ export const domain = z
|
|||||||
|
|
||||||
export const domainCompose = z
|
export const domainCompose = z
|
||||||
.object({
|
.object({
|
||||||
host: z.string().min(1, { message: "Host is required" }),
|
host: z
|
||||||
|
.string()
|
||||||
|
.min(1, { message: "Add a hostname" })
|
||||||
|
.refine((val) => val === val.trim(), {
|
||||||
|
message: "Domain name cannot have leading or trailing spaces",
|
||||||
|
})
|
||||||
|
.transform((val) => val.trim()),
|
||||||
path: z.string().min(1).optional(),
|
path: z.string().min(1).optional(),
|
||||||
port: z
|
port: z
|
||||||
.number()
|
.number()
|
||||||
|
|||||||
@@ -2,7 +2,13 @@ import { z } from "zod";
|
|||||||
|
|
||||||
export const domain = z
|
export const domain = z
|
||||||
.object({
|
.object({
|
||||||
host: z.string().min(1, { message: "Add a hostname" }),
|
host: z
|
||||||
|
.string()
|
||||||
|
.min(1, { message: "Add a hostname" })
|
||||||
|
.refine((val) => val === val.trim(), {
|
||||||
|
message: "Domain name cannot have leading or trailing spaces",
|
||||||
|
})
|
||||||
|
.transform((val) => val.trim()),
|
||||||
path: z.string().min(1).optional(),
|
path: z.string().min(1).optional(),
|
||||||
internalPath: z.string().optional(),
|
internalPath: z.string().optional(),
|
||||||
stripPath: z.boolean().optional(),
|
stripPath: z.boolean().optional(),
|
||||||
@@ -58,7 +64,13 @@ export const domain = z
|
|||||||
|
|
||||||
export const domainCompose = z
|
export const domainCompose = z
|
||||||
.object({
|
.object({
|
||||||
host: z.string().min(1, { message: "Host is required" }),
|
host: z
|
||||||
|
.string()
|
||||||
|
.min(1, { message: "Add a hostname" })
|
||||||
|
.refine((val) => val === val.trim(), {
|
||||||
|
message: "Domain name cannot have leading or trailing spaces",
|
||||||
|
})
|
||||||
|
.transform((val) => val.trim()),
|
||||||
path: z.string().min(1).optional(),
|
path: z.string().min(1).optional(),
|
||||||
internalPath: z.string().optional(),
|
internalPath: z.string().optional(),
|
||||||
stripPath: z.boolean().optional(),
|
stripPath: z.boolean().optional(),
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ export const createDomain = async (input: typeof apiCreateDomain._type) => {
|
|||||||
.insert(domains)
|
.insert(domains)
|
||||||
.values({
|
.values({
|
||||||
...input,
|
...input,
|
||||||
|
host: input.host?.trim(),
|
||||||
})
|
})
|
||||||
.returning()
|
.returning()
|
||||||
.then((response) => response[0]);
|
.then((response) => response[0]);
|
||||||
@@ -120,6 +121,7 @@ export const updateDomainById = async (
|
|||||||
.update(domains)
|
.update(domains)
|
||||||
.set({
|
.set({
|
||||||
...domainData,
|
...domainData,
|
||||||
|
...(domainData.host && { host: domainData.host.trim() }),
|
||||||
})
|
})
|
||||||
.where(eq(domains.domainId, domainId))
|
.where(eq(domains.domainId, domainId))
|
||||||
.returning();
|
.returning();
|
||||||
|
|||||||
Reference in New Issue
Block a user