mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-26 16:48:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

document-portal: Fix the document portal for files outside /app

Browse Source 
Strip /newroot prefix from document path since validate_parent_dir()
depends on a system path to get the parent directory stat.
This commit is contained in:
Juan Pablo Ugarte
2016-09-05 14:33:30 -03:00
parent d10409cb3e
commit cd574cfbfe
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
document-portal/xdp-main.c
View File

@@ -440,22 +440,29 @@ validate_fd (int fd,
if (!validate_fd_common (fd, st_buf, path_buffer, error))
return FALSE;
if (app_id != NULL && *app_id != 0 &&
g_str_has_prefix (path_buffer, "/newroot/app/"))
if (app_id != NULL && *app_id != 0)
{
char *rel_path = path_buffer + strlen ("/newroot/app/");
g_autofree char *app_path = NULL;
app_path = resolve_flatpak_path (rel_path, app_id);
if (app_path == NULL)
if (g_str_has_prefix (path_buffer, "/newroot/app/"))
{
g_set_error (error,
FLATPAK_PORTAL_ERROR, FLATPAK_PORTAL_ERROR_INVALID_ARGUMENT,
"Invalid fd passed");
return FALSE;
}
char *rel_path = path_buffer + strlen ("/newroot/app/");
g_autofree char *app_path = NULL;
strncpy (path_buffer, app_path, PATH_MAX);
app_path = resolve_flatpak_path (rel_path, app_id);
if (app_path == NULL)
{
g_set_error (error,
FLATPAK_PORTAL_ERROR, FLATPAK_PORTAL_ERROR_INVALID_ARGUMENT,
"Invalid fd passed");
return FALSE;
}
strncpy (path_buffer, app_path, PATH_MAX);
}
else if (g_str_has_prefix (path_buffer, "/newroot/"))
{
char *rel_path = path_buffer + strlen ("/newroot");
g_strlcpy (path_buffer, rel_path, PATH_MAX);
}
}
if (!validate_parent_dir (path_buffer, st_buf, real_parent_st_buf, error))