mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-24 16:57:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4436 from pwithnall/4418-fix-parental-controls

Browse Source 
flatpak-dir: Fix parental controls checks for root
This commit is contained in:
Philip Withnall
2021-09-29 11:38:45 +01:00
committed by GitHub
parent b4e838a0fd 8cb27763fc
commit 90e6c723d6
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/flatpak-dir.c
View File

@@ -7972,9 +7972,15 @@ flatpak_dir_check_parental_controls (FlatpakDir *self,
MctGetAppFilterFlags manager_flags;
/* Assume that root is allowed to install any ref and shouldn't have any
* parental controls restrictions applied to them */
if (getuid () == 0)
return TRUE;
* parental controls restrictions applied to them. Note that this branch
* must not be taken if this code is running within the system-helper, as that
* runs as root but on behalf of another process. If running within the
* system-helper, self->source_pid is non-zero. */
if (self->source_pid == 0 && getuid () == 0)
{
g_debug ("Skipping parental controls check for %s due to running as root", ref);
return TRUE;
}
/* The ostree-metadata and appstream/ branches should not have any parental
* controls restrictions. Similarly, for the moment, there is no point in