To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to plugin-runner.c
- browse files at revision 237
- compare with another revision
- download diff
- download tarball
- view history from revision 237
- Committer: Teddy Hogeborn
- Date: 2008-11-08 17:26:35 UTC
- Revision ID: teddy@fukt.bsnet.se-20081108172635-6eexzbysvsk4bu1z
* mandos: Also import "with_statement" and "absolute_import" from
"__future__. Import "closing" from "contextlib".
(Client.__init__): Use "with closing" on "secfile".
(Client.checker_callback): Call "self.bump_timeout()" instead of
doing it directly.
(Client.bump_timeout): New method to bump up the timeout.
(TCP_handler.handle): Simplify code to provide fallback default for
GnuTLS priority string.
(IPv6_TCPServer): Do not inherit from
"SocketServer.ForkingTCPServer", since that is
undocumented - instead, follow the example code
from the documentation.
(if_nametoindex): Use "with closing" on the socket.
"__future__. Import "closing" from "contextlib".
(Client.__init__): Use "with closing" on "secfile".
(Client.checker_callback): Call "self.bump_timeout()" instead of
doing it directly.
(Client.bump_timeout): New method to bump up the timeout.
(TCP_handler.handle): Simplify code to provide fallback default for
GnuTLS priority string.
(IPv6_TCPServer): Do not inherit from
"SocketServer.ForkingTCPServer", since that is
undocumented - instead, follow the example code
from the documentation.
(if_nametoindex): Use "with closing" on the socket.
- files added:
- debian/mandos-client.config
- files removed:
- debian/watch
- 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 = (int)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 (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
240
ret | FD_CLOEXEC));
216
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
241
217
}
242
218
243
219
244
220
/* Mark processes as completed when they exit, and save their exit
245
221
status. */
246
222
static void handle_sigchld(__attribute__((unused)) int sig){
247
int old_errno = errno;
248
223
while(true){
249
224
plugin *proc = plugin_list;
250
225
int status;
254
229
break;
255
230
}
256
231
if(pid == -1){
257
if(errno == ECHILD){
258
/* No child processes */
259
break;
232
if (errno != ECHILD){
233
perror("waitpid");
260
234
}
261
perror("waitpid");
235
/* No child processes */
236
break;
262
237
}
263
238
264
239
/* A child exited, find it in process_list */
270
245
continue;
271
246
}
272
247
proc->status = status;
273
proc->completed = 1;
248
proc->completed = true;
274
249
}
275
errno = old_errno;
276
250
}
277
251
278
252
/* Prints out a password to stdout */
300
274
}
301
275
free(plugin_node->environ);
302
276
free(plugin_node->buffer);
303
277
304
278
/* Removes the plugin from the singly-linked list */
305
279
if(plugin_node == plugin_list){
306
280
/* First one - simple */
334
308
struct stat st;
335
309
fd_set rfds_all;
336
310
int ret, maxfd = 0;
337
ssize_t sret;
338
311
uid_t uid = 65534;
339
312
gid_t gid = 65534;
340
313
bool debug = false;
397
370
{ .name = NULL }
398
371
};
399
372
400
error_t parse_opt(int key, char *arg, __attribute__((unused))
401
struct argp_state *state){
402
switch(key){
403
char *tmp;
404
intmax_t tmpmax;
373
error_t parse_opt (int key, char *arg, __attribute__((unused))
374
struct argp_state *state) {
375
switch (key) {
405
376
case 'g': /* --global-options */
406
if(arg != NULL){
407
char *plugin_option;
408
while((plugin_option = strsep(&arg, ",")) != NULL){
409
if(plugin_option[0] == '\0'){
377
if (arg != NULL){
378
char *p;
379
while((p = strsep(&arg, ",")) != NULL){
380
if(p[0] == '\0'){
410
381
continue;
411
382
}
412
if(not add_argument(getplugin(NULL), plugin_option)){
383
if(not add_argument(getplugin(NULL), p)){
413
384
perror("add_argument");
414
385
return ARGP_ERR_UNKNOWN;
415
386
}
425
396
}
426
397
break;
427
398
case 'o': /* --options-for */
428
if(arg != NULL){
429
char *plugin_name = strsep(&arg, ":");
430
if(plugin_name[0] == '\0'){
431
break;
432
}
433
char *plugin_option;
434
while((plugin_option = strsep(&arg, ",")) != NULL){
435
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)){
436
414
perror("add_argument");
437
415
return ARGP_ERR_UNKNOWN;
438
416
}
455
433
}
456
434
break;
457
435
case 'd': /* --disable */
458
if(arg != NULL){
436
if (arg != NULL){
459
437
plugin *p = getplugin(arg);
460
438
if(p == NULL){
461
439
return ARGP_ERR_UNKNOWN;
464
442
}
465
443
break;
466
444
case 'e': /* --enable */
467
if(arg != NULL){
445
if (arg != NULL){
468
446
plugin *p = getplugin(arg);
469
447
if(p == NULL){
470
448
return ARGP_ERR_UNKNOWN;
477
455
plugindir = strdup(arg);
478
456
if(plugindir == NULL){
479
457
perror("strdup");
480
}
458
}
481
459
break;
482
460
case 129: /* --config-file */
483
461
/* This is already done by parse_opt_config_file() */
484
462
break;
485
463
case 130: /* --userid */
486
errno = 0;
487
tmpmax = strtoimax(arg, &tmp, 10);
488
if(errno != 0 or tmp == arg or *tmp != '\0'
489
or tmpmax != (uid_t)tmpmax){
490
fprintf(stderr, "Bad user ID number: \"%s\", using %"
491
PRIdMAX "\n", arg, (intmax_t)uid);
492
} else {
493
uid = (uid_t)tmpmax;
494
}
464
uid = (uid_t)strtol(arg, NULL, 10);
495
465
break;
496
466
case 131: /* --groupid */
497
errno = 0;
498
tmpmax = strtoimax(arg, &tmp, 10);
499
if(errno != 0 or tmp == arg or *tmp != '\0'
500
or tmpmax != (gid_t)tmpmax){
501
fprintf(stderr, "Bad group ID number: \"%s\", using %"
502
PRIdMAX "\n", arg, (intmax_t)gid);
503
} else {
504
gid = (gid_t)tmpmax;
505
}
467
gid = (gid_t)strtol(arg, NULL, 10);
506
468
break;
507
469
case 132: /* --debug */
508
470
debug = true;
509
471
break;
510
/*
511
* When adding more options before this line, remember to also add a
512
* "case" to the "parse_opt_config_file" function below.
513
*/
514
472
case ARGP_KEY_ARG:
515
473
/* Cryptsetup always passes an argument, which is an empty
516
474
string if "none" was specified in /etc/crypttab. So if
529
487
530
488
/* This option parser is the same as parse_opt() above, except it
531
489
ignores everything but the --config-file option. */
532
error_t parse_opt_config_file(int key, char *arg,
533
__attribute__((unused))
534
struct argp_state *state){
535
switch(key){
490
error_t parse_opt_config_file (int key, char *arg,
491
__attribute__((unused))
492
struct argp_state *state) {
493
switch (key) {
536
494
case 'g': /* --global-options */
537
495
case 'G': /* --global-env */
538
496
case 'o': /* --options-for */
547
505
if(argfile == NULL){
548
506
perror("strdup");
549
507
}
550
break;
508
break;
551
509
case 130: /* --userid */
552
510
case 131: /* --groupid */
553
511
case 132: /* --debug */
565
523
.args_doc = "",
566
524
.doc = "Mandos plugin runner -- Run plugins" };
567
525
568
/* 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
569
527
config file location, if any. */
570
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
571
if(ret == ARGP_ERR_UNKNOWN){
528
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
529
if (ret == ARGP_ERR_UNKNOWN){
572
530
fprintf(stderr, "Unknown error while parsing arguments\n");
573
531
exitstatus = EXIT_FAILURE;
574
532
goto fallback;
578
536
argp.parser = parse_opt;
579
537
580
538
/* Open the configfile if available */
581
if(argfile == NULL){
539
if (argfile == NULL){
582
540
conffp = fopen(AFILE, "r");
583
541
} else {
584
542
conffp = fopen(argfile, "r");
585
}
543
}
586
544
if(conffp != NULL){
587
545
char *org_line = NULL;
588
546
char *p, *arg, *new_arg, *line;
589
547
size_t size = 0;
548
ssize_t sret;
590
549
const char whitespace_delims[] = " \r\t\f\v\n";
591
550
const char comment_delim[] = "#";
592
551
593
552
custom_argc = 1;
594
553
custom_argv = malloc(sizeof(char*) * 2);
595
554
if(custom_argv == NULL){
599
558
}
600
559
custom_argv[0] = argv[0];
601
560
custom_argv[1] = NULL;
602
561
603
562
/* for each line in the config file, strip whitespace and ignore
604
563
commented text */
605
564
while(true){
607
566
if(sret == -1){
608
567
break;
609
568
}
610
569
611
570
line = org_line;
612
571
arg = strsep(&line, comment_delim);
613
572
while((p = strsep(&arg, whitespace_delims)) != NULL){
632
591
goto fallback;
633
592
}
634
593
custom_argv[custom_argc-1] = new_arg;
635
custom_argv[custom_argc] = NULL;
594
custom_argv[custom_argc] = NULL;
636
595
}
637
596
}
638
do {
639
ret = fclose(conffp);
640
} while(ret == EOF and errno == EINTR);
641
if(ret == EOF){
642
perror("fclose");
643
exitstatus = EXIT_FAILURE;
644
goto fallback;
645
}
646
597
free(org_line);
647
598
} else {
648
599
/* Check for harmful errors and go to fallback. Other errors might
649
600
not affect opening plugins */
650
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
601
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
651
602
perror("fopen");
652
603
exitstatus = EXIT_FAILURE;
653
604
goto fallback;
656
607
/* If there was any arguments from configuration file,
657
608
pass them to parser as command arguments */
658
609
if(custom_argv != NULL){
659
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
660
0, NULL);
661
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){
662
613
fprintf(stderr, "Unknown error while parsing arguments\n");
663
614
exitstatus = EXIT_FAILURE;
664
615
goto fallback;
667
618
668
619
/* Parse actual command line arguments, to let them override the
669
620
config file */
670
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
671
if(ret == ARGP_ERR_UNKNOWN){
621
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
622
if (ret == ARGP_ERR_UNKNOWN){
672
623
fprintf(stderr, "Unknown error while parsing arguments\n");
673
624
exitstatus = EXIT_FAILURE;
674
625
goto fallback;
681
632
for(char **a = p->argv; *a != NULL; a++){
682
633
fprintf(stderr, "\tArg: %s\n", *a);
683
634
}
684
fprintf(stderr, "...and %d environment variables\n", p->envc);
635
fprintf(stderr, "...and %u environment variables\n", p->envc);
685
636
for(char **a = p->environ; *a != NULL; a++){
686
637
fprintf(stderr, "\t%s\n", *a);
687
638
}
689
640
}
690
641
691
642
/* Strip permissions down to nobody */
643
ret = setuid(uid);
644
if (ret == -1){
645
perror("setuid");
646
}
692
647
setgid(gid);
693
if(ret == -1){
648
if (ret == -1){
694
649
perror("setgid");
695
650
}
696
ret = setuid(uid);
697
if(ret == -1){
698
perror("setuid");
699
}
700
651
701
if(plugindir == NULL){
652
if (plugindir == NULL){
702
653
dir = opendir(PDIR);
703
654
} else {
704
655
dir = opendir(plugindir);
727
678
728
679
/* Read and execute any executable in the plugin directory*/
729
680
while(true){
730
do {
731
dirst = readdir(dir);
732
} while(dirst == NULL and errno == EINTR);
681
dirst = readdir(dir);
733
682
734
683
/* All directory entries have been processed */
735
684
if(dirst == NULL){
736
if(errno == EBADF){
685
if (errno == EBADF){
737
686
perror("readdir");
738
687
exitstatus = EXIT_FAILURE;
739
688
goto fallback;
786
735
continue;
787
736
}
788
737
}
789
738
790
739
char *filename;
791
740
if(plugindir == NULL){
792
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
793
dirst->d_name));
741
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
794
742
} else {
795
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
796
plugindir,
797
dirst->d_name));
743
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
798
744
}
799
745
if(ret < 0){
800
746
perror("asprintf");
801
747
continue;
802
748
}
803
749
804
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
805
if(ret == -1){
750
ret = stat(filename, &st);
751
if (ret == -1){
806
752
perror("stat");
807
753
free(filename);
808
754
continue;
809
755
}
810
756
811
757
/* Ignore non-executable files */
812
if(not S_ISREG(st.st_mode)
813
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
758
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
814
759
if(debug){
815
760
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
816
761
" with bad type or mode\n", filename);
862
807
}
863
808
864
809
int pipefd[2];
865
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
866
if(ret == -1){
810
ret = pipe(pipefd);
811
if (ret == -1){
867
812
perror("pipe");
868
813
exitstatus = EXIT_FAILURE;
869
814
goto fallback;
882
827
goto fallback;
883
828
}
884
829
/* Block SIGCHLD until process is safely in process list */
885
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
886
&sigchld_action.sa_mask,
887
NULL));
830
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
888
831
if(ret < 0){
889
832
perror("sigprocmask");
890
833
exitstatus = EXIT_FAILURE;
891
834
goto fallback;
892
835
}
893
836
/* Starting a new process to be watched */
894
pid_t pid;
895
do {
896
pid = fork();
897
} while(pid == -1 and errno == EINTR);
837
pid_t pid = fork();
898
838
if(pid == -1){
899
839
perror("fork");
900
840
exitstatus = EXIT_FAILURE;
938
878
/* no return */
939
879
}
940
880
/* Parent process */
941
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
942
pipe */
881
close(pipefd[1]); /* Close unused write end of pipe */
943
882
free(filename);
944
883
plugin *new_plugin = getplugin(dirst->d_name);
945
if(new_plugin == NULL){
884
if (new_plugin == NULL){
946
885
perror("getplugin");
947
ret = (int)(TEMP_FAILURE_RETRY
948
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
949
NULL)));
886
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
950
887
if(ret < 0){
951
888
perror("sigprocmask");
952
889
}
959
896
960
897
/* Unblock SIGCHLD so signal handler can be run if this process
961
898
has already completed */
962
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
963
&sigchld_action.sa_mask,
964
NULL));
899
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
965
900
if(ret < 0){
966
901
perror("sigprocmask");
967
902
exitstatus = EXIT_FAILURE;
968
903
goto fallback;
969
904
}
970
905
971
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
972
-Wconversion */
906
FD_SET(new_plugin->fd, &rfds_all);
973
907
974
if(maxfd < new_plugin->fd){
908
if (maxfd < new_plugin->fd){
975
909
maxfd = new_plugin->fd;
976
910
}
977
911
}
978
912
979
TEMP_FAILURE_RETRY(closedir(dir));
913
closedir(dir);
980
914
dir = NULL;
981
free_plugin(getplugin(NULL));
982
915
983
916
for(plugin *p = plugin_list; p != NULL; p = p->next){
984
917
if(p->pid != 0){
995
928
while(plugin_list){
996
929
fd_set rfds = rfds_all;
997
930
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
998
if(select_ret == -1 and errno != EINTR){
931
if (select_ret == -1){
999
932
perror("select");
1000
933
exitstatus = EXIT_FAILURE;
1001
934
goto fallback;
1004
937
from one of them */
1005
938
for(plugin *proc = plugin_list; proc != NULL;){
1006
939
/* Is this process completely done? */
1007
if(proc->completed and proc->eof){
940
if(proc->eof and proc->completed){
1008
941
/* Only accept the plugin output if it exited cleanly */
1009
942
if(not WIFEXITED(proc->status)
1010
943
or WEXITSTATUS(proc->status) != 0){
1011
944
/* Bad exit by plugin */
1012
945
1013
946
if(debug){
1014
947
if(WIFEXITED(proc->status)){
1015
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1016
" status %d\n", proc->name,
1017
(intmax_t) (proc->pid),
948
fprintf(stderr, "Plugin %u exited with status %d\n",
949
(unsigned int) (proc->pid),
1018
950
WEXITSTATUS(proc->status));
1019
} else if(WIFSIGNALED(proc->status)){
1020
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1021
" signal %d: %s\n", proc->name,
1022
(intmax_t) (proc->pid),
1023
WTERMSIG(proc->status),
1024
strsignal(WTERMSIG(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));
1025
955
} else if(WCOREDUMP(proc->status)){
1026
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1027
" core\n", proc->name, (intmax_t) (proc->pid));
956
fprintf(stderr, "Plugin %d dumped core\n",
957
(unsigned int) (proc->pid));
1028
958
}
1029
959
}
1030
960
1031
961
/* Remove the plugin */
1032
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1033
-Wconversion */
1034
962
FD_CLR(proc->fd, &rfds_all);
963
1035
964
/* Block signal while modifying process_list */
1036
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1037
(SIG_BLOCK,
1038
&sigchld_action.sa_mask,
1039
NULL));
965
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1040
966
if(ret < 0){
1041
967
perror("sigprocmask");
1042
968
exitstatus = EXIT_FAILURE;
1048
974
proc = next_plugin;
1049
975
1050
976
/* We are done modifying process list, so unblock signal */
1051
ret = (int)(TEMP_FAILURE_RETRY
1052
(sigprocmask(SIG_UNBLOCK,
1053
&sigchld_action.sa_mask, NULL)));
977
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
978
NULL);
1054
979
if(ret < 0){
1055
980
perror("sigprocmask");
1056
981
exitstatus = EXIT_FAILURE;
1076
1001
}
1077
1002
1078
1003
/* This process has not completed. Does it have any output? */
1079
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1080
warning from
1081
-Wconversion */
1004
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1082
1005
/* This process had nothing to say at this time */
1083
1006
proc = proc->next;
1084
1007
continue;
1087
1010
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1088
1011
proc->buffer = realloc(proc->buffer, proc->buffer_size
1089
1012
+ (size_t) BUFFER_SIZE);
1090
if(proc->buffer == NULL){
1013
if (proc->buffer == NULL){
1091
1014
perror("malloc");
1092
1015
exitstatus = EXIT_FAILURE;
1093
1016
goto fallback;
1095
1018
proc->buffer_size += BUFFER_SIZE;
1096
1019
}
1097
1020
/* Read from the process */
1098
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1099
proc->buffer
1100
+ proc->buffer_length,
1101
BUFFER_SIZE));
1102
if(sret < 0){
1021
ret = read(proc->fd, proc->buffer + proc->buffer_length,
1022
BUFFER_SIZE);
1023
if(ret < 0){
1103
1024
/* Read error from this process; ignore the error */
1104
1025
proc = proc->next;
1105
1026
continue;
1106
1027
}
1107
if(sret == 0){
1028
if(ret == 0){
1108
1029
/* got EOF */
1109
1030
proc->eof = true;
1110
1031
} else {
1111
proc->buffer_length += (size_t) sret;
1032
proc->buffer_length += (size_t) ret;
1112
1033
}
1113
1034
}
1114
1035
}
1115
1116
1036
1037
1117
1038
fallback:
1118
1039
1119
1040
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1166
1087
}
1167
1088
1168
1089
/* Wait for any remaining child processes to terminate */
1169
do {
1090
do{
1170
1091
ret = wait(NULL);
1171
1092
} while(ret >= 0);
1172
1093
if(errno != ECHILD){
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0