Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

document-portal: add snap support to app_has_file_access() #550

Merged
merged 1 commit into from Dec 28, 2020
Merged

document-portal: add snap support to app_has_file_access() #550

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 16 additions & 7 deletions document-portal/document-portal.c
View file
Open in desktop
Expand Up @@ -499,15 +499,16 @@ portal_add (GDBusMethodInvocation *invocation,
}

static char *
flatpak (GError **error,
...)
get_output (GError **error,
const char *argv0,
...)
{
gboolean res;
g_autofree char *output = NULL;
va_list ap;

va_start (ap, error);
res = xdp_spawn (NULL, &output, 0, error, "flatpak", ap);
va_start (ap, argv0);
res = xdp_spawn (NULL, &output, 0, error, argv0, ap);
va_end (ap);

if (res)
Expand Down Expand Up @@ -632,9 +633,17 @@ app_has_file_access (const char *target_app_id,
if (target_app_id == NULL || target_app_id[0] == '\0')
return FALSE;

/* First we try flatpak info --file-access=PATH APPID, which is supported on new versions */
arg = g_strdup_printf ("--file-access=%s", path);
res = flatpak (&error, "info", arg, target_app_id, NULL);
if (g_str_has_prefix (target_app_id, "snap."))
{
res = get_output (&error, "snap", "routine", "file-access",
target_app_id + strlen ("snap."), path, NULL);
}
else
{
/* First we try flatpak info --file-access=PATH APPID, which is supported on new versions */
arg = g_strdup_printf ("--file-access=%s", path);
res = get_output (&error, "flatpak", "info", arg, target_app_id, NULL);
}

if (res)
{
Expand Down