Skip to content

Commit e6e2ca4

Browse files
DemiMariemarmarek
authored andcommitted
Use allow-all-names instead of allow-unsafe-characters
As pointed out by Andrew David Wong the latter name is unnecessarily alarming. No backwards compatibility is provided because users should not need to remember to blocklist two different strings in their qrexec policies. Denying "+allow-all-names" should be sufficient. Reported-by: Andrew David Wong <[email protected]> Fixes: QubesOS/qubes-issues#8332 (for real this time) (cherry picked from commit 59d94f3)
1 parent acc17a6 commit e6e2ca4

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

qubes-rpc/qfile-unpacker.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ enum {
6969
};
7070

7171
const struct option opts[] = {
72-
{ "no-allow-unsafe-characters", no_argument, NULL, opt_no_allow_unsafe_characters },
73-
{ "allow-unsafe-characters", no_argument, NULL, opt_allow_unsafe_characters },
72+
{ "no-allow-all-names", no_argument, NULL, opt_no_allow_unsafe_characters },
73+
{ "allow-all-names", no_argument, NULL, opt_allow_unsafe_characters },
7474
{ "no-allow-unsafe-symlinks", no_argument, NULL, opt_no_allow_unsafe_symlinks },
7575
{ "allow-unsafe-symlinks", no_argument, NULL, opt_allow_unsafe_symlinks },
7676
{ "verbose", no_argument, NULL, 'v' },

qubes-rpc/qubes-fs-tree-check.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ const struct option opts[] = {
191191
{"no-allow-symlinks", no_argument, NULL, 'A'},
192192
{"allow-directories", no_argument, NULL, 'd'},
193193
{"no-allow-directories", no_argument, NULL, 'D'},
194-
{"allow-unsafe-characters", no_argument, NULL, 'u'},
195-
{"no-allow-unsafe-characters", no_argument, NULL, 'U'},
194+
{"allow-all-names", no_argument, NULL, 'u'},
195+
{"no-allow-all-names", no_argument, NULL, 'U'},
196196
{0, 0, NULL, 0},
197197
};
198198

qubes-rpc/qubes.Filecopy

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ then
55
fi
66
case $1 in
77
('') arg=;;
8-
(allow-unsafe-characters) arg=--allow-unsafe-characters;;
8+
(allow-all-names) arg=--allow-all-names;;
99
(*) printf 'Unexpected argument %s\n' "$1" >&2; exit 1;;
1010
esac
1111
exec /usr/lib/qubes/qfile-unpacker $arg

qubes-rpc/qvm-copy

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ if FILECOPY_TOTAL_SIZE=$(/usr/lib/qubes/qubes-fs-tree-check \
8080
else
8181
status=$?
8282
if [[ "$status" -ne 2 ]]; then exit "$status"; fi
83-
service=qubes.Filecopy+allow-unsafe-characters
83+
service=qubes.Filecopy+allow-all-names
8484
fi
8585
if [[ "$PROGRESS_TYPE" = 'console' ]]; then export FILECOPY_TOTAL_SIZE; fi
8686

0 commit comments

Comments
 (0)