mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-02-02 20:11:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

system-helper: Don't use the system user when running on the session bus

Browse Source 
This makes it possible to test the revokefs codepaths with make check
as non-root.

Closes: #2657
Approved by: alexlarsson
This commit is contained in:
Alexander Larsson
2019-04-03 18:05:27 +02:00
committed by Atomic Bot
parent 42e42ddc86
commit cd3028abd0
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
system-helper/flatpak-system-helper.c
View File

@@ -1640,7 +1640,7 @@ handle_get_revokefs_fd (FlatpakSystemHelper *object,
g_autofree gchar *flatpak_dir = NULL;
g_autofree gchar *repo_tmp = NULL;
g_autofree gchar *passwd_buf = NULL;
struct passwd passwd;
struct passwd passwd = { NULL };
OngoingPull *new_pull;
uid_t uid;
int fd_index = -1;
@@ -1661,7 +1661,12 @@ handle_get_revokefs_fd (FlatpakSystemHelper *object,
return TRUE;
}
if (!check_for_system_helper_user (&passwd, &passwd_buf, &error))
if (on_session_bus)
{
passwd.pw_uid = getuid();
passwd.pw_gid = getgid();
}
else if (!check_for_system_helper_user (&passwd, &passwd_buf, &error))
{
g_dbus_method_invocation_return_gerror (invocation, error);
return TRUE;