marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xdg-app-helper: Always set the right gid on created files.

tingping/wmclass
Alexander Larsson 2015-01-19 16:32:12 +01:00
parent 6fdb7d3b5a
commit 1407f53be3
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
xdg-app-helper.c
View File

@ -433,6 +433,21 @@ create_file (const char *path, mode_t mode, const char *content)
return 0;
}
static void
set_owner (const char *name, int flags)
{
if (flags & FILE_FLAGS_USER_OWNED)
{
if (lchown (name, getuid(), getuid()))
die_with_error ("chown to user");
}
else
{
if (lchown (name, 0, 0))
die_with_error ("chown to root");
}
}
static void
create_files (const create_table_t *create, int n_create, int ignore_shm, int system_mode)
{
@ -461,11 +476,13 @@ create_files (const create_table_t *create, int n_create, int ignore_shm, int sy
case FILE_TYPE_DIR:
if (mkdir (name, mode) != 0)
die_with_error ("creating dir %s", name);
set_owner (name, flags);
break;
case FILE_TYPE_REGULAR:
if (create_file (name, mode, NULL))
die_with_error ("creating file %s", name);
set_owner (name, flags);
break;
case FILE_TYPE_SYSTEM_SYMLINK:
@ -478,6 +495,7 @@ create_files (const create_table_t *create, int n_create, int ignore_shm, int sy
{
if (mkdir (name, mode) != 0)
die_with_error ("creating dir %s", name);
set_owner (name, flags);
if (bind_mount (in_root, name, BIND_PRIVATE | BIND_READONLY))
die_with_error ("mount %s", name);
@ -496,6 +514,7 @@ create_files (const create_table_t *create, int n_create, int ignore_shm, int sy
case FILE_TYPE_SYMLINK:
if (symlink (data, name) != 0)
die_with_error ("creating symlink %s", name);
set_owner (name, flags);
break;
case FILE_TYPE_BIND:
@ -548,18 +567,14 @@ create_files (const create_table_t *create, int n_create, int ignore_shm, int sy
if (mknod (name, mode, st.st_rdev) < 0)
die_with_error ("mknod %s", name);
set_owner (name, flags);
break;
default:
die ("Unknown create type %d\n", create[i].type);
}
if (flags & FILE_FLAGS_USER_OWNED)
{
if (chown (name, getuid(), -1))
die_with_error ("chown to user");
}
free (name);
}
}