luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-31 09:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

gio: don't use O_PATH file descriptors with OpenURI portal

Browse Source 
This change relates to https://github.com/flatpak/xdg-desktop-portal/issues/167

The OpenURI portal requires the caller to pass a file descriptor as
proof of access for local files.  Old versions required this file
descriptor to use the O_PATH mode.  However, this does not prove access
since you can create O_PATH descriptors for files that you can't read.

Since xdg-desktop-portal 1.0.1, regular file descriptors are also
accepted with O_PATH descriptors restricted to flatpaks for the
transition.
This commit is contained in:
James Henstridge 2019-01-15 15:59:46 +08:00
parent 5751189fb8
commit e244a78fbc
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/gopenuriportal.c
View File

@ -31,9 +31,6 @@
#include "gunixfdlist.h" #include "gunixfdlist.h"
#endif #endif
#ifndef O_PATH
#define O_PATH 0
#endif
#ifndef O_CLOEXEC #ifndef O_CLOEXEC
#define O_CLOEXEC 0 #define O_CLOEXEC 0
#else #else
@ -107,7 +104,7 @@ g_openuri_portal_open_uri (const char *uri,
path = g_file_get_path (file); path = g_file_get_path (file);
fd = g_open (path, O_PATH | O_CLOEXEC); fd = g_open (path, O_RDONLY | O_CLOEXEC);
errsv = errno; errsv = errno;
if (fd == -1) if (fd == -1)
{ {
@ -318,7 +315,7 @@ g_openuri_portal_open_uri_async (const char *uri,
g_object_set_data (G_OBJECT (task), "open-file", GINT_TO_POINTER (TRUE)); g_object_set_data (G_OBJECT (task), "open-file", GINT_TO_POINTER (TRUE));
path = g_file_get_path (file); path = g_file_get_path (file);
fd = g_open (path, O_PATH | O_CLOEXEC); fd = g_open (path, O_RDONLY | O_CLOEXEC);
errsv = errno; errsv = errno;
if (fd == -1) if (fd == -1)
{ {