colin/bubblewrap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: Warn when non-repeatable options are repeated

Browse Source 
A user might reasonably expect that `bwrap --seccomp 3 --seccomp 4 ...`
would load seccomp programs from both fds 3 and 4, but in fact it only
loads the program from fd 4.

Helps: https://github.com/containers/bubblewrap/issues/453
Resolves: https://github.com/containers/bubblewrap/issues/454
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie
2021-10-10 13:00:23 +01:00
parent 9d187f096d
commit 0d369cdfd9
1 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
bubblewrap.c
View File

@@ -1536,6 +1536,12 @@ takes_perms (const char *next_option)
return 0; return 0;
} }
static void
warn_only_last_option (const char *name)
{
warn ("Only the last %s option will take effect", name);
}
static void static void
parse_args_recurse (int *argcp, parse_args_recurse (int *argcp,
const char ***argvp, const char ***argvp,
@@ -1693,6 +1699,9 @@ parse_args_recurse (int *argcp,
if (argc < 2) if (argc < 2)
die ("--chdir takes one argument"); die ("--chdir takes one argument");
if (opt_chdir_path != NULL)
warn_only_last_option ("--chdir");
opt_chdir_path = argv[1]; opt_chdir_path = argv[1];
argv++; argv++;
argc--; argc--;
@@ -1768,6 +1777,10 @@ parse_args_recurse (int *argcp,
{ {
if (argc < 2) if (argc < 2)
die ("--exec-label takes an argument"); die ("--exec-label takes an argument");
if (opt_exec_label != NULL)
warn_only_last_option ("--exec-label");
opt_exec_label = argv[1]; opt_exec_label = argv[1];
die_unless_label_valid (opt_exec_label); die_unless_label_valid (opt_exec_label);
@@ -1778,6 +1791,10 @@ parse_args_recurse (int *argcp,
{ {
if (argc < 2) if (argc < 2)
die ("--file-label takes an argument"); die ("--file-label takes an argument");
if (opt_file_label != NULL)
warn_only_last_option ("--file-label");
opt_file_label = argv[1]; opt_file_label = argv[1];
die_unless_label_valid (opt_file_label); die_unless_label_valid (opt_file_label);
if (label_create_file (opt_file_label)) if (label_create_file (opt_file_label))
@@ -1957,6 +1974,9 @@ parse_args_recurse (int *argcp,
if (argc < 2) if (argc < 2)
die ("--sync-fd takes an argument"); die ("--sync-fd takes an argument");
if (opt_sync_fd != -1)
warn_only_last_option ("--sync-fd");
the_fd = strtol (argv[1], &endptr, 10); the_fd = strtol (argv[1], &endptr, 10);
if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0) if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0)
die ("Invalid fd: %s", argv[1]); die ("Invalid fd: %s", argv[1]);
@@ -1974,6 +1994,9 @@ parse_args_recurse (int *argcp,
if (argc < 2) if (argc < 2)
die ("--block-fd takes an argument"); die ("--block-fd takes an argument");
if (opt_block_fd != -1)
warn_only_last_option ("--block-fd");
the_fd = strtol (argv[1], &endptr, 10); the_fd = strtol (argv[1], &endptr, 10);
if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0) if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0)
die ("Invalid fd: %s", argv[1]); die ("Invalid fd: %s", argv[1]);
@@ -1991,6 +2014,9 @@ parse_args_recurse (int *argcp,
if (argc < 2) if (argc < 2)
die ("--userns-block-fd takes an argument"); die ("--userns-block-fd takes an argument");
if (opt_userns_block_fd != -1)
warn_only_last_option ("--userns-block-fd");
the_fd = strtol (argv[1], &endptr, 10); the_fd = strtol (argv[1], &endptr, 10);
if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0) if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0)
die ("Invalid fd: %s", argv[1]); die ("Invalid fd: %s", argv[1]);
@@ -2008,6 +2034,9 @@ parse_args_recurse (int *argcp,
if (argc < 2) if (argc < 2)
die ("--info-fd takes an argument"); die ("--info-fd takes an argument");
if (opt_info_fd != -1)
warn_only_last_option ("--info-fd");
the_fd = strtol (argv[1], &endptr, 10); the_fd = strtol (argv[1], &endptr, 10);
if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0) if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0)
die ("Invalid fd: %s", argv[1]); die ("Invalid fd: %s", argv[1]);
@@ -2025,6 +2054,9 @@ parse_args_recurse (int *argcp,
if (argc < 2) if (argc < 2)
die ("--json-status-fd takes an argument"); die ("--json-status-fd takes an argument");
if (opt_json_status_fd != -1)
warn_only_last_option ("--json-status-fd");
the_fd = strtol (argv[1], &endptr, 10); the_fd = strtol (argv[1], &endptr, 10);
if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0) if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0)
die ("Invalid fd: %s", argv[1]); die ("Invalid fd: %s", argv[1]);
@@ -2042,6 +2074,9 @@ parse_args_recurse (int *argcp,
if (argc < 2) if (argc < 2)
die ("--seccomp takes an argument"); die ("--seccomp takes an argument");
if (opt_seccomp_fd != -1)
warn_only_last_option ("--seccomp");
the_fd = strtol (argv[1], &endptr, 10); the_fd = strtol (argv[1], &endptr, 10);
if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0) if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0)
die ("Invalid fd: %s", argv[1]); die ("Invalid fd: %s", argv[1]);
@@ -2059,6 +2094,9 @@ parse_args_recurse (int *argcp,
if (argc < 2) if (argc < 2)
die ("--userns takes an argument"); die ("--userns takes an argument");
if (opt_userns_fd != -1)
warn_only_last_option ("--userns");
the_fd = strtol (argv[1], &endptr, 10); the_fd = strtol (argv[1], &endptr, 10);
if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0) if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0)
die ("Invalid fd: %s", argv[1]); die ("Invalid fd: %s", argv[1]);
@@ -2076,6 +2114,9 @@ parse_args_recurse (int *argcp,
if (argc < 2) if (argc < 2)
die ("--userns2 takes an argument"); die ("--userns2 takes an argument");
if (opt_userns2_fd != -1)
warn_only_last_option ("--userns2");
the_fd = strtol (argv[1], &endptr, 10); the_fd = strtol (argv[1], &endptr, 10);
if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0) if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0)
die ("Invalid fd: %s", argv[1]); die ("Invalid fd: %s", argv[1]);
@@ -2093,6 +2134,9 @@ parse_args_recurse (int *argcp,
if (argc < 2) if (argc < 2)
die ("--pidns takes an argument"); die ("--pidns takes an argument");
if (opt_pidns_fd != -1)
warn_only_last_option ("--pidns");
the_fd = strtol (argv[1], &endptr, 10); the_fd = strtol (argv[1], &endptr, 10);
if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0) if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0)
die ("Invalid fd: %s", argv[1]); die ("Invalid fd: %s", argv[1]);
@@ -2134,6 +2178,9 @@ parse_args_recurse (int *argcp,
if (argc < 2) if (argc < 2)
die ("--uid takes an argument"); die ("--uid takes an argument");
if (opt_sandbox_uid != -1)
warn_only_last_option ("--uid");
the_uid = strtol (argv[1], &endptr, 10); the_uid = strtol (argv[1], &endptr, 10);
if (argv[1][0] == 0 || endptr[0] != 0 || the_uid < 0) if (argv[1][0] == 0 || endptr[0] != 0 || the_uid < 0)
die ("Invalid uid: %s", argv[1]); die ("Invalid uid: %s", argv[1]);
@@ -2151,6 +2198,9 @@ parse_args_recurse (int *argcp,
if (argc < 2) if (argc < 2)
die ("--gid takes an argument"); die ("--gid takes an argument");
if (opt_sandbox_gid != -1)
warn_only_last_option ("--gid");
the_gid = strtol (argv[1], &endptr, 10); the_gid = strtol (argv[1], &endptr, 10);
if (argv[1][0] == 0 || endptr[0] != 0 || the_gid < 0) if (argv[1][0] == 0 || endptr[0] != 0 || the_gid < 0)
die ("Invalid gid: %s", argv[1]); die ("Invalid gid: %s", argv[1]);
@@ -2165,6 +2215,9 @@ parse_args_recurse (int *argcp,
if (argc < 2) if (argc < 2)
die ("--hostname takes an argument"); die ("--hostname takes an argument");
if (opt_sandbox_hostname != NULL)
warn_only_last_option ("--hostname");
op = setup_op_new (SETUP_SET_HOSTNAME); op = setup_op_new (SETUP_SET_HOSTNAME);
op->dest = argv[1]; op->dest = argv[1];
op->flags = NO_CREATE_DEST; op->flags = NO_CREATE_DEST;