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