mirror of
https://github.com/Dokploy/dokploy.git
synced 2026-07-23 23:05:25 +02:00
Merge pull request #4873 from Dokploy/fix/cmdi-quote-sweep
fix(security): escape user-controlled values across command-injection sinks (quote sweep)
This commit is contained in:
@@ -49,6 +49,7 @@ import {
|
|||||||
restoreWebServerBackup,
|
restoreWebServerBackup,
|
||||||
} from "@dokploy/server/utils/restore";
|
} from "@dokploy/server/utils/restore";
|
||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
|
import { quote } from "shell-quote";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
import {
|
import {
|
||||||
createTRPCRouter,
|
createTRPCRouter,
|
||||||
@@ -510,7 +511,7 @@ export const backupRouter = createTRPCRouter({
|
|||||||
: input.search;
|
: input.search;
|
||||||
|
|
||||||
const searchPath = baseDir ? `${bucketPath}/${baseDir}` : bucketPath;
|
const searchPath = baseDir ? `${bucketPath}/${baseDir}` : bucketPath;
|
||||||
const listCommand = `rclone lsjson ${rcloneFlags.join(" ")} "${searchPath}" --no-mimetype --no-modtime 2>/dev/null`;
|
const listCommand = `rclone lsjson ${rcloneFlags.join(" ")} ${quote([searchPath])} --no-mimetype --no-modtime 2>/dev/null`;
|
||||||
|
|
||||||
let stdout = "";
|
let stdout = "";
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import {
|
|||||||
import { db } from "@dokploy/server/db";
|
import { db } from "@dokploy/server/db";
|
||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
import { desc, eq } from "drizzle-orm";
|
import { desc, eq } from "drizzle-orm";
|
||||||
|
import { quote } from "shell-quote";
|
||||||
import { createTRPCRouter, withPermission } from "@/server/api/trpc";
|
import { createTRPCRouter, withPermission } from "@/server/api/trpc";
|
||||||
import { audit } from "@/server/api/utils/audit";
|
import { audit } from "@/server/api/utils/audit";
|
||||||
import {
|
import {
|
||||||
@@ -58,10 +59,10 @@ export const destinationRouter = createTRPCRouter({
|
|||||||
} = input;
|
} = input;
|
||||||
try {
|
try {
|
||||||
const rcloneFlags = [
|
const rcloneFlags = [
|
||||||
`--s3-access-key-id="${accessKey}"`,
|
`--s3-access-key-id=${quote([accessKey])}`,
|
||||||
`--s3-secret-access-key="${secretAccessKey}"`,
|
`--s3-secret-access-key=${quote([secretAccessKey])}`,
|
||||||
`--s3-region="${region}"`,
|
`--s3-region=${quote([region])}`,
|
||||||
`--s3-endpoint="${endpoint}"`,
|
`--s3-endpoint=${quote([endpoint])}`,
|
||||||
"--s3-no-check-bucket",
|
"--s3-no-check-bucket",
|
||||||
"--s3-force-path-style",
|
"--s3-force-path-style",
|
||||||
"--retries 1",
|
"--retries 1",
|
||||||
@@ -70,13 +71,13 @@ export const destinationRouter = createTRPCRouter({
|
|||||||
"--contimeout 5s",
|
"--contimeout 5s",
|
||||||
];
|
];
|
||||||
if (provider) {
|
if (provider) {
|
||||||
rcloneFlags.unshift(`--s3-provider="${provider}"`);
|
rcloneFlags.unshift(`--s3-provider=${quote([provider])}`);
|
||||||
}
|
}
|
||||||
if (additionalFlags?.length) {
|
if (additionalFlags?.length) {
|
||||||
rcloneFlags.push(...additionalFlags);
|
rcloneFlags.push(...additionalFlags);
|
||||||
}
|
}
|
||||||
const rcloneDestination = `:s3:${bucket}`;
|
const rcloneDestination = `:s3:${bucket}`;
|
||||||
const rcloneCommand = `rclone ls ${rcloneFlags.join(" ")} "${rcloneDestination}"`;
|
const rcloneCommand = `rclone ls ${rcloneFlags.join(" ")} ${quote([rcloneDestination])}`;
|
||||||
|
|
||||||
if (IS_CLOUD && !input.serverId) {
|
if (IS_CLOUD && !input.serverId) {
|
||||||
throw new TRPCError({
|
throw new TRPCError({
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ import { db } from "@dokploy/server/db";
|
|||||||
import {
|
import {
|
||||||
createVolumeBackupSchema,
|
createVolumeBackupSchema,
|
||||||
updateVolumeBackupSchema,
|
updateVolumeBackupSchema,
|
||||||
|
VOLUME_NAME_MESSAGE,
|
||||||
|
VOLUME_NAME_REGEX,
|
||||||
volumeBackups,
|
volumeBackups,
|
||||||
} from "@dokploy/server/db/schema";
|
} from "@dokploy/server/db/schema";
|
||||||
import { findDestinationById } from "@dokploy/server/services/destination";
|
import { findDestinationById } from "@dokploy/server/services/destination";
|
||||||
@@ -275,7 +277,10 @@ export const volumeBackupsRouter = createTRPCRouter({
|
|||||||
z.object({
|
z.object({
|
||||||
backupFileName: z.string().min(1),
|
backupFileName: z.string().min(1),
|
||||||
destinationId: z.string().min(1),
|
destinationId: z.string().min(1),
|
||||||
volumeName: z.string().min(1),
|
volumeName: z
|
||||||
|
.string()
|
||||||
|
.min(1)
|
||||||
|
.regex(VOLUME_NAME_REGEX, VOLUME_NAME_MESSAGE),
|
||||||
id: z.string().min(1),
|
id: z.string().min(1),
|
||||||
serviceType: z.enum(["application", "compose"]),
|
serviceType: z.enum(["application", "compose"]),
|
||||||
serverId: z.string().optional(),
|
serverId: z.string().optional(),
|
||||||
|
|||||||
@@ -41,6 +41,12 @@ export const APP_NAME_REGEX = /^[a-zA-Z0-9._-]+$/;
|
|||||||
export const APP_NAME_MESSAGE =
|
export const APP_NAME_MESSAGE =
|
||||||
"App name can only contain letters, numbers, dots, underscores and hyphens";
|
"App name can only contain letters, numbers, dots, underscores and hyphens";
|
||||||
|
|
||||||
|
/** Docker volume name: must start alphanumeric, then letters/numbers/._- only. Safe for shell. */
|
||||||
|
export const VOLUME_NAME_REGEX = /^[a-zA-Z0-9][a-zA-Z0-9_.-]*$/;
|
||||||
|
|
||||||
|
export const VOLUME_NAME_MESSAGE =
|
||||||
|
"Volume name must start with a letter or number and contain only letters, numbers, dots, underscores and hyphens";
|
||||||
|
|
||||||
/** Database password: blocks shell-dangerous characters like $ ! ' " \ / and spaces. */
|
/** Database password: blocks shell-dangerous characters like $ ! ' " \ / and spaces. */
|
||||||
export const DATABASE_PASSWORD_REGEX =
|
export const DATABASE_PASSWORD_REGEX =
|
||||||
/^[a-zA-Z0-9@#%^&*()_+\-=[\]{}|;:,.<>?~`]*$/;
|
/^[a-zA-Z0-9@#%^&*()_+\-=[\]{}|;:,.<>?~`]*$/;
|
||||||
|
|||||||
@@ -14,7 +14,11 @@ import { serviceType } from "./mount";
|
|||||||
import { mysql } from "./mysql";
|
import { mysql } from "./mysql";
|
||||||
import { postgres } from "./postgres";
|
import { postgres } from "./postgres";
|
||||||
import { redis } from "./redis";
|
import { redis } from "./redis";
|
||||||
import { generateAppName } from "./utils";
|
import {
|
||||||
|
generateAppName,
|
||||||
|
VOLUME_NAME_MESSAGE,
|
||||||
|
VOLUME_NAME_REGEX,
|
||||||
|
} from "./utils";
|
||||||
|
|
||||||
export const volumeBackups = pgTable("volume_backup", {
|
export const volumeBackups = pgTable("volume_backup", {
|
||||||
volumeBackupId: text("volumeBackupId")
|
volumeBackupId: text("volumeBackupId")
|
||||||
@@ -113,7 +117,9 @@ export const volumeBackupsRelations = relations(
|
|||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
export const createVolumeBackupSchema = createInsertSchema(volumeBackups).omit({
|
export const createVolumeBackupSchema = createInsertSchema(volumeBackups, {
|
||||||
|
volumeName: z.string().regex(VOLUME_NAME_REGEX, VOLUME_NAME_MESSAGE),
|
||||||
|
}).omit({
|
||||||
volumeBackupId: true,
|
volumeBackupId: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import {
|
|||||||
import { removeDirectoryIfExistsContent } from "@dokploy/server/utils/filesystem/directory";
|
import { removeDirectoryIfExistsContent } from "@dokploy/server/utils/filesystem/directory";
|
||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
import { eq } from "drizzle-orm";
|
import { eq } from "drizzle-orm";
|
||||||
|
import { quote } from "shell-quote";
|
||||||
import { stringify } from "yaml";
|
import { stringify } from "yaml";
|
||||||
import type { z } from "zod";
|
import type { z } from "zod";
|
||||||
import { encodeBase64 } from "../utils/docker/utils";
|
import { encodeBase64 } from "../utils/docker/utils";
|
||||||
@@ -63,7 +64,7 @@ export const removeCertificateById = async (certificateId: string) => {
|
|||||||
const certDir = path.join(CERTIFICATES_PATH, certificate.certificatePath);
|
const certDir = path.join(CERTIFICATES_PATH, certificate.certificatePath);
|
||||||
|
|
||||||
if (certificate.serverId) {
|
if (certificate.serverId) {
|
||||||
await execAsyncRemote(certificate.serverId, `rm -rf ${certDir}`);
|
await execAsyncRemote(certificate.serverId, `rm -rf ${quote([certDir])}`);
|
||||||
} else {
|
} else {
|
||||||
await removeDirectoryIfExistsContent(certDir);
|
await removeDirectoryIfExistsContent(certDir);
|
||||||
}
|
}
|
||||||
@@ -108,10 +109,10 @@ const createCertificateFiles = async (certificate: Certificate) => {
|
|||||||
const certificateData = encodeBase64(certificate.certificateData);
|
const certificateData = encodeBase64(certificate.certificateData);
|
||||||
const privateKey = encodeBase64(certificate.privateKey);
|
const privateKey = encodeBase64(certificate.privateKey);
|
||||||
const command = `
|
const command = `
|
||||||
mkdir -p ${certDir};
|
mkdir -p ${quote([certDir])};
|
||||||
echo "${certificateData}" | base64 -d > "${crtPath}";
|
echo "${certificateData}" | base64 -d > ${quote([crtPath])};
|
||||||
echo "${privateKey}" | base64 -d > "${keyPath}";
|
echo "${privateKey}" | base64 -d > ${quote([keyPath])};
|
||||||
echo "${yamlConfig}" > "${configFile}";
|
echo "${yamlConfig}" > ${quote([configFile])};
|
||||||
`;
|
`;
|
||||||
|
|
||||||
await execAsyncRemote(certificate.serverId, command);
|
await execAsyncRemote(certificate.serverId, command);
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ import {
|
|||||||
} from "@dokploy/server/utils/process/execAsync";
|
} from "@dokploy/server/utils/process/execAsync";
|
||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
import { eq, type SQL, sql } from "drizzle-orm";
|
import { eq, type SQL, sql } from "drizzle-orm";
|
||||||
|
import { quote } from "shell-quote";
|
||||||
import type { z } from "zod";
|
import type { z } from "zod";
|
||||||
|
|
||||||
export type Mount = typeof mounts.$inferSelect;
|
export type Mount = typeof mounts.$inferSelect;
|
||||||
@@ -317,7 +318,7 @@ export const updateFileMount = async (mountId: string) => {
|
|||||||
try {
|
try {
|
||||||
const serverId = await getServerId(mount);
|
const serverId = await getServerId(mount);
|
||||||
const encodedContent = encodeBase64(mount.content || "");
|
const encodedContent = encodeBase64(mount.content || "");
|
||||||
const command = `echo "${encodedContent}" | base64 -d > ${fullPath}`;
|
const command = `echo "${encodedContent}" | base64 -d > ${quote([fullPath])}`;
|
||||||
if (serverId) {
|
if (serverId) {
|
||||||
await execAsyncRemote(serverId, command);
|
await execAsyncRemote(serverId, command);
|
||||||
} else {
|
} else {
|
||||||
@@ -337,7 +338,7 @@ export const deleteFileMount = async (mountId: string) => {
|
|||||||
try {
|
try {
|
||||||
const serverId = await getServerId(mount);
|
const serverId = await getServerId(mount);
|
||||||
if (serverId) {
|
if (serverId) {
|
||||||
const command = `rm -rf ${fullPath}`;
|
const command = `rm -rf ${quote([fullPath])}`;
|
||||||
await execAsyncRemote(serverId, command);
|
await execAsyncRemote(serverId, command);
|
||||||
} else {
|
} else {
|
||||||
await removeFileOrDirectory(fullPath);
|
await removeFileOrDirectory(fullPath);
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
import { paths } from "@dokploy/server/constants";
|
import { paths } from "@dokploy/server/constants";
|
||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
|
import { quote } from "shell-quote";
|
||||||
import { execAsync, execAsyncRemote } from "../utils/process/execAsync";
|
import { execAsync, execAsyncRemote } from "../utils/process/execAsync";
|
||||||
import { cloneBitbucketRepository } from "../utils/providers/bitbucket";
|
import { cloneBitbucketRepository } from "../utils/providers/bitbucket";
|
||||||
import { cloneGitRepository } from "../utils/providers/git";
|
import { cloneGitRepository } from "../utils/providers/git";
|
||||||
@@ -85,7 +86,7 @@ export const readPatchRepoDirectory = async (
|
|||||||
serverId?: string | null,
|
serverId?: string | null,
|
||||||
): Promise<DirectoryEntry[]> => {
|
): Promise<DirectoryEntry[]> => {
|
||||||
// Use git ls-tree to get tracked files only
|
// Use git ls-tree to get tracked files only
|
||||||
const command = `cd "${repoPath}" && git ls-tree -r --name-only HEAD`;
|
const command = `cd ${quote([repoPath])} && git ls-tree -r --name-only HEAD`;
|
||||||
|
|
||||||
let stdout: string;
|
let stdout: string;
|
||||||
try {
|
try {
|
||||||
@@ -168,7 +169,7 @@ export const readPatchRepoFile = async (
|
|||||||
const repoPath = join(PATCH_REPOS_PATH, type, application.appName);
|
const repoPath = join(PATCH_REPOS_PATH, type, application.appName);
|
||||||
const fullPath = join(repoPath, filePath);
|
const fullPath = join(repoPath, filePath);
|
||||||
|
|
||||||
const command = `cat "${fullPath}"`;
|
const command = `cat ${quote([fullPath])}`;
|
||||||
|
|
||||||
if (serverId) {
|
if (serverId) {
|
||||||
const result = await execAsyncRemote(serverId, command);
|
const result = await execAsyncRemote(serverId, command);
|
||||||
|
|||||||
@@ -72,16 +72,16 @@ export const getS3Credentials = (destination: Destination) => {
|
|||||||
const { accessKey, secretAccessKey, region, endpoint, provider } =
|
const { accessKey, secretAccessKey, region, endpoint, provider } =
|
||||||
destination;
|
destination;
|
||||||
const rcloneFlags = [
|
const rcloneFlags = [
|
||||||
`--s3-access-key-id="${accessKey}"`,
|
`--s3-access-key-id=${quote([accessKey])}`,
|
||||||
`--s3-secret-access-key="${secretAccessKey}"`,
|
`--s3-secret-access-key=${quote([secretAccessKey])}`,
|
||||||
`--s3-region="${region}"`,
|
`--s3-region=${quote([region])}`,
|
||||||
`--s3-endpoint="${endpoint}"`,
|
`--s3-endpoint=${quote([endpoint])}`,
|
||||||
"--s3-no-check-bucket",
|
"--s3-no-check-bucket",
|
||||||
"--s3-force-path-style",
|
"--s3-force-path-style",
|
||||||
];
|
];
|
||||||
|
|
||||||
if (provider) {
|
if (provider) {
|
||||||
rcloneFlags.unshift(`--s3-provider="${provider}"`);
|
rcloneFlags.unshift(`--s3-provider=${quote([provider])}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (destination.additionalFlags?.length) {
|
if (destination.additionalFlags?.length) {
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import { deployMySql } from "@dokploy/server/services/mysql";
|
|||||||
import { deployPostgres } from "@dokploy/server/services/postgres";
|
import { deployPostgres } from "@dokploy/server/services/postgres";
|
||||||
import { deployRedis } from "@dokploy/server/services/redis";
|
import { deployRedis } from "@dokploy/server/services/redis";
|
||||||
import { eq } from "drizzle-orm";
|
import { eq } from "drizzle-orm";
|
||||||
|
import { quote } from "shell-quote";
|
||||||
import { removeService } from "../docker/utils";
|
import { removeService } from "../docker/utils";
|
||||||
import { execAsync, execAsyncRemote } from "../process/execAsync";
|
import { execAsync, execAsyncRemote } from "../process/execAsync";
|
||||||
|
|
||||||
@@ -40,7 +41,7 @@ export const rebuildDatabase = async (
|
|||||||
|
|
||||||
for (const mount of database.mounts) {
|
for (const mount of database.mounts) {
|
||||||
if (mount.type === "volume") {
|
if (mount.type === "volume") {
|
||||||
const command = `docker volume rm ${mount?.volumeName} --force`;
|
const command = `docker volume rm ${quote([mount?.volumeName ?? ""])} --force`;
|
||||||
if (database.serverId) {
|
if (database.serverId) {
|
||||||
await execAsyncRemote(database.serverId, command);
|
await execAsyncRemote(database.serverId, command);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -712,14 +712,14 @@ export const getCreateFileCommand = (
|
|||||||
) => {
|
) => {
|
||||||
const fullPath = path.join(outputPath, filePath);
|
const fullPath = path.join(outputPath, filePath);
|
||||||
if (fullPath.endsWith(path.sep) || filePath.endsWith("/")) {
|
if (fullPath.endsWith(path.sep) || filePath.endsWith("/")) {
|
||||||
return `mkdir -p ${fullPath};`;
|
return `mkdir -p ${quote([fullPath])};`;
|
||||||
}
|
}
|
||||||
|
|
||||||
const directory = path.dirname(fullPath);
|
const directory = path.dirname(fullPath);
|
||||||
const encodedContent = encodeBase64(content);
|
const encodedContent = encodeBase64(content);
|
||||||
return `
|
return `
|
||||||
mkdir -p ${directory};
|
mkdir -p ${quote([directory])};
|
||||||
echo "${encodedContent}" | base64 -d > "${fullPath}";
|
echo "${encodedContent}" | base64 -d > ${quote([fullPath])};
|
||||||
`;
|
`;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import type { apiRestoreBackup } from "@dokploy/server/db/schema";
|
import type { apiRestoreBackup } from "@dokploy/server/db/schema";
|
||||||
import type { Compose } from "@dokploy/server/services/compose";
|
import type { Compose } from "@dokploy/server/services/compose";
|
||||||
import type { Destination } from "@dokploy/server/services/destination";
|
import type { Destination } from "@dokploy/server/services/destination";
|
||||||
|
import { quote } from "shell-quote";
|
||||||
import type { z } from "zod";
|
import type { z } from "zod";
|
||||||
import { getS3Credentials } from "../backups/utils";
|
import { getS3Credentials } from "../backups/utils";
|
||||||
import { execAsync, execAsyncRemote } from "../process/execAsync";
|
import { execAsync, execAsyncRemote } from "../process/execAsync";
|
||||||
@@ -26,10 +27,10 @@ export const restoreComposeBackup = async (
|
|||||||
const rcloneFlags = getS3Credentials(destination);
|
const rcloneFlags = getS3Credentials(destination);
|
||||||
const bucketPath = `:s3:${destination.bucket}`;
|
const bucketPath = `:s3:${destination.bucket}`;
|
||||||
const backupPath = `${bucketPath}/${backupInput.backupFile}`;
|
const backupPath = `${bucketPath}/${backupInput.backupFile}`;
|
||||||
let rcloneCommand = `rclone cat ${rcloneFlags.join(" ")} "${backupPath}" | gunzip`;
|
let rcloneCommand = `rclone cat ${rcloneFlags.join(" ")} ${quote([backupPath])} | gunzip`;
|
||||||
|
|
||||||
if (backupInput.metadata?.mongo) {
|
if (backupInput.metadata?.mongo) {
|
||||||
rcloneCommand = `rclone copy ${rcloneFlags.join(" ")} "${backupPath}"`;
|
rcloneCommand = `rclone copy ${rcloneFlags.join(" ")} ${quote([backupPath])}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
let credentials: DatabaseCredentials = {};
|
let credentials: DatabaseCredentials = {};
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import type { apiRestoreBackup } from "@dokploy/server/db/schema";
|
import type { apiRestoreBackup } from "@dokploy/server/db/schema";
|
||||||
import type { Destination } from "@dokploy/server/services/destination";
|
import type { Destination } from "@dokploy/server/services/destination";
|
||||||
import type { Libsql } from "@dokploy/server/services/libsql";
|
import type { Libsql } from "@dokploy/server/services/libsql";
|
||||||
|
import { quote } from "shell-quote";
|
||||||
import type { z } from "zod";
|
import type { z } from "zod";
|
||||||
import { getS3Credentials, getServiceContainerCommand } from "../backups/utils";
|
import { getS3Credentials, getServiceContainerCommand } from "../backups/utils";
|
||||||
import { execAsync, execAsyncRemote } from "../process/execAsync";
|
import { execAsync, execAsyncRemote } from "../process/execAsync";
|
||||||
@@ -19,7 +20,7 @@ export const restoreLibsqlBackup = async (
|
|||||||
|
|
||||||
const backupPath = `${bucketPath}/${backupInput.backupFile}`;
|
const backupPath = `${bucketPath}/${backupInput.backupFile}`;
|
||||||
|
|
||||||
const rcloneCommand = `rclone cat ${rcloneFlags.join(" ")} "${backupPath}"`;
|
const rcloneCommand = `rclone cat ${rcloneFlags.join(" ")} ${quote([backupPath])}`;
|
||||||
|
|
||||||
const containerSearch = getServiceContainerCommand(appName);
|
const containerSearch = getServiceContainerCommand(appName);
|
||||||
const restoreCommand = `docker exec -i $CONTAINER_ID sh -c "tar xzf - -C /var/lib/sqld"`;
|
const restoreCommand = `docker exec -i $CONTAINER_ID sh -c "tar xzf - -C /var/lib/sqld"`;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import type { apiRestoreBackup } from "@dokploy/server/db/schema";
|
import type { apiRestoreBackup } from "@dokploy/server/db/schema";
|
||||||
import type { Destination } from "@dokploy/server/services/destination";
|
import type { Destination } from "@dokploy/server/services/destination";
|
||||||
import type { Mariadb } from "@dokploy/server/services/mariadb";
|
import type { Mariadb } from "@dokploy/server/services/mariadb";
|
||||||
|
import { quote } from "shell-quote";
|
||||||
import type { z } from "zod";
|
import type { z } from "zod";
|
||||||
import { getS3Credentials } from "../backups/utils";
|
import { getS3Credentials } from "../backups/utils";
|
||||||
import { execAsync, execAsyncRemote } from "../process/execAsync";
|
import { execAsync, execAsyncRemote } from "../process/execAsync";
|
||||||
@@ -19,7 +20,7 @@ export const restoreMariadbBackup = async (
|
|||||||
const bucketPath = `:s3:${destination.bucket}`;
|
const bucketPath = `:s3:${destination.bucket}`;
|
||||||
const backupPath = `${bucketPath}/${backupInput.backupFile}`;
|
const backupPath = `${bucketPath}/${backupInput.backupFile}`;
|
||||||
|
|
||||||
const rcloneCommand = `rclone cat ${rcloneFlags.join(" ")} "${backupPath}" | gunzip`;
|
const rcloneCommand = `rclone cat ${rcloneFlags.join(" ")} ${quote([backupPath])} | gunzip`;
|
||||||
|
|
||||||
const command = getRestoreCommand({
|
const command = getRestoreCommand({
|
||||||
appName,
|
appName,
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import type { apiRestoreBackup } from "@dokploy/server/db/schema";
|
import type { apiRestoreBackup } from "@dokploy/server/db/schema";
|
||||||
import type { Destination } from "@dokploy/server/services/destination";
|
import type { Destination } from "@dokploy/server/services/destination";
|
||||||
import type { Mongo } from "@dokploy/server/services/mongo";
|
import type { Mongo } from "@dokploy/server/services/mongo";
|
||||||
|
import { quote } from "shell-quote";
|
||||||
import type { z } from "zod";
|
import type { z } from "zod";
|
||||||
import { getS3Credentials } from "../backups/utils";
|
import { getS3Credentials } from "../backups/utils";
|
||||||
import { execAsync, execAsyncRemote } from "../process/execAsync";
|
import { execAsync, execAsyncRemote } from "../process/execAsync";
|
||||||
@@ -18,7 +19,7 @@ export const restoreMongoBackup = async (
|
|||||||
const rcloneFlags = getS3Credentials(destination);
|
const rcloneFlags = getS3Credentials(destination);
|
||||||
const bucketPath = `:s3:${destination.bucket}`;
|
const bucketPath = `:s3:${destination.bucket}`;
|
||||||
const backupPath = `${bucketPath}/${backupInput.backupFile}`;
|
const backupPath = `${bucketPath}/${backupInput.backupFile}`;
|
||||||
const rcloneCommand = `rclone copy ${rcloneFlags.join(" ")} "${backupPath}"`;
|
const rcloneCommand = `rclone copy ${rcloneFlags.join(" ")} ${quote([backupPath])}`;
|
||||||
|
|
||||||
const command = getRestoreCommand({
|
const command = getRestoreCommand({
|
||||||
appName,
|
appName,
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import type { apiRestoreBackup } from "@dokploy/server/db/schema";
|
import type { apiRestoreBackup } from "@dokploy/server/db/schema";
|
||||||
import type { Destination } from "@dokploy/server/services/destination";
|
import type { Destination } from "@dokploy/server/services/destination";
|
||||||
import type { MySql } from "@dokploy/server/services/mysql";
|
import type { MySql } from "@dokploy/server/services/mysql";
|
||||||
|
import { quote } from "shell-quote";
|
||||||
import type { z } from "zod";
|
import type { z } from "zod";
|
||||||
import { getS3Credentials } from "../backups/utils";
|
import { getS3Credentials } from "../backups/utils";
|
||||||
import { execAsync, execAsyncRemote } from "../process/execAsync";
|
import { execAsync, execAsyncRemote } from "../process/execAsync";
|
||||||
@@ -19,7 +20,7 @@ export const restoreMySqlBackup = async (
|
|||||||
const bucketPath = `:s3:${destination.bucket}`;
|
const bucketPath = `:s3:${destination.bucket}`;
|
||||||
const backupPath = `${bucketPath}/${backupInput.backupFile}`;
|
const backupPath = `${bucketPath}/${backupInput.backupFile}`;
|
||||||
|
|
||||||
const rcloneCommand = `rclone cat ${rcloneFlags.join(" ")} "${backupPath}" | gunzip`;
|
const rcloneCommand = `rclone cat ${rcloneFlags.join(" ")} ${quote([backupPath])} | gunzip`;
|
||||||
|
|
||||||
const command = getRestoreCommand({
|
const command = getRestoreCommand({
|
||||||
appName,
|
appName,
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import type { apiRestoreBackup } from "@dokploy/server/db/schema";
|
import type { apiRestoreBackup } from "@dokploy/server/db/schema";
|
||||||
import type { Destination } from "@dokploy/server/services/destination";
|
import type { Destination } from "@dokploy/server/services/destination";
|
||||||
import type { Postgres } from "@dokploy/server/services/postgres";
|
import type { Postgres } from "@dokploy/server/services/postgres";
|
||||||
|
import { quote } from "shell-quote";
|
||||||
import type { z } from "zod";
|
import type { z } from "zod";
|
||||||
import { getS3Credentials } from "../backups/utils";
|
import { getS3Credentials } from "../backups/utils";
|
||||||
import { execAsync, execAsyncRemote } from "../process/execAsync";
|
import { execAsync, execAsyncRemote } from "../process/execAsync";
|
||||||
@@ -20,7 +21,7 @@ export const restorePostgresBackup = async (
|
|||||||
|
|
||||||
const backupPath = `${bucketPath}/${backupInput.backupFile}`;
|
const backupPath = `${bucketPath}/${backupInput.backupFile}`;
|
||||||
|
|
||||||
const rcloneCommand = `rclone cat ${rcloneFlags.join(" ")} "${backupPath}" | gunzip`;
|
const rcloneCommand = `rclone cat ${rcloneFlags.join(" ")} ${quote([backupPath])} | gunzip`;
|
||||||
|
|
||||||
const command = getRestoreCommand({
|
const command = getRestoreCommand({
|
||||||
appName,
|
appName,
|
||||||
|
|||||||
@@ -92,8 +92,8 @@ rm -rf ${tempDir} && \
|
|||||||
mkdir -p ${tempDir} && \
|
mkdir -p ${tempDir} && \
|
||||||
${rcloneCommand} ${tempDir} && \
|
${rcloneCommand} ${tempDir} && \
|
||||||
cd ${tempDir} && \
|
cd ${tempDir} && \
|
||||||
gunzip -f "${fileName}" && \
|
gunzip -f ${quote([fileName])} && \
|
||||||
${restoreCommand} < "${decompressedName}" && \
|
${restoreCommand} < ${quote([decompressedName])} && \
|
||||||
rm -rf ${tempDir}
|
rm -rf ${tempDir}
|
||||||
`;
|
`;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { tmpdir } from "node:os";
|
|||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
import { IS_CLOUD, paths } from "@dokploy/server/constants";
|
import { IS_CLOUD, paths } from "@dokploy/server/constants";
|
||||||
import type { Destination } from "@dokploy/server/services/destination";
|
import type { Destination } from "@dokploy/server/services/destination";
|
||||||
|
import { quote } from "shell-quote";
|
||||||
import { getS3Credentials } from "../backups/utils";
|
import { getS3Credentials } from "../backups/utils";
|
||||||
import { execAsync } from "../process/execAsync";
|
import { execAsync } from "../process/execAsync";
|
||||||
|
|
||||||
@@ -35,7 +36,7 @@ export const restoreWebServerBackup = async (
|
|||||||
// Download backup from S3
|
// Download backup from S3
|
||||||
emit("Downloading backup from S3...");
|
emit("Downloading backup from S3...");
|
||||||
await execAsync(
|
await execAsync(
|
||||||
`rclone copyto ${rcloneFlags.join(" ")} "${backupPath}" "${tempDir}/${backupFile}"`,
|
`rclone copyto ${rcloneFlags.join(" ")} ${quote([backupPath])} ${quote([`${tempDir}/${backupFile}`])}`,
|
||||||
);
|
);
|
||||||
|
|
||||||
// List files before extraction
|
// List files before extraction
|
||||||
@@ -45,7 +46,9 @@ export const restoreWebServerBackup = async (
|
|||||||
|
|
||||||
// Extract backup
|
// Extract backup
|
||||||
emit("Extracting backup...");
|
emit("Extracting backup...");
|
||||||
await execAsync(`cd ${tempDir} && unzip ${backupFile} > /dev/null 2>&1`);
|
await execAsync(
|
||||||
|
`cd ${quote([tempDir])} && unzip ${quote([backupFile])} > /dev/null 2>&1`,
|
||||||
|
);
|
||||||
|
|
||||||
// Restore filesystem first
|
// Restore filesystem first
|
||||||
emit("Restoring filesystem...");
|
emit("Restoring filesystem...");
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import {
|
|||||||
} from "@dokploy/server/services/deployment";
|
} from "@dokploy/server/services/deployment";
|
||||||
import { findScheduleById } from "@dokploy/server/services/schedule";
|
import { findScheduleById } from "@dokploy/server/services/schedule";
|
||||||
import { scheduledJobs, scheduleJob as scheduleJobNode } from "node-schedule";
|
import { scheduledJobs, scheduleJob as scheduleJobNode } from "node-schedule";
|
||||||
|
import { quote } from "shell-quote";
|
||||||
import { getComposeContainer, getServiceContainer } from "../docker/utils";
|
import { getComposeContainer, getServiceContainer } from "../docker/utils";
|
||||||
import { execAsyncRemote } from "../process/execAsync";
|
import { execAsyncRemote } from "../process/execAsync";
|
||||||
import { spawnAsync } from "../process/spawnAsync";
|
import { spawnAsync } from "../process/spawnAsync";
|
||||||
@@ -77,12 +78,12 @@ export const runCommand = async (scheduleId: string) => {
|
|||||||
serverId,
|
serverId,
|
||||||
`
|
`
|
||||||
set -e
|
set -e
|
||||||
echo "Running command: docker exec ${containerId} ${shellType} -c '${command}'" >> ${deployment.logPath};
|
echo "Running scheduled command" >> ${quote([deployment.logPath])};
|
||||||
docker exec ${containerId} ${shellType} -c '${command}' >> ${deployment.logPath} 2>> ${deployment.logPath} || {
|
docker exec ${quote([containerId])} ${quote([shellType])} -c ${quote([command])} >> ${quote([deployment.logPath])} 2>> ${quote([deployment.logPath])} || {
|
||||||
echo "❌ Command failed" >> ${deployment.logPath};
|
echo "❌ Command failed" >> ${quote([deployment.logPath])};
|
||||||
exit 1;
|
exit 1;
|
||||||
}
|
}
|
||||||
echo "✅ Command executed successfully" >> ${deployment.logPath};
|
echo "✅ Command executed successfully" >> ${quote([deployment.logPath])};
|
||||||
`,
|
`,
|
||||||
);
|
);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import path from "node:path";
|
|||||||
import { createInterface } from "node:readline";
|
import { createInterface } from "node:readline";
|
||||||
import { paths } from "@dokploy/server/constants";
|
import { paths } from "@dokploy/server/constants";
|
||||||
import type { Domain } from "@dokploy/server/services/domain";
|
import type { Domain } from "@dokploy/server/services/domain";
|
||||||
|
import { quote } from "shell-quote";
|
||||||
import { parse, stringify } from "yaml";
|
import { parse, stringify } from "yaml";
|
||||||
import { encodeBase64 } from "../docker/utils";
|
import { encodeBase64 } from "../docker/utils";
|
||||||
import { execAsync, execAsyncRemote } from "../process/execAsync";
|
import { execAsync, execAsyncRemote } from "../process/execAsync";
|
||||||
@@ -57,7 +58,7 @@ export const removeTraefikConfig = async (
|
|||||||
try {
|
try {
|
||||||
const { DYNAMIC_TRAEFIK_PATH } = paths(!!serverId);
|
const { DYNAMIC_TRAEFIK_PATH } = paths(!!serverId);
|
||||||
const configPath = path.join(DYNAMIC_TRAEFIK_PATH, `${appName}.yml`);
|
const configPath = path.join(DYNAMIC_TRAEFIK_PATH, `${appName}.yml`);
|
||||||
const command = `rm -f ${configPath}`;
|
const command = `rm -f ${quote([configPath])}`;
|
||||||
|
|
||||||
if (serverId) {
|
if (serverId) {
|
||||||
await execAsyncRemote(serverId, command);
|
await execAsyncRemote(serverId, command);
|
||||||
@@ -76,7 +77,7 @@ export const removeTraefikConfigRemote = async (
|
|||||||
try {
|
try {
|
||||||
const { DYNAMIC_TRAEFIK_PATH } = paths(true);
|
const { DYNAMIC_TRAEFIK_PATH } = paths(true);
|
||||||
const configPath = path.join(DYNAMIC_TRAEFIK_PATH, `${appName}.yml`);
|
const configPath = path.join(DYNAMIC_TRAEFIK_PATH, `${appName}.yml`);
|
||||||
await execAsyncRemote(serverId, `rm -f ${configPath}`);
|
await execAsyncRemote(serverId, `rm -f ${quote([configPath])}`);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(
|
console.error(
|
||||||
`Error removing remote traefik config for ${appName}:`,
|
`Error removing remote traefik config for ${appName}:`,
|
||||||
@@ -106,7 +107,10 @@ export const loadOrCreateConfigRemote = async (
|
|||||||
const fileConfig: FileConfig = { http: { routers: {}, services: {} } };
|
const fileConfig: FileConfig = { http: { routers: {}, services: {} } };
|
||||||
const configPath = path.join(DYNAMIC_TRAEFIK_PATH, `${appName}.yml`);
|
const configPath = path.join(DYNAMIC_TRAEFIK_PATH, `${appName}.yml`);
|
||||||
try {
|
try {
|
||||||
const { stdout } = await execAsyncRemote(serverId, `cat ${configPath}`);
|
const { stdout } = await execAsyncRemote(
|
||||||
|
serverId,
|
||||||
|
`cat ${quote([configPath])}`,
|
||||||
|
);
|
||||||
|
|
||||||
if (!stdout) return fileConfig;
|
if (!stdout) return fileConfig;
|
||||||
|
|
||||||
@@ -133,7 +137,10 @@ export const readRemoteConfig = async (serverId: string, appName: string) => {
|
|||||||
const { DYNAMIC_TRAEFIK_PATH } = paths(true);
|
const { DYNAMIC_TRAEFIK_PATH } = paths(true);
|
||||||
const configPath = path.join(DYNAMIC_TRAEFIK_PATH, `${appName}.yml`);
|
const configPath = path.join(DYNAMIC_TRAEFIK_PATH, `${appName}.yml`);
|
||||||
try {
|
try {
|
||||||
const { stdout } = await execAsyncRemote(serverId, `cat ${configPath}`);
|
const { stdout } = await execAsyncRemote(
|
||||||
|
serverId,
|
||||||
|
`cat ${quote([configPath])}`,
|
||||||
|
);
|
||||||
if (!stdout) return null;
|
if (!stdout) return null;
|
||||||
return stdout;
|
return stdout;
|
||||||
} catch {
|
} catch {
|
||||||
@@ -189,7 +196,10 @@ export const readConfigInPath = async (pathFile: string, serverId?: string) => {
|
|||||||
const configPath = path.join(pathFile);
|
const configPath = path.join(pathFile);
|
||||||
|
|
||||||
if (serverId) {
|
if (serverId) {
|
||||||
const { stdout } = await execAsyncRemote(serverId, `cat ${configPath}`);
|
const { stdout } = await execAsyncRemote(
|
||||||
|
serverId,
|
||||||
|
`cat ${quote([configPath])}`,
|
||||||
|
);
|
||||||
if (!stdout) return null;
|
if (!stdout) return null;
|
||||||
return stdout;
|
return stdout;
|
||||||
}
|
}
|
||||||
@@ -221,7 +231,7 @@ export const writeConfigRemote = async (
|
|||||||
const encoded = encodeBase64(traefikConfig);
|
const encoded = encodeBase64(traefikConfig);
|
||||||
await execAsyncRemote(
|
await execAsyncRemote(
|
||||||
serverId,
|
serverId,
|
||||||
`echo "${encoded}" | base64 -d > "${configPath}"`,
|
`echo "${encoded}" | base64 -d > ${quote([configPath])}`,
|
||||||
);
|
);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error("Error saving the YAML config file:", e);
|
console.error("Error saving the YAML config file:", e);
|
||||||
@@ -239,7 +249,7 @@ export const writeTraefikConfigInPath = async (
|
|||||||
const encoded = encodeBase64(traefikConfig);
|
const encoded = encodeBase64(traefikConfig);
|
||||||
await execAsyncRemote(
|
await execAsyncRemote(
|
||||||
serverId,
|
serverId,
|
||||||
`echo "${encoded}" | base64 -d > "${configPath}"`,
|
`echo "${encoded}" | base64 -d > ${quote([configPath])}`,
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
fs.writeFileSync(configPath, traefikConfig, "utf8");
|
fs.writeFileSync(configPath, traefikConfig, "utf8");
|
||||||
@@ -272,7 +282,11 @@ export const writeTraefikConfigRemote = async (
|
|||||||
const { DYNAMIC_TRAEFIK_PATH } = paths(true);
|
const { DYNAMIC_TRAEFIK_PATH } = paths(true);
|
||||||
const configPath = path.join(DYNAMIC_TRAEFIK_PATH, `${appName}.yml`);
|
const configPath = path.join(DYNAMIC_TRAEFIK_PATH, `${appName}.yml`);
|
||||||
const yamlStr = stringify(traefikConfig);
|
const yamlStr = stringify(traefikConfig);
|
||||||
await execAsyncRemote(serverId, `echo '${yamlStr}' > ${configPath}`);
|
const encoded = encodeBase64(yamlStr);
|
||||||
|
await execAsyncRemote(
|
||||||
|
serverId,
|
||||||
|
`echo "${encoded}" | base64 -d > ${quote([configPath])}`,
|
||||||
|
);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error("Error saving the YAML config file:", e);
|
console.error("Error saving the YAML config file:", e);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import path from "node:path";
|
import path from "node:path";
|
||||||
|
import { quote } from "shell-quote";
|
||||||
import {
|
import {
|
||||||
findApplicationById,
|
findApplicationById,
|
||||||
findComposeById,
|
findComposeById,
|
||||||
@@ -23,7 +24,7 @@ export const restoreVolume = async (
|
|||||||
const backupPath = `${bucketPath}/${backupFileName}`;
|
const backupPath = `${bucketPath}/${backupFileName}`;
|
||||||
|
|
||||||
// Command to download backup file from S3
|
// Command to download backup file from S3
|
||||||
const downloadCommand = `rclone copyto ${rcloneFlags.join(" ")} "${backupPath}" "${volumeBackupPath}/${backupFileName}"`;
|
const downloadCommand = `rclone copyto ${rcloneFlags.join(" ")} ${quote([backupPath])} ${quote([`${volumeBackupPath}/${backupFileName}`])}`;
|
||||||
|
|
||||||
// Base restore command that creates the volume and restores data
|
// Base restore command that creates the volume and restores data
|
||||||
const baseRestoreCommand = `
|
const baseRestoreCommand = `
|
||||||
@@ -40,7 +41,7 @@ export const restoreVolume = async (
|
|||||||
-v ${volumeName}:/volume_data \
|
-v ${volumeName}:/volume_data \
|
||||||
-v ${volumeBackupPath}:/backup \
|
-v ${volumeBackupPath}:/backup \
|
||||||
ubuntu \
|
ubuntu \
|
||||||
bash -c "cd /volume_data && tar xvf /backup/${backupFileName} ."
|
bash -c "cd /volume_data && tar xvf /backup/${quote([backupFileName])} ."
|
||||||
echo "Volume restore completed ✅"
|
echo "Volume restore completed ✅"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user