add cleanup in case chown fails

cockpit-project · Jan 3, 2025 · 5323e45 · 5323e45
1 parent e5c843a
commit 5323e45
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/dialogs/copyPasteOwnership.tsx b/src/dialogs/copyPasteOwnership.tsx
@@ -41,19 +41,30 @@ async function pasteAsOwner(clipboard: ClipboardInfo, dstPath: string, owner: st
         await cockpit.spawn([
             "cp",
             "--recursive",
-            ...clipboard.files.map(file => clipboard.path + file.name),
+            ...clipboard.files.map(file => clipboard.path + "/" + file.name),
             dstPath
         ], { superuser: "try" });
 
         await cockpit.spawn([
             "chown",
             "--recursive",
             owner,
-            ...clipboard.files.map(file => dstPath + file.name),
+            ...clipboard.files.map(file => dstPath + "/" + file.name),
         ], { superuser: "try" });
     } catch (err) {
         const e = err as cockpit.BasicError;
         addAlert(e.message, AlertVariant.danger, `${new Date().getTime()}`);
+
+        // cleanup potentially copied files in case of "chown" fail
+        try {
+            await cockpit.spawn([
+                "rm",
+                "-rf",
+                ...clipboard.files.map(file => dstPath + "/" + file.name)
+            ], { superuser: "try" });
+        } catch (ex) {
+            console.warn(`Failed to clean up copied files in ${dstPath}`, ex);
+        }
     }
 }
 

diff --git a/test/check-application b/test/check-application
@@ -1957,8 +1957,6 @@ class TestFiles(testlib.MachineCase):
         # Copy/paste file
         m.execute("runuser -u admin mkdir /home/admin/newdir")
         m.write('/home/admin/newfile', 'test_text\n', owner='admin:admin')
-        # "hack" test is too quick and UI doesnt reflect the chown done in m.write so it still
-        # thinks that file owner is root
         b.wait_in_text("[data-item='newfile'] .item-owner", "admin")
         b.click("[data-item='newfile']")
         b.click("#dropdown-menu")