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