luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-21 16:38:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

trash portal: Fix permission checks

Browse Source 
Implement the approach suggested in
https://gitlab.gnome.org/GNOME/glib/merge_requests/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)
This commit is contained in:
Matthias Clasen
2019-03-04 19:47:11 +00:00
committed by Philip Withnall
parent 7fa9a2a5da
commit 147ac51f90
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gio/gtrashportal.c
View File

@@ -37,6 +37,10 @@
#define HAVE_O_CLOEXEC 1 #define HAVE_O_CLOEXEC 1
#endif #endif
#ifndef O_PATH
#define O_PATH 0
#endif
static GXdpTrash * static GXdpTrash *
ensure_trash_portal (void) ensure_trash_portal (void)
{ {
@@ -83,9 +87,9 @@ g_trash_portal_trash_file (GFile *file,
path = g_file_get_path (file); path = g_file_get_path (file);
fd = g_open (path, O_RDWR | O_CLOEXEC); fd = g_open (path, O_RDWR | O_CLOEXEC);
if (fd == -1 && (errno == EACCES || errno == EISDIR)) if (fd == -1 && errno == EISDIR)
/* If we don't have write access, fall back to read-only */ /* If it is a directory, fall back to O_PATH */
fd = g_open (path, O_CLOEXEC | O_RDONLY); fd = g_open (path, O_PATH | O_CLOEXEC | O_RDONLY);
errsv = errno; errsv = errno;