Git-Mirrors/qusal
1
0
Fork 0
mirror of https://github.com/ben-grande/qusal.git synced 2024-10-01 02:35:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: unconfined qfile-unpacker

Browse Source 
Upstream-commit: 0648b2329f0d142a2e24ecf376b28603fb04abb4
This commit is contained in:
Ben Grande 2024-01-03 14:30:40 +01:00
parent 083285901c
commit 0eecbcffc4
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/qubes-builder/files/admin/policy/default.policy
View File

@ -1,6 +1,7 @@
# SPDX-FileCopyrightText: 2023 The Qubes OS Project <https://www.qubes-os.org>
# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> # SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
# #
# SPDX-License-Identifier: AGPL-3.0-or-later # SPDX-License-Identifier: GPL-2.0-only
## Do not modify this file, create a new policy with with a lower number in the ## Do not modify this file, create a new policy with with a lower number in the
## file name instead. For example `30-user.policy`. ## file name instead. For example `30-user.policy`.

13
salt/qubes-builder/files/server/rpc/qubesbuilder.FileCopyIn
View File

@ -1,4 +1,4 @@
#!/usr/bin/bash #!/usr/bin/sh
# SPDX-FileCopyrightText: 2022 - 2023 The Qubes OS Project <https://www.qubes-os.org> # SPDX-FileCopyrightText: 2022 - 2023 The Qubes OS Project <https://www.qubes-os.org>
# #
@ -7,5 +7,12 @@
set -e set -e
sudo bash -c "mkdir -p /builder/incoming && chown -R user:user /builder" sudo bash -c "mkdir -p /builder/incoming && chown -R user:user /builder"
id="$(id -u user)"
exec /usr/lib/qubes/qfile-unpacker "${id}" "/builder/incoming" id=$(id -u user)
if test -x /usr/lib/qubes/qfile-unpacker; then
# shellcheck disable=SC2123
PATH="${PATH+"$PATH:"}/usr/lib/qubes"
fi
exec qfile-unpacker "$id" "/builder/incoming"