@lightnet/cli 4.6.0 → 4.6.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @lightnet/cli
 
+## 4.6.1
+
+### Patch Changes
+
+- [#441](https://github.com/LightNetDev/LightNet/pull/441) [`b643414`](https://github.com/LightNetDev/LightNet/commit/b643414852ed1e6d80fa013dff9e1189c9f7ba35) - Protect R2 bucket-root delete and copy replacement with a visible warning and require the long `--force` flag to bypass confirmation.
+
 ## 4.6.0
 
 ### Minor Changes

package/package.json

@@ -3,7 +3,7 @@
   "description": "CLI for managing LightNet projects",
   "type": "module",
   "license": "MIT",
-  "version": "4.6.0",
+  "version": "4.6.1",
   "publishConfig": {
     "access": "public"
   },

package/src/index.js

@@ -96,10 +96,11 @@ r2Command
   .option("-r, --recursive", "delete a directory/prefix recursively")
   .option(
     "-f, --force",
-    "delete without confirmation, except when cleaning the bucket root",
+    'delete without confirmation; use "--force" to clean the bucket root without confirmation',
   )
   .action(async (path, options) => {
     try {
+      options.longForce = hasLongForceFlag()
       await removeR2(path, options)
     } catch (error) {
       handleCommandError(error)
@@ -113,9 +114,13 @@ r2Command
   )
   .argument("<source>", 'source path; use "r2:<path>" for R2')
   .argument("<destination>", 'destination path; use "r2:<path>" for R2')
-  .option("-f, --force", "overwrite existing files without confirmation")
+  .option(
+    "-f, --force",
+    'overwrite without confirmation; use "--force" to replace the bucket root without confirmation',
+  )
   .action(async (source, destination, options) => {
     try {
+      options.longForce = hasLongForceFlag()
       await copyR2(source, destination, options)
     } catch (error) {
       handleCommandError(error)
@@ -154,3 +159,7 @@ function handleCommandError(error) {
   }
   throw error
 }
+
+function hasLongForceFlag() {
+  return process.argv.includes("--force")
+}

package/src/r2.js

@@ -20,6 +20,7 @@ const remotePathPrefix = "r2:"
 /**
  * @typedef {{
  *   force?: boolean
+ *   longForce?: boolean
  * }} R2CopyOptions
  */
 
@@ -42,6 +43,7 @@ const remotePathPrefix = "r2:"
  * @typedef {{
  *   force?: boolean
  *   recursive?: boolean
+ *   longForce?: boolean
  * }} R2RemoveOptions
  */
 
@@ -89,9 +91,19 @@ export async function removeR2(path, options, runtime = {}) {
   }
 
   const interactive = getInteractive(runtime)
-  if (isBucketRoot && !interactive) {
+  if (isBucketRoot && options.force && !options.longForce && !interactive) {
     throw new CliError(
-      "Cleaning the R2 bucket root requires interactive confirmation.",
+      'Ignoring "-f" for R2 bucket-root cleanup. If you are sure you want to delete the entire R2 bucket, use "--force".',
+    )
+  }
+  if (isBucketRoot && !interactive && !options.longForce) {
+    throw new CliError(
+      'Cleaning the R2 bucket root requires interactive confirmation. If you are sure you want to delete the entire R2 bucket, use "--force".',
+    )
+  }
+  if (isBucketRoot && options.force && !options.longForce) {
+    log.warn(
+      'Ignoring "-f" for R2 bucket-root cleanup. Use "--force" if you are sure you want to delete the entire R2 bucket.',
     )
   }
   if (!options.force && !interactive) {
@@ -107,14 +119,15 @@ export async function removeR2(path, options, runtime = {}) {
   }
 
   const shouldDelete = isBucketRoot
-    ? await getPromptConfirm(runtime)(
+    ? options.longForce ||
+      (await getPromptConfirm(runtime)(
         "Delete all files in the R2 bucket? [y/N] ",
-      )
+      ))
     : options.force ||
       (await getPromptConfirm(runtime)(`Delete R2 path "${r2Path}"? [y/N] `))
 
   if (!shouldDelete) {
-    return
+    cancelPrompt()
   }
 
   const client = createR2CommandClient(runtime)
@@ -161,14 +174,23 @@ export async function copyR2(source, destination, options = {}, runtime = {}) {
     sourceType === "file" &&
     (targetType !== "directory" || isDirectoryLikeCopyPath(destinationPath))
 
-  await confirmCopyOverwrite({
-    destination,
+  const confirmedRootOverwrite = await confirmCopyRootOverwrite({
     force: options.force === true,
+    longForce: options.longForce === true,
     runtime,
-    sourceType,
     targetPath,
     targetType,
   })
+  if (!confirmedRootOverwrite) {
+    await confirmCopyOverwrite({
+      destination,
+      force: options.force === true,
+      runtime,
+      sourceType,
+      targetPath,
+      targetType,
+    })
+  }
   await replaceCopyTargetBeforeCopy({
     client,
     runtime,
@@ -271,6 +293,55 @@ async function replaceCopyTargetBeforeCopy({
   })
 }
 
+/**
+ * @param {{
+ *   force: boolean,
+ *   longForce: boolean,
+ *   runtime: R2Runtime,
+ *   targetPath: CopyPath,
+ *   targetType: CopyPathType
+ * }} args
+ */
+async function confirmCopyRootOverwrite({
+  force,
+  longForce,
+  runtime,
+  targetPath,
+  targetType,
+}) {
+  if (!isR2BucketRootCopyPath(targetPath) || targetType === "missing") {
+    return false
+  }
+  log.warn(
+    "This will replace ALL files in the configured R2 bucket. This cannot be undone.",
+  )
+  if (longForce) {
+    return true
+  }
+  if (force && !getInteractive(runtime)) {
+    throw new CliError(
+      'Ignoring "-f" for R2 bucket-root replacement. If you are sure you want to replace the entire R2 bucket, use "--force".',
+    )
+  }
+  if (!getInteractive(runtime)) {
+    throw new CliError(
+      'Replacing the R2 bucket root requires interactive confirmation. If you are sure you want to replace the entire R2 bucket, use "--force".',
+    )
+  }
+  if (force) {
+    log.warn(
+      'Ignoring "-f" for R2 bucket-root replacement. Use "--force" if you are sure you want to replace the entire R2 bucket.',
+    )
+  }
+  const shouldOverwrite = await getPromptConfirm(runtime)(
+    "Replace all files in the R2 bucket? [y/N] ",
+  )
+  if (!shouldOverwrite) {
+    cancelPrompt()
+  }
+  return true
+}
+
 /**
  * @param {R2Runtime} runtime
  */
@@ -498,6 +569,13 @@ function isR2BucketRootPath(path) {
   return path.trim() === "/"
 }
 
+/**
+ * @param {CopyPath} path
+ */
+function isR2BucketRootCopyPath(path) {
+  return path.remote && path.path === ""
+}
+
 /**
  * @param {unknown} error
  */