Merge branch 'MCSManager:master' into master

Author: SnowMoonSS

daemon/src/routers/file_router.ts

@@ -188,7 +188,6 @@ routerApp.on("file/download_from_url", async (ctx, data) => {
 
     const fileManager = getFileManager(data.instanceUuid);
     fileManager.checkPath(fileName);
-    fileManager.assertNotLink(fileName);
     const targetPath = fileManager.toAbsolutePath(fileName);
 
     // Start download in background
@@ -225,7 +224,6 @@ routerApp.on("file/download_from_url_stop", (ctx, data) => {
     } else if (data.instanceUuid) {
       const fileManager = getFileManager(data.instanceUuid);
       fileManager.checkPath(data.fileName);
-      fileManager.assertNotLink(data.fileName);
       const targetPath = fileManager.toAbsolutePath(data.fileName);
 
       const result = downloadManager.stop(targetPath);

daemon/src/service/disk_limit_service.ts

@@ -1,5 +1,6 @@
 import { exec } from "node:child_process";
 import fs from "node:fs";
+import os from "node:os";
 import { promisify } from "util";
 import Instance from "../entity/instance/instance";
 import { $t } from "../i18n";
@@ -92,6 +93,11 @@ class DiskLimitService {
       return this.getCheckDefaultValue(instance, maxSpace);
     }
 
+    // Disk limit is not supported on Windows
+    if (os.platform() === "win32") {
+      return this.getCheckDefaultValue(instance, maxSpace);
+    }
+
     // There was already an initial check on the working directory when saving,
     // but we double-check here.
     if (!checkFilePath(workspace) || !fs.existsSync(workspace)) {

daemon/src/service/system_file.ts

@@ -7,10 +7,10 @@ import { compress, decompress } from "../common/compress";
 import { globalConfiguration } from "../entity/config";
 import { $t, i18next } from "../i18n";
 import { normalizedJoin } from "../tools/filepath";
-import { isFileSystemLink } from "../tools/path_link_check";
+import { resolveRealPath } from "../tools/path_link_check";
 
 const ERROR_MSG_01 = $t("TXT_CODE_system_file.illegalAccess");
-const ERROR_MSG_LINK = $t("TXT_CODE_system_file.linkNotAllowed");
+const ERROR_PATH_NOT_FOUND = $t("TXT_CODE_96281410");
 const MAX_EDIT_SIZE = 1024 * 1024 * 5;
 
 interface IFile {
@@ -43,6 +43,16 @@ export default class FileManager {
     return this.topPath === "/" || this.topPath === "\\";
   }
 
+  private isOutsideWorkspace(absPath: string): boolean {
+    // fix the /app/ vs /app mismatch bug and keep it secure
+    if (this.isRootTopRath()) return false;
+    const realTop = resolveRealPath(this.topPath);
+    const realPath = resolveRealPath(absPath);
+    if (!realTop || !realPath) return true; // If the path cannot be resolved, treat it as outside for safety
+    const relative = path.relative(realTop, realPath);
+    return relative === ".." || relative.startsWith(".." + path.sep) || path.isAbsolute(relative);
+  }
+
   toAbsolutePath(fileName: string = "") {
     const topAbsolutePath = this.topPath;
 
@@ -62,12 +72,7 @@ export default class FileManager {
       finalPath = path.normalize(path.join(this.topPath, this.cwd, fileName));
     }
 
-    // fix the /app/ vs /app mismatch bug and keep it secure
-    const relative = path.relative(topAbsolutePath, finalPath);
-    const isOutside =
-      relative === ".." || relative.startsWith(".." + path.sep) || path.isAbsolute(relative);
-    if (isOutside && topAbsolutePath !== "/" && topAbsolutePath !== "\\")
-      throw new Error(ERROR_MSG_01);
+    if (this.isOutsideWorkspace(finalPath)) throw new Error(ERROR_MSG_01);
     return finalPath;
   }
 
@@ -83,7 +88,7 @@ export default class FileManager {
       ? topAbsolutePath.slice(0, -1)
       : topAbsolutePath;
 
-    this.assertNotLink(destPath);
+    this.assertInsideWorkspace(destPath);
 
     if (destPath.startsWith(topPath)) {
       const parts = destPath.split(path.sep);
@@ -94,17 +99,15 @@ export default class FileManager {
     return false;
   }
 
-  assertNotLink(fileNameOrPath: string) {
+  assertInsideWorkspace(fileNameOrPath: string) {
     const absPath = this.toAbsolutePath(fileNameOrPath);
-    if (fs.existsSync(absPath) && isFileSystemLink(absPath)) {
-      throw new Error(ERROR_MSG_LINK);
-    }
+    if (this.isOutsideWorkspace(absPath)) throw new Error(ERROR_MSG_01);
   }
 
   check(destPath: string) {
     if (this.isRootTopRath()) return true;
-    if (!this.checkPath(destPath) || !fs.existsSync(this.toAbsolutePath(destPath))) return false;
-    this.assertNotLink(destPath);
+    if (!this.checkPath(destPath)) return false;
+    if (!fs.existsSync(this.toAbsolutePath(destPath))) throw new Error(ERROR_PATH_NOT_FOUND);
     return true;
   }
 
@@ -116,21 +119,30 @@ export default class FileManager {
   async list(page: 0, pageSize = 40, searchFileName?: string) {
     if (pageSize > 100 || pageSize <= 0 || page < 0) throw new Error("Beyond the value limit");
 
-    this.assertNotLink(".");
+    this.assertInsideWorkspace(".");
 
     // Use withFileTypes option to get file type directly, reducing stat calls
     const dirents = await fs.readdir(this.toAbsolutePath(), { withFileTypes: true });
 
     // Filter search results and create basic file info with type
-    let filteredItems = dirents
-      .filter(
-        (dirent) =>
-          !searchFileName || dirent.name.toLowerCase().includes(searchFileName.toLowerCase())
-      )
-      .map((dirent) => ({
-        name: dirent.name,
-        type: dirent.isFile() ? 1 : 0
-      }));
+    let filteredItems = await Promise.all(
+      dirents
+        .filter(
+          (dirent) =>
+            !searchFileName || dirent.name.toLowerCase().includes(searchFileName.toLowerCase())
+        )
+        .map(async (dirent) => {
+          let type = dirent.isFile() ? 1 : 0;
+          if (type === 0 && !dirent.isDirectory()) {
+            // Symbolic links may return false for both isFile() and isDirectory()
+            // see #2124
+            try {
+              type = (await fs.stat(this.toAbsolutePath(dirent.name))).isFile() ? 1 : 0;
+            } catch {}
+          }
+          return { name: dirent.name, type };
+        })
+    );
 
     const total = filteredItems.length;
 
@@ -263,12 +275,12 @@ export default class FileManager {
     const filesPath = [];
     let totalSize = 0;
     for (const iterator of files) {
-      if (this.check(iterator)) {
-        filesPath.push(this.toAbsolutePath(iterator));
-        try {
+      try {
+        if (this.check(iterator)) {
+          filesPath.push(this.toAbsolutePath(iterator));
           totalSize += fs.statSync(this.toAbsolutePath(iterator))?.size;
-        } catch (error: any) {}
-      }
+        }
+      } catch (error: any) {}
     }
     if (totalSize > MAX_TOTAL_FIELS_SIZE)
       throw new Error($t("TXT_CODE_system_file.unzipLimit", { max: MAX_ZIP_GB }));
@@ -307,7 +319,6 @@ export default class FileManager {
   }
 
   private zipFileCheck(path: string) {
-    if (isFileSystemLink(path)) throw new Error(ERROR_MSG_LINK);
     const fileInfo = fs.statSync(path);
     const MAX_ZIP_GB = globalConfiguration.config.maxZipFileSize;
     if (fileInfo.size > 1024 * 1024 * 1024 * MAX_ZIP_GB)

daemon/src/tools/path_link_check.ts

@@ -1,32 +1,30 @@
 import fs from "fs-extra";
+import path from "path";
 
 /**
- * Returns true when the path itself is a symbolic link (does not follow the link).
+ * Resolves the real absolute path by walking backwards from the target to
+ * find the deepest existing ancestor, then calling realpathSync on it and
+ * appending the non-existent tail segments.
+ *
+ * Returns null if realpathSync fails on the existing ancestor.
  */
-export function isSymbolicLinkPath(absolutePath: string): boolean {
-  try {
-    return fs.lstatSync(absolutePath).isSymbolicLink();
-  } catch {
-    return false;
-  }
-}
+export function resolveRealPath(absolutePath: string): string | null {
+  let dir = path.resolve(absolutePath);
+  const root = path.parse(dir).root;
+  const missed: string[] = [];
 
-/**
- * Returns true when the path is a hard link to an existing file.
- * Directories are excluded because nlink is not meaningful for them across platforms.
- */
-export function isHardLinkPath(absolutePath: string): boolean {
-  try {
-    const stat = fs.statSync(absolutePath);
-    return stat.isFile() && stat.nlink > 1;
-  } catch {
-    return false;
+  while (true) {
+    try {
+      fs.lstatSync(dir);
+      try {
+        return path.join(fs.realpathSync(dir), ...missed);
+      } catch {
+        return null;
+      }
+    } catch {
+      if (dir === root) return null;
+      missed.unshift(path.basename(dir));
+      dir = path.dirname(dir);
+    }
   }
 }
-
-/**
- * Returns true when the path is a symbolic link or a hard link.
- */
-export function isFileSystemLink(absolutePath: string): boolean {
-  return isSymbolicLinkPath(absolutePath) || isHardLinkPath(absolutePath);
-}

languages/de_DE.json

@@ -3445,6 +3445,5 @@
   "TXT_CODE_6542489a": "Beispiel: /dev/sda:10MB",
   "TXT_CODE_9d2e6d5e": "Schreibrate-Limit für Geräte (BPS)",
   "TXT_CODE_2b2ff3ff": "Begrenzt die Schreibrate bestimmter Blockgeräte für den Container. Format: /dev/sda:5MB. Mehrere Geräte durch Kommas trennen.",
-  "TXT_CODE_f0dc9eca": "Beispiel: /dev/sda:5MB",
-  "TXT_CODE_system_file.linkNotAllowed": "Symbolische Verknüpfungen und feste Verknüpfungen sind für diesen Vorgang nicht zulässig"
+  "TXT_CODE_f0dc9eca": "Beispiel: /dev/sda:5MB"
 }

languages/en_US.json

@@ -3299,7 +3299,6 @@
   "TXT_CODE_systemUser.userCount": "Number of local users: {{n}}",
   "TXT_CODE_system_file.execLimit": "Exceeded maximum file editing limit",
   "TXT_CODE_system_file.illegalAccess": "Illegal access path",
-  "TXT_CODE_system_file.linkNotAllowed": "Symbolic links and hard links are not allowed for this operation",
   "TXT_CODE_system_file.unzipLimit": "File decompression only supports file up to {{max}}GB. To change this limit, please go to the data/Config/global.json file.",
   "TXT_CODE_system_instance.autoStart": "Automatic start command for instance {{name}} ({{uuid}}) has been issued.",
   "TXT_CODE_system_instance.autoStartErr": "Error occurred while automatically starting instance {{name}} ({{uuid}}): {{reason}}",
@@ -3447,4 +3446,4 @@
   "TXT_CODE_9d2e6d5e": "Device Write Rate Limit (BPS)",
   "TXT_CODE_2b2ff3ff": "Limit the write rate of specific block devices for the container. Format: /dev/sda:5MB. Separate multiple devices with commas.",
   "TXT_CODE_f0dc9eca": "Example: /dev/sda:5MB"
-}
+}

languages/es_ES.json

@@ -3445,6 +3445,5 @@
   "TXT_CODE_6542489a": "Ejemplo: /dev/sda:10MB",
   "TXT_CODE_9d2e6d5e": "Límite de velocidad de escritura del dispositivo (BPS)",
   "TXT_CODE_2b2ff3ff": "Limitar la velocidad de escritura de dispositivos de bloque específicos del contenedor. Formato: /dev/sda:5MB. Separe varios dispositivos con comas.",
-  "TXT_CODE_f0dc9eca": "Ejemplo: /dev/sda:5MB",
-  "TXT_CODE_system_file.linkNotAllowed": "No se permiten enlaces simbólicos ni enlaces duros para esta operación"
+  "TXT_CODE_f0dc9eca": "Ejemplo: /dev/sda:5MB"
 }

languages/fr_FR.json

@@ -3445,6 +3445,5 @@
   "TXT_CODE_6542489a": "Exemple : /dev/sda:10Mo",
   "TXT_CODE_9d2e6d5e": "Limite d'écriture du périphérique (BPS)",
   "TXT_CODE_2b2ff3ff": "Limite le débit d'écriture de périphériques bloc spécifiques pour le conteneur. Format : /dev/sda:5Mo. Séparez plusieurs périphériques par des virgules.",
-  "TXT_CODE_f0dc9eca": "Exemple : /dev/sda:5Mo",
-  "TXT_CODE_system_file.linkNotAllowed": "Les liens symboliques et les liens physiques ne sont pas autorisés pour cette opération"
+  "TXT_CODE_f0dc9eca": "Exemple : /dev/sda:5Mo"
 }

languages/ja_JP.json

@@ -3445,6 +3445,5 @@
   "TXT_CODE_6542489a": "例: /dev/sda:10MB",
   "TXT_CODE_9d2e6d5e": "デバイス書き込みレート制限（BPS）",
   "TXT_CODE_2b2ff3ff": "コンテナの特定ブロックデバイスの書き込みレートを制限します。形式: /dev/sda:5MB。複数デバイスはカンマで区切ります。",
-  "TXT_CODE_f0dc9eca": "例: /dev/sda:5MB",
-  "TXT_CODE_system_file.linkNotAllowed": "この操作では、シンボリックリンクとハードリンクは許可されていません。"
+  "TXT_CODE_f0dc9eca": "例: /dev/sda:5MB"
 }

languages/ko_KR.json

@@ -3445,6 +3445,5 @@
   "TXT_CODE_6542489a": "예시: /dev/sda:10MB",
   "TXT_CODE_9d2e6d5e": "장치 쓰기 속도 제한 (BPS)",
   "TXT_CODE_2b2ff3ff": "컨테이너의 특정 블록 장치 쓰기 속도를 제한합니다. 형식: /dev/sda:5MB. 여러 장치는 쉼표로 구분하세요.",
-  "TXT_CODE_f0dc9eca": "예시: /dev/sda:5MB",
-  "TXT_CODE_system_file.linkNotAllowed": "이 작업에서는 심볼릭 링크와 하드 링크가 허용되지 않습니다"
+  "TXT_CODE_f0dc9eca": "예시: /dev/sda:5MB"
 }