@yunsoft/yuncms 0.1.25 → 0.1.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yunsoft/yuncms",
-  "version": "0.1.25",
+  "version": "0.1.27",
   "description": "Command-line setup and runtime launcher for YunCMS.",
   "license": "MIT",
   "type": "module",
@@ -30,8 +30,8 @@
     "test": "node --test"
   },
   "dependencies": {
-    "@yunsoft/yuncms-api": "0.1.25",
-    "@yunsoft/yuncms-core": "0.1.25"
+    "@yunsoft/yuncms-api": "0.1.27",
+    "@yunsoft/yuncms-core": "0.1.27"
   },
   "funding": {
     "type": "github",

package/src/update-lock.js

@@ -1,14 +1,21 @@
 import { randomBytes } from 'node:crypto';
-import { mkdir, open, rm } from 'node:fs/promises';
+import { lstat, mkdir, open, readFile, rm } from 'node:fs/promises';
 import { dirname, resolve } from 'node:path';
 
 import {
+  assertSecureUserParentDir,
   hashMaintenanceBypassToken,
+  legacyMaintenanceLockPath,
   maintenanceLockPath,
+  probeLegacyMaintenanceLock,
 } from '@yunsoft/yuncms-core';
 
-export function updateLockPath(cwd = process.cwd()) {
-  return maintenanceLockPath(cwd);
+export function updateLockPath(cwd = process.cwd(), options = {}) {
+  return maintenanceLockPath(cwd, options);
+}
+
+export function legacyUpdateLockPath(cwd = process.cwd(), options = {}) {
+  return legacyMaintenanceLockPath(cwd, options);
 }
 
 export async function acquireUpdateLock({
@@ -16,10 +23,54 @@ export async function acquireUpdateLock({
   now = new Date(),
   pid = process.pid,
   generateToken = () => randomBytes(32).toString('hex'),
+  tempRoot,
+  getuidFn,
+  userInfoFn,
+  readFileFn = readFile,
+  lstatFn = lstat,
 } = {}) {
-  const path = updateLockPath(cwd);
-  await mkdir(dirname(path), { recursive: true, mode: 0o700 });
+  const options = {
+    cwd,
+    tempRoot,
+    getuidFn,
+    userInfoFn,
+    readFileFn,
+    lstatFn,
+  };
+
+  // 1. An accessible active or corrupt legacy lock blocks new CLI acquisition
+  let legacy;
+  try {
+    legacy = await probeLegacyMaintenanceLock(options);
+  } catch (err) {
+    if (err?.code === 'YUNCMS_MAINTENANCE_ACTIVE') {
+      const locked = new Error(
+        `Another YunCMS backup/update/restore operation may already be running. Inspect and remove the stale lock only after verifying no operation is active: ${err.lockPath || legacyMaintenanceLockPath(cwd, options)}`,
+      );
+      locked.code = 'UPDATE_ALREADY_RUNNING';
+      locked.lockPath = err.lockPath || legacyMaintenanceLockPath(cwd, options);
+      locked.cause = err;
+      throw locked;
+    }
+    throw err;
+  }
+
+  if (legacy) {
+    const locked = new Error(
+      `Another YunCMS backup/update/restore operation may already be running. Inspect and remove the stale lock only after verifying no operation is active: ${legacy.path}`,
+    );
+    locked.code = 'UPDATE_ALREADY_RUNNING';
+    locked.lockPath = legacy.path;
+    throw locked;
+  }
+
+  // 2. Prepare per-user lock directory and validate security
+  const path = updateLockPath(cwd, options);
+  const parentDir = dirname(path);
+  await mkdir(parentDir, { recursive: true, mode: 0o700 });
+  await assertSecureUserParentDir(parentDir, { lstatFn, getuidFn });
 
+  // 3. Acquire exclusive lock file
   let handle;
   try {
     handle = await open(path, 'wx', 0o600);