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 223
- compare with another revision
- download diff
- download tarball
- view history from revision 223
- Committer: Teddy Hogeborn
- Date: 2008-10-03 09:32:30 UTC
- Revision ID: teddy@fukt.bsnet.se-20081003093230-rshn19e0c19zz12i
* .bzrignore (plugins.d/askpass-fifo): Added.
* Makefile (FORTIFY): Added "-fstack-protector-all".
(mandos, mandos-keygen): Use more strict regexps when updating the
version number.
* mandos (Client.__init__): Use os.path.expandvars() and
os.path.expanduser() on the "secfile"
config value.
* plugins.d/splashy.c: Update comments and order of #include's.
(main): Check user and group when looking for running splashy
process. Do not ignore ENOENT from execl(). Use _exit()
instead of "return" when an error happens in child
processes. Bug fix: Only wait for splashy_update
completion if it was started. Bug fix: detect failing
waitpid(). Only kill splashy_update if it is running. Do
the killing of the old splashy process before the fork().
Do setsid() and setuid(geteuid()) before starting the new
splashy. Report failing execl().
* plugins.d/usplash.c: Update comments and order of #include's.
(main): Check user and group when looking for running usplash
process. Do not report execv() error if interrupted by a
signal.
* Makefile (FORTIFY): Added "-fstack-protector-all".
(mandos, mandos-keygen): Use more strict regexps when updating the
version number.
* mandos (Client.__init__): Use os.path.expandvars() and
os.path.expanduser() on the "secfile"
config value.
* plugins.d/splashy.c: Update comments and order of #include's.
(main): Check user and group when looking for running splashy
process. Do not ignore ENOENT from execl(). Use _exit()
instead of "return" when an error happens in child
processes. Bug fix: Only wait for splashy_update
completion if it was started. Bug fix: detect failing
waitpid(). Only kill splashy_update if it is running. Do
the killing of the old splashy process before the fork().
Do setsid() and setuid(geteuid()) before starting the new
splashy. Report failing execl().
* plugins.d/usplash.c: Update comments and order of #include's.
(main): Check user and group when looking for running usplash
process. Do not report execv() error if interrupted by a
signal.
- files added:
- debian/mandos-client.config
- files removed:
- NEWS
- 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
*
5
* Copyright © 2008,2009 Teddy Hogeborn
6
* Copyright © 2008,2009 Björn Påhlsson
5
* Copyright © 2008 Teddy Hogeborn & Björn Påhlsson
7
6
*
8
7
* This program is free software: you can redistribute it and/or
9
8
* modify it under the terms of the GNU General Public License as
38
37
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
39
38
FD_SET(), FD_ISSET(), FD_CLR */
40
39
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
41
WEXITSTATUS(), WTERMSIG(),
42
WCOREDUMP() */
40
WEXITSTATUS() */
43
41
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
44
42
#include <iso646.h> /* and, or, not */
45
43
#include <dirent.h> /* DIR, struct dirent, opendir(),
53
51
close() */
54
52
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
55
53
FD_CLOEXEC */
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal() */
54
#include <string.h> /* strsep, strlen(), asprintf() */
58
55
#include <errno.h> /* errno */
59
56
#include <argp.h> /* struct argp_option, struct
60
57
argp_state, struct argp,
64
61
#include <signal.h> /* struct sigaction, sigemptyset(),
65
62
sigaddset(), sigaction(),
66
63
sigprocmask(), SIG_BLOCK, SIGCHLD,
67
SIG_UNBLOCK, kill(), sig_atomic_t
68
*/
64
SIG_UNBLOCK, kill() */
69
65
#include <errno.h> /* errno, EBADF */
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
71
66
72
67
#define BUFFER_SIZE 256
73
68
84
79
char **environ;
85
80
int envc;
86
81
bool disabled;
87
82
88
83
/* Variables used for running processes*/
89
84
pid_t pid;
90
85
int fd;
92
87
size_t buffer_size;
93
88
size_t buffer_length;
94
89
bool eof;
95
volatile sig_atomic_t completed;
96
int status;
90
volatile bool completed;
91
volatile int status;
97
92
struct plugin *next;
98
93
} plugin;
99
94
103
98
or if none is found, creates a new one */
104
99
static plugin *getplugin(char *name){
105
100
/* Check for exiting plugin with that name */
106
for(plugin *p = plugin_list; p != NULL; p = p->next){
107
if((p->name == name)
108
or (p->name and name and (strcmp(p->name, name) == 0))){
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))){
109
104
return p;
110
105
}
111
106
}
112
107
/* Create a new plugin */
113
plugin *new_plugin = NULL;
114
do {
115
new_plugin = malloc(sizeof(plugin));
116
} while(new_plugin == NULL and errno == EINTR);
117
if(new_plugin == NULL){
108
plugin *new_plugin = malloc(sizeof(plugin));
109
if (new_plugin == NULL){
118
110
return NULL;
119
111
}
120
112
char *copy_name = NULL;
121
113
if(name != NULL){
122
do {
123
copy_name = strdup(name);
124
} while(copy_name == NULL and errno == EINTR);
114
copy_name = strdup(name);
125
115
if(copy_name == NULL){
126
free(new_plugin);
127
116
return NULL;
128
117
}
129
118
}
130
119
131
*new_plugin = (plugin){ .name = copy_name,
132
.argc = 1,
133
.disabled = false,
134
.next = plugin_list };
120
*new_plugin = (plugin) { .name = copy_name,
121
.argc = 1,
122
.disabled = false,
123
.next = plugin_list };
135
124
136
do {
137
new_plugin->argv = malloc(sizeof(char *) * 2);
138
} while(new_plugin->argv == NULL and errno == EINTR);
139
if(new_plugin->argv == NULL){
125
new_plugin->argv = malloc(sizeof(char *) * 2);
126
if (new_plugin->argv == NULL){
140
127
free(copy_name);
141
128
free(new_plugin);
142
129
return NULL;
144
131
new_plugin->argv[0] = copy_name;
145
132
new_plugin->argv[1] = NULL;
146
133
147
do {
148
new_plugin->environ = malloc(sizeof(char *));
149
} while(new_plugin->environ == NULL and errno == EINTR);
134
new_plugin->environ = malloc(sizeof(char *));
150
135
if(new_plugin->environ == NULL){
151
136
free(copy_name);
152
137
free(new_plugin->argv);
164
149
static bool add_to_char_array(const char *new, char ***array,
165
150
int *len){
166
151
/* Resize the pointed-to array to hold one more pointer */
167
do {
168
*array = realloc(*array, sizeof(char *)
169
* (size_t) ((*len) + 2));
170
} while(*array == NULL and errno == EINTR);
152
*array = realloc(*array, sizeof(char *)
153
* (size_t) ((*len) + 2));
171
154
/* Malloc check */
172
155
if(*array == NULL){
173
156
return false;
174
157
}
175
158
/* Make a copy of the new string */
176
char *copy;
177
do {
178
copy = strdup(new);
179
} while(copy == NULL and errno == EINTR);
159
char *copy = strdup(new);
180
160
if(copy == NULL){
181
161
return false;
182
162
}
208
188
if(strncmp(*e, def, namelen + 1) == 0){
209
189
/* It already exists */
210
190
if(replace){
211
char *new;
212
do {
213
new = realloc(*e, strlen(def) + 1);
214
} while(new == NULL and errno == EINTR);
191
char *new = realloc(*e, strlen(def) + 1);
215
192
if(new == NULL){
216
193
return false;
217
194
}
227
204
/*
228
205
* Based on the example in the GNU LibC manual chapter 13.13 "File
229
206
* Descriptor Flags".
230
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
207
* *Note File Descriptor Flags:(libc)Descriptor Flags.
231
208
*/
232
209
static int set_cloexec_flag(int fd){
233
int ret = TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
210
int ret = fcntl(fd, F_GETFD, 0);
234
211
/* If reading the flags failed, return error indication now. */
235
212
if(ret < 0){
236
213
return ret;
237
214
}
238
215
/* Store modified flag word in the descriptor. */
239
return TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD, ret | FD_CLOEXEC));
216
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
240
217
}
241
218
242
219
243
220
/* Mark processes as completed when they exit, and save their exit
244
221
status. */
245
222
static void handle_sigchld(__attribute__((unused)) int sig){
246
int old_errno = errno;
247
223
while(true){
248
224
plugin *proc = plugin_list;
249
225
int status;
253
229
break;
254
230
}
255
231
if(pid == -1){
256
if(errno == ECHILD){
257
/* No child processes */
258
break;
232
if (errno != ECHILD){
233
perror("waitpid");
259
234
}
260
perror("waitpid");
235
/* No child processes */
236
break;
261
237
}
262
238
263
239
/* A child exited, find it in process_list */
269
245
continue;
270
246
}
271
247
proc->status = status;
272
proc->completed = 1;
248
proc->completed = true;
273
249
}
274
errno = old_errno;
275
250
}
276
251
277
252
/* Prints out a password to stdout */
299
274
}
300
275
free(plugin_node->environ);
301
276
free(plugin_node->buffer);
302
277
303
278
/* Removes the plugin from the singly-linked list */
304
279
if(plugin_node == plugin_list){
305
280
/* First one - simple */
333
308
struct stat st;
334
309
fd_set rfds_all;
335
310
int ret, maxfd = 0;
336
ssize_t sret;
337
311
uid_t uid = 65534;
338
312
gid_t gid = 65534;
339
313
bool debug = false;
396
370
{ .name = NULL }
397
371
};
398
372
399
error_t parse_opt(int key, char *arg, __attribute__((unused))
400
struct argp_state *state){
401
switch(key){
402
char *tmp;
403
intmax_t tmpmax;
373
error_t parse_opt (int key, char *arg, __attribute__((unused))
374
struct argp_state *state) {
375
switch (key) {
404
376
case 'g': /* --global-options */
405
if(arg != NULL){
406
char *plugin_option;
407
while((plugin_option = strsep(&arg, ",")) != NULL){
408
if(plugin_option[0] == '\0'){
377
if (arg != NULL){
378
char *p;
379
while((p = strsep(&arg, ",")) != NULL){
380
if(p[0] == '\0'){
409
381
continue;
410
382
}
411
if(not add_argument(getplugin(NULL), plugin_option)){
383
if(not add_argument(getplugin(NULL), p)){
412
384
perror("add_argument");
413
385
return ARGP_ERR_UNKNOWN;
414
386
}
424
396
}
425
397
break;
426
398
case 'o': /* --options-for */
427
if(arg != NULL){
428
char *plugin_name = strsep(&arg, ":");
429
if(plugin_name[0] == '\0'){
430
break;
431
}
432
char *plugin_option;
433
while((plugin_option = strsep(&arg, ",")) != NULL){
434
if(not add_argument(getplugin(plugin_name), plugin_option)){
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)){
435
414
perror("add_argument");
436
415
return ARGP_ERR_UNKNOWN;
437
416
}
454
433
}
455
434
break;
456
435
case 'd': /* --disable */
457
if(arg != NULL){
436
if (arg != NULL){
458
437
plugin *p = getplugin(arg);
459
438
if(p == NULL){
460
439
return ARGP_ERR_UNKNOWN;
463
442
}
464
443
break;
465
444
case 'e': /* --enable */
466
if(arg != NULL){
445
if (arg != NULL){
467
446
plugin *p = getplugin(arg);
468
447
if(p == NULL){
469
448
return ARGP_ERR_UNKNOWN;
476
455
plugindir = strdup(arg);
477
456
if(plugindir == NULL){
478
457
perror("strdup");
479
}
458
}
480
459
break;
481
460
case 129: /* --config-file */
482
461
/* This is already done by parse_opt_config_file() */
483
462
break;
484
463
case 130: /* --userid */
485
errno = 0;
486
tmpmax = strtoimax(arg, &tmp, 10);
487
if(errno != 0 or tmp == arg or *tmp != '\0'
488
or tmpmax != (uid_t)tmpmax){
489
fprintf(stderr, "Bad user ID number: \"%s\", using %"
490
PRIdMAX "\n", arg, (intmax_t)uid);
491
} else {
492
uid = (uid_t)tmpmax;
493
}
464
uid = (uid_t)strtol(arg, NULL, 10);
494
465
break;
495
466
case 131: /* --groupid */
496
errno = 0;
497
tmpmax = strtoimax(arg, &tmp, 10);
498
if(errno != 0 or tmp == arg or *tmp != '\0'
499
or tmpmax != (gid_t)tmpmax){
500
fprintf(stderr, "Bad group ID number: \"%s\", using %"
501
PRIdMAX "\n", arg, (intmax_t)gid);
502
} else {
503
gid = (gid_t)tmpmax;
504
}
467
gid = (gid_t)strtol(arg, NULL, 10);
505
468
break;
506
469
case 132: /* --debug */
507
470
debug = true;
508
471
break;
509
/*
510
* When adding more options before this line, remember to also add a
511
* "case" to the "parse_opt_config_file" function below.
512
*/
513
472
case ARGP_KEY_ARG:
514
473
/* Cryptsetup always passes an argument, which is an empty
515
474
string if "none" was specified in /etc/crypttab. So if
528
487
529
488
/* This option parser is the same as parse_opt() above, except it
530
489
ignores everything but the --config-file option. */
531
error_t parse_opt_config_file(int key, char *arg,
532
__attribute__((unused))
533
struct argp_state *state){
534
switch(key){
490
error_t parse_opt_config_file (int key, char *arg,
491
__attribute__((unused))
492
struct argp_state *state) {
493
switch (key) {
535
494
case 'g': /* --global-options */
536
495
case 'G': /* --global-env */
537
496
case 'o': /* --options-for */
546
505
if(argfile == NULL){
547
506
perror("strdup");
548
507
}
549
break;
508
break;
550
509
case 130: /* --userid */
551
510
case 131: /* --groupid */
552
511
case 132: /* --debug */
564
523
.args_doc = "",
565
524
.doc = "Mandos plugin runner -- Run plugins" };
566
525
567
/* Parse using parse_opt_config_file() in order to get the custom
526
/* Parse using the parse_opt_config_file in order to get the custom
568
527
config file location, if any. */
569
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
570
if(ret == ARGP_ERR_UNKNOWN){
528
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
529
if (ret == ARGP_ERR_UNKNOWN){
571
530
fprintf(stderr, "Unknown error while parsing arguments\n");
572
531
exitstatus = EXIT_FAILURE;
573
532
goto fallback;
577
536
argp.parser = parse_opt;
578
537
579
538
/* Open the configfile if available */
580
if(argfile == NULL){
539
if (argfile == NULL){
581
540
conffp = fopen(AFILE, "r");
582
541
} else {
583
542
conffp = fopen(argfile, "r");
584
}
543
}
585
544
if(conffp != NULL){
586
545
char *org_line = NULL;
587
546
char *p, *arg, *new_arg, *line;
588
547
size_t size = 0;
548
ssize_t sret;
589
549
const char whitespace_delims[] = " \r\t\f\v\n";
590
550
const char comment_delim[] = "#";
591
551
592
552
custom_argc = 1;
593
553
custom_argv = malloc(sizeof(char*) * 2);
594
554
if(custom_argv == NULL){
598
558
}
599
559
custom_argv[0] = argv[0];
600
560
custom_argv[1] = NULL;
601
561
602
562
/* for each line in the config file, strip whitespace and ignore
603
563
commented text */
604
564
while(true){
606
566
if(sret == -1){
607
567
break;
608
568
}
609
569
610
570
line = org_line;
611
571
arg = strsep(&line, comment_delim);
612
572
while((p = strsep(&arg, whitespace_delims)) != NULL){
631
591
goto fallback;
632
592
}
633
593
custom_argv[custom_argc-1] = new_arg;
634
custom_argv[custom_argc] = NULL;
594
custom_argv[custom_argc] = NULL;
635
595
}
636
596
}
637
do {
638
ret = fclose(conffp);
639
} while(ret == EOF and errno == EINTR);
640
if(ret == EOF){
641
perror("fclose");
642
exitstatus = EXIT_FAILURE;
643
goto fallback;
644
}
645
597
free(org_line);
646
598
} else {
647
599
/* Check for harmful errors and go to fallback. Other errors might
648
600
not affect opening plugins */
649
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
601
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
650
602
perror("fopen");
651
603
exitstatus = EXIT_FAILURE;
652
604
goto fallback;
655
607
/* If there was any arguments from configuration file,
656
608
pass them to parser as command arguments */
657
609
if(custom_argv != NULL){
658
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
659
0, NULL);
660
if(ret == ARGP_ERR_UNKNOWN){
610
ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
611
0, NULL);
612
if (ret == ARGP_ERR_UNKNOWN){
661
613
fprintf(stderr, "Unknown error while parsing arguments\n");
662
614
exitstatus = EXIT_FAILURE;
663
615
goto fallback;
666
618
667
619
/* Parse actual command line arguments, to let them override the
668
620
config file */
669
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
670
if(ret == ARGP_ERR_UNKNOWN){
621
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
622
if (ret == ARGP_ERR_UNKNOWN){
671
623
fprintf(stderr, "Unknown error while parsing arguments\n");
672
624
exitstatus = EXIT_FAILURE;
673
625
goto fallback;
680
632
for(char **a = p->argv; *a != NULL; a++){
681
633
fprintf(stderr, "\tArg: %s\n", *a);
682
634
}
683
fprintf(stderr, "...and %d environment variables\n", p->envc);
635
fprintf(stderr, "...and %u environment variables\n", p->envc);
684
636
for(char **a = p->environ; *a != NULL; a++){
685
637
fprintf(stderr, "\t%s\n", *a);
686
638
}
688
640
}
689
641
690
642
/* Strip permissions down to nobody */
643
ret = setuid(uid);
644
if (ret == -1){
645
perror("setuid");
646
}
691
647
setgid(gid);
692
if(ret == -1){
648
if (ret == -1){
693
649
perror("setgid");
694
650
}
695
ret = setuid(uid);
696
if(ret == -1){
697
perror("setuid");
698
}
699
651
700
if(plugindir == NULL){
652
if (plugindir == NULL){
701
653
dir = opendir(PDIR);
702
654
} else {
703
655
dir = opendir(plugindir);
726
678
727
679
/* Read and execute any executable in the plugin directory*/
728
680
while(true){
729
do {
730
dirst = readdir(dir);
731
} while(dirst == NULL and errno == EINTR);
681
dirst = readdir(dir);
732
682
733
683
/* All directory entries have been processed */
734
684
if(dirst == NULL){
735
if(errno == EBADF){
685
if (errno == EBADF){
736
686
perror("readdir");
737
687
exitstatus = EXIT_FAILURE;
738
688
goto fallback;
750
700
751
701
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
752
702
".dpkg-old",
753
".dpkg-bak",
754
703
".dpkg-divert", NULL };
755
704
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
756
705
size_t pre_len = strlen(*pre);
785
734
continue;
786
735
}
787
736
}
788
737
789
738
char *filename;
790
739
if(plugindir == NULL){
791
ret = TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
792
dirst->d_name));
740
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
793
741
} else {
794
ret = TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s", plugindir,
795
dirst->d_name));
742
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
796
743
}
797
744
if(ret < 0){
798
745
perror("asprintf");
799
746
continue;
800
747
}
801
748
802
ret = TEMP_FAILURE_RETRY(stat(filename, &st));
803
if(ret == -1){
749
ret = stat(filename, &st);
750
if (ret == -1){
804
751
perror("stat");
805
752
free(filename);
806
753
continue;
807
754
}
808
755
809
756
/* Ignore non-executable files */
810
if(not S_ISREG(st.st_mode)
811
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
757
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
812
758
if(debug){
813
759
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
814
760
" with bad type or mode\n", filename);
860
806
}
861
807
862
808
int pipefd[2];
863
ret = TEMP_FAILURE_RETRY(pipe(pipefd));
864
if(ret == -1){
809
ret = pipe(pipefd);
810
if (ret == -1){
865
811
perror("pipe");
866
812
exitstatus = EXIT_FAILURE;
867
813
goto fallback;
880
826
goto fallback;
881
827
}
882
828
/* Block SIGCHLD until process is safely in process list */
883
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
884
&sigchld_action.sa_mask,
885
NULL));
829
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
886
830
if(ret < 0){
887
831
perror("sigprocmask");
888
832
exitstatus = EXIT_FAILURE;
889
833
goto fallback;
890
834
}
891
835
/* Starting a new process to be watched */
892
pid_t pid;
893
do {
894
pid = fork();
895
} while(pid == -1 and errno == EINTR);
836
pid_t pid = fork();
896
837
if(pid == -1){
897
838
perror("fork");
898
839
exitstatus = EXIT_FAILURE;
936
877
/* no return */
937
878
}
938
879
/* Parent process */
939
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
940
pipe */
880
close(pipefd[1]); /* Close unused write end of pipe */
941
881
free(filename);
942
882
plugin *new_plugin = getplugin(dirst->d_name);
943
if(new_plugin == NULL){
883
if (new_plugin == NULL){
944
884
perror("getplugin");
945
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
946
&sigchld_action.sa_mask,
947
NULL));
885
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
948
886
if(ret < 0){
949
887
perror("sigprocmask");
950
888
}
957
895
958
896
/* Unblock SIGCHLD so signal handler can be run if this process
959
897
has already completed */
960
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
961
&sigchld_action.sa_mask,
962
NULL));
898
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
963
899
if(ret < 0){
964
900
perror("sigprocmask");
965
901
exitstatus = EXIT_FAILURE;
968
904
969
905
FD_SET(new_plugin->fd, &rfds_all);
970
906
971
if(maxfd < new_plugin->fd){
907
if (maxfd < new_plugin->fd){
972
908
maxfd = new_plugin->fd;
973
909
}
974
910
}
975
911
976
TEMP_FAILURE_RETRY(closedir(dir));
912
closedir(dir);
977
913
dir = NULL;
978
free_plugin(getplugin(NULL));
979
914
980
915
for(plugin *p = plugin_list; p != NULL; p = p->next){
981
916
if(p->pid != 0){
992
927
while(plugin_list){
993
928
fd_set rfds = rfds_all;
994
929
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
995
if(select_ret == -1 and errno != EINTR){
930
if (select_ret == -1){
996
931
perror("select");
997
932
exitstatus = EXIT_FAILURE;
998
933
goto fallback;
1001
936
from one of them */
1002
937
for(plugin *proc = plugin_list; proc != NULL;){
1003
938
/* Is this process completely done? */
1004
if(proc->completed and proc->eof){
939
if(proc->eof and proc->completed){
1005
940
/* Only accept the plugin output if it exited cleanly */
1006
941
if(not WIFEXITED(proc->status)
1007
942
or WEXITSTATUS(proc->status) != 0){
1008
943
/* Bad exit by plugin */
1009
944
1010
945
if(debug){
1011
946
if(WIFEXITED(proc->status)){
1012
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1013
" status %d\n", proc->name,
1014
(intmax_t) (proc->pid),
947
fprintf(stderr, "Plugin %u exited with status %d\n",
948
(unsigned int) (proc->pid),
1015
949
WEXITSTATUS(proc->status));
1016
} else if(WIFSIGNALED(proc->status)){
1017
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1018
" signal %d: %s\n", proc->name,
1019
(intmax_t) (proc->pid),
1020
WTERMSIG(proc->status),
1021
strsignal(WTERMSIG(proc->status)));
950
} else if(WIFSIGNALED(proc->status)) {
951
fprintf(stderr, "Plugin %u killed by signal %d\n",
952
(unsigned int) (proc->pid),
953
WTERMSIG(proc->status));
1022
954
} else if(WCOREDUMP(proc->status)){
1023
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1024
" core\n", proc->name, (intmax_t) (proc->pid));
955
fprintf(stderr, "Plugin %d dumped core\n",
956
(unsigned int) (proc->pid));
1025
957
}
1026
958
}
1027
959
1028
960
/* Remove the plugin */
1029
961
FD_CLR(proc->fd, &rfds_all);
1030
962
1031
963
/* Block signal while modifying process_list */
1032
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1033
&sigchld_action.sa_mask,
1034
NULL));
964
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1035
965
if(ret < 0){
1036
966
perror("sigprocmask");
1037
967
exitstatus = EXIT_FAILURE;
1043
973
proc = next_plugin;
1044
974
1045
975
/* We are done modifying process list, so unblock signal */
1046
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1047
&sigchld_action.sa_mask,
1048
NULL));
976
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
977
NULL);
1049
978
if(ret < 0){
1050
979
perror("sigprocmask");
1051
980
exitstatus = EXIT_FAILURE;
1080
1009
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1081
1010
proc->buffer = realloc(proc->buffer, proc->buffer_size
1082
1011
+ (size_t) BUFFER_SIZE);
1083
if(proc->buffer == NULL){
1012
if (proc->buffer == NULL){
1084
1013
perror("malloc");
1085
1014
exitstatus = EXIT_FAILURE;
1086
1015
goto fallback;
1088
1017
proc->buffer_size += BUFFER_SIZE;
1089
1018
}
1090
1019
/* Read from the process */
1091
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1092
proc->buffer
1093
+ proc->buffer_length,
1094
BUFFER_SIZE));
1095
if(sret < 0){
1020
ret = read(proc->fd, proc->buffer + proc->buffer_length,
1021
BUFFER_SIZE);
1022
if(ret < 0){
1096
1023
/* Read error from this process; ignore the error */
1097
1024
proc = proc->next;
1098
1025
continue;
1099
1026
}
1100
if(sret == 0){
1027
if(ret == 0){
1101
1028
/* got EOF */
1102
1029
proc->eof = true;
1103
1030
} else {
1104
proc->buffer_length += (size_t) sret;
1031
proc->buffer_length += (size_t) ret;
1105
1032
}
1106
1033
}
1107
1034
}
1108
1109
1035
1036
1110
1037
fallback:
1111
1038
1112
1039
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1159
1086
}
1160
1087
1161
1088
/* Wait for any remaining child processes to terminate */
1162
do {
1089
do{
1163
1090
ret = wait(NULL);
1164
1091
} while(ret >= 0);
1165
1092
if(errno != ECHILD){
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0