Commit 147ac51f authored by Matthias Clasen's avatar Matthias Clasen Committed by Philip Withnall

trash portal: Fix permission checks

Implement the approach suggested in
!276

1. Try to open O_RDWR. On success, pass that fd
2. If EACCESS => fail the trash op, we "need" read-write to successfully trash it
3. If EISDIR => re-open the fd with O_PATH, and pass that (which will fail on snap,
   but verify the dir for flatpaks)
parent 7fa9a2a5
......@@ -37,6 +37,10 @@
#define HAVE_O_CLOEXEC 1
#endif
#ifndef O_PATH
#define O_PATH 0
#endif
static GXdpTrash *
ensure_trash_portal (void)
{
......@@ -83,9 +87,9 @@ g_trash_portal_trash_file (GFile *file,
path = g_file_get_path (file);
fd = g_open (path, O_RDWR | O_CLOEXEC);
if (fd == -1 && (errno == EACCES || errno == EISDIR))
/* If we don't have write access, fall back to read-only */
fd = g_open (path, O_CLOEXEC | O_RDONLY);
if (fd == -1 && errno == EISDIR)
/* If it is a directory, fall back to O_PATH */
fd = g_open (path, O_PATH | O_CLOEXEC | O_RDONLY);
errsv = errno;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment