+ {backupType === "compose" && (
+
+ Make sure the compose is running before creating a backup.
+
+ )}
- {postgres?.backups.map((backup) => (
-
-
-
-
- Destination
-
- {backup.destination.name}
-
-
-
- Database
-
- {backup.database}
-
-
-
- Scheduled
-
- {backup.schedule}
-
-
-
- Prefix Storage
-
- {backup.prefix}
-
-
-
- Enabled
-
- {backup.enabled ? "Yes" : "No"}
-
-
-
- Keep Latest
-
- {backup.keepLatestCount || "All"}
-
-
-
-
-
-
-
- {
- setActiveManualBackup(backup.backupId);
- await manualBackup({
- backupId: backup.backupId as string,
- })
- .then(async () => {
- toast.success(
- "Manual Backup Successful",
- );
- })
- .catch(() => {
- toast.error(
- "Error creating the manual backup",
- );
- });
- setActiveManualBackup(undefined);
- }}
- >
-
-
- Run Manual Backup
-
-
+ {postgres?.backups.map((backup) => {
+ const serverId =
+ "serverId" in postgres ? postgres.serverId : undefined;
-
-
{
- await deleteBackup({
- backupId: backup.backupId,
- })
- .then(() => {
- refetch();
- toast.success("Backup deleted successfully");
- })
- .catch(() => {
- toast.error("Error deleting backup");
- });
- }}
- >
-
+
+
+
+ {backup.backupType === "compose" && (
+
+ {backup.databaseType === "postgres" && (
+
+ )}
+ {backup.databaseType === "mysql" && (
+
+ )}
+ {backup.databaseType === "mariadb" && (
+
+ )}
+ {backup.databaseType === "mongo" && (
+
+ )}
+
+ )}
+
+ {backup.backupType === "compose" && (
+
+
+ {backup.serviceName}
+
+
+ {backup.databaseType}
+
+
+ )}
+
+
+
+ {backup.enabled ? "Active" : "Inactive"}
+
+
+
+
+
+
+
+
+ Destination
+
+
+ {backup.destination.name}
+
+
+
+
+
+ Database
+
+
+ {backup.database}
+
+
+
+
+
+ Schedule
+
+
+ {backup.schedule}
+
+
+
+
+
+ Prefix Storage
+
+
+ {backup.prefix}
+
+
+
+
+
+ Keep Latest
+
+
+ {backup.keepLatestCount || "All"}
+
+
+
+
+
+
+
-
+
+
+
+
+
+ {
+ setActiveManualBackup(backup.backupId);
+ await manualBackup({
+ backupId: backup.backupId as string,
+ })
+ .then(async () => {
+ toast.success(
+ "Manual Backup Successful",
+ );
+ })
+ .catch(() => {
+ toast.error(
+ "Error creating the manual backup",
+ );
+ });
+ setActiveManualBackup(undefined);
+ }}
+ >
+
+
+
+ Run Manual Backup
+
+
+
+
+
+
{
+ await deleteBackup({
+ backupId: backup.backupId,
+ })
+ .then(() => {
+ refetch();
+ toast.success(
+ "Backup deleted successfully",
+ );
+ })
+ .catch(() => {
+ toast.error("Error deleting backup");
+ });
+ }}
+ >
+
+
+
+
-
- ))}
+ );
+ })}
)}
diff --git a/apps/dokploy/components/dashboard/database/backups/update-backup.tsx b/apps/dokploy/components/dashboard/database/backups/update-backup.tsx
deleted file mode 100644
index 2cf7b7a5f..000000000
--- a/apps/dokploy/components/dashboard/database/backups/update-backup.tsx
+++ /dev/null
@@ -1,329 +0,0 @@
-import { Button } from "@/components/ui/button";
-import {
- Command,
- CommandEmpty,
- CommandGroup,
- CommandInput,
- CommandItem,
-} from "@/components/ui/command";
-import {
- Dialog,
- DialogContent,
- DialogDescription,
- DialogFooter,
- DialogHeader,
- DialogTitle,
- DialogTrigger,
-} from "@/components/ui/dialog";
-import {
- Form,
- FormControl,
- FormDescription,
- FormField,
- FormItem,
- FormLabel,
- FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import {
- Popover,
- PopoverContent,
- PopoverTrigger,
-} from "@/components/ui/popover";
-import { ScrollArea } from "@/components/ui/scroll-area";
-import { Switch } from "@/components/ui/switch";
-import { cn } from "@/lib/utils";
-import { api } from "@/utils/api";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { CheckIcon, ChevronsUpDown, PenBoxIcon } from "lucide-react";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-
-const UpdateBackupSchema = z.object({
- destinationId: z.string().min(1, "Destination required"),
- schedule: z.string().min(1, "Schedule (Cron) required"),
- prefix: z.string().min(1, "Prefix required"),
- enabled: z.boolean(),
- database: z.string().min(1, "Database required"),
- keepLatestCount: z.coerce.number().optional(),
-});
-
-type UpdateBackup = z.infer
;
-
-interface Props {
- backupId: string;
- refetch: () => void;
-}
-
-export const UpdateBackup = ({ backupId, refetch }: Props) => {
- const [isOpen, setIsOpen] = useState(false);
- const { data, isLoading } = api.destination.all.useQuery();
- const { data: backup } = api.backup.one.useQuery(
- {
- backupId,
- },
- {
- enabled: !!backupId,
- },
- );
-
- const { mutateAsync, isLoading: isLoadingUpdate } =
- api.backup.update.useMutation();
-
- const form = useForm({
- defaultValues: {
- database: "",
- destinationId: "",
- enabled: true,
- prefix: "/",
- schedule: "",
- keepLatestCount: undefined,
- },
- resolver: zodResolver(UpdateBackupSchema),
- });
-
- useEffect(() => {
- if (backup) {
- form.reset({
- database: backup.database,
- destinationId: backup.destinationId,
- enabled: backup.enabled || false,
- prefix: backup.prefix,
- schedule: backup.schedule,
- keepLatestCount: backup.keepLatestCount
- ? Number(backup.keepLatestCount)
- : undefined,
- });
- }
- }, [form, form.reset, backup]);
-
- const onSubmit = async (data: UpdateBackup) => {
- await mutateAsync({
- backupId,
- destinationId: data.destinationId,
- prefix: data.prefix,
- schedule: data.schedule,
- enabled: data.enabled,
- database: data.database,
- keepLatestCount: data.keepLatestCount as number | null,
- })
- .then(async () => {
- toast.success("Backup Updated");
- refetch();
- setIsOpen(false);
- })
- .catch(() => {
- toast.error("Error updating the Backup");
- });
- };
-
- return (
-
-
-
-
-
-
-
- Update Backup
- Update the backup
-
-
-
-
-
-
- );
-};
diff --git a/apps/dokploy/components/dashboard/docker/logs/docker-logs-id.tsx b/apps/dokploy/components/dashboard/docker/logs/docker-logs-id.tsx
index 861b4bbe9..611af355e 100644
--- a/apps/dokploy/components/dashboard/docker/logs/docker-logs-id.tsx
+++ b/apps/dokploy/components/dashboard/docker/logs/docker-logs-id.tsx
@@ -140,7 +140,14 @@ export const DockerLogsId: React.FC = ({
ws.onmessage = (e) => {
if (!isCurrentConnection) return;
- setRawLogs((prev) => prev + e.data);
+ setRawLogs((prev) => {
+ const updated = prev + e.data;
+ const splitLines = updated.split("\n");
+ if (splitLines.length > lines) {
+ return splitLines.slice(-lines).join("\n");
+ }
+ return updated;
+ });
setIsLoading(false);
if (noDataTimeout) clearTimeout(noDataTimeout);
};
diff --git a/apps/dokploy/components/dashboard/impersonation/impersonation-bar.tsx b/apps/dokploy/components/dashboard/impersonation/impersonation-bar.tsx
new file mode 100644
index 000000000..8a9f55c90
--- /dev/null
+++ b/apps/dokploy/components/dashboard/impersonation/impersonation-bar.tsx
@@ -0,0 +1,454 @@
+"use client";
+
+import { Logo } from "@/components/shared/logo";
+import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import {
+ Command,
+ CommandEmpty,
+ CommandGroup,
+ CommandInput,
+ CommandItem,
+ CommandList,
+} from "@/components/ui/command";
+import {
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+} from "@/components/ui/popover";
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipProvider,
+ TooltipTrigger,
+} from "@/components/ui/tooltip";
+import { authClient } from "@/lib/auth-client";
+import { cn } from "@/lib/utils";
+import { api } from "@/utils/api";
+import copy from "copy-to-clipboard";
+import { format } from "date-fns";
+import {
+ Building2,
+ Calendar,
+ CheckIcon,
+ ChevronsUpDown,
+ Copy,
+ CreditCard,
+ Fingerprint,
+ Key,
+ Server,
+ Settings2,
+ Shield,
+ UserIcon,
+ XIcon,
+} from "lucide-react";
+import { useEffect, useState } from "react";
+import { toast } from "sonner";
+
+type User = typeof authClient.$Infer.Session.user;
+
+export const ImpersonationBar = () => {
+ const [users, setUsers] = useState([]);
+ const [selectedUser, setSelectedUser] = useState(null);
+ const [isImpersonating, setIsImpersonating] = useState(false);
+ const [open, setOpen] = useState(false);
+ const [isLoading, setIsLoading] = useState(false);
+ const [showBar, setShowBar] = useState(false);
+ const { data } = api.user.get.useQuery();
+
+ const fetchUsers = async (search?: string) => {
+ try {
+ const session = await authClient.getSession();
+ if (session?.data?.session?.impersonatedBy) {
+ return;
+ }
+ setIsLoading(true);
+ const response = await authClient.admin.listUsers({
+ query: {
+ limit: 30,
+ ...(search && {
+ searchField: "email",
+ searchOperator: "contains",
+ searchValue: search,
+ }),
+ },
+ });
+
+ const filteredUsers = response.data?.users.filter(
+ // @ts-ignore
+ (user) => user.allowImpersonation && data?.user?.email !== user.email,
+ );
+
+ if (!response.error) {
+ // @ts-ignore
+ setUsers(filteredUsers || []);
+ }
+ } catch (error) {
+ console.error("Error fetching users:", error);
+ toast.error("Error loading users");
+ } finally {
+ setIsLoading(false);
+ }
+ };
+
+ const handleImpersonate = async () => {
+ if (!selectedUser) return;
+
+ try {
+ await authClient.admin.impersonateUser({
+ userId: selectedUser.id,
+ });
+ setIsImpersonating(true);
+ setOpen(false);
+
+ toast.success("Successfully impersonating user", {
+ description: `You are now viewing as ${selectedUser.name || selectedUser.email}`,
+ });
+ window.location.reload();
+ } catch (error) {
+ console.error("Error impersonating user:", error);
+ toast.error("Error impersonating user");
+ }
+ };
+
+ const handleStopImpersonating = async () => {
+ try {
+ await authClient.admin.stopImpersonating();
+ setIsImpersonating(false);
+ setSelectedUser(null);
+ setShowBar(false);
+ toast.success("Stopped impersonating user");
+ window.location.reload();
+ } catch (error) {
+ console.error("Error stopping impersonation:", error);
+ toast.error("Error stopping impersonation");
+ }
+ };
+
+ useEffect(() => {
+ const checkImpersonation = async () => {
+ try {
+ const session = await authClient.getSession();
+ if (session?.data?.session?.impersonatedBy) {
+ setIsImpersonating(true);
+ setShowBar(true);
+ // setSelectedUser(data);
+ }
+ } catch (error) {
+ console.error("Error checking impersonation status:", error);
+ }
+ };
+
+ checkImpersonation();
+ fetchUsers();
+ }, []);
+
+ return (
+
+ <>
+
+
+ setShowBar(!showBar)}
+ >
+
+
+
+ {isImpersonating ? "Impersonation Controls" : "User Impersonation"}
+
+
+
+
+
+
+ {!isImpersonating ? (
+
+
+
+
+ {selectedUser ? (
+
+
+
+ {selectedUser.name || ""}
+
+
+ {selectedUser.email}
+
+
+
+ ) : (
+ <>
+ Select user to impersonate
+
+ )}
+
+
+
+
+ {
+ fetchUsers(search);
+ }}
+ className="h-9"
+ />
+ {isLoading ? (
+
+ Loading users...
+
+ ) : (
+ <>
+ No users found.
+
+
+ {users.map((user) => (
+ {
+ setSelectedUser(user);
+ setOpen(false);
+ }}
+ >
+
+
+
+ {user.name || ""}
+
+
+ {user.email} • {user.role}
+
+
+
+
+ ))}
+
+
+
+ )}
+
+
+
+
+
+
+ ) : (
+
+
+
+
+ {data?.user?.name?.slice(0, 2).toUpperCase() || "U"}
+
+
+
+
+
+
+
+ {data?.user?.name || ""}
+
+
+
+
+
+
+
+ ID: {data?.user?.id?.slice(0, 8)}
+ {
+ if (data?.id) {
+ copy(data.id);
+ toast.success("ID copied to clipboard");
+ }
+ }}
+ >
+
+
+
+
+
+ Org: {data?.organizationId?.slice(0, 8)}
+ {
+ if (data?.organizationId) {
+ copy(data.organizationId);
+ toast.success(
+ "Organization ID copied to clipboard",
+ );
+ }
+ }}
+ >
+
+
+
+ {data?.user?.stripeCustomerId && (
+
+
+ Customer:
+ {data?.user?.stripeCustomerId?.slice(0, 8)}
+ {
+ copy(data?.user?.stripeCustomerId || "");
+ toast.success(
+ "Stripe Customer ID copied to clipboard",
+ );
+ }}
+ >
+
+
+
+ )}
+ {data?.user?.stripeSubscriptionId && (
+
+
+ Sub: {data?.user?.stripeSubscriptionId?.slice(0, 8)}
+ {
+ copy(data.user.stripeSubscriptionId || "");
+ toast.success(
+ "Stripe Subscription ID copied to clipboard",
+ );
+ }}
+ >
+
+
+
+ )}
+ {data?.user?.serversQuantity !== undefined && (
+
+ Servers: {data.user.serversQuantity}
+
+ )}
+ {data?.createdAt && (
+
+
+ )}
+
+
+
+
+ 2FA{" "}
+ {data?.user?.twoFactorEnabled
+ ? "Enabled"
+ : "Disabled"}
+
+
+
+
+ Two-Factor Authentication Status
+
+
+
+
+
+
+
+
+ )}
+
+
+ );
+};
diff --git a/apps/dokploy/components/dashboard/project/add-application.tsx b/apps/dokploy/components/dashboard/project/add-application.tsx
index 16c56917d..6b0a690db 100644
--- a/apps/dokploy/components/dashboard/project/add-application.tsx
+++ b/apps/dokploy/components/dashboard/project/add-application.tsx
@@ -103,7 +103,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => {
projectId,
});
})
- .catch((_e) => {
+ .catch(() => {
toast.error("Error creating the service");
});
};
@@ -145,10 +145,8 @@ export const AddApplication = ({ projectId, projectName }: Props) => {
{...field}
onChange={(e) => {
const val = e.target.value?.trim() || "";
- form.setValue(
- "appName",
- `${slug}-${val.toLowerCase().replaceAll(" ", "-")}`,
- );
+ const serviceName = slugify(val);
+ form.setValue("appName", `${slug}-${serviceName}`);
field.onChange(val);
}}
/>
diff --git a/apps/dokploy/components/dashboard/project/add-compose.tsx b/apps/dokploy/components/dashboard/project/add-compose.tsx
index ea8690a83..5f2bb137f 100644
--- a/apps/dokploy/components/dashboard/project/add-compose.tsx
+++ b/apps/dokploy/components/dashboard/project/add-compose.tsx
@@ -152,10 +152,8 @@ export const AddCompose = ({ projectId, projectName }: Props) => {
{...field}
onChange={(e) => {
const val = e.target.value?.trim() || "";
- form.setValue(
- "appName",
- `${slug}-${val.toLowerCase()}`,
- );
+ const serviceName = slugify(val);
+ form.setValue("appName", `${slug}-${serviceName}`);
field.onChange(val);
}}
/>
diff --git a/apps/dokploy/components/dashboard/project/add-database.tsx b/apps/dokploy/components/dashboard/project/add-database.tsx
index a58aef2c8..2420e603f 100644
--- a/apps/dokploy/components/dashboard/project/add-database.tsx
+++ b/apps/dokploy/components/dashboard/project/add-database.tsx
@@ -363,10 +363,8 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
{...field}
onChange={(e) => {
const val = e.target.value?.trim() || "";
- form.setValue(
- "appName",
- `${slug}-${val.toLowerCase()}`,
- );
+ const serviceName = slugify(val);
+ form.setValue("appName", `${slug}-${serviceName}`);
field.onChange(val);
}}
/>
diff --git a/apps/dokploy/components/dashboard/project/duplicate-project.tsx b/apps/dokploy/components/dashboard/project/duplicate-project.tsx
index 038ddcb6a..ffcfeba87 100644
--- a/apps/dokploy/components/dashboard/project/duplicate-project.tsx
+++ b/apps/dokploy/components/dashboard/project/duplicate-project.tsx
@@ -10,6 +10,7 @@ import {
} from "@/components/ui/dialog";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
+import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
import { api } from "@/utils/api";
import { Copy, Loader2 } from "lucide-react";
import { useRouter } from "next/router";
@@ -48,6 +49,7 @@ export const DuplicateProject = ({
const [open, setOpen] = useState(false);
const [name, setName] = useState("");
const [description, setDescription] = useState("");
+ const [duplicateType, setDuplicateType] = useState("new-project"); // "new-project" or "same-project"
const utils = api.useUtils();
const router = useRouter();
@@ -59,9 +61,15 @@ export const DuplicateProject = ({
api.project.duplicate.useMutation({
onSuccess: async (newProject) => {
await utils.project.all.invalidate();
- toast.success("Project duplicated successfully");
+ toast.success(
+ duplicateType === "new-project"
+ ? "Project duplicated successfully"
+ : "Services duplicated successfully",
+ );
setOpen(false);
- router.push(`/dashboard/project/${newProject.projectId}`);
+ if (duplicateType === "new-project") {
+ router.push(`/dashboard/project/${newProject.projectId}`);
+ }
},
onError: (error) => {
toast.error(error.message);
@@ -69,7 +77,7 @@ export const DuplicateProject = ({
});
const handleDuplicate = async () => {
- if (!name) {
+ if (duplicateType === "new-project" && !name) {
toast.error("Project name is required");
return;
}
@@ -83,6 +91,7 @@ export const DuplicateProject = ({
id: service.id,
type: service.type,
})),
+ duplicateInSameProject: duplicateType === "same-project",
});
};
@@ -95,6 +104,7 @@ export const DuplicateProject = ({
// Reset form when closing
setName("");
setDescription("");
+ setDuplicateType("new-project");
}
}}
>
@@ -106,32 +116,54 @@ export const DuplicateProject = ({
- Duplicate Project
+ Duplicate Services
- Create a new project with the selected services
+ Choose where to duplicate the selected services
-
Name
-
setName(e.target.value)}
- placeholder="New project name"
- />
+
Duplicate to
+
+
+ New project
+
+
+ Same project
+
+
-
- Description
-
+ {duplicateType === "new-project" && (
+ <>
+
+ Name
+
+
+
+ Description
+
+
+ )}
Selected services to duplicate
@@ -159,10 +191,14 @@ export const DuplicateProject = ({
{isLoading ? (
<>
- Duplicating...
+ {duplicateType === "new-project"
+ ? "Duplicating project..."
+ : "Duplicating services..."}
+ ) : duplicateType === "new-project" ? (
+ "Duplicate project"
) : (
- "Duplicate"
+ "Duplicate services"
)}
diff --git a/apps/dokploy/components/dashboard/projects/handle-project.tsx b/apps/dokploy/components/dashboard/projects/handle-project.tsx
index dcb812419..01d66fbaa 100644
--- a/apps/dokploy/components/dashboard/projects/handle-project.tsx
+++ b/apps/dokploy/components/dashboard/projects/handle-project.tsx
@@ -33,12 +33,23 @@ import { z } from "zod";
const AddProjectSchema = z.object({
name: z
.string()
- .min(1, {
- message: "Name is required",
- })
- .regex(/^[a-zA-Z]/, {
+ .min(1, "Project name is required")
+ .refine(
+ (name) => {
+ const trimmedName = name.trim();
+ const validNameRegex =
+ /^[\p{L}\p{N}_-][\p{L}\p{N}\s_.-]*[\p{L}\p{N}_-]$/u;
+ return validNameRegex.test(trimmedName);
+ },
+ {
+ message:
+ "Project name must start and end with a letter, number, hyphen or underscore. Spaces are allowed in between.",
+ },
+ )
+ .refine((name) => !/^\d/.test(name.trim()), {
message: "Project name cannot start with a number",
- }),
+ })
+ .transform((name) => name.trim()),
description: z.string().optional(),
});
diff --git a/apps/dokploy/components/dashboard/settings/ai-form.tsx b/apps/dokploy/components/dashboard/settings/ai-form.tsx
index 05ab93a4f..b1923918e 100644
--- a/apps/dokploy/components/dashboard/settings/ai-form.tsx
+++ b/apps/dokploy/components/dashboard/settings/ai-form.tsx
@@ -55,7 +55,7 @@ export const AiForm = () => {
key={config.aiId}
className="flex items-center justify-between bg-sidebar p-1 w-full rounded-lg"
>
-
+
{config.name}
diff --git a/apps/dokploy/components/dashboard/settings/certificates/show-certificates.tsx b/apps/dokploy/components/dashboard/settings/certificates/show-certificates.tsx
index 6aaa25630..b80c7b549 100644
--- a/apps/dokploy/components/dashboard/settings/certificates/show-certificates.tsx
+++ b/apps/dokploy/components/dashboard/settings/certificates/show-certificates.tsx
@@ -70,7 +70,7 @@ export const ShowCertificates = () => {
key={certificate.certificateId}
className="flex items-center justify-between bg-sidebar p-1 w-full rounded-lg"
>
-
+
diff --git a/apps/dokploy/components/dashboard/settings/certificates/utils.ts b/apps/dokploy/components/dashboard/settings/certificates/utils.ts
index 34d3ad77c..e2aa59ef3 100644
--- a/apps/dokploy/components/dashboard/settings/certificates/utils.ts
+++ b/apps/dokploy/components/dashboard/settings/certificates/utils.ts
@@ -1,68 +1,93 @@
+// @ts-nocheck
+
export const extractExpirationDate = (certData: string): Date | null => {
try {
- const match = certData.match(
- /-----BEGIN CERTIFICATE-----\s*([^-]+)\s*-----END CERTIFICATE-----/,
- );
- if (!match?.[1]) return null;
-
- const base64Cert = match[1].replace(/\s/g, "");
- const binaryStr = window.atob(base64Cert);
- const bytes = new Uint8Array(binaryStr.length);
-
- for (let i = 0; i < binaryStr.length; i++) {
- bytes[i] = binaryStr.charCodeAt(i);
+ // Decode PEM base64 to DER binary
+ const b64 = certData.replace(/-----[^-]+-----/g, "").replace(/\s+/g, "");
+ const binStr = atob(b64);
+ const der = new Uint8Array(binStr.length);
+ for (let i = 0; i < binStr.length; i++) {
+ der[i] = binStr.charCodeAt(i);
}
- let dateFound = 0;
- for (let i = 0; i < bytes.length - 2; i++) {
- if (bytes[i] === 0x17 || bytes[i] === 0x18) {
- const dateType = bytes[i];
- const dateLength = bytes[i + 1];
- if (typeof dateLength === "undefined") continue;
+ let offset = 0;
- if (dateFound === 0) {
- dateFound++;
- i += dateLength + 1;
- continue;
+ // Helper: read ASN.1 length field
+ function readLength(pos: number): { length: number; offset: number } {
+ // biome-ignore lint/style/noParameterAssign:
+ let len = der[pos++];
+ if (len & 0x80) {
+ const bytes = len & 0x7f;
+ len = 0;
+ for (let i = 0; i < bytes; i++) {
+ // biome-ignore lint/style/noParameterAssign:
+ len = (len << 8) + der[pos++];
}
+ }
+ return { length: len, offset: pos };
+ }
- let dateStr = "";
- for (let j = 0; j < dateLength; j++) {
- const charCode = bytes[i + 2 + j];
- if (typeof charCode === "undefined") continue;
- dateStr += String.fromCharCode(charCode);
- }
+ // Skip the outer certificate sequence
+ if (der[offset++] !== 0x30) throw new Error("Expected sequence");
+ ({ offset } = readLength(offset));
- if (dateType === 0x17) {
- // UTCTime (YYMMDDhhmmssZ)
- const year = Number.parseInt(dateStr.slice(0, 2));
- const fullYear = year >= 50 ? 1900 + year : 2000 + year;
- return new Date(
- Date.UTC(
- fullYear,
- Number.parseInt(dateStr.slice(2, 4)) - 1,
- Number.parseInt(dateStr.slice(4, 6)),
- Number.parseInt(dateStr.slice(6, 8)),
- Number.parseInt(dateStr.slice(8, 10)),
- Number.parseInt(dateStr.slice(10, 12)),
- ),
- );
- }
+ // Skip tbsCertificate sequence
+ if (der[offset++] !== 0x30) throw new Error("Expected tbsCertificate");
+ ({ offset } = readLength(offset));
- // GeneralizedTime (YYYYMMDDhhmmssZ)
+ // Check for optional version field (context-specific tag [0])
+ if (der[offset] === 0xa0) {
+ offset++;
+ const versionLen = readLength(offset);
+ offset = versionLen.offset + versionLen.length;
+ }
+
+ // Skip serialNumber, signature, issuer
+ for (let i = 0; i < 3; i++) {
+ if (der[offset] !== 0x30 && der[offset] !== 0x02)
+ throw new Error("Unexpected structure");
+ offset++;
+ const fieldLen = readLength(offset);
+ offset = fieldLen.offset + fieldLen.length;
+ }
+
+ // Validity sequence (notBefore and notAfter)
+ if (der[offset++] !== 0x30) throw new Error("Expected validity sequence");
+ const validityLen = readLength(offset);
+ offset = validityLen.offset;
+
+ // notBefore
+ offset++;
+ const notBeforeLen = readLength(offset);
+ offset = notBeforeLen.offset + notBeforeLen.length;
+
+ // notAfter
+ offset++;
+ const notAfterLen = readLength(offset);
+ const notAfterStr = new TextDecoder().decode(
+ der.slice(notAfterLen.offset, notAfterLen.offset + notAfterLen.length),
+ );
+
+ // Parse GeneralizedTime (15 chars) or UTCTime (13 chars)
+ function parseTime(str: string): Date {
+ if (str.length === 13) {
+ // UTCTime YYMMDDhhmmssZ
+ const year = Number.parseInt(str.slice(0, 2), 10);
+ const fullYear = year < 50 ? 2000 + year : 1900 + year;
return new Date(
- Date.UTC(
- Number.parseInt(dateStr.slice(0, 4)),
- Number.parseInt(dateStr.slice(4, 6)) - 1,
- Number.parseInt(dateStr.slice(6, 8)),
- Number.parseInt(dateStr.slice(8, 10)),
- Number.parseInt(dateStr.slice(10, 12)),
- Number.parseInt(dateStr.slice(12, 14)),
- ),
+ `${fullYear}-${str.slice(2, 4)}-${str.slice(4, 6)}T${str.slice(6, 8)}:${str.slice(8, 10)}:${str.slice(10, 12)}Z`,
);
}
+ if (str.length === 15) {
+ // GeneralizedTime YYYYMMDDhhmmssZ
+ return new Date(
+ `${str.slice(0, 4)}-${str.slice(4, 6)}-${str.slice(6, 8)}T${str.slice(8, 10)}:${str.slice(10, 12)}:${str.slice(12, 14)}Z`,
+ );
+ }
+ throw new Error("Invalid ASN.1 time format");
}
- return null;
+
+ return parseTime(notAfterStr);
} catch (error) {
console.error("Error parsing certificate:", error);
return null;
diff --git a/apps/dokploy/components/dashboard/settings/cluster/nodes/show-nodes-modal.tsx b/apps/dokploy/components/dashboard/settings/cluster/nodes/show-nodes-modal.tsx
index 82e6e1f9a..5f0b32fc3 100644
--- a/apps/dokploy/components/dashboard/settings/cluster/nodes/show-nodes-modal.tsx
+++ b/apps/dokploy/components/dashboard/settings/cluster/nodes/show-nodes-modal.tsx
@@ -20,7 +20,7 @@ export const ShowNodesModal = ({ serverId }: Props) => {
Show Swarm Nodes
-
+
diff --git a/apps/dokploy/components/dashboard/settings/cluster/nodes/show-nodes.tsx b/apps/dokploy/components/dashboard/settings/cluster/nodes/show-nodes.tsx
index 4354a8bca..51f874d8d 100644
--- a/apps/dokploy/components/dashboard/settings/cluster/nodes/show-nodes.tsx
+++ b/apps/dokploy/components/dashboard/settings/cluster/nodes/show-nodes.tsx
@@ -87,7 +87,7 @@ export const ShowNodes = ({ serverId }: Props) => {
- Hostname
+ Hostname
Status
Role
Availability
@@ -104,7 +104,7 @@ export const ShowNodes = ({ serverId }: Props) => {
const isManager = node.Spec.Role === "manager";
return (
-
+
{node.Description.Hostname}
diff --git a/apps/dokploy/components/dashboard/settings/cluster/registry/show-registry.tsx b/apps/dokploy/components/dashboard/settings/cluster/registry/show-registry.tsx
index 08cb03813..9ae595d6f 100644
--- a/apps/dokploy/components/dashboard/settings/cluster/registry/show-registry.tsx
+++ b/apps/dokploy/components/dashboard/settings/cluster/registry/show-registry.tsx
@@ -54,7 +54,7 @@ export const ShowRegistry = () => {
key={registry.registryId}
className="flex items-center justify-between bg-sidebar p-1 w-full rounded-lg"
>
-
+
diff --git a/apps/dokploy/components/dashboard/settings/destination/show-destinations.tsx b/apps/dokploy/components/dashboard/settings/destination/show-destinations.tsx
index 0639b0f75..014596ce3 100644
--- a/apps/dokploy/components/dashboard/settings/destination/show-destinations.tsx
+++ b/apps/dokploy/components/dashboard/settings/destination/show-destinations.tsx
@@ -55,7 +55,7 @@ export const ShowDestinations = () => {
key={destination.destinationId}
className="flex items-center justify-between bg-sidebar p-1 w-full rounded-lg"
>
-
+
{index + 1}. {destination.name}
diff --git a/apps/dokploy/components/dashboard/settings/git/github/add-github-provider.tsx b/apps/dokploy/components/dashboard/settings/git/github/add-github-provider.tsx
index 90cefe592..af7d58544 100644
--- a/apps/dokploy/components/dashboard/settings/git/github/add-github-provider.tsx
+++ b/apps/dokploy/components/dashboard/settings/git/github/add-github-provider.tsx
@@ -18,6 +18,7 @@ import { useEffect, useState } from "react";
export const AddGithubProvider = () => {
const [isOpen, setIsOpen] = useState(false);
const { data: activeOrganization } = authClient.useActiveOrganization();
+ const { data: session } = authClient.useSession();
const { data } = api.user.get.useQuery();
const [manifest, setManifest] = useState("");
const [isOrganization, setIsOrganization] = useState(false);
@@ -27,7 +28,7 @@ export const AddGithubProvider = () => {
const url = document.location.origin;
const manifest = JSON.stringify(
{
- redirect_url: `${origin}/api/providers/github/setup?organizationId=${activeOrganization?.id}`,
+ redirect_url: `${origin}/api/providers/github/setup?organizationId=${activeOrganization?.id}&userId=${session?.user?.id}`,
name: `Dokploy-${format(new Date(), "yyyy-MM-dd")}`,
url: origin,
hook_attributes: {
diff --git a/apps/dokploy/components/dashboard/settings/git/gitlab/add-gitlab-provider.tsx b/apps/dokploy/components/dashboard/settings/git/gitlab/add-gitlab-provider.tsx
index 4dd7da93c..023e46ed2 100644
--- a/apps/dokploy/components/dashboard/settings/git/gitlab/add-gitlab-provider.tsx
+++ b/apps/dokploy/components/dashboard/settings/git/gitlab/add-gitlab-provider.tsx
@@ -248,7 +248,9 @@ export const AddGitlabProvider = () => {
name="groupName"
render={({ field }) => (
- Group Name (Optional)
+
+ Group Name (Optional, Comma-Separated List)
+
- Group Name (Optional)
+
+ Group Name (Optional, Comma-Separated List)
+
+
{notification.notificationType === "slack" && (
diff --git a/apps/dokploy/components/dashboard/settings/profile/disable-2fa.tsx b/apps/dokploy/components/dashboard/settings/profile/disable-2fa.tsx
index 458bf5632..11f164355 100644
--- a/apps/dokploy/components/dashboard/settings/profile/disable-2fa.tsx
+++ b/apps/dokploy/components/dashboard/settings/profile/disable-2fa.tsx
@@ -63,7 +63,7 @@ export const Disable2FA = () => {
toast.success("2FA disabled successfully");
utils.user.get.invalidate();
setIsOpen(false);
- } catch (_error) {
+ } catch {
form.setError("password", {
message: "Connection error. Please try again.",
});
diff --git a/apps/dokploy/components/dashboard/settings/profile/enable-2fa.tsx b/apps/dokploy/components/dashboard/settings/profile/enable-2fa.tsx
index 6cf2c6a53..afc859f41 100644
--- a/apps/dokploy/components/dashboard/settings/profile/enable-2fa.tsx
+++ b/apps/dokploy/components/dashboard/settings/profile/enable-2fa.tsx
@@ -36,6 +36,7 @@ const PasswordSchema = z.object({
password: z.string().min(8, {
message: "Password is required",
}),
+ issuer: z.string().optional(),
});
const PinSchema = z.object({
@@ -60,12 +61,86 @@ export const Enable2FA = () => {
const [isDialogOpen, setIsDialogOpen] = useState(false);
const [step, setStep] = useState<"password" | "verify">("password");
const [isPasswordLoading, setIsPasswordLoading] = useState(false);
+ const [otpValue, setOtpValue] = useState("");
+
+ const handleVerifySubmit = async (e: React.FormEvent) => {
+ e.preventDefault();
+ try {
+ const result = await authClient.twoFactor.verifyTotp({
+ code: otpValue,
+ });
+
+ if (result.error) {
+ if (result.error.code === "INVALID_TWO_FACTOR_AUTHENTICATION") {
+ toast.error("Invalid verification code");
+ return;
+ }
+
+ throw result.error;
+ }
+
+ if (!result.data) {
+ throw new Error("No response received from server");
+ }
+
+ toast.success("2FA configured successfully");
+ utils.user.get.invalidate();
+ setIsDialogOpen(false);
+ } catch (error) {
+ if (error instanceof Error) {
+ const errorMessage =
+ error.message === "Failed to fetch"
+ ? "Connection error. Please check your internet connection."
+ : error.message;
+
+ toast.error(errorMessage);
+ } else {
+ toast.error("Error verifying 2FA code", {
+ description: error instanceof Error ? error.message : "Unknown error",
+ });
+ }
+ }
+ };
+
+ const passwordForm = useForm
({
+ resolver: zodResolver(PasswordSchema),
+ defaultValues: {
+ password: "",
+ },
+ });
+
+ const pinForm = useForm({
+ resolver: zodResolver(PinSchema),
+ defaultValues: {
+ pin: "",
+ },
+ });
+
+ useEffect(() => {
+ if (!isDialogOpen) {
+ setStep("password");
+ setData(null);
+ setBackupCodes([]);
+ setOtpValue("");
+ passwordForm.reset({
+ password: "",
+ issuer: "",
+ });
+ }
+ }, [isDialogOpen, passwordForm]);
+
+ useEffect(() => {
+ if (step === "verify") {
+ setOtpValue("");
+ }
+ }, [step]);
const handlePasswordSubmit = async (formData: PasswordForm) => {
setIsPasswordLoading(true);
try {
const { data: enableData, error } = await authClient.twoFactor.enable({
password: formData.password,
+ issuer: formData.issuer,
});
if (!enableData) {
@@ -103,75 +178,6 @@ export const Enable2FA = () => {
}
};
- const handleVerifySubmit = async (formData: PinForm) => {
- try {
- const result = await authClient.twoFactor.verifyTotp({
- code: formData.pin,
- });
-
- if (result.error) {
- if (result.error.code === "INVALID_TWO_FACTOR_AUTHENTICATION") {
- pinForm.setError("pin", {
- message: "Invalid code. Please try again.",
- });
- toast.error("Invalid verification code");
- return;
- }
-
- throw result.error;
- }
-
- if (!result.data) {
- throw new Error("No response received from server");
- }
-
- toast.success("2FA configured successfully");
- utils.user.get.invalidate();
- setIsDialogOpen(false);
- } catch (error) {
- if (error instanceof Error) {
- const errorMessage =
- error.message === "Failed to fetch"
- ? "Connection error. Please check your internet connection."
- : error.message;
-
- pinForm.setError("pin", {
- message: errorMessage,
- });
- toast.error(errorMessage);
- } else {
- pinForm.setError("pin", {
- message: "Error verifying code",
- });
- toast.error("Error verifying 2FA code");
- }
- }
- };
-
- const passwordForm = useForm({
- resolver: zodResolver(PasswordSchema),
- defaultValues: {
- password: "",
- },
- });
-
- const pinForm = useForm({
- resolver: zodResolver(PinSchema),
- defaultValues: {
- pin: "",
- },
- });
-
- useEffect(() => {
- if (!isDialogOpen) {
- setStep("password");
- setData(null);
- setBackupCodes([]);
- passwordForm.reset();
- pinForm.reset();
- }
- }, [isDialogOpen, passwordForm, pinForm]);
-
return (
@@ -217,6 +223,27 @@ export const Enable2FA = () => {
)}
/>
+ (
+
+ Issuer
+
+
+
+ Use a custom issuer to identify the service you're
+ authenticating with.
+
+
+ )}
+ />
{
) : (
{t("settings.common.save")}
diff --git a/apps/dokploy/components/dashboard/settings/servers/actions/show-dokploy-actions.tsx b/apps/dokploy/components/dashboard/settings/servers/actions/show-dokploy-actions.tsx
index f57dad3cd..6850e8645 100644
--- a/apps/dokploy/components/dashboard/settings/servers/actions/show-dokploy-actions.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/actions/show-dokploy-actions.tsx
@@ -22,6 +22,9 @@ export const ShowDokployActions = () => {
const { mutateAsync: reloadServer, isLoading } =
api.settings.reloadServer.useMutation();
+ const { mutateAsync: cleanRedis } = api.settings.cleanRedis.useMutation();
+ const { mutateAsync: reloadRedis } = api.settings.reloadRedis.useMutation();
+
return (
@@ -69,6 +72,36 @@ export const ShowDokployActions = () => {
{t("settings.server.webServer.updateServerIp")}
+
+ {
+ await cleanRedis()
+ .then(async () => {
+ toast.success("Redis cleaned");
+ })
+ .catch(() => {
+ toast.error("Error cleaning Redis");
+ });
+ }}
+ >
+ Clean Redis
+
+
+ {
+ await reloadRedis()
+ .then(async () => {
+ toast.success("Redis reloaded");
+ })
+ .catch(() => {
+ toast.error("Error reloading Redis");
+ });
+ }}
+ >
+ Reload Redis
+
diff --git a/apps/dokploy/components/dashboard/settings/servers/actions/toggle-docker-cleanup.tsx b/apps/dokploy/components/dashboard/settings/servers/actions/toggle-docker-cleanup.tsx
index 12e279423..604ab6ce0 100644
--- a/apps/dokploy/components/dashboard/settings/servers/actions/toggle-docker-cleanup.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/actions/toggle-docker-cleanup.tsx
@@ -36,7 +36,7 @@ export const ToggleDockerCleanup = ({ serverId }: Props) => {
await refetch();
}
toast.success("Docker Cleanup updated");
- } catch (_error) {
+ } catch {
toast.error("Docker Cleanup Error");
}
};
diff --git a/apps/dokploy/components/dashboard/settings/servers/gpu-support.tsx b/apps/dokploy/components/dashboard/settings/servers/gpu-support.tsx
index c24440a61..fdd57f5b0 100644
--- a/apps/dokploy/components/dashboard/settings/servers/gpu-support.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/gpu-support.tsx
@@ -56,7 +56,7 @@ export function GPUSupport({ serverId }: GPUSupportProps) {
try {
await utils.settings.checkGPUStatus.invalidate({ serverId });
await refetch();
- } catch (_error) {
+ } catch {
toast.error("Failed to refresh GPU status");
} finally {
setIsRefreshing(false);
@@ -74,7 +74,7 @@ export function GPUSupport({ serverId }: GPUSupportProps) {
try {
await setupGPU.mutateAsync({ serverId });
- } catch (_error) {
+ } catch {
// Error handling is done in mutation's onError
}
};
diff --git a/apps/dokploy/components/dashboard/settings/servers/handle-servers.tsx b/apps/dokploy/components/dashboard/settings/servers/handle-servers.tsx
index 979941458..a2c9b50a6 100644
--- a/apps/dokploy/components/dashboard/settings/servers/handle-servers.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/handle-servers.tsx
@@ -156,6 +156,67 @@ export const HandleServers = ({ serverId }: Props) => {
remotely.
+
+
+ You will need to purchase or rent a Virtual Private Server (VPS) to
+ proceed, we recommend to use one of these providers since has been
+ heavily tested.
+
+
+
+ You are free to use whatever provider, but we recommend to use one
+ of the above, to avoid issues.
+
+
You cannot create more servers,{" "}
diff --git a/apps/dokploy/components/dashboard/settings/servers/show-schedules-modal.tsx b/apps/dokploy/components/dashboard/settings/servers/show-schedules-modal.tsx
new file mode 100644
index 000000000..6f6a1a6d0
--- /dev/null
+++ b/apps/dokploy/components/dashboard/settings/servers/show-schedules-modal.tsx
@@ -0,0 +1,28 @@
+import { ShowSchedules } from "@/components/dashboard/application/schedules/show-schedules";
+import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog";
+import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
+import { useState } from "react";
+
+interface Props {
+ serverId: string;
+}
+
+export const ShowSchedulesModal = ({ serverId }: Props) => {
+ const [isOpen, setIsOpen] = useState(false);
+
+ return (
+
+
+ e.preventDefault()}
+ >
+ Show Schedules
+
+
+
+
+
+ );
+};
diff --git a/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx b/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx
index 4771edd95..d6465cf09 100644
--- a/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx
@@ -40,6 +40,7 @@ import { HandleServers } from "./handle-servers";
import { SetupServer } from "./setup-server";
import { ShowDockerContainersModal } from "./show-docker-containers-modal";
import { ShowMonitoringModal } from "./show-monitoring-modal";
+import { ShowSchedulesModal } from "./show-schedules-modal";
import { ShowSwarmOverviewModal } from "./show-swarm-overview-modal";
import { ShowTraefikFileSystemModal } from "./show-traefik-file-system-modal";
import { WelcomeSuscription } from "./welcome-stripe/welcome-suscription";
@@ -140,7 +141,7 @@ export const ShowServers = () => {
- Name
+ Name
{isCloud && (
Status
@@ -172,7 +173,7 @@ export const ShowServers = () => {
const isActive = server.serverStatus === "active";
return (
-
+
{server.name}
{isCloud && (
@@ -332,6 +333,10 @@ export const ShowServers = () => {
+
+ American Cloud - Get $20 Credits
+
+
{
key={sshKey.sshKeyId}
className="flex items-center justify-between bg-sidebar p-1 w-full rounded-lg"
>
-
+
diff --git a/apps/dokploy/components/dashboard/settings/users/add-invitation.tsx b/apps/dokploy/components/dashboard/settings/users/add-invitation.tsx
index d05409fb7..24e8f34e6 100644
--- a/apps/dokploy/components/dashboard/settings/users/add-invitation.tsx
+++ b/apps/dokploy/components/dashboard/settings/users/add-invitation.tsx
@@ -41,6 +41,7 @@ const addInvitation = z.object({
.min(1, "Email is required")
.email({ message: "Invalid email" }),
role: z.enum(["member", "admin"]),
+ notificationId: z.string().optional(),
});
type AddInvitation = z.infer;
@@ -49,6 +50,10 @@ export const AddInvitation = () => {
const [open, setOpen] = useState(false);
const utils = api.useUtils();
const [isLoading, setIsLoading] = useState(false);
+ const { data: isCloud } = api.settings.isCloud.useQuery();
+ const { data: emailProviders } =
+ api.notification.getEmailProviders.useQuery();
+ const { mutateAsync: sendInvitation } = api.user.sendInvitation.useMutation();
const [error, setError] = useState(null);
const { data: activeOrganization } = authClient.useActiveOrganization();
@@ -56,6 +61,7 @@ export const AddInvitation = () => {
defaultValues: {
email: "",
role: "member",
+ notificationId: "",
},
resolver: zodResolver(addInvitation),
});
@@ -74,7 +80,20 @@ export const AddInvitation = () => {
if (result.error) {
setError(result.error.message || "");
} else {
- toast.success("Invitation created");
+ if (!isCloud && data.notificationId) {
+ await sendInvitation({
+ invitationId: result.data.id,
+ notificationId: data.notificationId || "",
+ })
+ .then(() => {
+ toast.success("Invitation created and email sent");
+ })
+ .catch((error: any) => {
+ toast.error(error.message);
+ });
+ } else {
+ toast.success("Invitation created");
+ }
setError(null);
setOpen(false);
}
@@ -149,6 +168,47 @@ export const AddInvitation = () => {
);
}}
/>
+
+ {!isCloud && (
+ {
+ return (
+
+ Email Provider
+
+
+
+
+
+
+ {emailProviders?.map((provider) => (
+
+ {provider.name}
+
+ ))}
+
+ None
+
+
+
+
+ Select the email provider to send the invitation
+
+
+ );
+ }}
+ />
+ )}
{
const { data, isLoading, refetch } =
api.organization.allInvitations.useQuery();
+ const { mutateAsync: removeInvitation } =
+ api.organization.removeInvitation.useMutation();
+
return (
@@ -143,7 +146,7 @@ export const ShowInvitations = () => {
{invitation.status === "pending" && (
{
+ onSelect={() => {
copy(
`${origin}/invitation?token=${invitation.id}`,
);
@@ -159,7 +162,7 @@ export const ShowInvitations = () => {
{invitation.status === "pending" && (
{
+ onSelect={async () => {
const result =
await authClient.organization.cancelInvitation(
{
@@ -184,6 +187,19 @@ export const ShowInvitations = () => {
)}
)}
+ {
+ await removeInvitation({
+ invitationId: invitation.id,
+ }).then(() => {
+ refetch();
+ toast.success("Invitation removed");
+ });
+ }}
+ >
+ Remove Invitation
+
diff --git a/apps/dokploy/components/dashboard/settings/web-server/manage-traefik-ports.tsx b/apps/dokploy/components/dashboard/settings/web-server/manage-traefik-ports.tsx
index dd9839e3d..a5cfb6308 100644
--- a/apps/dokploy/components/dashboard/settings/web-server/manage-traefik-ports.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/manage-traefik-ports.tsx
@@ -91,7 +91,7 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
});
toast.success(t("settings.server.webServer.traefik.portsUpdated"));
setOpen(false);
- } catch (_error) {}
+ } catch {}
};
return (
diff --git a/apps/dokploy/components/dashboard/swarm/applications/show-applications.tsx b/apps/dokploy/components/dashboard/swarm/applications/show-applications.tsx
index 681afd755..7e0f25fed 100644
--- a/apps/dokploy/components/dashboard/swarm/applications/show-applications.tsx
+++ b/apps/dokploy/components/dashboard/swarm/applications/show-applications.tsx
@@ -87,7 +87,7 @@ export const ShowNodeApplications = ({ serverId }: Props) => {
Services
-
+
Node Applications
diff --git a/apps/dokploy/components/layouts/dashboard-layout.tsx b/apps/dokploy/components/layouts/dashboard-layout.tsx
index 00697e7c4..b4832b4b3 100644
--- a/apps/dokploy/components/layouts/dashboard-layout.tsx
+++ b/apps/dokploy/components/layouts/dashboard-layout.tsx
@@ -1,9 +1,25 @@
+import { api } from "@/utils/api";
+import { ImpersonationBar } from "../dashboard/impersonation/impersonation-bar";
+import { ChatwootWidget } from "../shared/ChatwootWidget";
import Page from "./side";
+
interface Props {
children: React.ReactNode;
metaName?: string;
}
export const DashboardLayout = ({ children }: Props) => {
- return {children} ;
+ const { data: haveRootAccess } = api.user.haveRootAccess.useQuery();
+ const { data: isCloud } = api.settings.isCloud.useQuery();
+
+ return (
+ <>
+ {children}
+ {isCloud === true && (
+ {children} ;
-};
diff --git a/apps/dokploy/components/layouts/side.tsx b/apps/dokploy/components/layouts/side.tsx
index 15d8728bc..8d180967e 100644
--- a/apps/dokploy/components/layouts/side.tsx
+++ b/apps/dokploy/components/layouts/side.tsx
@@ -10,6 +10,7 @@ import {
ChevronRight,
ChevronsUpDown,
CircleHelp,
+ Clock,
CreditCard,
Database,
Folder,
@@ -158,6 +159,14 @@ const MENU: Menu = {
// Only enabled in non-cloud environments
isEnabled: ({ isCloud }) => !isCloud,
},
+ {
+ isSingle: true,
+ title: "Schedules",
+ url: "/dashboard/schedules",
+ icon: Clock,
+ // Only enabled in non-cloud environments
+ isEnabled: ({ isCloud, auth }) => !isCloud && auth?.role === "owner",
+ },
{
isSingle: true,
title: "Traefik File System",
diff --git a/apps/dokploy/components/layouts/user-nav.tsx b/apps/dokploy/components/layouts/user-nav.tsx
index 0aca5b00d..05c601f6e 100644
--- a/apps/dokploy/components/layouts/user-nav.tsx
+++ b/apps/dokploy/components/layouts/user-nav.tsx
@@ -133,17 +133,6 @@ export const UserNav = () => {
Servers
)}
-
- {data?.role === "owner" && (
- {
- router.push("/dashboard/settings");
- }}
- >
- Settings
-
- )}
)}
diff --git a/apps/dokploy/components/shared/ChatwootWidget.tsx b/apps/dokploy/components/shared/ChatwootWidget.tsx
new file mode 100644
index 000000000..6694b13cc
--- /dev/null
+++ b/apps/dokploy/components/shared/ChatwootWidget.tsx
@@ -0,0 +1,69 @@
+import Script from "next/script";
+import { useEffect } from "react";
+
+interface ChatwootWidgetProps {
+ websiteToken: string;
+ baseUrl?: string;
+ settings?: {
+ position?: "left" | "right";
+ type?: "standard" | "expanded_bubble";
+ launcherTitle?: string;
+ darkMode?: boolean;
+ hideMessageBubble?: boolean;
+ placement?: "right" | "left";
+ showPopoutButton?: boolean;
+ widgetStyle?: "standard" | "bubble";
+ };
+ user?: {
+ identifier: string;
+ name?: string;
+ email?: string;
+ phoneNumber?: string;
+ avatarUrl?: string;
+ customAttributes?: Record;
+ identifierHash?: string;
+ };
+}
+
+export const ChatwootWidget = ({
+ websiteToken,
+ baseUrl = "https://app.chatwoot.com",
+ settings = {
+ position: "right",
+ type: "standard",
+ launcherTitle: "Chat with us",
+ },
+ user,
+}: ChatwootWidgetProps) => {
+ useEffect(() => {
+ // Configurar los settings de Chatwoot
+ window.chatwootSettings = {
+ position: "right",
+ };
+
+ (window as any).chatwootSDKReady = () => {
+ window.chatwootSDK?.run({ websiteToken, baseUrl });
+
+ const trySetUser = () => {
+ if (window.$chatwoot && user) {
+ window.$chatwoot.setUser(user.identifier, {
+ email: user.email,
+ name: user.name,
+ avatar_url: user.avatarUrl,
+ phone_number: user.phoneNumber,
+ });
+ }
+ };
+
+ trySetUser();
+ };
+ }, [websiteToken, baseUrl, user, settings]);
+
+ return (
+ 
-
-
- 
-
-
- 
-
-
- 
-
+ 
+
+
+ 
+
+
+
-
-
## Contributing
Check out the [Contributing Guide](CONTRIBUTING.md) for more information.
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..47633ab95
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,28 @@
+# Dokploy Security Policy
+
+At Dokploy, security is a top priority. We appreciate the help of security researchers and the community in identifying and reporting vulnerabilities.
+
+## How to Report a Vulnerability
+
+If you have discovered a security vulnerability in Dokploy, we ask that you report it responsibly by following these guidelines:
+
+1. **Contact us:** Send an email to [contact@dokploy.com](mailto:contact@dokploy.com).
+2. **Provide clear details:** Include as much information as possible to help us understand and reproduce the vulnerability. This should include:
+ * A clear description of the vulnerability.
+ * Steps to reproduce the vulnerability.
+ * Any sample code, screenshots, or videos that might be helpful.
+ * The potential impact of the vulnerability.
+3. **Do not make the vulnerability public:** Please refrain from publicly disclosing the vulnerability until we have had the opportunity to investigate and address it. This is crucial for protecting our users.
+4. **Allow us time:** We will endeavor to acknowledge receipt of your report as soon as possible and keep you informed of our progress. The time to resolve the vulnerability may vary depending on its complexity and severity.
+
+## What We Expect From You
+
+* Do not access user data or systems beyond what is necessary to demonstrate the vulnerability.
+* Do not perform denial-of-service (DoS) attacks, spamming, or social engineering.
+* Do not modify or destroy data that does not belong to you.
+
+## Our Commitment
+
+We are committed to working with you quickly and responsibly to address any legitimate security vulnerability.
+
+Thank you for helping us keep Dokploy secure for everyone.
diff --git a/apps/api/package.json b/apps/api/package.json
index 56ea56952..65f9d4ad9 100644
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -9,25 +9,25 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
- "pino": "9.4.0",
- "pino-pretty": "11.2.2",
- "@hono/zod-validator": "0.3.0",
- "zod": "^3.23.4",
- "react": "18.2.0",
- "react-dom": "18.2.0",
"@dokploy/server": "workspace:*",
"@hono/node-server": "^1.12.1",
- "hono": "^4.5.8",
+ "@hono/zod-validator": "0.3.0",
+ "@nerimity/mimiqueue": "1.2.3",
"dotenv": "^16.3.1",
+ "hono": "^4.5.8",
+ "pino": "9.4.0",
+ "pino-pretty": "11.2.2",
+ "react": "18.2.0",
+ "react-dom": "18.2.0",
"redis": "4.7.0",
- "@nerimity/mimiqueue": "1.2.3"
+ "zod": "^3.23.4"
},
"devDependencies": {
- "typescript": "^5.4.2",
+ "@types/node": "^20.11.17",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
- "@types/node": "^20.11.17",
- "tsx": "^4.7.1"
+ "tsx": "^4.7.1",
+ "typescript": "^5.4.2"
},
"packageManager": "pnpm@9.5.0"
}
diff --git a/apps/dokploy/.nvmrc b/apps/dokploy/.nvmrc
index 43bff1f8c..593cb75bc 100644
--- a/apps/dokploy/.nvmrc
+++ b/apps/dokploy/.nvmrc
@@ -1 +1 @@
-20.9.0
\ No newline at end of file
+20.16.0
\ No newline at end of file
diff --git a/apps/dokploy/Dockerfile b/apps/dokploy/Dockerfile
deleted file mode 100644
index f4188c54e..000000000
--- a/apps/dokploy/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM node:18-slim AS base
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
-
-FROM base AS build
-COPY . /usr/src/app
-WORKDIR /usr/src/app
-
-
-RUN apt-get update && apt-get install -y python3 make g++ git && rm -rf /var/lib/apt/lists/*
-
-# Install dependencies
-RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
-
-# Build only the dokploy app
-RUN pnpm run dokploy:build
-
-# Deploy only the dokploy app
-RUN pnpm deploy --filter=dokploy --prod /prod/dokploy
-
-FROM base AS dokploy
-COPY --from=build /prod/dokploy /prod/dokploy
-WORKDIR /prod/dokploy
-EXPOSE 3000
-CMD [ "pnpm", "start" ]
\ No newline at end of file
diff --git a/apps/dokploy/LICENSE.MD b/apps/dokploy/LICENSE.MD
deleted file mode 100644
index 8a508efb4..000000000
--- a/apps/dokploy/LICENSE.MD
+++ /dev/null
@@ -1,26 +0,0 @@
-# License
-
-## Core License (Apache License 2.0)
-
-Copyright 2024 Mauricio Siu.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and limitations under the License.
-
-## Additional Terms for Specific Features
-
-The following additional terms apply to the multi-node support, Docker Compose file, Preview Deployments and Multi Server features of Dokploy. In the event of a conflict, these provisions shall take precedence over those in the Apache License:
-
-- **Self-Hosted Version Free**: All features of Dokploy, including multi-node support, Docker Compose file support, Preview Deployments and Multi Server, will always be free to use in the self-hosted version.
-- **Restriction on Resale**: The multi-node support, Docker Compose file support, Preview Deployments and Multi Server features cannot be sold or offered as a service by any party other than the copyright holder without prior written consent.
-- **Modification Distribution**: Any modifications to the multi-node support, Docker Compose file support, Preview Deployments and Multi Server features must be distributed freely and cannot be sold or offered as a service.
-
-For further inquiries or permissions, please contact us directly.
diff --git a/apps/dokploy/__test__/compose/domain/labels.test.ts b/apps/dokploy/__test__/compose/domain/labels.test.ts
index c5f45810f..172bff2af 100644
--- a/apps/dokploy/__test__/compose/domain/labels.test.ts
+++ b/apps/dokploy/__test__/compose/domain/labels.test.ts
@@ -19,6 +19,8 @@ describe("createDomainLabels", () => {
path: "/",
createdAt: "",
previewDeploymentId: "",
+ internalPath: "/",
+ stripPath: false,
};
it("should create basic labels for web entrypoint", async () => {
diff --git a/apps/dokploy/__test__/drop/drop.test.test.ts b/apps/dokploy/__test__/drop/drop.test.test.ts
index 7dc9e560c..9fa68b6bb 100644
--- a/apps/dokploy/__test__/drop/drop.test.test.ts
+++ b/apps/dokploy/__test__/drop/drop.test.test.ts
@@ -34,7 +34,9 @@ const baseApp: ApplicationNested = {
giteaRepository: "",
cleanCache: false,
watchPaths: [],
+ enableSubmodules: false,
applicationStatus: "done",
+ triggerType: "push",
appName: "",
autoDeploy: true,
serverId: "",
@@ -103,6 +105,7 @@ const baseApp: ApplicationNested = {
ports: [],
projectId: "",
publishDirectory: null,
+ isStaticSpa: null,
redirects: [],
refreshToken: "",
registry: null,
@@ -118,6 +121,7 @@ const baseApp: ApplicationNested = {
updateConfigSwarm: null,
username: null,
dockerContextPath: null,
+ rollbackActive: false,
};
describe("unzipDrop using real zip files", () => {
@@ -147,67 +151,68 @@ describe("unzipDrop using real zip files", () => {
} finally {
}
});
-
- it("should correctly extract a zip with a single root folder and a subfolder", async () => {
- baseApp.appName = "folderwithfile";
- // const appName = "folderwithfile";
- const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
- const zip = new AdmZip("./__test__/drop/zips/folder-with-file.zip");
-
- const zipBuffer = zip.toBuffer();
- const file = new File([zipBuffer], "single.zip");
- await unzipDrop(file, baseApp);
-
- const files = await fs.readdir(outputPath, { withFileTypes: true });
- expect(files.some((f) => f.name === "folder1.txt")).toBe(true);
- });
-
- it("should correctly extract a zip with multiple root folders", async () => {
- baseApp.appName = "two-folders";
- // const appName = "two-folders";
- const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
- const zip = new AdmZip("./__test__/drop/zips/two-folders.zip");
-
- const zipBuffer = zip.toBuffer();
- const file = new File([zipBuffer], "single.zip");
- await unzipDrop(file, baseApp);
-
- const files = await fs.readdir(outputPath, { withFileTypes: true });
-
- expect(files.some((f) => f.name === "folder1")).toBe(true);
- expect(files.some((f) => f.name === "folder2")).toBe(true);
- });
-
- it("should correctly extract a zip with a single root with a file", async () => {
- baseApp.appName = "nested";
- // const appName = "nested";
- const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
- const zip = new AdmZip("./__test__/drop/zips/nested.zip");
-
- const zipBuffer = zip.toBuffer();
- const file = new File([zipBuffer], "single.zip");
- await unzipDrop(file, baseApp);
-
- const files = await fs.readdir(outputPath, { withFileTypes: true });
-
- expect(files.some((f) => f.name === "folder1")).toBe(true);
- expect(files.some((f) => f.name === "folder2")).toBe(true);
- expect(files.some((f) => f.name === "folder3")).toBe(true);
- });
-
- it("should correctly extract a zip with a single root with a folder", async () => {
- baseApp.appName = "folder-with-sibling-file";
- // const appName = "folder-with-sibling-file";
- const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
- const zip = new AdmZip("./__test__/drop/zips/folder-with-sibling-file.zip");
-
- const zipBuffer = zip.toBuffer();
- const file = new File([zipBuffer], "single.zip");
- await unzipDrop(file, baseApp);
-
- const files = await fs.readdir(outputPath, { withFileTypes: true });
-
- expect(files.some((f) => f.name === "folder1")).toBe(true);
- expect(files.some((f) => f.name === "test.txt")).toBe(true);
- });
});
+
+// it("should correctly extract a zip with a single root folder and a subfolder", async () => {
+// baseApp.appName = "folderwithfile";
+// // const appName = "folderwithfile";
+// const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
+// const zip = new AdmZip("./__test__/drop/zips/folder-with-file.zip");
+
+// const zipBuffer = zip.toBuffer();
+// const file = new File([zipBuffer], "single.zip");
+// await unzipDrop(file, baseApp);
+
+// const files = await fs.readdir(outputPath, { withFileTypes: true });
+// expect(files.some((f) => f.name === "folder1.txt")).toBe(true);
+// });
+
+// it("should correctly extract a zip with multiple root folders", async () => {
+// baseApp.appName = "two-folders";
+// // const appName = "two-folders";
+// const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
+// const zip = new AdmZip("./__test__/drop/zips/two-folders.zip");
+
+// const zipBuffer = zip.toBuffer();
+// const file = new File([zipBuffer], "single.zip");
+// await unzipDrop(file, baseApp);
+
+// const files = await fs.readdir(outputPath, { withFileTypes: true });
+
+// expect(files.some((f) => f.name === "folder1")).toBe(true);
+// expect(files.some((f) => f.name === "folder2")).toBe(true);
+// });
+
+// it("should correctly extract a zip with a single root with a file", async () => {
+// baseApp.appName = "nested";
+// // const appName = "nested";
+// const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
+// const zip = new AdmZip("./__test__/drop/zips/nested.zip");
+
+// const zipBuffer = zip.toBuffer();
+// const file = new File([zipBuffer], "single.zip");
+// await unzipDrop(file, baseApp);
+
+// const files = await fs.readdir(outputPath, { withFileTypes: true });
+
+// expect(files.some((f) => f.name === "folder1")).toBe(true);
+// expect(files.some((f) => f.name === "folder2")).toBe(true);
+// expect(files.some((f) => f.name === "folder3")).toBe(true);
+// });
+
+// it("should correctly extract a zip with a single root with a folder", async () => {
+// baseApp.appName = "folder-with-sibling-file";
+// // const appName = "folder-with-sibling-file";
+// const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
+// const zip = new AdmZip("./__test__/drop/zips/folder-with-sibling-file.zip");
+
+// const zipBuffer = zip.toBuffer();
+// const file = new File([zipBuffer], "single.zip");
+// await unzipDrop(file, baseApp);
+
+// const files = await fs.readdir(outputPath, { withFileTypes: true });
+
+// expect(files.some((f) => f.name === "folder1")).toBe(true);
+// expect(files.some((f) => f.name === "test.txt")).toBe(true);
+// });
+// });
diff --git a/apps/dokploy/__test__/templates/config.template.test.ts b/apps/dokploy/__test__/templates/config.template.test.ts
index d6e87cb7a..202abdf2d 100644
--- a/apps/dokploy/__test__/templates/config.template.test.ts
+++ b/apps/dokploy/__test__/templates/config.template.test.ts
@@ -51,6 +51,35 @@ describe("processTemplate", () => {
expect(result.domains).toHaveLength(0);
expect(result.mounts).toHaveLength(0);
});
+
+ it("should allow creation of real jwt secret", () => {
+ const template: CompleteTemplate = {
+ metadata: {} as any,
+ variables: {
+ jwt_secret: "cQsdycq1hDLopQonF6jUTqgQc5WEZTwWLL02J6XJ",
+ anon_payload: JSON.stringify({
+ role: "tester",
+ iss: "dockploy",
+ iat: "${timestamps:2025-01-01T00:00:00Z}",
+ exp: "${timestamps:2030-01-01T00:00:00Z}",
+ }),
+ anon_key: "${jwt:jwt_secret:anon_payload}",
+ },
+ config: {
+ domains: [],
+ env: {
+ ANON_KEY: "${anon_key}",
+ },
+ },
+ };
+ const result = processTemplate(template, mockSchema);
+ expect(result.envs).toHaveLength(1);
+ expect(result.envs).toContain(
+ "ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOiIxNzM1Njg5NjAwIiwiZXhwIjoiMTg5MzQ1NjAwMCIsInJvbGUiOiJ0ZXN0ZXIiLCJpc3MiOiJkb2NrcGxveSJ9.BG5JoxL2_NaTFbPgyZdm3kRWenf_O3su_HIRKGCJ_kY",
+ );
+ expect(result.mounts).toHaveLength(0);
+ expect(result.domains).toHaveLength(0);
+ });
});
describe("domains processing", () => {
diff --git a/apps/dokploy/__test__/templates/helpers.template.test.ts b/apps/dokploy/__test__/templates/helpers.template.test.ts
new file mode 100644
index 000000000..1144b65fe
--- /dev/null
+++ b/apps/dokploy/__test__/templates/helpers.template.test.ts
@@ -0,0 +1,232 @@
+import type { Schema } from "@dokploy/server/templates";
+import { processValue } from "@dokploy/server/templates/processors";
+import { describe, expect, it } from "vitest";
+
+describe("helpers functions", () => {
+ // Mock schema for testing
+ const mockSchema: Schema = {
+ projectName: "test",
+ serverIp: "127.0.0.1",
+ };
+ // some helpers to test jwt
+ type JWTParts = [string, string, string];
+ const jwtMatchExp = /^[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+$/;
+ const jwtBase64Decode = (str: string) => {
+ const base64 = str.replace(/-/g, "+").replace(/_/g, "/");
+ const padding = "=".repeat((4 - (base64.length % 4)) % 4);
+ const decoded = Buffer.from(base64 + padding, "base64").toString("utf-8");
+ return JSON.parse(decoded);
+ };
+ const jwtCheckHeader = (jwtHeader: string) => {
+ const decodedHeader = jwtBase64Decode(jwtHeader);
+ expect(decodedHeader).toHaveProperty("alg");
+ expect(decodedHeader).toHaveProperty("typ");
+ expect(decodedHeader.alg).toEqual("HS256");
+ expect(decodedHeader.typ).toEqual("JWT");
+ };
+
+ describe("${domain}", () => {
+ it("should generate a random domain", () => {
+ const domain = processValue("${domain}", {}, mockSchema);
+ expect(domain.startsWith(`${mockSchema.projectName}-`)).toBeTruthy();
+ expect(
+ domain.endsWith(
+ `${mockSchema.serverIp.replaceAll(".", "-")}.traefik.me`,
+ ),
+ ).toBeTruthy();
+ });
+ });
+
+ describe("${base64}", () => {
+ it("should generate a base64 string", () => {
+ const base64 = processValue("${base64}", {}, mockSchema);
+ expect(base64).toMatch(/^[A-Za-z0-9+=/]+={0,2}$/);
+ });
+ it.each([
+ [4, 8],
+ [8, 12],
+ [16, 24],
+ [32, 44],
+ [64, 88],
+ [128, 172],
+ ])(
+ "should generate a base64 string from parameter %d bytes length",
+ (length, finalLength) => {
+ const base64 = processValue(`\${base64:${length}}`, {}, mockSchema);
+ expect(base64).toMatch(/^[A-Za-z0-9+=/]+={0,2}$/);
+ expect(base64.length).toBe(finalLength);
+ },
+ );
+ });
+
+ describe("${password}", () => {
+ it("should generate a password string", () => {
+ const password = processValue("${password}", {}, mockSchema);
+ expect(password).toMatch(/^[A-Za-z0-9]+$/);
+ });
+ it.each([6, 8, 12, 16, 32])(
+ "should generate a password string respecting parameter %d length",
+ (length) => {
+ const password = processValue(`\${password:${length}}`, {}, mockSchema);
+ expect(password).toMatch(/^[A-Za-z0-9]+$/);
+ expect(password.length).toBe(length);
+ },
+ );
+ });
+
+ describe("${hash}", () => {
+ it("should generate a hash string", () => {
+ const hash = processValue("${hash}", {}, mockSchema);
+ expect(hash).toMatch(/^[A-Za-z0-9]+$/);
+ });
+ it.each([6, 8, 12, 16, 32])(
+ "should generate a hash string respecting parameter %d length",
+ (length) => {
+ const hash = processValue(`\${hash:${length}}`, {}, mockSchema);
+ expect(hash).toMatch(/^[A-Za-z0-9]+$/);
+ expect(hash.length).toBe(length);
+ },
+ );
+ });
+
+ describe("${uuid}", () => {
+ it("should generate a UUID string", () => {
+ const uuid = processValue("${uuid}", {}, mockSchema);
+ expect(uuid).toMatch(
+ /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/,
+ );
+ });
+ });
+
+ describe("${timestamp}", () => {
+ it("should generate a timestamp string in milliseconds", () => {
+ const timestamp = processValue("${timestamp}", {}, mockSchema);
+ const nowLength = Math.floor(Date.now()).toString().length;
+ expect(timestamp).toMatch(/^\d+$/);
+ expect(timestamp.length).toBe(nowLength);
+ });
+ });
+ describe("${timestampms}", () => {
+ it("should generate a timestamp string in milliseconds", () => {
+ const timestamp = processValue("${timestampms}", {}, mockSchema);
+ const nowLength = Date.now().toString().length;
+ expect(timestamp).toMatch(/^\d+$/);
+ expect(timestamp.length).toBe(nowLength);
+ });
+ it("should generate a timestamp string in milliseconds from parameter", () => {
+ const timestamp = processValue(
+ "${timestampms:2025-01-01}",
+ {},
+ mockSchema,
+ );
+ expect(timestamp).toEqual("1735689600000");
+ });
+ });
+ describe("${timestamps}", () => {
+ it("should generate a timestamp string in seconds", () => {
+ const timestamps = processValue("${timestamps}", {}, mockSchema);
+ const nowLength = Math.floor(Date.now() / 1000).toString().length;
+ expect(timestamps).toMatch(/^\d+$/);
+ expect(timestamps.length).toBe(nowLength);
+ });
+ it("should generate a timestamp string in seconds from parameter", () => {
+ const timestamps = processValue(
+ "${timestamps:2025-01-01}",
+ {},
+ mockSchema,
+ );
+ expect(timestamps).toEqual("1735689600");
+ });
+ });
+
+ describe("${randomPort}", () => {
+ it("should generate a random port string", () => {
+ const randomPort = processValue("${randomPort}", {}, mockSchema);
+ expect(randomPort).toMatch(/^\d+$/);
+ expect(Number(randomPort)).toBeLessThan(65536);
+ });
+ });
+
+ describe("${username}", () => {
+ it("should generate a username string", () => {
+ const username = processValue("${username}", {}, mockSchema);
+ expect(username).toMatch(/^[a-zA-Z0-9._-]{3,}$/);
+ });
+ });
+
+ describe("${email}", () => {
+ it("should generate an email string", () => {
+ const email = processValue("${email}", {}, mockSchema);
+ expect(email).toMatch(/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/);
+ });
+ });
+
+ describe("${jwt}", () => {
+ it("should generate a JWT string", () => {
+ const jwt = processValue("${jwt}", {}, mockSchema);
+ expect(jwt).toMatch(jwtMatchExp);
+ const parts = jwt.split(".") as JWTParts;
+ const decodedPayload = jwtBase64Decode(parts[1]);
+ jwtCheckHeader(parts[0]);
+ expect(decodedPayload).toHaveProperty("iat");
+ expect(decodedPayload).toHaveProperty("iss");
+ expect(decodedPayload).toHaveProperty("exp");
+ expect(decodedPayload.iss).toEqual("dokploy");
+ });
+ it.each([6, 8, 12, 16, 32])(
+ "should generate a random hex string from parameter %d byte length",
+ (length) => {
+ const jwt = processValue(`\${jwt:${length}}`, {}, mockSchema);
+ expect(jwt).toMatch(/^[A-Za-z0-9-_.]+$/);
+ expect(jwt.length).toBeGreaterThanOrEqual(length); // bytes translated to hex can take up to 2x the length
+ expect(jwt.length).toBeLessThanOrEqual(length * 2);
+ },
+ );
+ });
+ describe("${jwt:secret}", () => {
+ it("should generate a JWT string respecting parameter secret from variable", () => {
+ const jwt = processValue(
+ "${jwt:secret}",
+ { secret: "mysecret" },
+ mockSchema,
+ );
+ expect(jwt).toMatch(jwtMatchExp);
+ const parts = jwt.split(".") as JWTParts;
+ const decodedPayload = jwtBase64Decode(parts[1]);
+ jwtCheckHeader(parts[0]);
+ expect(decodedPayload).toHaveProperty("iat");
+ expect(decodedPayload).toHaveProperty("iss");
+ expect(decodedPayload).toHaveProperty("exp");
+ expect(decodedPayload.iss).toEqual("dokploy");
+ });
+ });
+ describe("${jwt:secret:payload}", () => {
+ it("should generate a JWT string respecting parameters secret and payload from variables", () => {
+ const iat = Math.floor(new Date("2025-01-01T00:00:00Z").getTime() / 1000);
+ const expiry = iat + 3600;
+ const jwt = processValue(
+ "${jwt:secret:payload}",
+ {
+ secret: "mysecret",
+ payload: `{"iss": "test-issuer", "iat": ${iat}, "exp": ${expiry}, "customprop": "customvalue"}`,
+ },
+ mockSchema,
+ );
+ expect(jwt).toMatch(jwtMatchExp);
+ const parts = jwt.split(".") as JWTParts;
+ jwtCheckHeader(parts[0]);
+ const decodedPayload = jwtBase64Decode(parts[1]);
+ expect(decodedPayload).toHaveProperty("iat");
+ expect(decodedPayload.iat).toEqual(iat);
+ expect(decodedPayload).toHaveProperty("iss");
+ expect(decodedPayload.iss).toEqual("test-issuer");
+ expect(decodedPayload).toHaveProperty("exp");
+ expect(decodedPayload.exp).toEqual(expiry);
+ expect(decodedPayload).toHaveProperty("customprop");
+ expect(decodedPayload.customprop).toEqual("customvalue");
+ expect(jwt).toEqual(
+ "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOjE3MzU2ODk2MDAsImV4cCI6MTczNTY5MzIwMCwiaXNzIjoidGVzdC1pc3N1ZXIiLCJjdXN0b21wcm9wIjoiY3VzdG9tdmFsdWUifQ.m42U7PZSUSCf7gBOJrxJir0rQmyPq4rA59Dydr_QahI",
+ );
+ });
+ });
+});
diff --git a/apps/dokploy/__test__/traefik/server/update-server-config.test.ts b/apps/dokploy/__test__/traefik/server/update-server-config.test.ts
index 201aee1ed..6858f0f00 100644
--- a/apps/dokploy/__test__/traefik/server/update-server-config.test.ts
+++ b/apps/dokploy/__test__/traefik/server/update-server-config.test.ts
@@ -16,6 +16,8 @@ import { beforeEach, expect, test, vi } from "vitest";
const baseAdmin: User = {
https: false,
enablePaidFeatures: false,
+ allowImpersonation: false,
+ role: "user",
metricsConfig: {
containers: {
refreshRate: 20,
diff --git a/apps/dokploy/__test__/traefik/traefik.test.ts b/apps/dokploy/__test__/traefik/traefik.test.ts
index d8a14ab42..f2d0f0a50 100644
--- a/apps/dokploy/__test__/traefik/traefik.test.ts
+++ b/apps/dokploy/__test__/traefik/traefik.test.ts
@@ -5,6 +5,7 @@ import { createRouterConfig } from "@dokploy/server";
import { expect, test } from "vitest";
const baseApp: ApplicationNested = {
+ rollbackActive: false,
applicationId: "",
herokuVersion: "",
giteaRepository: "",
@@ -16,6 +17,7 @@ const baseApp: ApplicationNested = {
applicationStatus: "done",
appName: "",
autoDeploy: true,
+ enableSubmodules: false,
serverId: "",
branch: null,
dockerBuildStage: "",
@@ -24,6 +26,7 @@ const baseApp: ApplicationNested = {
buildArgs: null,
isPreviewDeploymentsActive: false,
previewBuildArgs: null,
+ triggerType: "push",
previewCertificateType: "none",
previewEnv: null,
previewHttps: false,
@@ -83,6 +86,7 @@ const baseApp: ApplicationNested = {
ports: [],
projectId: "",
publishDirectory: null,
+ isStaticSpa: null,
redirects: [],
refreshToken: "",
registry: null,
@@ -115,6 +119,8 @@ const baseDomain: Domain = {
domainType: "application",
uniqueConfigKey: 1,
previewDeploymentId: "",
+ internalPath: "/",
+ stripPath: false,
};
const baseRedirect: Redirect = {
diff --git a/apps/dokploy/__test__/utils/backups.test.ts b/apps/dokploy/__test__/utils/backups.test.ts
index c7bc310cf..2c1e5decc 100644
--- a/apps/dokploy/__test__/utils/backups.test.ts
+++ b/apps/dokploy/__test__/utils/backups.test.ts
@@ -1,5 +1,5 @@
-import { describe, expect, test } from "vitest";
import { normalizeS3Path } from "@dokploy/server/utils/backups/utils";
+import { describe, expect, test } from "vitest";
describe("normalizeS3Path", () => {
test("should handle empty and whitespace-only prefix", () => {
diff --git a/apps/dokploy/components/dashboard/application/advanced/cluster/modify-swarm-settings.tsx b/apps/dokploy/components/dashboard/application/advanced/cluster/modify-swarm-settings.tsx
index 95a559f66..ae30a799d 100644
--- a/apps/dokploy/components/dashboard/application/advanced/cluster/modify-swarm-settings.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/cluster/modify-swarm-settings.tsx
@@ -130,7 +130,7 @@ const createStringToJSONSchema = (schema: z.ZodTypeAny) => {
}
try {
return JSON.parse(str);
- } catch (_e) {
+ } catch {
ctx.addIssue({ code: "custom", message: "Invalid JSON format" });
return z.NEVER;
}
diff --git a/apps/dokploy/components/dashboard/application/advanced/import/show-import.tsx b/apps/dokploy/components/dashboard/application/advanced/import/show-import.tsx
index 0e848fece..d44455b27 100644
--- a/apps/dokploy/components/dashboard/application/advanced/import/show-import.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/import/show-import.tsx
@@ -107,7 +107,7 @@ export const ShowImport = ({ composeId }: Props) => {
composeId,
});
setShowModal(false);
- } catch (_error) {
+ } catch {
toast.error("Error importing template");
}
};
@@ -126,7 +126,7 @@ export const ShowImport = ({ composeId }: Props) => {
});
setTemplateInfo(result);
setShowModal(true);
- } catch (_error) {
+ } catch {
toast.error("Error processing template");
}
};
@@ -263,7 +263,7 @@ export const ShowImport = ({ composeId }: Props) => {
{templateInfo.template.envs.map((env, index) => (