picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3572 from poettering/machinectl-shell-fix

Browse source 
machinectl: interpret options placed between "shell" verb and machine name
This commit is contained in:
Martin Pitt 2016-06-26 17:46:23 +02:00 committed by GitHub
parent 4b930ded83 5b566d2475
commit bed48d6655
2 changed files with 62 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
src/machine/machinectl.c
View file

@ -2579,35 +2579,65 @@ static int parse_argv(int argc, char *argv[]) {
};
bool reorder = false;
int c, r;
int c, r, shell = -1;
assert(argc >= 0);
assert(argv);
for (;;) {
const char * const option_string = "+hp:als:H:M:qn:o:";
static const char option_string[] = "-hp:als:H:M:qn:o:";
c = getopt_long(argc, argv, option_string + reorder, options, NULL);
if (c < 0) {
if (c < 0)
break;
switch (c) {
case 1: /* getopt_long() returns 1 if "-" was the first character of the option string, and a
* non-option argument was discovered. */
assert(!reorder);
/* We generally are fine with the fact that getopt_long() reorders the command line, and looks
* for switches after the main verb. However, for "shell" we really don't want that, since we
* want that switches passed after that are passed to the program to execute, and not processed
* by us. To make this possible, we'll first invoke getopt_long() with reordering disabled
* (i.e. with the "+" prefix in the option string), and as soon as we hit the end (i.e. the
* verb) we check if that's "shell". If it is, we exit the loop, since we don't want any
* further options processed. However, if it is anything else, we process the same argument
* again, but this time allow reordering. */
* want that switches specified after the machine name are passed to the program to execute,
* and not processed by us. To make this possible, we'll first invoke getopt_long() with
* reordering disabled (i.e. with the "-" prefix in the option string), looking for the first
* non-option parameter. If it's the verb "shell" we remember its position and continue
* processing options. In this case, as soon as we hit the next non-option argument we found
* the machine name, and stop further processing. If the first non-option argument is any other
* verb than "shell" we switch to normal reordering mode and continue processing arguments
* normally. */
if (!reorder && optind < argc && !streq(argv[optind], "shell")) {
if (shell >= 0) {
/* If we already found the "shell" verb on the command line, and now found the next
* non-option argument, then this is the machine name and we should stop processing
* further arguments. */
optind --; /* don't process this argument, go one step back */
goto done;
}
if (streq(optarg, "shell"))
/* Remember the position of the "shell" verb, and continue processing normally. */
shell = optind - 1;
else {
int saved_optind;
/* OK, this is some other verb. In this case, turn on reordering again, and continue
* processing normally. */
reorder = true;
optind--;
continue;
/* We changed the option string. getopt_long() only looks at it again if we invoke it
* at least once with a reset option index. Hence, let's reset the option index here,
* then invoke getopt_long() again (ignoring what it has to say, after all we most
* likely already processed it), and the bump the option index so that we read the
* intended argument again. */
saved_optind = optind;
optind = 0;
(void) getopt_long(argc, argv, option_string + reorder, options, NULL);
optind = saved_optind - 1; /* go one step back, process this argument again */
}
break;
}
switch (c) {
case 'h':
return help(0, NULL, NULL);
@ -2743,6 +2773,22 @@ static int parse_argv(int argc, char *argv[]) {
}
}
done:
if (shell >= 0) {
char *t;
int i;
/* We found the "shell" verb while processing the argument list. Since we turned off reordering of the
* argument list initially let's readjust it now, and move the "shell" verb to the back. */
optind -= 1; /* place the option index where the "shell" verb will be placed */
t = argv[shell];
for (i = shell; i < optind; i++)
argv[i] = argv[i+1];
argv[optind] = t;
}
return 1;
}

2
units/systemd-machined.service.in
View file

@ -18,7 +18,7 @@ BusName=org.freedesktop.machine1
CapabilityBoundingSet=CAP_KILL CAP_SYS_PTRACE CAP_SYS_ADMIN CAP_SETGID CAP_SYS_CHROOT CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_CHOWN CAP_FOWNER CAP_FSETID CAP_MKNOD
WatchdogSec=3min
MemoryDenyWriteExecute=yes
SystemCallFilter=~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @raw-io
SystemCallFilter=~@clock @cpu-emulation @debug @keyring @module @obsolete @raw-io
# Note that machined cannot be placed in a mount namespace, since it
# needs access to the host's mount namespace in order to implement the