Support copy&pasting files with administrator privileges #880

tomasmatus · 2024-12-16T12:47:03Z

Allows administrator to paste files into directories owned by a different user.

tomasmatus · 2024-12-16T12:50:29Z

Adjusted for design mockups from Garrett:

default selected value is the same as destination directory owner, other options include the current logged-in user, root, and if permissions matches on all files there also is an option to keep original permission (should it be different from any of the three mentioned earlier)

martinpitt

Thanks! I had an initial look for things which are independent of the visual design.

Wrt. that, I still don't understand why uploading and pasting look so dramatically different -- IMHO either both should use an Alert or a Modal. It's not clear to me how #551 handled that, but it surely must have the same problem of dropping a dragged file into a non-user directory? But that's primarily @garrett 's decision.

Thanks!

src/dialogs/copyPasteOwnership.tsx

martinpitt · 2024-12-19T09:12:48Z

src/dialogs/copyPasteOwnership.tsx

+            ...clipboard.files.map(file => dstPath + file.name),
+        ], { superuser: "try" });
+    } catch (err) {
+        const e = err as cockpit.BasicError;


Error handling is a bit tricky here. It could theoretically happen that the cp works, but the chown fails (not very likely, but think of "target user is unknown or invalid"). Or that the cp fails but already copied half of the files. So similar to #845 this needs to do some cleanup here -- best to remove everything you may have copied already.

What pains me is that upload, drag and drop, and now here pasting essentially do the same things and all have the same issues. This really could use some factorization of the cp/chown/chmod bits which all three reuse.

I've added error handling for this but I'm not sure how I could test it. If you have an idea how to deterministically fail cp or chown I'm all ears as the code coverage doesn't look great on this PR.

Some ideas to make these commands fail:

For a cp, can you create a directory, remove write permissions and cp a file to it?

For chown, can you try to chown to a user that doesn't exist?

martinpitt · 2024-12-19T09:15:41Z

src/dialogs/copyPasteOwnership.tsx

+    if (selectedOwner === undefined) {
+        return;
+    }


So that would be the code path if you aren't admin, right?

Hmm seems like "make ts happy", the modal won't ever open when the user is not an admin. It will just show "permission denied" alert.

src/menu.tsx

test/check-application

garrett · 2025-01-08T13:58:10Z

Issues:

Why is this a warning?
There is no explanation why this is showing up.

I was thinking something like this:

"Files being pasted have a different owner. By default, ownership will be changed to match the destination directory."

Also: The dropdown should have the "username:username" -> "username" collapsing, like the user:group being the same does elsewhere, to be consistent.

Anyway, this is so that there's a explanation of what's going on, and that the default is almost always what is wanted, so someone can just click "Paste" to continue.

If the ownership matches between the files and destination, then we can skip this dialog, provided there's some kind of visual change to show that files have been pasted (which should happen after this too). Nautilus has the file(s) highlighted afterward, for example.

garrett

Requested changes are above. (I really wish GitHub would fix their broken UI and allow for reviews to take place without having to look at the code. Not every review needs to look at the code.)

garrett · 2025-01-08T14:10:27Z

Here's an updated set of mockups with the various states.

It shows the collapsing when user and group are the same and it shows that the original owner has a special note in the dropdown options. It still defaults to the directory being pasted into, but it also quickly allows someone to select the original owner without having to think about it.

Allows administrator to paste files into directories owned by a different user.

Map guarantees that Map.keys() are in the same order as they were insterted.

cockpituous · 2025-01-14T12:40:46Z

src/dialogs/copyPasteOwnership.tsx

+    } catch (err) {
+        const e = err as cockpit.BasicError;
+        addAlert(e.message, AlertVariant.danger, `${new Date().getTime()}`);


These 3 added lines are not executed by any test.

cockpituous · 2025-01-14T12:40:46Z

src/dialogs/copyPasteOwnership.tsx

+        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);


These 8 added lines are not executed by any test.

cockpituous · 2025-01-14T12:40:46Z

src/dialogs/copyPasteOwnership.tsx

+          position="top"
+          title={_("Paste as owner")}
+          isOpen
+          onClose={() => dialogResult.resolve()}


This added line is not executed by any test.

cockpituous · 2025-01-14T12:40:47Z

src/menu.tsx

+            ...clipboard.files.map(file => clipboard.path + file.name),
+            path
+        ])
+                .catch(err => addAlert(err.message, AlertVariant.danger, `${new Date().getTime()}`));


This added line is not executed by any test.

cockpituous · 2025-01-14T12:40:47Z

src/menu.tsx

@@ -183,7 +197,7 @@ export function get_menu_items(
            {
                id: "copy-item",
                title: _("Copy"),
-                onClick: () => setClipboard(selected.map(s => path + s.name)),
+                onClick: () => setClipboard({ path, files: selected }),


This added line is not executed by any test.

martinpitt requested changes Dec 19, 2024

View reviewed changes

tomasmatus force-pushed the copy-paste-nonowned branch from 4cf4968 to 5323e45 Compare January 3, 2025 11:05

garrett requested changes Jan 8, 2025

View reviewed changes

tomasmatus added 4 commits January 13, 2025 16:30

Support copy&pasting files with administrator privileges

b2e7a5a

Allows administrator to paste files into directories owned by a different user.

add cleanup in case chown fails

5023964

change to normal modal instead of warning

1eba95e

change how candidates ownership is displayed in dropdown

faa8115

tomasmatus force-pushed the copy-paste-nonowned branch 4 times, most recently from 4e29ac6 to 367e694 Compare January 14, 2025 12:22

use Map instead of normal Object

6633d7c

Map guarantees that Map.keys() are in the same order as they were insterted.

tomasmatus force-pushed the copy-paste-nonowned branch from 367e694 to 6633d7c Compare January 14, 2025 12:32

tomasmatus requested review from martinpitt and garrett January 14, 2025 12:35

cockpituous reviewed Jan 14, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support copy&pasting files with administrator privileges #880

Support copy&pasting files with administrator privileges #880

tomasmatus commented Dec 16, 2024

tomasmatus commented Dec 16, 2024 •

edited

Loading

martinpitt left a comment

martinpitt Dec 19, 2024

tomasmatus Jan 14, 2025

garrett Jan 15, 2025

martinpitt Dec 19, 2024

tomasmatus Jan 2, 2025

garrett commented Jan 8, 2025

garrett left a comment

garrett commented Jan 8, 2025

cockpituous Jan 14, 2025

cockpituous Jan 14, 2025

cockpituous Jan 14, 2025

cockpituous Jan 14, 2025

cockpituous Jan 14, 2025

Support copy&pasting files with administrator privileges #880

Are you sure you want to change the base?

Support copy&pasting files with administrator privileges #880

Conversation

tomasmatus commented Dec 16, 2024

tomasmatus commented Dec 16, 2024 • edited Loading

martinpitt left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

garrett commented Jan 8, 2025

garrett left a comment

Choose a reason for hiding this comment

garrett commented Jan 8, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tomasmatus commented Dec 16, 2024 •

edited

Loading