@opengsd/gsd-core 1.6.1 → 1.7.0-rc.2

package/gsd-core/bin/lib/capability-loader.cjs

@@ -67,6 +67,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.readHostVersion = readHostVersion;
 exports.loadRegistry = loadRegistry;
 const fs = __importStar(require("node:fs"));
 const os = __importStar(require("node:os"));
@@ -110,17 +111,33 @@ function _setValidatorForTest(v) {
 function _setGeneratorForTest(g) {
     _generatorOverride = g;
 }
-/** Resolve the running GSD version; fail-closed to '0.0.0' if it cannot be read. */
-function readHostVersion() {
+/**
+ * Resolve the running GSD version; fail-closed to '0.0.0' if it cannot be read.
+ *
+ * Prefer the authoritative `gsd-core/VERSION` the installer writes for EVERY runtime
+ * (libDir = gsd-core/bin/lib/, so `../../VERSION` = gsd-core/VERSION). This is reliable
+ * across all installed layouts — including runtimes that get no marker package.json, and
+ * local installs where the walked-up `../../../package.json` would resolve to the USER's
+ * own project and report a wrong version (#1920). Fall back to the runtime-root
+ * package.json for the dev/source tree, then fail-closed. Mirrors resolveVersionFrom()
+ * (#1383). `libDir` is injectable for tests; it defaults to this module's directory.
+ */
+function readHostVersion(libDir = __dirname) {
+    const SEMVER_PREFIX = /^\d+\.\d+\.\d+/;
     try {
-        // gsd-core/bin/lib/ -> repo/package root is three levels up.
-        // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-unsafe-assignment
-        const pkg = require('../../../package.json');
-        return typeof pkg.version === 'string' && pkg.version ? pkg.version : '0.0.0';
+        const v = fs.readFileSync(path.join(libDir, '..', '..', 'VERSION'), 'utf8').trim();
+        if (SEMVER_PREFIX.test(v))
+            return v;
     }
-    catch {
-        return '0.0.0';
+    catch { /* not an installed tree (no gsd-core/VERSION) */ }
+    try {
+        // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-unsafe-assignment
+        const pkg = require(path.join(libDir, '..', '..', '..', 'package.json'));
+        if (pkg && typeof pkg.version === 'string' && SEMVER_PREFIX.test(pkg.version))
+            return pkg.version;
     }
+    catch { /* runtime root has no package.json */ }
+    return '0.0.0';
 }
 /**
  * Canonicalize a directory path for dedup/scope-escalation comparison. #1459 finding 1 (HIGH): the dedup
@@ -397,6 +414,10 @@ function loadRegistry(options = {}) {
     const ledgerMod = require('./capability-ledger.cjs');
     // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-unsafe-assignment
     const consentMod = require('./capability-consent.cjs');
+    // ADR-1239 Phase C-2 (#1681): load-time configHome confinement for installed
+    // third-party descriptors. Accessed via module ref for stub compatibility.
+    // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-unsafe-assignment
+    const externalDescriptorTrust = require('./external-descriptor-trust.cjs');
     const cwd = options.cwd || process.cwd();
     const hostVersion = options.hostVersion || readHostVersion();
     // The user-owned consent home — SAME `gsdHome || GSD_HOME || homedir()` rule the CLI uses, so the
@@ -681,6 +702,20 @@ function loadRegistry(options = {}) {
                     skip('cross-capability validation failed: ' + crossErrs.slice(0, 3).join('; '));
                     continue;
                 }
+                // ADR-1239 Phase C-2 (#1681): load-time configHome confinement — reject
+                // (skip + warn) any installed third-party descriptor whose declared
+                // destSubpath escapes the user-approved configHome, BEFORE it is composed.
+                // Defense-in-depth on top of the install-time gate (#1679 AC3).
+                if (typeof options.configHome === 'string' && options.configHome.length > 0) {
+                    try {
+                        externalDescriptorTrust.assertDescriptorConfined(cap, options.configHome);
+                    }
+                    catch (confineErr) {
+                        acceptedMap.delete(id);
+                        skip('configHome confinement rejected: ' + errMessage(confineErr));
+                        continue;
+                    }
+                }
                 // Accepted.
                 overlayCaps.push(cap);
                 acceptedIds.add(id);
@@ -761,4 +796,5 @@ function loadRegistry(options = {}) {
         return withOverlayMeta(base, meta);
     }
 }
-module.exports = { loadRegistry, _setValidatorForTest, _setGeneratorForTest };
+// readHostVersion is exported for the #1920 regression (VERSION-first host-version resolution).
+module.exports = { loadRegistry, readHostVersion, _setValidatorForTest, _setGeneratorForTest };

package/gsd-core/bin/lib/capability-lock.cjs

@@ -42,7 +42,7 @@ const node_os_1 = __importDefault(require("node:os"));
 const node_crypto_1 = __importDefault(require("node:crypto"));
 /* eslint-disable @typescript-eslint/no-require-imports */
 const ledgerMod = require('./capability-ledger.cjs');
-const { execTool } = require('./shell-command-projection.cjs');
+const { execTool, retryRenameSync } = require('./shell-command-projection.cjs');
 /* eslint-enable @typescript-eslint/no-require-imports */
 // ---------------------------------------------------------------------------
 // Constants
@@ -475,7 +475,7 @@ function acquireLock(lockPath, opts) {
         // Steal atomically (only one racer can rename the inode).
         const stolen = `${lockPath}.stale-${process.pid}-${Date.now()}-${node_crypto_1.default.randomBytes(4).toString('hex')}`;
         try {
-            node_fs_1.default.renameSync(lockPath, stolen);
+            retryRenameSync(lockPath, stolen);
         }
         catch {
             return null;