To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to plugin-runner.c
- browse files at revision 394
- compare with another revision
- download diff
- download tarball
- view history from revision 394
- Committer: Teddy Hogeborn
- Date: 2009-10-24 19:17:52 UTC
- Revision ID: teddy@fukt.bsnet.se-20091024191752-7g6xlf6wpp2pdexb
Convert some programs to use the exit codes from <sysexits.h>. Change
all programs using the "argp" parsing functions to use them correctly;
checking return value, using argp_error() to report parse errors etc.
* plugin-runner.c: Use <sysexits.h> exit codes. Always use fallback,
even on option errors, except for "--help", etc.
(getplugin): Make sure "errno" is set correctly on return.
(main): Declare our own "--help", "--usage", and "--version"
options which do not cause the fallback to be invoked.
In all other options, use fallback on any error.
(parse_opt, parse_opt_config_file): Reset errno at start and return
errno. No need to check "arg"
for NULL. New "--help",
"--usage", and "--version"
options.
(parse_opt): Accept empty string as global option. Do not print
errors which will be detected and reported later. Do
"argp_error()" on parse error or empty plugin names.
* plugins.d/mandos-client.c: Use <sysexits.h> exit codes. Do not
return successful exit code on "--help",
etc. since this would give the wrong
message to "plugin-runner".
(main): Declare our own "--help", "--usage", and "--version"
options which do not return a successful exit code.
(parse_opt): Reset errno at start and return errno. Do
"argp_error()" on parse errors. New "--help",
"--usage", and "--version" options.
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
not return successful exit code on
"--help", etc. since this would give
the wrong message to "plugin-runner".
(main): Declare our own "--help", "--usage", and "--version" options
which do not return a successful exit code. Do
close(STDOUT_FILENO) after writing to check its return code.
(parse_opt): Reset errno at start and return errno.
all programs using the "argp" parsing functions to use them correctly;
checking return value, using argp_error() to report parse errors etc.
* plugin-runner.c: Use <sysexits.h> exit codes. Always use fallback,
even on option errors, except for "--help", etc.
(getplugin): Make sure "errno" is set correctly on return.
(main): Declare our own "--help", "--usage", and "--version"
options which do not cause the fallback to be invoked.
In all other options, use fallback on any error.
(parse_opt, parse_opt_config_file): Reset errno at start and return
errno. No need to check "arg"
for NULL. New "--help",
"--usage", and "--version"
options.
(parse_opt): Accept empty string as global option. Do not print
errors which will be detected and reported later. Do
"argp_error()" on parse error or empty plugin names.
* plugins.d/mandos-client.c: Use <sysexits.h> exit codes. Do not
return successful exit code on "--help",
etc. since this would give the wrong
message to "plugin-runner".
(main): Declare our own "--help", "--usage", and "--version"
options which do not return a successful exit code.
(parse_opt): Reset errno at start and return errno. Do
"argp_error()" on parse errors. New "--help",
"--usage", and "--version" options.
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
not return successful exit code on
"--help", etc. since this would give
the wrong message to "plugin-runner".
(main): Declare our own "--help", "--usage", and "--version" options
which do not return a successful exit code. Do
close(STDOUT_FILENO) after writing to check its return code.
(parse_opt): Reset errno at start and return errno.
- files modified:
- INSTALL
added
removed
plugin-runner.c
1
/* -*- coding: utf-8 -*- */
1
/* -*- coding: utf-8; mode: c; mode: orgtbl -*- */
2
2
/*
3
3
* Mandos plugin runner - Run Mandos plugins
4
4
*
23
23
*/
24
24
25
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
asprintf() */
26
asprintf(), O_CLOEXEC */
27
27
#include <stddef.h> /* size_t, NULL */
28
28
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
29
29
EXIT_SUCCESS, realloc() */
30
30
#include <stdbool.h> /* bool, true, false */
31
31
#include <stdio.h> /* perror, fileno(), fprintf(),
32
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, opendir(), stat(), struct
33
#include <sys/types.h> /* DIR, fdopendir(), stat(), struct
34
34
stat, waitpid(), WIFEXITED(),
35
35
WEXITSTATUS(), wait(), pid_t,
36
36
uid_t, gid_t, getuid(), getgid(),
38
38
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
39
39
FD_SET(), FD_ISSET(), FD_CLR */
40
40
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
41
WEXITSTATUS() */
41
WEXITSTATUS(), WTERMSIG(),
42
WCOREDUMP() */
42
43
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
43
44
#include <iso646.h> /* and, or, not */
44
#include <dirent.h> /* DIR, struct dirent, opendir(),
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
45
46
readdir(), closedir(), dirfd() */
46
47
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
47
48
fcntl(), setuid(), setgid(),
52
53
close() */
53
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
54
55
FD_CLOEXEC */
55
#include <string.h> /* strsep, strlen(), asprintf() */
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal() */
56
58
#include <errno.h> /* errno */
57
59
#include <argp.h> /* struct argp_option, struct
58
60
argp_state, struct argp,
62
64
#include <signal.h> /* struct sigaction, sigemptyset(),
63
65
sigaddset(), sigaction(),
64
66
sigprocmask(), SIG_BLOCK, SIGCHLD,
65
SIG_UNBLOCK, kill() */
67
SIG_UNBLOCK, kill(), sig_atomic_t
68
*/
66
69
#include <errno.h> /* errno, EBADF */
67
#include <inttypes.h> /* intmax_t, SCNdMAX, PRIdMAX, */
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
71
#include <sysexits.h> /* EX_OSERR, EX_USAGE */
68
72
69
73
#define BUFFER_SIZE 256
70
74
81
85
char **environ;
82
86
int envc;
83
87
bool disabled;
84
88
85
89
/* Variables used for running processes*/
86
90
pid_t pid;
87
91
int fd;
89
93
size_t buffer_size;
90
94
size_t buffer_length;
91
95
bool eof;
92
volatile bool completed;
93
volatile int status;
96
volatile sig_atomic_t completed;
97
int status;
94
98
struct plugin *next;
95
99
} plugin;
96
100
99
103
/* Gets an existing plugin based on name,
100
104
or if none is found, creates a new one */
101
105
static plugin *getplugin(char *name){
102
/* Check for exiting plugin with that name */
106
/* Check for existing plugin with that name */
103
107
for(plugin *p = plugin_list; p != NULL; p = p->next){
104
108
if((p->name == name)
105
109
or (p->name and name and (strcmp(p->name, name) == 0))){
107
111
}
108
112
}
109
113
/* Create a new plugin */
110
plugin *new_plugin = malloc(sizeof(plugin));
114
plugin *new_plugin = NULL;
115
do {
116
new_plugin = malloc(sizeof(plugin));
117
} while(new_plugin == NULL and errno == EINTR);
111
118
if(new_plugin == NULL){
112
119
return NULL;
113
120
}
114
121
char *copy_name = NULL;
115
122
if(name != NULL){
116
copy_name = strdup(name);
123
do {
124
copy_name = strdup(name);
125
} while(copy_name == NULL and errno == EINTR);
117
126
if(copy_name == NULL){
127
int e = errno;
118
128
free(new_plugin);
129
errno = e;
119
130
return NULL;
120
131
}
121
132
}
122
133
123
*new_plugin = (plugin) { .name = copy_name,
124
.argc = 1,
125
.disabled = false,
126
.next = plugin_list };
134
*new_plugin = (plugin){ .name = copy_name,
135
.argc = 1,
136
.disabled = false,
137
.next = plugin_list };
127
138
128
new_plugin->argv = malloc(sizeof(char *) * 2);
139
do {
140
new_plugin->argv = malloc(sizeof(char *) * 2);
141
} while(new_plugin->argv == NULL and errno == EINTR);
129
142
if(new_plugin->argv == NULL){
143
int e = errno;
130
144
free(copy_name);
131
145
free(new_plugin);
146
errno = e;
132
147
return NULL;
133
148
}
134
149
new_plugin->argv[0] = copy_name;
135
150
new_plugin->argv[1] = NULL;
136
151
137
new_plugin->environ = malloc(sizeof(char *));
152
do {
153
new_plugin->environ = malloc(sizeof(char *));
154
} while(new_plugin->environ == NULL and errno == EINTR);
138
155
if(new_plugin->environ == NULL){
156
int e = errno;
139
157
free(copy_name);
140
158
free(new_plugin->argv);
141
159
free(new_plugin);
160
errno = e;
142
161
return NULL;
143
162
}
144
163
new_plugin->environ[0] = NULL;
152
171
static bool add_to_char_array(const char *new, char ***array,
153
172
int *len){
154
173
/* Resize the pointed-to array to hold one more pointer */
155
*array = realloc(*array, sizeof(char *)
156
* (size_t) ((*len) + 2));
174
do {
175
*array = realloc(*array, sizeof(char *)
176
* (size_t) ((*len) + 2));
177
} while(*array == NULL and errno == EINTR);
157
178
/* Malloc check */
158
179
if(*array == NULL){
159
180
return false;
160
181
}
161
182
/* Make a copy of the new string */
162
char *copy = strdup(new);
183
char *copy;
184
do {
185
copy = strdup(new);
186
} while(copy == NULL and errno == EINTR);
163
187
if(copy == NULL){
164
188
return false;
165
189
}
191
215
if(strncmp(*e, def, namelen + 1) == 0){
192
216
/* It already exists */
193
217
if(replace){
194
char *new = realloc(*e, strlen(def) + 1);
218
char *new;
219
do {
220
new = realloc(*e, strlen(def) + 1);
221
} while(new == NULL and errno == EINTR);
195
222
if(new == NULL){
196
223
return false;
197
224
}
207
234
/*
208
235
* Based on the example in the GNU LibC manual chapter 13.13 "File
209
236
* Descriptor Flags".
210
* *Note File Descriptor Flags:(libc)Descriptor Flags.
237
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
211
238
*/
212
239
static int set_cloexec_flag(int fd){
213
int ret = fcntl(fd, F_GETFD, 0);
240
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
214
241
/* If reading the flags failed, return error indication now. */
215
242
if(ret < 0){
216
243
return ret;
217
244
}
218
245
/* Store modified flag word in the descriptor. */
219
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
246
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
247
ret | FD_CLOEXEC));
220
248
}
221
249
222
250
223
251
/* Mark processes as completed when they exit, and save their exit
224
252
status. */
225
253
static void handle_sigchld(__attribute__((unused)) int sig){
254
int old_errno = errno;
226
255
while(true){
227
256
plugin *proc = plugin_list;
228
257
int status;
232
261
break;
233
262
}
234
263
if(pid == -1){
235
if(errno != ECHILD){
236
perror("waitpid");
264
if(errno == ECHILD){
265
/* No child processes */
266
break;
237
267
}
238
/* No child processes */
239
break;
268
perror("waitpid");
240
269
}
241
270
242
271
/* A child exited, find it in process_list */
248
277
continue;
249
278
}
250
279
proc->status = status;
251
proc->completed = true;
280
proc->completed = 1;
252
281
}
282
errno = old_errno;
253
283
}
254
284
255
285
/* Prints out a password to stdout */
277
307
}
278
308
free(plugin_node->environ);
279
309
free(plugin_node->buffer);
280
310
281
311
/* Removes the plugin from the singly-linked list */
282
312
if(plugin_node == plugin_list){
283
313
/* First one - simple */
310
340
struct dirent *dirst;
311
341
struct stat st;
312
342
fd_set rfds_all;
313
int ret, numchars, maxfd = 0;
343
int ret, maxfd = 0;
314
344
ssize_t sret;
315
intmax_t tmpmax;
316
345
uid_t uid = 65534;
317
346
gid_t gid = 65534;
318
347
bool debug = false;
372
401
.doc = "Group ID the plugins will run as", .group = 3 },
373
402
{ .name = "debug", .key = 132,
374
403
.doc = "Debug mode", .group = 4 },
404
/*
405
* These reproduce what we would get without ARGP_NO_HELP
406
*/
407
{ .name = "help", .key = '?',
408
.doc = "Give this help list", .group = -1 },
409
{ .name = "usage", .key = -3,
410
.doc = "Give a short usage message", .group = -1 },
411
{ .name = "version", .key = 'V',
412
.doc = "Print program version", .group = -1 },
375
413
{ .name = NULL }
376
414
};
377
415
378
error_t parse_opt(int key, char *arg, __attribute__((unused))
379
struct argp_state *state) {
380
switch(key) {
416
error_t parse_opt(int key, char *arg, struct argp_state *state){
417
errno = 0;
418
switch(key){
419
char *tmp;
420
intmax_t tmpmax;
381
421
case 'g': /* --global-options */
382
if(arg != NULL){
383
char *p;
384
while((p = strsep(&arg, ",")) != NULL){
385
if(p[0] == '\0'){
386
continue;
387
}
388
if(not add_argument(getplugin(NULL), p)){
389
perror("add_argument");
390
return ARGP_ERR_UNKNOWN;
422
{
423
char *plugin_option;
424
while((plugin_option = strsep(&arg, ",")) != NULL){
425
if(not add_argument(getplugin(NULL), plugin_option)){
426
break;
391
427
}
392
428
}
393
429
}
394
430
break;
395
431
case 'G': /* --global-env */
396
if(arg == NULL){
397
break;
398
}
399
if(not add_environment(getplugin(NULL), arg, true)){
400
perror("add_environment");
401
}
432
add_environment(getplugin(NULL), arg, true);
402
433
break;
403
434
case 'o': /* --options-for */
404
if(arg != NULL){
405
char *p_name = strsep(&arg, ":");
406
if(p_name[0] == '\0' or arg == NULL){
407
break;
408
}
409
char *opt = strsep(&arg, ":");
410
if(opt[0] == '\0' or opt == NULL){
411
break;
412
}
413
char *p;
414
while((p = strsep(&opt, ",")) != NULL){
415
if(p[0] == '\0'){
416
continue;
417
}
418
if(not add_argument(getplugin(p_name), p)){
419
perror("add_argument");
420
return ARGP_ERR_UNKNOWN;
435
{
436
char *option_list = strchr(arg, ':');
437
if(option_list == NULL){
438
argp_error(state, "No colon in \"%s\"", arg);
439
errno = EINVAL;
440
break;
441
}
442
*option_list = '\0';
443
option_list++;
444
if(arg[0] == '\0'){
445
argp_error(state, "Empty plugin name");
446
errno = EINVAL;
447
break;
448
}
449
char *option;
450
while((option = strsep(&option_list, ",")) != NULL){
451
if(not add_argument(getplugin(arg), option)){
452
break;
421
453
}
422
454
}
423
455
}
424
456
break;
425
457
case 'E': /* --env-for */
426
if(arg == NULL){
427
break;
428
}
429
458
{
430
459
char *envdef = strchr(arg, ':');
431
460
if(envdef == NULL){
461
argp_error(state, "No colon in \"%s\"", arg);
462
errno = EINVAL;
432
463
break;
433
464
}
434
465
*envdef = '\0';
435
if(not add_environment(getplugin(arg), envdef+1, true)){
436
perror("add_environment");
466
envdef++;
467
if(arg[0] == '\0'){
468
argp_error(state, "Empty plugin name");
469
errno = EINVAL;
470
break;
437
471
}
472
add_environment(getplugin(arg), envdef, true);
438
473
}
439
474
break;
440
475
case 'd': /* --disable */
441
if(arg != NULL){
476
{
442
477
plugin *p = getplugin(arg);
443
if(p == NULL){
444
return ARGP_ERR_UNKNOWN;
478
if(p != NULL){
479
p->disabled = true;
445
480
}
446
p->disabled = true;
447
481
}
448
482
break;
449
483
case 'e': /* --enable */
450
if(arg != NULL){
484
{
451
485
plugin *p = getplugin(arg);
452
if(p == NULL){
453
return ARGP_ERR_UNKNOWN;
486
if(p != NULL){
487
p->disabled = false;
454
488
}
455
p->disabled = false;
456
489
}
457
490
break;
458
491
case 128: /* --plugin-dir */
459
492
free(plugindir);
460
493
plugindir = strdup(arg);
461
if(plugindir == NULL){
462
perror("strdup");
463
}
464
494
break;
465
495
case 129: /* --config-file */
466
496
/* This is already done by parse_opt_config_file() */
467
497
break;
468
498
case 130: /* --userid */
469
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
470
if(ret < 1 or tmpmax != (uid_t)tmpmax
471
or arg[numchars] != '\0'){
472
fprintf(stderr, "Bad user ID number: \"%s\", using %"
473
PRIdMAX "\n", arg, (intmax_t)uid);
474
} else {
475
uid = (uid_t)tmpmax;
499
tmpmax = strtoimax(arg, &tmp, 10);
500
if(errno != 0 or tmp == arg or *tmp != '\0'
501
or tmpmax != (uid_t)tmpmax){
502
argp_error(state, "Bad user ID number: \"%s\", using %"
503
PRIdMAX, arg, (intmax_t)uid);
504
break;
476
505
}
506
uid = (uid_t)tmpmax;
477
507
break;
478
508
case 131: /* --groupid */
479
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
480
if(ret < 1 or tmpmax != (gid_t)tmpmax
481
or arg[numchars] != '\0'){
482
fprintf(stderr, "Bad group ID number: \"%s\", using %"
483
PRIdMAX "\n", arg, (intmax_t)gid);
484
} else {
485
gid = (gid_t)tmpmax;
509
tmpmax = strtoimax(arg, &tmp, 10);
510
if(errno != 0 or tmp == arg or *tmp != '\0'
511
or tmpmax != (gid_t)tmpmax){
512
argp_error(state, "Bad group ID number: \"%s\", using %"
513
PRIdMAX, arg, (intmax_t)gid);
514
break;
486
515
}
516
gid = (gid_t)tmpmax;
487
517
break;
488
518
case 132: /* --debug */
489
519
debug = true;
490
520
break;
521
/*
522
* These reproduce what we would get without ARGP_NO_HELP
523
*/
524
case '?': /* --help */
525
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
526
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
527
case -3: /* --usage */
528
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
529
argp_state_help(state, state->out_stream,
530
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
531
case 'V': /* --version */
532
fprintf(state->out_stream, "%s\n", argp_program_version);
533
exit(EXIT_SUCCESS);
534
break;
491
535
/*
492
536
* When adding more options before this line, remember to also add a
493
537
* "case" to the "parse_opt_config_file" function below.
496
540
/* Cryptsetup always passes an argument, which is an empty
497
541
string if "none" was specified in /etc/crypttab. So if
498
542
argument was empty, we ignore it silently. */
499
if(arg[0] != '\0'){
500
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
543
if(arg[0] == '\0'){
544
break;
501
545
}
502
break;
503
case ARGP_KEY_END:
504
break;
505
546
default:
506
547
return ARGP_ERR_UNKNOWN;
507
548
}
508
return 0;
549
return errno; /* Set to 0 at start */
509
550
}
510
551
511
552
/* This option parser is the same as parse_opt() above, except it
512
553
ignores everything but the --config-file option. */
513
554
error_t parse_opt_config_file(int key, char *arg,
514
555
__attribute__((unused))
515
struct argp_state *state) {
516
switch(key) {
556
struct argp_state *state){
557
errno = 0;
558
switch(key){
517
559
case 'g': /* --global-options */
518
560
case 'G': /* --global-env */
519
561
case 'o': /* --options-for */
525
567
case 129: /* --config-file */
526
568
free(argfile);
527
569
argfile = strdup(arg);
528
if(argfile == NULL){
529
perror("strdup");
530
}
531
break;
570
break;
532
571
case 130: /* --userid */
533
572
case 131: /* --groupid */
534
573
case 132: /* --debug */
574
case '?': /* --help */
575
case -3: /* --usage */
576
case 'V': /* --version */
535
577
case ARGP_KEY_ARG:
536
case ARGP_KEY_END:
537
578
break;
538
579
default:
539
580
return ARGP_ERR_UNKNOWN;
540
581
}
541
return 0;
582
return errno;
542
583
}
543
584
544
585
struct argp argp = { .options = options,
548
589
549
590
/* Parse using parse_opt_config_file() in order to get the custom
550
591
config file location, if any. */
551
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
552
if(ret == ARGP_ERR_UNKNOWN){
553
fprintf(stderr, "Unknown error while parsing arguments\n");
554
exitstatus = EXIT_FAILURE;
592
ret = argp_parse(&argp, argc, argv,
593
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
594
NULL, NULL);
595
switch(ret){
596
case 0:
597
break;
598
case ENOMEM:
599
default:
600
errno = ret;
601
perror("argp_parse");
602
exitstatus = EX_OSERR;
603
goto fallback;
604
case EINVAL:
605
exitstatus = EX_USAGE;
555
606
goto fallback;
556
607
}
557
608
563
614
conffp = fopen(AFILE, "r");
564
615
} else {
565
616
conffp = fopen(argfile, "r");
566
}
617
}
567
618
if(conffp != NULL){
568
619
char *org_line = NULL;
569
620
char *p, *arg, *new_arg, *line;
570
621
size_t size = 0;
571
622
const char whitespace_delims[] = " \r\t\f\v\n";
572
623
const char comment_delim[] = "#";
573
624
574
625
custom_argc = 1;
575
626
custom_argv = malloc(sizeof(char*) * 2);
576
627
if(custom_argv == NULL){
580
631
}
581
632
custom_argv[0] = argv[0];
582
633
custom_argv[1] = NULL;
583
634
584
635
/* for each line in the config file, strip whitespace and ignore
585
636
commented text */
586
637
while(true){
588
639
if(sret == -1){
589
640
break;
590
641
}
591
642
592
643
line = org_line;
593
644
arg = strsep(&line, comment_delim);
594
645
while((p = strsep(&arg, whitespace_delims)) != NULL){
613
664
goto fallback;
614
665
}
615
666
custom_argv[custom_argc-1] = new_arg;
616
custom_argv[custom_argc] = NULL;
667
custom_argv[custom_argc] = NULL;
617
668
}
618
669
}
670
do {
671
ret = fclose(conffp);
672
} while(ret == EOF and errno == EINTR);
673
if(ret == EOF){
674
perror("fclose");
675
exitstatus = EXIT_FAILURE;
676
goto fallback;
677
}
619
678
free(org_line);
620
679
} else {
621
680
/* Check for harmful errors and go to fallback. Other errors might
626
685
goto fallback;
627
686
}
628
687
}
629
/* If there was any arguments from configuration file,
630
pass them to parser as command arguments */
688
/* If there were any arguments from the configuration file, pass
689
them to parser as command line arguments */
631
690
if(custom_argv != NULL){
632
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
633
0, NULL);
634
if(ret == ARGP_ERR_UNKNOWN){
635
fprintf(stderr, "Unknown error while parsing arguments\n");
636
exitstatus = EXIT_FAILURE;
691
ret = argp_parse(&argp, custom_argc, custom_argv,
692
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
693
NULL, NULL);
694
switch(ret){
695
case 0:
696
break;
697
case ENOMEM:
698
default:
699
errno = ret;
700
perror("argp_parse");
701
exitstatus = EX_OSERR;
702
goto fallback;
703
case EINVAL:
704
exitstatus = EX_CONFIG;
637
705
goto fallback;
638
706
}
639
707
}
640
708
641
709
/* Parse actual command line arguments, to let them override the
642
710
config file */
643
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
644
if(ret == ARGP_ERR_UNKNOWN){
645
fprintf(stderr, "Unknown error while parsing arguments\n");
646
exitstatus = EXIT_FAILURE;
711
ret = argp_parse(&argp, argc, argv,
712
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
713
NULL, NULL);
714
switch(ret){
715
case 0:
716
break;
717
case ENOMEM:
718
default:
719
errno = ret;
720
perror("argp_parse");
721
exitstatus = EX_OSERR;
722
goto fallback;
723
case EINVAL:
724
exitstatus = EX_USAGE;
647
725
goto fallback;
648
726
}
649
727
662
740
}
663
741
664
742
/* Strip permissions down to nobody */
743
setgid(gid);
744
if(ret == -1){
745
perror("setgid");
746
}
665
747
ret = setuid(uid);
666
748
if(ret == -1){
667
749
perror("setuid");
668
}
669
setgid(gid);
670
if(ret == -1){
671
perror("setgid");
672
}
673
674
if(plugindir == NULL){
675
dir = opendir(PDIR);
676
} else {
677
dir = opendir(plugindir);
678
}
679
680
if(dir == NULL){
681
perror("Could not open plugin dir");
682
exitstatus = EXIT_FAILURE;
683
goto fallback;
684
}
685
686
/* Set the FD_CLOEXEC flag on the directory, if possible */
750
}
751
752
/* Open plugin directory with close_on_exec flag */
687
753
{
688
int dir_fd = dirfd(dir);
689
if(dir_fd >= 0){
690
ret = set_cloexec_flag(dir_fd);
691
if(ret < 0){
692
perror("set_cloexec_flag");
693
exitstatus = EXIT_FAILURE;
694
goto fallback;
695
}
754
int dir_fd = -1;
755
if(plugindir == NULL){
756
dir_fd = open(PDIR, O_RDONLY |
757
#ifdef O_CLOEXEC
758
O_CLOEXEC
759
#else /* not O_CLOEXEC */
760
0
761
#endif /* not O_CLOEXEC */
762
);
763
} else {
764
dir_fd = open(plugindir, O_RDONLY |
765
#ifdef O_CLOEXEC
766
O_CLOEXEC
767
#else /* not O_CLOEXEC */
768
0
769
#endif /* not O_CLOEXEC */
770
);
771
}
772
if(dir_fd == -1){
773
perror("Could not open plugin dir");
774
exitstatus = EXIT_FAILURE;
775
goto fallback;
776
}
777
778
#ifndef O_CLOEXEC
779
/* Set the FD_CLOEXEC flag on the directory */
780
ret = set_cloexec_flag(dir_fd);
781
if(ret < 0){
782
perror("set_cloexec_flag");
783
TEMP_FAILURE_RETRY(close(dir_fd));
784
exitstatus = EXIT_FAILURE;
785
goto fallback;
786
}
787
#endif /* O_CLOEXEC */
788
789
dir = fdopendir(dir_fd);
790
if(dir == NULL){
791
perror("Could not open plugin dir");
792
TEMP_FAILURE_RETRY(close(dir_fd));
793
exitstatus = EXIT_FAILURE;
794
goto fallback;
696
795
}
697
796
}
698
797
700
799
701
800
/* Read and execute any executable in the plugin directory*/
702
801
while(true){
703
dirst = readdir(dir);
802
do {
803
dirst = readdir(dir);
804
} while(dirst == NULL and errno == EINTR);
704
805
705
806
/* All directory entries have been processed */
706
807
if(dirst == NULL){
757
858
continue;
758
859
}
759
860
}
760
861
761
862
char *filename;
762
863
if(plugindir == NULL){
763
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
864
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
865
dirst->d_name));
764
866
} else {
765
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
867
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
868
plugindir,
869
dirst->d_name));
766
870
}
767
871
if(ret < 0){
768
872
perror("asprintf");
769
873
continue;
770
874
}
771
875
772
ret = stat(filename, &st);
876
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
773
877
if(ret == -1){
774
878
perror("stat");
775
879
free(filename);
776
880
continue;
777
881
}
778
882
779
883
/* Ignore non-executable files */
780
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
884
if(not S_ISREG(st.st_mode)
885
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
781
886
if(debug){
782
887
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
783
888
" with bad type or mode\n", filename);
829
934
}
830
935
831
936
int pipefd[2];
832
ret = pipe(pipefd);
937
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
833
938
if(ret == -1){
834
939
perror("pipe");
835
940
exitstatus = EXIT_FAILURE;
849
954
goto fallback;
850
955
}
851
956
/* Block SIGCHLD until process is safely in process list */
852
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
957
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
958
&sigchld_action.sa_mask,
959
NULL));
853
960
if(ret < 0){
854
961
perror("sigprocmask");
855
962
exitstatus = EXIT_FAILURE;
856
963
goto fallback;
857
964
}
858
965
/* Starting a new process to be watched */
859
pid_t pid = fork();
966
pid_t pid;
967
do {
968
pid = fork();
969
} while(pid == -1 and errno == EINTR);
860
970
if(pid == -1){
861
971
perror("fork");
862
972
exitstatus = EXIT_FAILURE;
900
1010
/* no return */
901
1011
}
902
1012
/* Parent process */
903
close(pipefd[1]); /* Close unused write end of pipe */
1013
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1014
pipe */
904
1015
free(filename);
905
1016
plugin *new_plugin = getplugin(dirst->d_name);
906
1017
if(new_plugin == NULL){
907
1018
perror("getplugin");
908
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1019
ret = (int)(TEMP_FAILURE_RETRY
1020
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1021
NULL)));
909
1022
if(ret < 0){
910
1023
perror("sigprocmask");
911
1024
}
918
1031
919
1032
/* Unblock SIGCHLD so signal handler can be run if this process
920
1033
has already completed */
921
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1034
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1035
&sigchld_action.sa_mask,
1036
NULL));
922
1037
if(ret < 0){
923
1038
perror("sigprocmask");
924
1039
exitstatus = EXIT_FAILURE;
925
1040
goto fallback;
926
1041
}
927
1042
928
FD_SET(new_plugin->fd, &rfds_all);
1043
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1044
-Wconversion */
929
1045
930
1046
if(maxfd < new_plugin->fd){
931
1047
maxfd = new_plugin->fd;
932
1048
}
933
1049
}
934
1050
935
closedir(dir);
1051
TEMP_FAILURE_RETRY(closedir(dir));
936
1052
dir = NULL;
1053
free_plugin(getplugin(NULL));
937
1054
938
1055
for(plugin *p = plugin_list; p != NULL; p = p->next){
939
1056
if(p->pid != 0){
950
1067
while(plugin_list){
951
1068
fd_set rfds = rfds_all;
952
1069
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
953
if(select_ret == -1){
1070
if(select_ret == -1 and errno != EINTR){
954
1071
perror("select");
955
1072
exitstatus = EXIT_FAILURE;
956
1073
goto fallback;
959
1076
from one of them */
960
1077
for(plugin *proc = plugin_list; proc != NULL;){
961
1078
/* Is this process completely done? */
962
if(proc->eof and proc->completed){
1079
if(proc->completed and proc->eof){
963
1080
/* Only accept the plugin output if it exited cleanly */
964
1081
if(not WIFEXITED(proc->status)
965
1082
or WEXITSTATUS(proc->status) != 0){
966
1083
/* Bad exit by plugin */
967
1084
968
1085
if(debug){
969
1086
if(WIFEXITED(proc->status)){
970
fprintf(stderr, "Plugin %" PRIdMAX " exited with status"
971
" %d\n", (intmax_t) (proc->pid),
1087
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1088
" status %d\n", proc->name,
1089
(intmax_t) (proc->pid),
972
1090
WEXITSTATUS(proc->status));
973
} else if(WIFSIGNALED(proc->status)) {
974
fprintf(stderr, "Plugin %" PRIdMAX " killed by signal"
975
" %d\n", (intmax_t) (proc->pid),
976
WTERMSIG(proc->status));
1091
} else if(WIFSIGNALED(proc->status)){
1092
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1093
" signal %d: %s\n", proc->name,
1094
(intmax_t) (proc->pid),
1095
WTERMSIG(proc->status),
1096
strsignal(WTERMSIG(proc->status)));
977
1097
} else if(WCOREDUMP(proc->status)){
978
fprintf(stderr, "Plugin %" PRIdMAX " dumped core\n",
979
(intmax_t) (proc->pid));
1098
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1099
" core\n", proc->name, (intmax_t) (proc->pid));
980
1100
}
981
1101
}
982
1102
983
1103
/* Remove the plugin */
984
FD_CLR(proc->fd, &rfds_all);
985
1104
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1105
-Wconversion */
1106
986
1107
/* Block signal while modifying process_list */
987
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1108
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1109
(SIG_BLOCK,
1110
&sigchld_action.sa_mask,
1111
NULL));
988
1112
if(ret < 0){
989
1113
perror("sigprocmask");
990
1114
exitstatus = EXIT_FAILURE;
996
1120
proc = next_plugin;
997
1121
998
1122
/* We are done modifying process list, so unblock signal */
999
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1000
NULL);
1123
ret = (int)(TEMP_FAILURE_RETRY
1124
(sigprocmask(SIG_UNBLOCK,
1125
&sigchld_action.sa_mask, NULL)));
1001
1126
if(ret < 0){
1002
1127
perror("sigprocmask");
1003
1128
exitstatus = EXIT_FAILURE;
1023
1148
}
1024
1149
1025
1150
/* This process has not completed. Does it have any output? */
1026
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1151
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1152
warning from
1153
-Wconversion */
1027
1154
/* This process had nothing to say at this time */
1028
1155
proc = proc->next;
1029
1156
continue;
1040
1167
proc->buffer_size += BUFFER_SIZE;
1041
1168
}
1042
1169
/* Read from the process */
1043
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1044
BUFFER_SIZE);
1170
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1171
proc->buffer
1172
+ proc->buffer_length,
1173
BUFFER_SIZE));
1045
1174
if(sret < 0){
1046
1175
/* Read error from this process; ignore the error */
1047
1176
proc = proc->next;
1055
1184
}
1056
1185
}
1057
1186
}
1058
1059
1187
1188
1060
1189
fallback:
1061
1190
1062
1191
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1109
1238
}
1110
1239
1111
1240
/* Wait for any remaining child processes to terminate */
1112
do{
1241
do {
1113
1242
ret = wait(NULL);
1114
1243
} while(ret >= 0);
1115
1244
if(errno != ECHILD){
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0