18
19
* along with this program. If not, see
19
20
* <http://www.gnu.org/licenses/>.
21
* Contact the authors at <mandos@fukt.bsnet.se>.
22
* Contact the authors at <mandos@recompile.se>.
24
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
27
#include <stddef.h> /* size_t, NULL */
27
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
28
EXIT_SUCCESS, realloc() */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
29
30
#include <stdbool.h> /* bool, true, false */
30
#include <stdio.h> /* perror, fileno(), fprintf(),
31
stderr, STDOUT_FILENO */
32
#include <sys/types.h> /* DIR, opendir(), stat(), struct
31
#include <stdio.h> /* fileno(), fprintf(),
32
stderr, STDOUT_FILENO, fclose() */
33
#include <sys/types.h> /* DIR, fdopendir(), fstat(), 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(),
41
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
41
WEXITSTATUS(), WTERMSIG(),
43
#include <sys/stat.h> /* struct stat, fstat(), 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
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
46
fcntl(), setuid(), setgid(),
47
F_GETFD, F_SETFD, FD_CLOEXEC,
48
access(), pipe(), fork(), close()
49
dup2(), STDOUT_FILENO, _exit(),
50
execv(), write(), read(),
47
#include <unistd.h> /* fcntl(), F_GETFD, F_SETFD,
48
FD_CLOEXEC, write(), STDOUT_FILENO,
49
struct stat, fstat(), close(),
50
setgid(), setuid(), S_ISREG(),
51
faccessat() pipe(), fork(),
52
_exit(), dup2(), fexecve(), read()
52
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
54
#include <string.h> /* strsep, strlen(), asprintf() */
55
FD_CLOEXEC, openat() */
56
#include <string.h> /* strsep, strlen(), strsignal(),
57
strcmp(), strncmp() */
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
65
69
#include <errno.h> /* errno, EBADF */
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
71
#include <sysexits.h> /* EX_OSERR, EX_USAGE, EX_IOERR,
72
EX_CONFIG, EX_UNAVAILABLE, EX_OK */
73
#include <errno.h> /* errno */
74
#include <error.h> /* error() */
75
#include <fnmatch.h> /* fnmatch() */
67
77
#define BUFFER_SIZE 256
69
79
#define PDIR "/lib/mandos/plugins.d"
70
80
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
72
const char *argp_program_version = "plugin-runner 1.0";
73
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
82
const char *argp_program_version = "plugin-runner " VERSION;
83
const char *argp_program_bug_address = "<mandos@recompile.se>";
75
85
typedef struct plugin{
76
86
char *name; /* can be NULL or any plugin name */
97
107
/* Gets an existing plugin based on name,
98
108
or if none is found, creates a new one */
109
__attribute__((warn_unused_result))
99
110
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))){
111
/* Check for existing plugin with that name */
112
for(plugin *p = plugin_list; p != NULL; p = p->next){
114
or (p->name and name and (strcmp(p->name, name) == 0))){
107
118
/* Create a new plugin */
108
plugin *new_plugin = malloc(sizeof(plugin));
109
if (new_plugin == NULL){
119
plugin *new_plugin = NULL;
121
new_plugin = malloc(sizeof(plugin));
122
} while(new_plugin == NULL and errno == EINTR);
123
if(new_plugin == NULL){
112
126
char *copy_name = NULL;
113
127
if(name != NULL){
114
copy_name = strdup(name);
129
copy_name = strdup(name);
130
} while(copy_name == NULL and errno == EINTR);
115
131
if(copy_name == NULL){
120
*new_plugin = (plugin) { .name = copy_name,
123
.next = plugin_list };
139
*new_plugin = (plugin){ .name = copy_name,
142
.next = plugin_list };
125
new_plugin->argv = malloc(sizeof(char *) * 2);
126
if (new_plugin->argv == NULL){
145
new_plugin->argv = malloc(sizeof(char *) * 2);
146
} while(new_plugin->argv == NULL and errno == EINTR);
147
if(new_plugin->argv == NULL){
128
150
free(new_plugin);
131
154
new_plugin->argv[0] = copy_name;
132
155
new_plugin->argv[1] = NULL;
134
new_plugin->environ = malloc(sizeof(char *));
158
new_plugin->environ = malloc(sizeof(char *));
159
} while(new_plugin->environ == NULL and errno == EINTR);
135
160
if(new_plugin->environ == NULL){
137
163
free(new_plugin->argv);
138
164
free(new_plugin);
141
168
new_plugin->environ[0] = NULL;
367
414
.doc = "Group ID the plugins will run as", .group = 3 },
368
415
{ .name = "debug", .key = 132,
369
416
.doc = "Debug mode", .group = 4 },
418
* These reproduce what we would get without ARGP_NO_HELP
420
{ .name = "help", .key = '?',
421
.doc = "Give this help list", .group = -1 },
422
{ .name = "usage", .key = -3,
423
.doc = "Give a short usage message", .group = -1 },
424
{ .name = "version", .key = 'V',
425
.doc = "Print program version", .group = -1 },
373
error_t parse_opt (int key, char *arg, __attribute__((unused))
374
struct argp_state *state) {
429
__attribute__((nonnull(3)))
430
error_t parse_opt(int key, char *arg, struct argp_state *state){
376
435
case 'g': /* --global-options */
379
while((p = strsep(&arg, ",")) != NULL){
383
if(not add_argument(getplugin(NULL), p)){
384
perror("add_argument");
385
return ARGP_ERR_UNKNOWN;
438
while((plugin_option = strsep(&arg, ",")) != NULL){
439
if(not add_argument(getplugin(NULL), plugin_option)){
390
446
case 'G': /* --global-env */
394
if(not add_environment(getplugin(NULL), arg, true)){
395
perror("add_environment");
447
if(add_environment(getplugin(NULL), arg, true)){
398
451
case 'o': /* --options-for */
400
char *p_name = strsep(&arg, ":");
401
if(p_name[0] == '\0' or arg == NULL){
404
char *opt = strsep(&arg, ":");
405
if(opt[0] == '\0' or opt == NULL){
409
while((p = strsep(&opt, ",")) != NULL){
413
if(not add_argument(getplugin(p_name), p)){
414
perror("add_argument");
415
return ARGP_ERR_UNKNOWN;
453
char *option_list = strchr(arg, ':');
454
if(option_list == NULL){
455
argp_error(state, "No colon in \"%s\"", arg);
462
argp_error(state, "Empty plugin name");
467
while((option = strsep(&option_list, ",")) != NULL){
468
if(not add_argument(getplugin(arg), option)){
420
475
case 'E': /* --env-for */
425
477
char *envdef = strchr(arg, ':');
426
478
if(envdef == NULL){
479
argp_error(state, "No colon in \"%s\"", arg);
430
if(not add_environment(getplugin(arg), envdef+1, true)){
431
perror("add_environment");
486
argp_error(state, "Empty plugin name");
490
if(add_environment(getplugin(arg), envdef, true)){
435
495
case 'd': /* --disable */
437
497
plugin *p = getplugin(arg);
439
return ARGP_ERR_UNKNOWN;
444
504
case 'e': /* --enable */
446
506
plugin *p = getplugin(arg);
448
return ARGP_ERR_UNKNOWN;
453
513
case 128: /* --plugin-dir */
455
515
plugindir = strdup(arg);
456
if(plugindir == NULL){
516
if(plugindir != NULL){
460
520
case 129: /* --config-file */
461
521
/* This is already done by parse_opt_config_file() */
463
523
case 130: /* --userid */
464
uid = (uid_t)strtol(arg, NULL, 10);
524
tmp_id = strtoimax(arg, &tmp, 10);
525
if(errno != 0 or tmp == arg or *tmp != '\0'
526
or tmp_id != (uid_t)tmp_id){
527
argp_error(state, "Bad user ID number: \"%s\", using %"
528
PRIdMAX, arg, (intmax_t)uid);
466
534
case 131: /* --groupid */
467
gid = (gid_t)strtol(arg, NULL, 10);
535
tmp_id = strtoimax(arg, &tmp, 10);
536
if(errno != 0 or tmp == arg or *tmp != '\0'
537
or tmp_id != (gid_t)tmp_id){
538
argp_error(state, "Bad group ID number: \"%s\", using %"
539
PRIdMAX, arg, (intmax_t)gid);
469
545
case 132: /* --debug */
549
* These reproduce what we would get without ARGP_NO_HELP
551
case '?': /* --help */
552
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
553
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
554
case -3: /* --usage */
555
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
556
argp_state_help(state, state->out_stream,
557
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
558
case 'V': /* --version */
559
fprintf(state->out_stream, "%s\n", argp_program_version);
563
* When adding more options before this line, remember to also add a
564
* "case" to the "parse_opt_config_file" function below.
472
566
case ARGP_KEY_ARG:
473
567
/* Cryptsetup always passes an argument, which is an empty
474
568
string if "none" was specified in /etc/crypttab. So if
475
569
argument was empty, we ignore it silently. */
477
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
483
574
return ARGP_ERR_UNKNOWN;
576
return errno; /* Set to 0 at start */
488
579
/* This option parser is the same as parse_opt() above, except it
489
580
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) {
581
error_t parse_opt_config_file(int key, char *arg,
582
__attribute__((unused))
583
struct argp_state *state){
494
586
case 'g': /* --global-options */
495
587
case 'G': /* --global-env */
496
588
case 'o': /* --options-for */
576
679
new_arg = strdup(p);
577
680
if(new_arg == NULL){
579
exitstatus = EXIT_FAILURE;
681
error(0, errno, "strdup");
682
exitstatus = EX_OSERR;
584
687
custom_argc += 1;
585
custom_argv = realloc(custom_argv, sizeof(char *)
586
* ((unsigned int) custom_argc + 1));
587
if(custom_argv == NULL){
589
exitstatus = EXIT_FAILURE;
689
char **new_argv = realloc(custom_argv, sizeof(char *)
692
if(new_argv == NULL){
693
error(0, errno, "realloc");
694
exitstatus = EX_OSERR;
699
custom_argv = new_argv;
593
702
custom_argv[custom_argc-1] = new_arg;
594
custom_argv[custom_argc] = NULL;
703
custom_argv[custom_argc] = NULL;
707
ret = fclose(conffp);
708
} while(ret == EOF and errno == EINTR);
710
error(0, errno, "fclose");
711
exitstatus = EX_IOERR;
599
716
/* Check for harmful errors and go to fallback. Other errors might
600
717
not affect opening plugins */
601
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
603
exitstatus = EXIT_FAILURE;
718
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
719
error(0, errno, "fopen");
720
exitstatus = EX_OSERR;
607
/* If there was any arguments from configuration file,
608
pass them to parser as command arguments */
724
/* If there were any arguments from the configuration file, pass
725
them to parser as command line arguments */
609
726
if(custom_argv != NULL){
610
ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
612
if (ret == ARGP_ERR_UNKNOWN){
613
fprintf(stderr, "Unknown error while parsing arguments\n");
614
exitstatus = EXIT_FAILURE;
727
ret = argp_parse(&argp, custom_argc, custom_argv,
728
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
736
error(0, errno, "argp_parse");
737
exitstatus = EX_OSERR;
740
exitstatus = EX_CONFIG;
619
745
/* Parse actual command line arguments, to let them override the
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;
747
ret = argp_parse(&argp, argc, argv,
748
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
756
error(0, errno, "argp_parse");
757
exitstatus = EX_OSERR;
760
exitstatus = EX_USAGE;
632
768
for(char **a = p->argv; *a != NULL; a++){
633
769
fprintf(stderr, "\tArg: %s\n", *a);
635
fprintf(stderr, "...and %u environment variables\n", p->envc);
771
fprintf(stderr, "...and %d environment variables\n", p->envc);
636
772
for(char **a = p->environ; *a != NULL; a++){
637
773
fprintf(stderr, "\t%s\n", *a);
642
/* Strip permissions down to nobody */
779
/* Work around Debian bug #633582:
780
<http://bugs.debian.org/633582> */
781
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
782
if(plugindir_fd == -1){
784
error(0, errno, "open(\"" PDIR "\")");
787
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
789
error(0, errno, "fstat");
791
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
792
ret = fchown(plugindir_fd, uid, gid);
794
error(0, errno, "fchown");
798
TEMP_FAILURE_RETRY(close(plugindir_fd));
802
/* Lower permissions */
805
error(0, errno, "setgid");
643
807
ret = setuid(uid);
652
if (plugindir == NULL){
655
dir = opendir(plugindir);
659
perror("Could not open plugin dir");
660
exitstatus = EXIT_FAILURE;
664
/* Set the FD_CLOEXEC flag on the directory, if possible */
809
error(0, errno, "setuid");
812
/* Open plugin directory with close_on_exec flag */
666
int dir_fd = dirfd(dir);
668
ret = set_cloexec_flag(dir_fd);
670
perror("set_cloexec_flag");
671
exitstatus = EXIT_FAILURE;
814
dir_fd = open(plugindir != NULL ? plugindir : PDIR, O_RDONLY |
817
#else /* not O_CLOEXEC */
819
#endif /* not O_CLOEXEC */
822
error(0, errno, "Could not open plugin dir");
823
exitstatus = EX_UNAVAILABLE;
828
/* Set the FD_CLOEXEC flag on the directory */
829
ret = set_cloexec_flag(dir_fd);
831
error(0, errno, "set_cloexec_flag");
832
TEMP_FAILURE_RETRY(close(dir_fd));
833
exitstatus = EX_OSERR;
836
#endif /* O_CLOEXEC */
838
dir = fdopendir(dir_fd);
840
error(0, errno, "Could not open plugin dir");
841
TEMP_FAILURE_RETRY(close(dir_fd));
842
exitstatus = EX_OSERR;
679
849
/* Read and execute any executable in the plugin directory*/
681
dirst = readdir(dir);
852
dirst = readdir(dir);
853
} while(dirst == NULL and errno == EINTR);
683
855
/* All directory entries have been processed */
684
856
if(dirst == NULL){
687
exitstatus = EXIT_FAILURE;
858
error(0, errno, "readdir");
859
exitstatus = EX_IOERR;
693
d_name_len = strlen(dirst->d_name);
695
865
/* Ignore dotfiles, backup files and other junk */
697
867
bool bad_name = false;
699
const char const *bad_prefixes[] = { ".", "#", NULL };
701
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
703
".dpkg-divert", NULL };
704
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
705
size_t pre_len = strlen(*pre);
706
if((d_name_len >= pre_len)
707
and strncmp((dirst->d_name), *pre, pre_len) == 0){
709
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
710
" with bad prefix %s\n", dirst->d_name, *pre);
719
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
720
size_t suf_len = strlen(*suf);
721
if((d_name_len >= suf_len)
722
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
725
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
726
" with bad suffix %s\n", dirst->d_name, *suf);
739
if(plugindir == NULL){
740
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
742
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
868
const char * const patterns[] = { ".*", "#*#", "*~",
869
"*.dpkg-new", "*.dpkg-old",
870
"*.dpkg-bak", "*.dpkg-divert",
873
#pragma GCC diagnostic push
874
#pragma GCC diagnostic ignored "-Wcast-qual"
876
for(const char **pat = (const char **)patterns;
877
*pat != NULL; pat++){
879
#pragma GCC diagnostic pop
881
if(fnmatch(*pat, dirst->d_name,
882
FNM_FILE_NAME | FNM_PERIOD) != FNM_NOMATCH){
884
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
885
" matching pattern %s\n", dirst->d_name, *pat);
896
int plugin_fd = openat(dir_fd, dirst->d_name, O_RDONLY |
899
#else /* not O_CLOEXEC */
901
#endif /* not O_CLOEXEC */
904
error(0, errno, "Could not open plugin");
908
/* Set the FD_CLOEXEC flag on the plugin FD */
909
ret = set_cloexec_flag(plugin_fd);
911
error(0, errno, "set_cloexec_flag");
912
TEMP_FAILURE_RETRY(close(plugin_fd));
915
#endif /* O_CLOEXEC */
916
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
918
error(0, errno, "stat");
919
TEMP_FAILURE_RETRY(close(plugin_fd));
749
ret = stat(filename, &st);
756
923
/* Ignore non-executable files */
757
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
924
if(not S_ISREG(st.st_mode)
925
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, dirst->d_name, X_OK,
759
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
760
" with bad type or mode\n", filename);
928
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
929
" with bad type or mode\n",
930
plugindir != NULL ? plugindir : PDIR, dirst->d_name);
932
TEMP_FAILURE_RETRY(close(plugin_fd));
766
936
plugin *p = getplugin(dirst->d_name);
938
error(0, errno, "getplugin");
939
TEMP_FAILURE_RETRY(close(plugin_fd));
784
954
for(char **a = g->argv + 1; *a != NULL; a++){
785
955
if(not add_argument(p, *a)){
786
perror("add_argument");
956
error(0, errno, "add_argument");
789
959
/* Add global environment variables */
790
960
for(char **e = g->environ; *e != NULL; e++){
791
961
if(not add_environment(p, *e, false)){
792
perror("add_environment");
962
error(0, errno, "add_environment");
797
/* If this plugin has any environment variables, we will call
798
using execve and need to duplicate the environment from this
967
/* If this plugin has any environment variables, we need to
968
duplicate the environment from this process, too. */
800
969
if(p->environ[0] != NULL){
801
970
for(char **e = environ; *e != NULL; e++){
802
971
if(not add_environment(p, *e, false)){
803
perror("add_environment");
972
error(0, errno, "add_environment");
812
exitstatus = EXIT_FAILURE;
978
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
980
error(0, errno, "pipe");
981
exitstatus = EX_OSERR;
815
984
/* Ask OS to automatic close the pipe on exec */
816
985
ret = set_cloexec_flag(pipefd[0]);
818
perror("set_cloexec_flag");
819
exitstatus = EXIT_FAILURE;
987
error(0, errno, "set_cloexec_flag");
988
exitstatus = EX_OSERR;
822
991
ret = set_cloexec_flag(pipefd[1]);
824
perror("set_cloexec_flag");
825
exitstatus = EXIT_FAILURE;
993
error(0, errno, "set_cloexec_flag");
994
exitstatus = EX_OSERR;
828
997
/* Block SIGCHLD until process is safely in process list */
829
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
998
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
999
&sigchld_action.sa_mask,
831
perror("sigprocmask");
832
exitstatus = EXIT_FAILURE;
1002
error(0, errno, "sigprocmask");
1003
exitstatus = EX_OSERR;
835
1006
/* Starting a new process to be watched */
1010
} while(pid == -1 and errno == EINTR);
839
exitstatus = EXIT_FAILURE;
1012
error(0, errno, "fork");
1013
exitstatus = EX_OSERR;
843
1017
/* this is the child process */
844
1018
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1020
error(0, errno, "sigaction");
849
1023
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
851
perror("sigprocmask");
1025
error(0, errno, "sigprocmask");
855
1029
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1031
error(0, errno, "dup2");
861
1035
if(dirfd(dir) < 0){
863
1037
above and must now close it manually here. */
866
if(p->environ[0] == NULL){
867
if(execv(filename, p->argv) < 0){
872
if(execve(filename, p->argv, p->environ) < 0){
1040
if(fexecve(plugin_fd, p->argv,
1041
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1042
error(0, errno, "fexecve for %s/%s",
1043
plugindir != NULL ? plugindir : PDIR, dirst->d_name);
879
1048
/* Parent process */
880
close(pipefd[1]); /* Close unused write end of pipe */
1049
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1051
TEMP_FAILURE_RETRY(close(plugin_fd));
882
1052
plugin *new_plugin = getplugin(dirst->d_name);
883
if (new_plugin == NULL){
885
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1053
if(new_plugin == NULL){
1054
error(0, errno, "getplugin");
1055
ret = (int)(TEMP_FAILURE_RETRY
1056
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
887
perror("sigprocmask");
1059
error(0, errno, "sigprocmask");
889
exitstatus = EXIT_FAILURE;
1061
exitstatus = EX_OSERR;
896
1068
/* Unblock SIGCHLD so signal handler can be run if this process
897
1069
has already completed */
898
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1070
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1071
&sigchld_action.sa_mask,
900
perror("sigprocmask");
901
exitstatus = EXIT_FAILURE;
1074
error(0, errno, "sigprocmask");
1075
exitstatus = EX_OSERR;
905
FD_SET(new_plugin->fd, &rfds_all);
1079
#if defined (__GNUC__) and defined (__GLIBC__)
1080
#if not __GLIBC_PREREQ(2, 16)
1081
#pragma GCC diagnostic push
1082
#pragma GCC diagnostic ignored "-Wsign-conversion"
1085
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1086
-Wconversion in GNU libc
1088
#if defined (__GNUC__) and defined (__GLIBC__)
1089
#if not __GLIBC_PREREQ(2, 16)
1090
#pragma GCC diagnostic pop
907
if (maxfd < new_plugin->fd){
1094
if(maxfd < new_plugin->fd){
908
1095
maxfd = new_plugin->fd;
1099
TEMP_FAILURE_RETRY(closedir(dir));
1101
free_plugin(getplugin(NULL));
915
1103
for(plugin *p = plugin_list; p != NULL; p = p->next){
916
1104
if(p->pid != 0){
927
1115
while(plugin_list){
928
1116
fd_set rfds = rfds_all;
929
1117
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
930
if (select_ret == -1){
932
exitstatus = EXIT_FAILURE;
1118
if(select_ret == -1 and errno != EINTR){
1119
error(0, errno, "select");
1120
exitstatus = EX_OSERR;
935
1123
/* OK, now either a process completed, or something can be read
936
1124
from one of them */
937
1125
for(plugin *proc = plugin_list; proc != NULL;){
938
1126
/* Is this process completely done? */
939
if(proc->eof and proc->completed){
1127
if(proc->completed and proc->eof){
940
1128
/* Only accept the plugin output if it exited cleanly */
941
1129
if(not WIFEXITED(proc->status)
942
1130
or WEXITSTATUS(proc->status) != 0){
943
1131
/* Bad exit by plugin */
946
1134
if(WIFEXITED(proc->status)){
947
fprintf(stderr, "Plugin %u exited with status %d\n",
948
(unsigned int) (proc->pid),
1135
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1136
" status %d\n", proc->name,
1137
(intmax_t) (proc->pid),
949
1138
WEXITSTATUS(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));
1139
} else if(WIFSIGNALED(proc->status)){
1140
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1141
" signal %d: %s\n", proc->name,
1142
(intmax_t) (proc->pid),
1143
WTERMSIG(proc->status),
1144
strsignal(WTERMSIG(proc->status)));
954
1145
} else if(WCOREDUMP(proc->status)){
955
fprintf(stderr, "Plugin %d dumped core\n",
956
(unsigned int) (proc->pid));
1146
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1147
" core\n", proc->name, (intmax_t) (proc->pid));
960
1151
/* Remove the plugin */
961
FD_CLR(proc->fd, &rfds_all);
1152
#if defined (__GNUC__) and defined (__GLIBC__)
1153
#if not __GLIBC_PREREQ(2, 16)
1154
#pragma GCC diagnostic push
1155
#pragma GCC diagnostic ignored "-Wsign-conversion"
1158
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1159
-Wconversion in GNU libc
1161
#if defined (__GNUC__) and defined (__GLIBC__)
1162
#if not __GLIBC_PREREQ(2, 16)
1163
#pragma GCC diagnostic pop
963
1167
/* Block signal while modifying process_list */
964
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1168
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1170
&sigchld_action.sa_mask,
966
perror("sigprocmask");
967
exitstatus = EXIT_FAILURE;
1173
error(0, errno, "sigprocmask");
1174
exitstatus = EX_OSERR;
993
1201
bool bret = print_out_password(proc->buffer,
994
1202
proc->buffer_length);
996
perror("print_out_password");
997
exitstatus = EXIT_FAILURE;
1204
error(0, errno, "print_out_password");
1205
exitstatus = EX_IOERR;
1002
1210
/* This process has not completed. Does it have any output? */
1003
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1211
#if defined (__GNUC__) and defined (__GLIBC__)
1212
#if not __GLIBC_PREREQ(2, 16)
1213
#pragma GCC diagnostic push
1214
#pragma GCC diagnostic ignored "-Wsign-conversion"
1217
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1223
#if defined (__GNUC__) and defined (__GLIBC__)
1224
#if not __GLIBC_PREREQ(2, 16)
1225
#pragma GCC diagnostic pop
1004
1228
/* This process had nothing to say at this time */
1005
1229
proc = proc->next;
1008
1232
/* Before reading, make the process' data buffer large enough */
1009
1233
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1010
proc->buffer = realloc(proc->buffer, proc->buffer_size
1011
+ (size_t) BUFFER_SIZE);
1012
if (proc->buffer == NULL){
1014
exitstatus = EXIT_FAILURE;
1234
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1235
+ (size_t) BUFFER_SIZE);
1236
if(new_buffer == NULL){
1237
error(0, errno, "malloc");
1238
exitstatus = EX_OSERR;
1241
proc->buffer = new_buffer;
1017
1242
proc->buffer_size += BUFFER_SIZE;
1019
1244
/* Read from the process */
1020
ret = read(proc->fd, proc->buffer + proc->buffer_length,
1245
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1247
+ proc->buffer_length,
1023
1250
/* Read error from this process; ignore the error */
1024
1251
proc = proc->next;
1029
1256
proc->eof = true;
1031
proc->buffer_length += (size_t) ret;
1258
proc->buffer_length += (size_t) sret;
1039
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1266
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1267
and exitstatus != EX_OK)){
1040
1268
/* Fallback if all plugins failed, none are found or an error