38
37
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
39
38
FD_SET(), FD_ISSET(), FD_CLR */
40
39
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
41
WEXITSTATUS(), WTERMSIG(),
43
41
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
44
42
#include <iso646.h> /* and, or, not */
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
43
#include <dirent.h> /* DIR, struct dirent, opendir(),
46
44
readdir(), closedir(), dirfd() */
47
45
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
48
46
fcntl(), setuid(), setgid(),
49
47
F_GETFD, F_SETFD, FD_CLOEXEC,
50
48
access(), pipe(), fork(), close()
51
dup2(), STDOUT_FILENO, _exit(),
49
dup2, STDOUT_FILENO, _exit(),
52
50
execv(), write(), read(),
54
52
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
56
#include <string.h> /* strsep, strlen(), asprintf(),
54
#include <string.h> /* strsep, strlen(), strcpy(),
58
56
#include <errno.h> /* errno */
59
57
#include <argp.h> /* struct argp_option, struct
60
58
argp_state, struct argp,
61
59
argp_parse(), ARGP_ERR_UNKNOWN,
62
ARGP_KEY_END, ARGP_KEY_ARG,
60
ARGP_KEY_END, ARGP_KEY_ARG, error_t */
64
61
#include <signal.h> /* struct sigaction, sigemptyset(),
65
62
sigaddset(), sigaction(),
66
63
sigprocmask(), SIG_BLOCK, SIGCHLD,
67
SIG_UNBLOCK, kill(), sig_atomic_t
64
SIG_UNBLOCK, kill() */
69
65
#include <errno.h> /* errno, EBADF */
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
72
67
#define BUFFER_SIZE 256
74
#define PDIR "/lib/mandos/plugins.d"
75
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
77
const char *argp_program_version = "plugin-runner " VERSION;
69
const char *argp_program_version = "plugin-runner 1.0";
78
70
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
80
typedef struct plugin{
81
char *name; /* can be NULL or any plugin name */
88
/* Variables used for running processes*/
74
typedef struct process{
92
78
size_t buffer_size;
93
79
size_t buffer_length;
95
volatile sig_atomic_t completed;
86
typedef struct plugin{
87
char *name; /* can be NULL or any plugin name */
97
91
struct plugin *next;
100
static plugin *plugin_list = NULL;
102
/* Gets an existing plugin based on name,
103
or if none is found, creates a new one */
104
static plugin *getplugin(char *name){
105
/* Check for exiting plugin with that name */
106
for(plugin *p = plugin_list; p != NULL; p = p->next){
108
or (p->name and name and (strcmp(p->name, name) == 0))){
94
static plugin *getplugin(char *name, plugin **plugin_list){
95
for (plugin *p = *plugin_list; p != NULL; p = p->next){
97
or (p->name and name and (strcmp(p->name, name) == 0))){
112
101
/* Create a new plugin */
113
plugin *new_plugin = NULL;
115
new_plugin = malloc(sizeof(plugin));
116
} while(new_plugin == NULL and errno == EINTR);
117
if(new_plugin == NULL){
120
char *copy_name = NULL;
123
copy_name = strdup(name);
124
} while(copy_name == NULL and errno == EINTR);
125
if(copy_name == NULL){
131
*new_plugin = (plugin){ .name = copy_name,
134
.next = plugin_list };
137
new_plugin->argv = malloc(sizeof(char *) * 2);
138
} while(new_plugin->argv == NULL and errno == EINTR);
139
if(new_plugin->argv == NULL){
144
new_plugin->argv[0] = copy_name;
102
plugin *new_plugin = malloc(sizeof(plugin));
103
if (new_plugin == NULL){
107
new_plugin->name = name;
108
new_plugin->argv = malloc(sizeof(char *) * 2);
109
if (new_plugin->argv == NULL){
113
new_plugin->argv[0] = name;
145
114
new_plugin->argv[1] = NULL;
148
new_plugin->environ = malloc(sizeof(char *));
149
} while(new_plugin->environ == NULL and errno == EINTR);
150
if(new_plugin->environ == NULL){
152
free(new_plugin->argv);
156
new_plugin->environ[0] = NULL;
115
new_plugin->argc = 1;
116
new_plugin->disabled = false;
117
new_plugin->next = *plugin_list;
158
118
/* Append the new plugin to the list */
159
plugin_list = new_plugin;
119
*plugin_list = new_plugin;
160
120
return new_plugin;
163
/* Helper function for add_argument and add_environment */
164
static bool add_to_char_array(const char *new, char ***array,
166
/* Resize the pointed-to array to hold one more pointer */
168
*array = realloc(*array, sizeof(char *)
169
* (size_t) ((*len) + 2));
170
} while(*array == NULL and errno == EINTR);
175
/* Make a copy of the new string */
179
} while(copy == NULL and errno == EINTR);
183
/* Insert the copy */
184
(*array)[*len] = copy;
186
/* Add a new terminating NULL pointer to the last element */
187
(*array)[*len] = NULL;
191
/* Add to a plugin's argument vector */
192
static bool add_argument(plugin *p, const char *arg){
196
return add_to_char_array(arg, &(p->argv), &(p->argc));
199
/* Add to a plugin's environment */
200
static bool add_environment(plugin *p, const char *def, bool replace){
204
/* namelen = length of name of environment variable */
205
size_t namelen = (size_t)(strchrnul(def, '=') - def);
206
/* Search for this environment variable */
207
for(char **e = p->environ; *e != NULL; e++){
208
if(strncmp(*e, def, namelen + 1) == 0){
209
/* It already exists */
213
new = realloc(*e, strlen(def) + 1);
214
} while(new == NULL and errno == EINTR);
224
return add_to_char_array(def, &(p->environ), &(p->envc));
123
static void addargument(plugin *p, char *arg){
124
p->argv[p->argc] = arg;
125
p->argv = realloc(p->argv, sizeof(char *) * (size_t)(p->argc + 2));
126
if (p->argv == NULL){
131
p->argv[p->argc] = NULL;
228
135
* Based on the example in the GNU LibC manual chapter 13.13 "File
229
136
* Descriptor Flags".
230
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
137
* *Note File Descriptor Flags:(libc)Descriptor Flags.
232
static int set_cloexec_flag(int fd){
233
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
139
static int set_cloexec_flag(int fd)
141
int ret = fcntl(fd, F_GETFD, 0);
234
142
/* If reading the flags failed, return error indication now. */
238
146
/* Store modified flag word in the descriptor. */
239
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
147
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
150
process *process_list = NULL;
244
/* Mark processes as completed when they exit, and save their exit
152
/* Mark a process as completed when it exits, and save its exit
246
static void handle_sigchld(__attribute__((unused)) int sig){
247
int old_errno = errno;
249
plugin *proc = plugin_list;
251
pid_t pid = waitpid(-1, &status, WNOHANG);
253
/* Only still running child processes */
258
/* No child processes */
264
/* A child exited, find it in process_list */
265
while(proc != NULL and proc->pid != pid){
269
/* Process not found in process list */
272
proc->status = status;
154
void handle_sigchld(__attribute__((unused)) int sig){
155
process *proc = process_list;
157
pid_t pid = wait(&status);
162
while(proc != NULL and proc->pid != pid){
166
/* Process not found in process list */
169
proc->status = status;
170
proc->completed = true;
278
/* Prints out a password to stdout */
279
static bool print_out_password(const char *buffer, size_t length){
173
bool print_out_password(const char *buffer, size_t length){
175
if(length>0 and buffer[length-1] == '\n'){
281
178
for(size_t written = 0; written < length; written += (size_t)ret){
282
179
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,
283
180
length - written));
365
221
{ .name = "global-options", .key = 'g',
366
222
.arg = "OPTION[,OPTION[,...]]",
367
223
.doc = "Options passed to all plugins" },
368
{ .name = "global-env", .key = 'G',
370
.doc = "Environment variable passed to all plugins" },
371
224
{ .name = "options-for", .key = 'o',
372
225
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
373
226
.doc = "Options passed only to specified plugin" },
374
{ .name = "env-for", .key = 'E',
375
.arg = "PLUGIN:ENV=value",
376
.doc = "Environment variable passed to specified plugin" },
377
227
{ .name = "disable", .key = 'd',
379
229
.doc = "Disable a specific plugin", .group = 1 },
380
{ .name = "enable", .key = 'e',
382
.doc = "Enable a specific plugin", .group = 1 },
383
230
{ .name = "plugin-dir", .key = 128,
384
231
.arg = "DIRECTORY",
385
232
.doc = "Specify a different plugin directory", .group = 2 },
386
{ .name = "config-file", .key = 129,
388
.doc = "Specify a different configuration file", .group = 2 },
389
{ .name = "userid", .key = 130,
390
.arg = "ID", .flags = 0,
391
.doc = "User ID the plugins will run as", .group = 3 },
392
{ .name = "groupid", .key = 131,
393
.arg = "ID", .flags = 0,
394
.doc = "Group ID the plugins will run as", .group = 3 },
395
{ .name = "debug", .key = 132,
396
.doc = "Debug mode", .group = 4 },
233
{ .name = "userid", .key = 129,
234
.arg = "ID", .flags = 0,
235
.doc = "User ID the plugins will run as", .group = 2 },
236
{ .name = "groupid", .key = 130,
237
.arg = "ID", .flags = 0,
238
.doc = "Group ID the plugins will run as", .group = 2 },
239
{ .name = "debug", .key = 131,
240
.doc = "Debug mode", .group = 3 },
400
error_t parse_opt(int key, char *arg, __attribute__((unused))
401
struct argp_state *state){
405
case 'g': /* --global-options */
408
while((plugin_option = strsep(&arg, ",")) != NULL){
409
if(plugin_option[0] == '\0'){
244
error_t parse_opt (int key, char *arg, struct argp_state *state) {
245
/* Get the INPUT argument from `argp_parse', which we know is a
246
pointer to our plugin list pointer. */
247
plugin **plugins = state->input;
252
while((p = strsep(&arg, ",")) != NULL){
253
if(strcmp(p, "") == 0){
412
if(not add_argument(getplugin(NULL), plugin_option)){
413
perror("add_argument");
414
return ARGP_ERR_UNKNOWN;
419
case 'G': /* --global-env */
423
if(not add_environment(getplugin(NULL), arg, true)){
424
perror("add_environment");
427
case 'o': /* --options-for */
429
char *plugin_name = strsep(&arg, ":");
430
if(plugin_name[0] == '\0'){
434
while((plugin_option = strsep(&arg, ",")) != NULL){
435
if(not add_argument(getplugin(plugin_name), plugin_option)){
436
perror("add_argument");
437
return ARGP_ERR_UNKNOWN;
442
case 'E': /* --env-for */
447
char *envdef = strchr(arg, ':');
452
if(not add_environment(getplugin(arg), envdef+1, true)){
453
perror("add_environment");
457
case 'd': /* --disable */
459
plugin *p = getplugin(arg);
461
return ARGP_ERR_UNKNOWN;
466
case 'e': /* --enable */
468
plugin *p = getplugin(arg);
470
return ARGP_ERR_UNKNOWN;
475
case 128: /* --plugin-dir */
477
plugindir = strdup(arg);
478
if(plugindir == NULL){
482
case 129: /* --config-file */
483
/* This is already done by parse_opt_config_file() */
485
case 130: /* --userid */
487
tmpmax = strtoimax(arg, &tmp, 10);
488
if(errno != 0 or tmp == arg or *tmp != '\0'
489
or tmpmax != (uid_t)tmpmax){
490
fprintf(stderr, "Bad user ID number: \"%s\", using %"
491
PRIdMAX "\n", arg, (intmax_t)uid);
496
case 131: /* --groupid */
498
tmpmax = strtoimax(arg, &tmp, 10);
499
if(errno != 0 or tmp == arg or *tmp != '\0'
500
or tmpmax != (gid_t)tmpmax){
501
fprintf(stderr, "Bad group ID number: \"%s\", using %"
502
PRIdMAX "\n", arg, (intmax_t)gid);
507
case 132: /* --debug */
256
addargument(getplugin(NULL, plugins), p);
262
char *name = strsep(&arg, ":");
263
if(strcmp(name, "") == 0){
266
char *opt = strsep(&arg, ":");
267
if(strcmp(opt, "") == 0){
272
while((p = strsep(&opt, ",")) != NULL){
273
if(strcmp(p, "") == 0){
276
addargument(getplugin(name, plugins), p);
283
getplugin(arg, plugins)->disabled = true;
290
uid = (uid_t)strtol(arg, NULL, 10);
293
gid = (gid_t)strtol(arg, NULL, 10);
511
* When adding more options before this line, remember to also add a
512
* "case" to the "parse_opt_config_file" function below.
515
/* Cryptsetup always passes an argument, which is an empty
516
string if "none" was specified in /etc/crypttab. So if
517
argument was empty, we ignore it silently. */
519
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
525
return ARGP_ERR_UNKNOWN;
530
/* This option parser is the same as parse_opt() above, except it
531
ignores everything but the --config-file option. */
532
error_t parse_opt_config_file(int key, char *arg,
533
__attribute__((unused))
534
struct argp_state *state){
536
case 'g': /* --global-options */
537
case 'G': /* --global-env */
538
case 'o': /* --options-for */
539
case 'E': /* --env-for */
540
case 'd': /* --disable */
541
case 'e': /* --enable */
542
case 128: /* --plugin-dir */
544
case 129: /* --config-file */
546
argfile = strdup(arg);
551
case 130: /* --userid */
552
case 131: /* --groupid */
553
case 132: /* --debug */
558
return ARGP_ERR_UNKNOWN;
563
struct argp argp = { .options = options,
564
.parser = parse_opt_config_file,
299
if(plus_options != NULL or arg == NULL or arg[0] != '+'){
307
return ARGP_ERR_UNKNOWN;
312
plugin *plugin_list = NULL;
314
struct argp argp = { .options = options, .parser = parse_opt,
315
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
566
316
.doc = "Mandos plugin runner -- Run plugins" };
568
/* Parse using parse_opt_config_file() in order to get the custom
569
config file location, if any. */
570
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
571
if(ret == ARGP_ERR_UNKNOWN){
318
ret = argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
319
if (ret == ARGP_ERR_UNKNOWN){
572
320
fprintf(stderr, "Unknown error while parsing arguments\n");
573
321
exitstatus = EXIT_FAILURE;
577
/* Reset to the normal argument parser */
578
argp.parser = parse_opt;
580
/* Open the configfile if available */
582
conffp = fopen(AFILE, "r");
584
conffp = fopen(argfile, "r");
587
char *org_line = NULL;
588
char *p, *arg, *new_arg, *line;
590
const char whitespace_delims[] = " \r\t\f\v\n";
591
const char comment_delim[] = "#";
594
custom_argv = malloc(sizeof(char*) * 2);
595
if(custom_argv == NULL){
326
/* This is a mangled argument in the form of
327
"+--option+--other-option=parameter+--yet-another-option", etc */
328
/* Make new argc and argv vars, and call argp_parse() again. */
329
plus_options++; /* skip the first '+' character */
330
const char delims[] = "+";
333
plus_argv = malloc(sizeof(char*) * 2);
334
if(plus_argv == NULL){
596
335
perror("malloc");
597
336
exitstatus = EXIT_FAILURE;
600
custom_argv[0] = argv[0];
601
custom_argv[1] = NULL;
339
plus_argv[0] = argv[0];
342
while((arg = strsep(&plus_options, delims)) != NULL){
344
plus_argv = realloc(plus_argv, sizeof(char *)
345
* ((unsigned int) new_argc + 1));
346
if(plus_argv == NULL){
348
exitstatus = EXIT_FAILURE;
351
plus_argv[new_argc-1] = arg;
352
plus_argv[new_argc] = NULL;
603
/* for each line in the config file, strip whitespace and ignore
606
sret = getline(&org_line, &size, conffp);
612
arg = strsep(&line, comment_delim);
613
while((p = strsep(&arg, whitespace_delims)) != NULL){
620
exitstatus = EXIT_FAILURE;
626
custom_argv = realloc(custom_argv, sizeof(char *)
627
* ((unsigned int) custom_argc + 1));
628
if(custom_argv == NULL){
630
exitstatus = EXIT_FAILURE;
634
custom_argv[custom_argc-1] = new_arg;
635
custom_argv[custom_argc] = NULL;
639
ret = fclose(conffp);
640
} while(ret == EOF and errno == EINTR);
643
exitstatus = EXIT_FAILURE;
648
/* Check for harmful errors and go to fallback. Other errors might
649
not affect opening plugins */
650
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
652
exitstatus = EXIT_FAILURE;
656
/* If there was any arguments from configuration file,
657
pass them to parser as command arguments */
658
if(custom_argv != NULL){
659
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
661
if(ret == ARGP_ERR_UNKNOWN){
355
ret = argp_parse (&argp, new_argc, plus_argv, 0, 0, &plugin_list);
356
if (ret == ARGP_ERR_UNKNOWN){
662
357
fprintf(stderr, "Unknown error while parsing arguments\n");
663
358
exitstatus = EXIT_FAILURE;
668
/* Parse actual command line arguments, to let them override the
670
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
671
if(ret == ARGP_ERR_UNKNOWN){
672
fprintf(stderr, "Unknown error while parsing arguments\n");
673
exitstatus = EXIT_FAILURE;
678
364
for(plugin *p = plugin_list; p != NULL; p=p->next){
679
365
fprintf(stderr, "Plugin: %s has %d arguments\n",
945
559
above and must now close it manually here. */
948
if(p->environ[0] == NULL){
949
if(execv(filename, p->argv) < 0){
954
if(execve(filename, p->argv, p->environ) < 0){
562
if(execv(filename, p->argv) < 0){
962
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
965
plugin *new_plugin = getplugin(dirst->d_name);
966
if(new_plugin == NULL){
968
ret = (int)(TEMP_FAILURE_RETRY
969
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
570
close(pipefd[1]); /* close unused write end of pipe */
571
process *new_process = malloc(sizeof(process));
572
if (new_process == NULL){
574
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
972
perror("sigprocmask");
576
perror("sigprocmask");
974
578
exitstatus = EXIT_FAILURE;
978
new_plugin->pid = pid;
979
new_plugin->fd = pipefd[0];
582
*new_process = (struct process){ .pid = pid,
584
.next = process_list };
586
process_list = new_process;
981
587
/* Unblock SIGCHLD so signal handler can be run if this process
982
588
has already completed */
983
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
984
&sigchld_action.sa_mask,
589
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
987
591
perror("sigprocmask");
988
592
exitstatus = EXIT_FAILURE;
992
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
995
if(maxfd < new_plugin->fd){
996
maxfd = new_plugin->fd;
1000
TEMP_FAILURE_RETRY(closedir(dir));
596
FD_SET(new_process->fd, &rfds_all);
598
if (maxfd < new_process->fd){
599
maxfd = new_process->fd;
604
/* Free the plugin list */
605
for(plugin *next; plugin_list != NULL; plugin_list = next){
606
next = plugin_list->next;
607
free(plugin_list->argv);
1002
free_plugin(getplugin(NULL));
1004
for(plugin *p = plugin_list; p != NULL; p = p->next){
1008
if(p->next == NULL){
1009
fprintf(stderr, "No plugin processes started. Incorrect plugin"
614
if (process_list == NULL){
615
fprintf(stderr, "No plugin processes started. Incorrect plugin"
1015
/* Main loop while running plugins exist */
1017
620
fd_set rfds = rfds_all;
1018
621
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
1019
if(select_ret == -1 and errno != EINTR){
622
if (select_ret == -1){
1020
623
perror("select");
1021
624
exitstatus = EXIT_FAILURE;
1024
627
/* OK, now either a process completed, or something can be read
1025
628
from one of them */
1026
for(plugin *proc = plugin_list; proc != NULL;){
629
for(process *proc = process_list; proc ; proc = proc->next){
1027
630
/* Is this process completely done? */
1028
if(proc->completed and proc->eof){
631
if(proc->eof and proc->completed){
1029
632
/* Only accept the plugin output if it exited cleanly */
1030
633
if(not WIFEXITED(proc->status)
1031
634
or WEXITSTATUS(proc->status) != 0){
1032
635
/* Bad exit by plugin */
1035
637
if(WIFEXITED(proc->status)){
1036
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1037
" status %d\n", proc->name,
1038
(intmax_t) (proc->pid),
638
fprintf(stderr, "Plugin %u exited with status %d\n",
639
(unsigned int) (proc->pid),
1039
640
WEXITSTATUS(proc->status));
1040
} else if(WIFSIGNALED(proc->status)){
1041
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1042
" signal %d: %s\n", proc->name,
1043
(intmax_t) (proc->pid),
1044
WTERMSIG(proc->status),
1045
strsignal(WTERMSIG(proc->status)));
641
} else if(WIFSIGNALED(proc->status)) {
642
fprintf(stderr, "Plugin %u killed by signal %d\n",
643
(unsigned int) (proc->pid),
644
WTERMSIG(proc->status));
1046
645
} else if(WCOREDUMP(proc->status)){
1047
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1048
" core\n", proc->name, (intmax_t) (proc->pid));
646
fprintf(stderr, "Plugin %d dumped core\n",
647
(unsigned int) (proc->pid));
1052
650
/* Remove the plugin */
1053
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
651
FD_CLR(proc->fd, &rfds_all);
1056
652
/* Block signal while modifying process_list */
1057
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1059
&sigchld_action.sa_mask,
653
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1062
655
perror("sigprocmask");
1063
656
exitstatus = EXIT_FAILURE;
1067
plugin *next_plugin = proc->next;
659
/* Delete this process entry from the list */
660
if(process_list == proc){
661
/* First one - simple */
662
process_list = proc->next;
664
/* Second one or later */
665
for(process *p = process_list; p != NULL; p = p->next){
667
p->next = proc->next;
1071
672
/* We are done modifying process list, so unblock signal */
1072
ret = (int)(TEMP_FAILURE_RETRY
1073
(sigprocmask(SIG_UNBLOCK,
1074
&sigchld_action.sa_mask, NULL)));
673
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
1076
676
perror("sigprocmask");
1077
exitstatus = EXIT_FAILURE;
1081
if(plugin_list == NULL){
680
/* We deleted this process from the list, so we can't go
681
proc->next. Therefore, start over from the beginning of
1088
685
/* This process exited nicely, so print its buffer */
1090
bool bret = print_out_password(proc->buffer,
1091
proc->buffer_length);
687
bool bret = print_out_password(proc->buffer, proc->buffer_length);
1093
689
perror("print_out_password");
1094
690
exitstatus = EXIT_FAILURE;
1099
694
/* This process has not completed. Does it have any output? */
1100
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
695
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1103
696
/* This process had nothing to say at this time */
1107
699
/* Before reading, make the process' data buffer large enough */
1108
700
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1109
701
proc->buffer = realloc(proc->buffer, proc->buffer_size
1110
702
+ (size_t) BUFFER_SIZE);
1111
if(proc->buffer == NULL){
703
if (proc->buffer == NULL){
1112
704
perror("malloc");
1113
705
exitstatus = EXIT_FAILURE;
1116
708
proc->buffer_size += BUFFER_SIZE;
1118
710
/* Read from the process */
1119
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1121
+ proc->buffer_length,
711
ret = read(proc->fd, proc->buffer + proc->buffer_length,
1124
714
/* Read error from this process; ignore the error */
1130
719
proc->eof = true;
1132
proc->buffer_length += (size_t) sret;
721
proc->buffer_length += (size_t) ret;
1140
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1141
/* Fallback if all plugins failed, none are found or an error
729
if(process_list == NULL or exitstatus != EXIT_SUCCESS){
730
/* Fallback if all plugins failed, none are found or an error occured */
1144
732
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
1145
733
char *passwordbuffer = getpass("Password: ");
1146
size_t len = strlen(passwordbuffer);
1147
/* Strip trailing newline */
1148
if(len > 0 and passwordbuffer[len-1] == '\n'){
1149
passwordbuffer[len-1] = '\0'; /* not strictly necessary */
1152
bret = print_out_password(passwordbuffer, len);
734
bret = print_out_password(passwordbuffer, strlen(passwordbuffer));
1154
736
perror("print_out_password");
1155
737
exitstatus = EXIT_FAILURE;
1159
742
/* Restore old signal handler */
1160
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1162
perror("sigaction");
1163
exitstatus = EXIT_FAILURE;
1166
if(custom_argv != NULL){
1167
for(char **arg = custom_argv+1; *arg != NULL; arg++){
743
sigaction(SIGCHLD, &old_sigchld_action, NULL);
747
/* Free the plugin list */
748
for(plugin *next; plugin_list != NULL; plugin_list = next){
749
next = plugin_list->next;
750
free(plugin_list->argv);
1173
754
if(dir != NULL){
1177
/* Kill the processes */
1178
for(plugin *p = plugin_list; p != NULL; p = p->next){
1181
ret = kill(p->pid, SIGTERM);
1182
if(ret == -1 and errno != ESRCH){
1183
/* Set-uid proccesses might not get closed */
758
/* Free the process list and kill the processes */
759
for(process *next; process_list != NULL; process_list = next){
760
next = process_list->next;
761
close(process_list->fd);
762
ret = kill(process_list->pid, SIGTERM);
763
if(ret == -1 and errno != ESRCH){
764
/* set-uid proccesses migth not get closed */
767
free(process_list->buffer);
1189
771
/* Wait for any remaining child processes to terminate */
1191
773
ret = wait(NULL);
1192
774
} while(ret >= 0);
1193
775
if(errno != ECHILD){
1202
779
return exitstatus;