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 266
- compare with another revision
- download diff
- download tarball
- view history from revision 266
- Committer: Teddy Hogeborn
- Date: 2009-01-13 04:35:19 UTC
- Revision ID: teddy@fukt.bsnet.se-20090113043519-0yr39snphoegq8l1
* plugin-runner.c: Only space changes.
* plugins.d/mandos-client.c: - '' -
* plugins.d/password-prompt.c: - '' -
* plugins.d/mandos-client.c: - '' -
* plugins.d/password-prompt.c: - '' -
- files removed:
- debian/watch
- files renamed:
- mandos-ctl => mandos-list
- files modified:
- INSTALL
added
removed
plugin-runner.c
1
/* -*- coding: utf-8; mode: c; mode: orgtbl -*- */
1
/* -*- coding: utf-8 -*- */
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(), O_CLOEXEC */
26
asprintf() */
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, fdopendir(), stat(), struct
33
#include <sys/types.h> /* DIR, opendir(), 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(), WTERMSIG(),
42
WCOREDUMP() */
41
WEXITSTATUS() */
43
42
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
44
43
#include <iso646.h> /* and, or, not */
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
44
#include <dirent.h> /* DIR, struct dirent, opendir(),
46
45
readdir(), closedir(), dirfd() */
47
46
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
48
47
fcntl(), setuid(), setgid(),
53
52
close() */
54
53
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
55
54
FD_CLOEXEC */
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal() */
55
#include <string.h> /* strsep, strlen(), asprintf() */
58
56
#include <errno.h> /* errno */
59
57
#include <argp.h> /* struct argp_option, struct
60
58
argp_state, struct argp,
64
62
#include <signal.h> /* struct sigaction, sigemptyset(),
65
63
sigaddset(), sigaction(),
66
64
sigprocmask(), SIG_BLOCK, SIGCHLD,
67
SIG_UNBLOCK, kill(), sig_atomic_t
68
*/
65
SIG_UNBLOCK, kill() */
69
66
#include <errno.h> /* errno, EBADF */
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
71
#include <sysexits.h> /* EX_OSERR, EX_USAGE */
72
67
73
68
#define BUFFER_SIZE 256
74
69
85
80
char **environ;
86
81
int envc;
87
82
bool disabled;
88
83
89
84
/* Variables used for running processes*/
90
85
pid_t pid;
91
86
int fd;
93
88
size_t buffer_size;
94
89
size_t buffer_length;
95
90
bool eof;
96
volatile sig_atomic_t completed;
97
int status;
91
volatile bool completed;
92
volatile int status;
98
93
struct plugin *next;
99
94
} plugin;
100
95
103
98
/* Gets an existing plugin based on name,
104
99
or if none is found, creates a new one */
105
100
static plugin *getplugin(char *name){
106
/* Check for existing plugin with that name */
101
/* Check for exiting plugin with that name */
107
102
for(plugin *p = plugin_list; p != NULL; p = p->next){
108
103
if((p->name == name)
109
104
or (p->name and name and (strcmp(p->name, name) == 0))){
111
106
}
112
107
}
113
108
/* Create a new plugin */
114
plugin *new_plugin = NULL;
115
do {
116
new_plugin = malloc(sizeof(plugin));
117
} while(new_plugin == NULL and errno == EINTR);
109
plugin *new_plugin = malloc(sizeof(plugin));
118
110
if(new_plugin == NULL){
119
111
return NULL;
120
112
}
121
113
char *copy_name = NULL;
122
114
if(name != NULL){
123
do {
124
copy_name = strdup(name);
125
} while(copy_name == NULL and errno == EINTR);
115
copy_name = strdup(name);
126
116
if(copy_name == NULL){
127
int e = errno;
128
free(new_plugin);
129
errno = e;
130
117
return NULL;
131
118
}
132
119
}
133
120
134
*new_plugin = (plugin){ .name = copy_name,
135
.argc = 1,
136
.disabled = false,
137
.next = plugin_list };
121
*new_plugin = (plugin) { .name = copy_name,
122
.argc = 1,
123
.disabled = false,
124
.next = plugin_list };
138
125
139
do {
140
new_plugin->argv = malloc(sizeof(char *) * 2);
141
} while(new_plugin->argv == NULL and errno == EINTR);
126
new_plugin->argv = malloc(sizeof(char *) * 2);
142
127
if(new_plugin->argv == NULL){
143
int e = errno;
144
128
free(copy_name);
145
129
free(new_plugin);
146
errno = e;
147
130
return NULL;
148
131
}
149
132
new_plugin->argv[0] = copy_name;
150
133
new_plugin->argv[1] = NULL;
151
134
152
do {
153
new_plugin->environ = malloc(sizeof(char *));
154
} while(new_plugin->environ == NULL and errno == EINTR);
135
new_plugin->environ = malloc(sizeof(char *));
155
136
if(new_plugin->environ == NULL){
156
int e = errno;
157
137
free(copy_name);
158
138
free(new_plugin->argv);
159
139
free(new_plugin);
160
errno = e;
161
140
return NULL;
162
141
}
163
142
new_plugin->environ[0] = NULL;
171
150
static bool add_to_char_array(const char *new, char ***array,
172
151
int *len){
173
152
/* Resize the pointed-to array to hold one more pointer */
174
do {
175
*array = realloc(*array, sizeof(char *)
176
* (size_t) ((*len) + 2));
177
} while(*array == NULL and errno == EINTR);
153
*array = realloc(*array, sizeof(char *)
154
* (size_t) ((*len) + 2));
178
155
/* Malloc check */
179
156
if(*array == NULL){
180
157
return false;
181
158
}
182
159
/* Make a copy of the new string */
183
char *copy;
184
do {
185
copy = strdup(new);
186
} while(copy == NULL and errno == EINTR);
160
char *copy = strdup(new);
187
161
if(copy == NULL){
188
162
return false;
189
163
}
215
189
if(strncmp(*e, def, namelen + 1) == 0){
216
190
/* It already exists */
217
191
if(replace){
218
char *new;
219
do {
220
new = realloc(*e, strlen(def) + 1);
221
} while(new == NULL and errno == EINTR);
192
char *new = realloc(*e, strlen(def) + 1);
222
193
if(new == NULL){
223
194
return false;
224
195
}
234
205
/*
235
206
* Based on the example in the GNU LibC manual chapter 13.13 "File
236
207
* Descriptor Flags".
237
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
208
* *Note File Descriptor Flags:(libc)Descriptor Flags.
238
209
*/
239
210
static int set_cloexec_flag(int fd){
240
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
211
int ret = fcntl(fd, F_GETFD, 0);
241
212
/* If reading the flags failed, return error indication now. */
242
213
if(ret < 0){
243
214
return ret;
244
215
}
245
216
/* Store modified flag word in the descriptor. */
246
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
247
ret | FD_CLOEXEC));
217
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
248
218
}
249
219
250
220
251
221
/* Mark processes as completed when they exit, and save their exit
252
222
status. */
253
223
static void handle_sigchld(__attribute__((unused)) int sig){
254
int old_errno = errno;
255
224
while(true){
256
225
plugin *proc = plugin_list;
257
226
int status;
261
230
break;
262
231
}
263
232
if(pid == -1){
264
if(errno == ECHILD){
265
/* No child processes */
266
break;
233
if(errno != ECHILD){
234
perror("waitpid");
267
235
}
268
perror("waitpid");
236
/* No child processes */
237
break;
269
238
}
270
239
271
240
/* A child exited, find it in process_list */
277
246
continue;
278
247
}
279
248
proc->status = status;
280
proc->completed = 1;
249
proc->completed = true;
281
250
}
282
errno = old_errno;
283
251
}
284
252
285
253
/* Prints out a password to stdout */
307
275
}
308
276
free(plugin_node->environ);
309
277
free(plugin_node->buffer);
310
278
311
279
/* Removes the plugin from the singly-linked list */
312
280
if(plugin_node == plugin_list){
313
281
/* First one - simple */
401
369
.doc = "Group ID the plugins will run as", .group = 3 },
402
370
{ .name = "debug", .key = 132,
403
371
.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 },
413
372
{ .name = NULL }
414
373
};
415
374
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;
375
error_t parse_opt(int key, char *arg, __attribute__((unused))
376
struct argp_state *state) {
377
switch(key) {
421
378
case 'g': /* --global-options */
422
{
423
char *plugin_option;
424
while((plugin_option = strsep(&arg, ",")) != NULL){
425
if(not add_argument(getplugin(NULL), plugin_option)){
426
break;
379
if(arg != NULL){
380
char *p;
381
while((p = strsep(&arg, ",")) != NULL){
382
if(p[0] == '\0'){
383
continue;
384
}
385
if(not add_argument(getplugin(NULL), p)){
386
perror("add_argument");
387
return ARGP_ERR_UNKNOWN;
427
388
}
428
389
}
429
390
}
430
391
break;
431
392
case 'G': /* --global-env */
432
add_environment(getplugin(NULL), arg, true);
393
if(arg == NULL){
394
break;
395
}
396
if(not add_environment(getplugin(NULL), arg, true)){
397
perror("add_environment");
398
}
433
399
break;
434
400
case 'o': /* --options-for */
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;
401
if(arg != NULL){
402
char *p_name = strsep(&arg, ":");
403
if(p_name[0] == '\0' or arg == NULL){
404
break;
405
}
406
char *opt = strsep(&arg, ":");
407
if(opt[0] == '\0' or opt == NULL){
408
break;
409
}
410
char *p;
411
while((p = strsep(&opt, ",")) != NULL){
412
if(p[0] == '\0'){
413
continue;
414
}
415
if(not add_argument(getplugin(p_name), p)){
416
perror("add_argument");
417
return ARGP_ERR_UNKNOWN;
453
418
}
454
419
}
455
420
}
456
421
break;
457
422
case 'E': /* --env-for */
423
if(arg == NULL){
424
break;
425
}
458
426
{
459
427
char *envdef = strchr(arg, ':');
460
428
if(envdef == NULL){
461
argp_error(state, "No colon in \"%s\"", arg);
462
errno = EINVAL;
463
429
break;
464
430
}
465
431
*envdef = '\0';
466
envdef++;
467
if(arg[0] == '\0'){
468
argp_error(state, "Empty plugin name");
469
errno = EINVAL;
470
break;
432
if(not add_environment(getplugin(arg), envdef+1, true)){
433
perror("add_environment");
471
434
}
472
add_environment(getplugin(arg), envdef, true);
473
435
}
474
436
break;
475
437
case 'd': /* --disable */
476
{
438
if(arg != NULL){
477
439
plugin *p = getplugin(arg);
478
if(p != NULL){
479
p->disabled = true;
440
if(p == NULL){
441
return ARGP_ERR_UNKNOWN;
480
442
}
443
p->disabled = true;
481
444
}
482
445
break;
483
446
case 'e': /* --enable */
484
{
447
if(arg != NULL){
485
448
plugin *p = getplugin(arg);
486
if(p != NULL){
487
p->disabled = false;
449
if(p == NULL){
450
return ARGP_ERR_UNKNOWN;
488
451
}
452
p->disabled = false;
489
453
}
490
454
break;
491
455
case 128: /* --plugin-dir */
492
456
free(plugindir);
493
457
plugindir = strdup(arg);
458
if(plugindir == NULL){
459
perror("strdup");
460
}
494
461
break;
495
462
case 129: /* --config-file */
496
463
/* This is already done by parse_opt_config_file() */
497
464
break;
498
465
case 130: /* --userid */
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;
466
/* In the GNU C library, uid_t is always unsigned int */
467
ret = sscanf(arg, "%u", &uid);
468
if(ret != 1){
469
fprintf(stderr, "Bad user ID number: \"%s\", using %u\n", arg,
470
uid);
505
471
}
506
uid = (uid_t)tmpmax;
507
472
break;
508
473
case 131: /* --groupid */
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;
474
/* In the GNU C library, gid_t is always unsigned int */
475
ret = sscanf(arg, "%u", &gid);
476
if(ret != 1){
477
fprintf(stderr, "Bad group ID number: \"%s\", using %u\n",
478
arg, gid);
515
479
}
516
gid = (gid_t)tmpmax;
517
480
break;
518
481
case 132: /* --debug */
519
482
debug = true;
520
483
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;
535
484
/*
536
485
* When adding more options before this line, remember to also add a
537
486
* "case" to the "parse_opt_config_file" function below.
540
489
/* Cryptsetup always passes an argument, which is an empty
541
490
string if "none" was specified in /etc/crypttab. So if
542
491
argument was empty, we ignore it silently. */
543
if(arg[0] == '\0'){
544
break;
492
if(arg[0] != '\0'){
493
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
545
494
}
495
break;
496
case ARGP_KEY_END:
497
break;
546
498
default:
547
499
return ARGP_ERR_UNKNOWN;
548
500
}
549
return errno; /* Set to 0 at start */
501
return 0;
550
502
}
551
503
552
504
/* This option parser is the same as parse_opt() above, except it
553
505
ignores everything but the --config-file option. */
554
506
error_t parse_opt_config_file(int key, char *arg,
555
507
__attribute__((unused))
556
struct argp_state *state){
557
errno = 0;
558
switch(key){
508
struct argp_state *state) {
509
switch(key) {
559
510
case 'g': /* --global-options */
560
511
case 'G': /* --global-env */
561
512
case 'o': /* --options-for */
567
518
case 129: /* --config-file */
568
519
free(argfile);
569
520
argfile = strdup(arg);
570
break;
521
if(argfile == NULL){
522
perror("strdup");
523
}
524
break;
571
525
case 130: /* --userid */
572
526
case 131: /* --groupid */
573
527
case 132: /* --debug */
574
case '?': /* --help */
575
case -3: /* --usage */
576
case 'V': /* --version */
577
528
case ARGP_KEY_ARG:
529
case ARGP_KEY_END:
578
530
break;
579
531
default:
580
532
return ARGP_ERR_UNKNOWN;
581
533
}
582
return errno;
534
return 0;
583
535
}
584
536
585
537
struct argp argp = { .options = options,
589
541
590
542
/* Parse using parse_opt_config_file() in order to get the custom
591
543
config file location, if any. */
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;
544
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
545
if(ret == ARGP_ERR_UNKNOWN){
546
fprintf(stderr, "Unknown error while parsing arguments\n");
547
exitstatus = EXIT_FAILURE;
606
548
goto fallback;
607
549
}
608
550
614
556
conffp = fopen(AFILE, "r");
615
557
} else {
616
558
conffp = fopen(argfile, "r");
617
}
559
}
618
560
if(conffp != NULL){
619
561
char *org_line = NULL;
620
562
char *p, *arg, *new_arg, *line;
621
563
size_t size = 0;
622
564
const char whitespace_delims[] = " \r\t\f\v\n";
623
565
const char comment_delim[] = "#";
624
566
625
567
custom_argc = 1;
626
568
custom_argv = malloc(sizeof(char*) * 2);
627
569
if(custom_argv == NULL){
631
573
}
632
574
custom_argv[0] = argv[0];
633
575
custom_argv[1] = NULL;
634
576
635
577
/* for each line in the config file, strip whitespace and ignore
636
578
commented text */
637
579
while(true){
639
581
if(sret == -1){
640
582
break;
641
583
}
642
584
643
585
line = org_line;
644
586
arg = strsep(&line, comment_delim);
645
587
while((p = strsep(&arg, whitespace_delims)) != NULL){
664
606
goto fallback;
665
607
}
666
608
custom_argv[custom_argc-1] = new_arg;
667
custom_argv[custom_argc] = NULL;
609
custom_argv[custom_argc] = NULL;
668
610
}
669
611
}
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
}
678
612
free(org_line);
679
613
} else {
680
614
/* Check for harmful errors and go to fallback. Other errors might
685
619
goto fallback;
686
620
}
687
621
}
688
/* If there were any arguments from the configuration file, pass
689
them to parser as command line arguments */
622
/* If there was any arguments from configuration file,
623
pass them to parser as command arguments */
690
624
if(custom_argv != NULL){
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;
625
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
626
0, NULL);
627
if(ret == ARGP_ERR_UNKNOWN){
628
fprintf(stderr, "Unknown error while parsing arguments\n");
629
exitstatus = EXIT_FAILURE;
705
630
goto fallback;
706
631
}
707
632
}
708
633
709
634
/* Parse actual command line arguments, to let them override the
710
635
config file */
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;
636
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
637
if(ret == ARGP_ERR_UNKNOWN){
638
fprintf(stderr, "Unknown error while parsing arguments\n");
639
exitstatus = EXIT_FAILURE;
725
640
goto fallback;
726
641
}
727
642
732
647
for(char **a = p->argv; *a != NULL; a++){
733
648
fprintf(stderr, "\tArg: %s\n", *a);
734
649
}
735
fprintf(stderr, "...and %d environment variables\n", p->envc);
650
fprintf(stderr, "...and %u environment variables\n", p->envc);
736
651
for(char **a = p->environ; *a != NULL; a++){
737
652
fprintf(stderr, "\t%s\n", *a);
738
653
}
740
655
}
741
656
742
657
/* Strip permissions down to nobody */
658
ret = setuid(uid);
659
if(ret == -1){
660
perror("setuid");
661
}
743
662
setgid(gid);
744
663
if(ret == -1){
745
664
perror("setgid");
746
665
}
747
ret = setuid(uid);
748
if(ret == -1){
749
perror("setuid");
750
}
751
752
/* Open plugin directory with close_on_exec flag */
666
667
if(plugindir == NULL){
668
dir = opendir(PDIR);
669
} else {
670
dir = opendir(plugindir);
671
}
672
673
if(dir == NULL){
674
perror("Could not open plugin dir");
675
exitstatus = EXIT_FAILURE;
676
goto fallback;
677
}
678
679
/* Set the FD_CLOEXEC flag on the directory, if possible */
753
680
{
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;
681
int dir_fd = dirfd(dir);
682
if(dir_fd >= 0){
683
ret = set_cloexec_flag(dir_fd);
684
if(ret < 0){
685
perror("set_cloexec_flag");
686
exitstatus = EXIT_FAILURE;
687
goto fallback;
688
}
795
689
}
796
690
}
797
691
799
693
800
694
/* Read and execute any executable in the plugin directory*/
801
695
while(true){
802
do {
803
dirst = readdir(dir);
804
} while(dirst == NULL and errno == EINTR);
696
dirst = readdir(dir);
805
697
806
698
/* All directory entries have been processed */
807
699
if(dirst == NULL){
858
750
continue;
859
751
}
860
752
}
861
753
862
754
char *filename;
863
755
if(plugindir == NULL){
864
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
865
dirst->d_name));
756
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
866
757
} else {
867
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
868
plugindir,
869
dirst->d_name));
758
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
870
759
}
871
760
if(ret < 0){
872
761
perror("asprintf");
873
762
continue;
874
763
}
875
764
876
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
765
ret = stat(filename, &st);
877
766
if(ret == -1){
878
767
perror("stat");
879
768
free(filename);
880
769
continue;
881
770
}
882
771
883
772
/* Ignore non-executable files */
884
if(not S_ISREG(st.st_mode)
885
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
773
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
886
774
if(debug){
887
775
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
888
776
" with bad type or mode\n", filename);
934
822
}
935
823
936
824
int pipefd[2];
937
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
825
ret = pipe(pipefd);
938
826
if(ret == -1){
939
827
perror("pipe");
940
828
exitstatus = EXIT_FAILURE;
954
842
goto fallback;
955
843
}
956
844
/* Block SIGCHLD until process is safely in process list */
957
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
958
&sigchld_action.sa_mask,
959
NULL));
845
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
960
846
if(ret < 0){
961
847
perror("sigprocmask");
962
848
exitstatus = EXIT_FAILURE;
963
849
goto fallback;
964
850
}
965
851
/* Starting a new process to be watched */
966
pid_t pid;
967
do {
968
pid = fork();
969
} while(pid == -1 and errno == EINTR);
852
pid_t pid = fork();
970
853
if(pid == -1){
971
854
perror("fork");
972
855
exitstatus = EXIT_FAILURE;
1010
893
/* no return */
1011
894
}
1012
895
/* Parent process */
1013
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1014
pipe */
896
close(pipefd[1]); /* Close unused write end of pipe */
1015
897
free(filename);
1016
898
plugin *new_plugin = getplugin(dirst->d_name);
1017
899
if(new_plugin == NULL){
1018
900
perror("getplugin");
1019
ret = (int)(TEMP_FAILURE_RETRY
1020
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1021
NULL)));
901
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1022
902
if(ret < 0){
1023
903
perror("sigprocmask");
1024
904
}
1031
911
1032
912
/* Unblock SIGCHLD so signal handler can be run if this process
1033
913
has already completed */
1034
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1035
&sigchld_action.sa_mask,
1036
NULL));
914
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1037
915
if(ret < 0){
1038
916
perror("sigprocmask");
1039
917
exitstatus = EXIT_FAILURE;
1040
918
goto fallback;
1041
919
}
1042
920
1043
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1044
-Wconversion */
921
FD_SET(new_plugin->fd, &rfds_all);
1045
922
1046
923
if(maxfd < new_plugin->fd){
1047
924
maxfd = new_plugin->fd;
1048
925
}
1049
926
}
1050
927
1051
TEMP_FAILURE_RETRY(closedir(dir));
928
closedir(dir);
1052
929
dir = NULL;
1053
free_plugin(getplugin(NULL));
1054
930
1055
931
for(plugin *p = plugin_list; p != NULL; p = p->next){
1056
932
if(p->pid != 0){
1067
943
while(plugin_list){
1068
944
fd_set rfds = rfds_all;
1069
945
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
1070
if(select_ret == -1 and errno != EINTR){
946
if(select_ret == -1){
1071
947
perror("select");
1072
948
exitstatus = EXIT_FAILURE;
1073
949
goto fallback;
1076
952
from one of them */
1077
953
for(plugin *proc = plugin_list; proc != NULL;){
1078
954
/* Is this process completely done? */
1079
if(proc->completed and proc->eof){
955
if(proc->eof and proc->completed){
1080
956
/* Only accept the plugin output if it exited cleanly */
1081
957
if(not WIFEXITED(proc->status)
1082
958
or WEXITSTATUS(proc->status) != 0){
1083
959
/* Bad exit by plugin */
1084
960
1085
961
if(debug){
1086
962
if(WIFEXITED(proc->status)){
1087
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1088
" status %d\n", proc->name,
1089
(intmax_t) (proc->pid),
963
fprintf(stderr, "Plugin %u exited with status %d\n",
964
(unsigned int) (proc->pid),
1090
965
WEXITSTATUS(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)));
966
} else if(WIFSIGNALED(proc->status)) {
967
fprintf(stderr, "Plugin %u killed by signal %d\n",
968
(unsigned int) (proc->pid),
969
WTERMSIG(proc->status));
1097
970
} else if(WCOREDUMP(proc->status)){
1098
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1099
" core\n", proc->name, (intmax_t) (proc->pid));
971
fprintf(stderr, "Plugin %u dumped core\n",
972
(unsigned int) (proc->pid));
1100
973
}
1101
974
}
1102
975
1103
976
/* Remove the plugin */
1104
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1105
-Wconversion */
1106
977
FD_CLR(proc->fd, &rfds_all);
978
1107
979
/* Block signal while modifying process_list */
1108
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1109
(SIG_BLOCK,
1110
&sigchld_action.sa_mask,
1111
NULL));
980
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1112
981
if(ret < 0){
1113
982
perror("sigprocmask");
1114
983
exitstatus = EXIT_FAILURE;
1120
989
proc = next_plugin;
1121
990
1122
991
/* We are done modifying process list, so unblock signal */
1123
ret = (int)(TEMP_FAILURE_RETRY
1124
(sigprocmask(SIG_UNBLOCK,
1125
&sigchld_action.sa_mask, NULL)));
992
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
993
NULL);
1126
994
if(ret < 0){
1127
995
perror("sigprocmask");
1128
996
exitstatus = EXIT_FAILURE;
1148
1016
}
1149
1017
1150
1018
/* This process has not completed. Does it have any output? */
1151
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1152
warning from
1153
-Wconversion */
1019
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1154
1020
/* This process had nothing to say at this time */
1155
1021
proc = proc->next;
1156
1022
continue;
1167
1033
proc->buffer_size += BUFFER_SIZE;
1168
1034
}
1169
1035
/* Read from the process */
1170
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1171
proc->buffer
1172
+ proc->buffer_length,
1173
BUFFER_SIZE));
1036
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1037
BUFFER_SIZE);
1174
1038
if(sret < 0){
1175
1039
/* Read error from this process; ignore the error */
1176
1040
proc = proc->next;
1184
1048
}
1185
1049
}
1186
1050
}
1187
1188
1051
1052
1189
1053
fallback:
1190
1054
1191
1055
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1238
1102
}
1239
1103
1240
1104
/* Wait for any remaining child processes to terminate */
1241
do {
1105
do{
1242
1106
ret = wait(NULL);
1243
1107
} while(ret >= 0);
1244
1108
if(errno != ECHILD){
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0