@supacloud/admin 0.7.9 → 0.7.11

package/dist/index.js

@@ -26399,6 +26399,8 @@ async function prepareLocalUpgradeBundle(request) {
 var REMOTE_STAGE_ROOT = "/var/lib/supacloud/upgrade-staging";
 var REMOTE_RUN_ROOT = "/var/lib/supacloud/upgrade-runs";
 var REMOTE_LOG_ROOT = "/var/log/supacloud";
+var REMOTE_UPLOAD_ROOT = "/var/tmp";
+var REMOTE_COMMAND_PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
 var POLL_INTERVAL_MS = 2000;
 var STATE_READ_ATTEMPTS = 3;
 var REMOTE_STATE_READ_TIMEOUT_MS = 15000;
@@ -26433,9 +26435,9 @@ function trustedInstalledGithubFunction() {
   ].join(`
 `);
 }
-function remotePaths(runId) {
+function buildRemoteUpgradePaths(runId) {
   return {
-    drop: `/tmp/.supacloud-upgrade-upload-${runId}`,
+    drop: `${REMOTE_UPLOAD_ROOT}/.supacloud-upgrade-upload-${runId}`,
     stage: `${REMOTE_STAGE_ROOT}/${runId}`,
     status: `${REMOTE_RUN_ROOT}/${runId}.status`,
     log: `${REMOTE_LOG_ROOT}/upgrade-${runId}.log`,
@@ -26457,11 +26459,12 @@ function buildRemotePreflightScript() {
   const capabilityFlags = STRICT_GITHUB_CAPABILITY_FLAGS.join(" ");
   return [
     "set -euo pipefail",
-    "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+    `PATH=${REMOTE_COMMAND_PATH}`,
     "export PATH",
     trustedInstalledGithubFunction(),
     "test -d /run/systemd/system || { echo 'systemd is not the active init system' >&2; exit 1; }",
-    'for tool in systemctl systemd-run sha256sum stat realpath tar file find sort awk grep timeout flock; do command -v "$tool" >/dev/null 2>&1 || { echo "Required local-upgrade tool is missing: $tool" >&2; exit 127; }; done',
+    'for tool in systemctl systemd-run sha256sum stat realpath tar file find sort awk grep tail timeout flock; do command -v "$tool" >/dev/null 2>&1 || { echo "Required local-upgrade tool is missing: $tool" >&2; exit 127; }; done',
+    "tail -n 0 -- /dev/null >/dev/null 2>&1 || { echo 'A tail implementation with -n and -- support is required' >&2; exit 1; }",
     "systemd-run --help | grep -Eq -- '(^|[[:space:]])--collect([=[:space:]]|$)' || { echo 'systemd-run --collect is required' >&2; exit 1; }",
     "test -d /run/lock || { echo '/run/lock is unavailable' >&2; exit 1; }",
     "test -d /var/lib/supacloud || { echo '/var/lib/supacloud is unavailable' >&2; exit 1; }",
@@ -26492,9 +26495,19 @@ function requiredRemoteBytes(bundle) {
   const transferBytes = [...bundle.files, ...bundle.verifierArchive ? [bundle.verifierArchive] : []].reduce((total, upload) => total + upload.size, 0);
   return transferBytes * 3 + 512 * 1024 * 1024;
 }
+function remoteUploadRootGate() {
+  return [
+    `UPLOAD_ROOT=${quoteShell2(REMOTE_UPLOAD_ROOT)}`,
+    `test -d "$UPLOAD_ROOT" && test ! -L "$UPLOAD_ROOT" || { echo 'Remote upload root must be a directory, not a symlink' >&2; exit 1; }`,
+    `test "$(stat -c '%u' "$UPLOAD_ROOT")" = 0 || { echo 'Remote upload root must be owned by root' >&2; exit 1; }`,
+    `UPLOAD_ROOT_MODE=$(stat -c '%a' "$UPLOAD_ROOT")`,
+    `case "$UPLOAD_ROOT_MODE" in [0-7]|[0-7][0-7]|[0-7][0-7][0-7]|[0-7][0-7][0-7][0-7]) ;; *) echo 'Remote upload root has invalid permission bits' >&2; exit 1 ;; esac`,
+    "(( (8#$UPLOAD_ROOT_MODE & 01000) != 0 )) || { echo 'Remote upload root must set the sticky bit' >&2; exit 1; }",
+    `test -w "$UPLOAD_ROOT" && test -x "$UPLOAD_ROOT" || { echo 'Remote upload root is not writable and searchable by the SSH user' >&2; exit 1; }`
+  ];
+}
 function buildPrepareDropCommand(paths, bundle) {
   const directories = [
-    paths.drop,
     `${paths.drop}/bundle`,
     `${paths.drop}/bundle/management-api`,
     `${paths.drop}/bundle/edge-runtime`
@@ -26505,10 +26518,12 @@ function buildPrepareDropCommand(paths, bundle) {
   return [
     "set -euo pipefail",
     "umask 077",
-    `test ! -e ${quoteShell2(paths.drop)} && test ! -L ${quoteShell2(paths.drop)} || { echo 'Remote upload drop already exists' >&2; exit 1; }`,
-    "TMP_AVAILABLE_KB=$(df -Pk /tmp | awk 'NR == 2 { print $4 }')",
+    ...remoteUploadRootGate(),
+    `DROP=${quoteShell2(paths.drop)}`,
+    `UPLOAD_AVAILABLE_KB=$(df -Pk "$UPLOAD_ROOT" | awk 'NR == 2 { print $4 }')`,
     "VAR_AVAILABLE_KB=$(df -Pk /var/lib/supacloud | awk 'NR == 2 { print $4 }')",
-    `test "${"$"}TMP_AVAILABLE_KB" -ge ${Math.ceil(requiredBytes / 1024)} && test "${"$"}VAR_AVAILABLE_KB" -ge ${Math.ceil(requiredBytes / 1024)} || { echo 'Insufficient remote disk space for verified upgrade staging' >&2; exit 1; }`,
+    `test "${"$"}UPLOAD_AVAILABLE_KB" -ge ${Math.ceil(requiredBytes / 1024)} && test "${"$"}VAR_AVAILABLE_KB" -ge ${Math.ceil(requiredBytes / 1024)} || { echo 'Insufficient remote disk space for verified upgrade staging' >&2; exit 1; }`,
+    `mkdir -m 700 -- "$DROP" || { echo 'Unable to create exclusive remote upload drop' >&2; exit 1; }`,
     `install -d -m 700 ${directories.map(quoteShell2).join(" ")}`
   ].join(`
 `);
@@ -26573,7 +26588,7 @@ function upgradeScriptSetup(paths) {
     "#!/usr/bin/env bash",
     "set -euo pipefail",
     "umask 077",
-    "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+    `PATH=${REMOTE_COMMAND_PATH}`,
     "export PATH",
     `STAGE=${quoteShell2(paths.stage)}`,
     `STATUS=${quoteShell2(paths.status)}`,
@@ -26876,9 +26891,11 @@ async function observeRemoteState(ssh, paths, observation) {
 }
 async function remoteLogTail(ssh, paths) {
   const script = [
+    `PATH=${REMOTE_COMMAND_PATH}`,
+    "export PATH",
     `LOG=${quoteShell2(paths.log)}`,
     `test -f "$LOG" && test ! -L "$LOG" || { echo 'Remote upgrade log is not a regular file' >&2; exit 1; }`,
-    'tail -80 -- "$LOG"'
+    'tail -n 80 -- "$LOG"'
   ].join(`
 `);
   const output = await ssh.exec(rootCommand(script), 15000);
@@ -26924,6 +26941,9 @@ function remoteEvidence(paths) {
 function remoteReconciliationFailure(message, failures, paths) {
   return new RemoteUpgradeReconciliationError(failures.map((failure) => operationError(failure, message)), `${message}; reconcile remote evidence at ${remoteEvidence(paths)}; do not retry blindly`);
 }
+function buildUploadDropCleanupFailure(transferFailure, cleanupFailure, paths) {
+  return remoteReconciliationFailure("Local upgrade failed and upload-drop cleanup did not complete", [transferFailure, cleanupFailure], paths);
+}
 function failureRequiresRemoteReconciliation(error) {
   return error instanceof RemoteUpgradeReconciliationError;
 }
@@ -27048,7 +27068,7 @@ async function awaitRemoteUpgrade(ssh, paths) {
 }
 async function executeLocalUpgradeTransfer(ssh, request) {
   const runId = randomUUID3();
-  const paths = remotePaths(runId);
+  const paths = buildRemoteUpgradePaths(runId);
   const preflight = await remoteUpgradePreflight(ssh);
   const bundle = await prepareLocalUpgradeBundle({ ...preflight, ...request });
   let adopted = false;
@@ -27068,7 +27088,7 @@ async function executeLocalUpgradeTransfer(ssh, request) {
         try {
           await cleanupRemoteDrop(ssh, paths);
         } catch (cleanupError) {
-          transferError = new AggregateError([transferError, cleanupError], "Local upgrade failed and upload-drop cleanup did not complete");
+          transferError = buildUploadDropCleanupFailure(transferError, cleanupError, paths);
         }
       }
       throw transferError;
@@ -28964,7 +28984,7 @@ Actions: routes, upsert_route, update_route, delete_route, config, get_certifica
 // package.json
 var package_default = {
   name: "@supacloud/admin",
-  version: "0.7.9",
+  version: "0.7.11",
   description: "Platform administration CLI for SupaCloud operators",
   type: "module",
   main: "./dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supacloud/admin",
-  "version": "0.7.9",
+  "version": "0.7.11",
   "description": "Platform administration CLI for SupaCloud operators",
   "type": "module",
   "main": "./dist/index.js",