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.2.153
- compare with another revision
- download diff
- download tarball
- view history from revision 237.2.153
- Committer: Teddy Hogeborn
- Date: 2009-10-18 16:09:05 UTC
- mto: (24.1.146 mandos) (237.12.2 mandos-persistent) (299.1.1 release) (300.1.1 release) (301.1.1 release)
- mto: This revision was merged to the branch mainline in revision 270.
- Revision ID: teddy@fukt.bsnet.se-20091018160905-ep07o5cwedsegz9x
* plugins.d/askpass-fifo.c: Do close(STDOUT_FILENO) before exiting to
check its return code. Use exit codes
from <sysexits.h>.
* plugins.d/splashy.c: Use exit codes from <sysexits.h> in the fork to
exec the "splashy_update" command.
check its return code. Use exit codes
from <sysexits.h>.
* plugins.d/splashy.c: Use exit codes from <sysexits.h> in the fork to
exec the "splashy_update" command.
- 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
*
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 */
67
#include <inttypes.h> /* intmax_t, SCNdMAX, PRIdMAX, */
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
68
71
69
72
#define BUFFER_SIZE 256
70
73
81
84
char **environ;
82
85
int envc;
83
86
bool disabled;
84
87
85
88
/* Variables used for running processes*/
86
89
pid_t pid;
87
90
int fd;
107
110
}
108
111
}
109
112
/* Create a new plugin */
110
plugin *new_plugin = malloc(sizeof(plugin));
113
plugin *new_plugin = NULL;
114
do {
115
new_plugin = malloc(sizeof(plugin));
116
} while(new_plugin == NULL and errno == EINTR);
111
117
if(new_plugin == NULL){
112
118
return NULL;
113
119
}
114
120
char *copy_name = NULL;
115
121
if(name != NULL){
116
copy_name = strdup(name);
122
do {
123
copy_name = strdup(name);
124
} while(copy_name == NULL and errno == EINTR);
117
125
if(copy_name == NULL){
118
126
free(new_plugin);
119
127
return NULL;
125
133
.disabled = false,
126
134
.next = plugin_list };
127
135
128
new_plugin->argv = malloc(sizeof(char *) * 2);
136
do {
137
new_plugin->argv = malloc(sizeof(char *) * 2);
138
} while(new_plugin->argv == NULL and errno == EINTR);
129
139
if(new_plugin->argv == NULL){
130
140
free(copy_name);
131
141
free(new_plugin);
134
144
new_plugin->argv[0] = copy_name;
135
145
new_plugin->argv[1] = NULL;
136
146
137
new_plugin->environ = malloc(sizeof(char *));
147
do {
148
new_plugin->environ = malloc(sizeof(char *));
149
} while(new_plugin->environ == NULL and errno == EINTR);
138
150
if(new_plugin->environ == NULL){
139
151
free(copy_name);
140
152
free(new_plugin->argv);
152
164
static bool add_to_char_array(const char *new, char ***array,
153
165
int *len){
154
166
/* Resize the pointed-to array to hold one more pointer */
155
*array = realloc(*array, sizeof(char *)
156
* (size_t) ((*len) + 2));
167
do {
168
*array = realloc(*array, sizeof(char *)
169
* (size_t) ((*len) + 2));
170
} while(*array == NULL and errno == EINTR);
157
171
/* Malloc check */
158
172
if(*array == NULL){
159
173
return false;
160
174
}
161
175
/* Make a copy of the new string */
162
char *copy = strdup(new);
176
char *copy;
177
do {
178
copy = strdup(new);
179
} while(copy == NULL and errno == EINTR);
163
180
if(copy == NULL){
164
181
return false;
165
182
}
191
208
if(strncmp(*e, def, namelen + 1) == 0){
192
209
/* It already exists */
193
210
if(replace){
194
char *new = realloc(*e, strlen(def) + 1);
211
char *new;
212
do {
213
new = realloc(*e, strlen(def) + 1);
214
} while(new == NULL and errno == EINTR);
195
215
if(new == NULL){
196
216
return false;
197
217
}
207
227
/*
208
228
* Based on the example in the GNU LibC manual chapter 13.13 "File
209
229
* Descriptor Flags".
210
* *Note File Descriptor Flags:(libc)Descriptor Flags.
230
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
211
231
*/
212
232
static int set_cloexec_flag(int fd){
213
int ret = fcntl(fd, F_GETFD, 0);
233
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
214
234
/* If reading the flags failed, return error indication now. */
215
235
if(ret < 0){
216
236
return ret;
217
237
}
218
238
/* Store modified flag word in the descriptor. */
219
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
239
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
240
ret | FD_CLOEXEC));
220
241
}
221
242
222
243
279
300
}
280
301
free(plugin_node->environ);
281
302
free(plugin_node->buffer);
282
303
283
304
/* Removes the plugin from the singly-linked list */
284
305
if(plugin_node == plugin_list){
285
306
/* First one - simple */
312
333
struct dirent *dirst;
313
334
struct stat st;
314
335
fd_set rfds_all;
315
int ret, numchars, maxfd = 0;
336
int ret, maxfd = 0;
316
337
ssize_t sret;
317
intmax_t tmpmax;
318
338
uid_t uid = 65534;
319
339
gid_t gid = 65534;
320
340
bool debug = false;
380
400
error_t parse_opt(int key, char *arg, __attribute__((unused))
381
401
struct argp_state *state){
382
402
switch(key){
403
char *tmp;
404
intmax_t tmpmax;
383
405
case 'g': /* --global-options */
384
406
if(arg != NULL){
385
char *p;
386
while((p = strsep(&arg, ",")) != NULL){
387
if(p[0] == '\0'){
407
char *plugin_option;
408
while((plugin_option = strsep(&arg, ",")) != NULL){
409
if(plugin_option[0] == '\0'){
388
410
continue;
389
411
}
390
if(not add_argument(getplugin(NULL), p)){
412
if(not add_argument(getplugin(NULL), plugin_option)){
391
413
perror("add_argument");
392
414
return ARGP_ERR_UNKNOWN;
393
415
}
404
426
break;
405
427
case 'o': /* --options-for */
406
428
if(arg != NULL){
407
char *p_name = strsep(&arg, ":");
408
if(p_name[0] == '\0' or arg == NULL){
409
break;
410
}
411
char *opt = strsep(&arg, ":");
412
if(opt[0] == '\0' or opt == NULL){
413
break;
414
}
415
char *p;
416
while((p = strsep(&opt, ",")) != NULL){
417
if(p[0] == '\0'){
418
continue;
419
}
420
if(not add_argument(getplugin(p_name), p)){
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)){
421
436
perror("add_argument");
422
437
return ARGP_ERR_UNKNOWN;
423
438
}
462
477
plugindir = strdup(arg);
463
478
if(plugindir == NULL){
464
479
perror("strdup");
465
}
480
}
466
481
break;
467
482
case 129: /* --config-file */
468
483
/* This is already done by parse_opt_config_file() */
469
484
break;
470
485
case 130: /* --userid */
471
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
472
if(ret < 1 or tmpmax != (uid_t)tmpmax
473
or arg[numchars] != '\0'){
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){
474
490
fprintf(stderr, "Bad user ID number: \"%s\", using %"
475
491
PRIdMAX "\n", arg, (intmax_t)uid);
476
492
} else {
478
494
}
479
495
break;
480
496
case 131: /* --groupid */
481
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
482
if(ret < 1 or tmpmax != (gid_t)tmpmax
483
or arg[numchars] != '\0'){
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){
484
501
fprintf(stderr, "Bad group ID number: \"%s\", using %"
485
502
PRIdMAX "\n", arg, (intmax_t)gid);
486
503
} else {
530
547
if(argfile == NULL){
531
548
perror("strdup");
532
549
}
533
break;
550
break;
534
551
case 130: /* --userid */
535
552
case 131: /* --groupid */
536
553
case 132: /* --debug */
565
582
conffp = fopen(AFILE, "r");
566
583
} else {
567
584
conffp = fopen(argfile, "r");
568
}
585
}
569
586
if(conffp != NULL){
570
587
char *org_line = NULL;
571
588
char *p, *arg, *new_arg, *line;
572
589
size_t size = 0;
573
590
const char whitespace_delims[] = " \r\t\f\v\n";
574
591
const char comment_delim[] = "#";
575
592
576
593
custom_argc = 1;
577
594
custom_argv = malloc(sizeof(char*) * 2);
578
595
if(custom_argv == NULL){
582
599
}
583
600
custom_argv[0] = argv[0];
584
601
custom_argv[1] = NULL;
585
602
586
603
/* for each line in the config file, strip whitespace and ignore
587
604
commented text */
588
605
while(true){
590
607
if(sret == -1){
591
608
break;
592
609
}
593
610
594
611
line = org_line;
595
612
arg = strsep(&line, comment_delim);
596
613
while((p = strsep(&arg, whitespace_delims)) != NULL){
615
632
goto fallback;
616
633
}
617
634
custom_argv[custom_argc-1] = new_arg;
618
custom_argv[custom_argc] = NULL;
635
custom_argv[custom_argc] = NULL;
619
636
}
620
637
}
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
}
621
646
free(org_line);
622
647
} else {
623
648
/* Check for harmful errors and go to fallback. Other errors might
673
698
perror("setuid");
674
699
}
675
700
676
if(plugindir == NULL){
677
dir = opendir(PDIR);
678
} else {
679
dir = opendir(plugindir);
680
}
681
682
if(dir == NULL){
683
perror("Could not open plugin dir");
684
exitstatus = EXIT_FAILURE;
685
goto fallback;
686
}
687
688
/* Set the FD_CLOEXEC flag on the directory, if possible */
701
/* Open plugin directory with close_on_exec flag */
689
702
{
690
int dir_fd = dirfd(dir);
691
if(dir_fd >= 0){
692
ret = set_cloexec_flag(dir_fd);
693
if(ret < 0){
694
perror("set_cloexec_flag");
695
exitstatus = EXIT_FAILURE;
696
goto fallback;
697
}
703
int dir_fd = -1;
704
if(plugindir == NULL){
705
dir_fd = open(PDIR, O_RDONLY |
706
#ifdef O_CLOEXEC
707
O_CLOEXEC
708
#else /* not O_CLOEXEC */
709
0
710
#endif /* not O_CLOEXEC */
711
);
712
} else {
713
dir_fd = open(plugindir, O_RDONLY |
714
#ifdef O_CLOEXEC
715
O_CLOEXEC
716
#else /* not O_CLOEXEC */
717
0
718
#endif /* not O_CLOEXEC */
719
);
720
}
721
if(dir_fd == -1){
722
perror("Could not open plugin dir");
723
exitstatus = EXIT_FAILURE;
724
goto fallback;
725
}
726
727
#ifndef O_CLOEXEC
728
/* Set the FD_CLOEXEC flag on the directory */
729
ret = set_cloexec_flag(dir_fd);
730
if(ret < 0){
731
perror("set_cloexec_flag");
732
TEMP_FAILURE_RETRY(close(dir_fd));
733
exitstatus = EXIT_FAILURE;
734
goto fallback;
735
}
736
#endif /* O_CLOEXEC */
737
738
dir = fdopendir(dir_fd);
739
if(dir == NULL){
740
perror("Could not open plugin dir");
741
TEMP_FAILURE_RETRY(close(dir_fd));
742
exitstatus = EXIT_FAILURE;
743
goto fallback;
698
744
}
699
745
}
700
746
702
748
703
749
/* Read and execute any executable in the plugin directory*/
704
750
while(true){
705
dirst = readdir(dir);
751
do {
752
dirst = readdir(dir);
753
} while(dirst == NULL and errno == EINTR);
706
754
707
755
/* All directory entries have been processed */
708
756
if(dirst == NULL){
759
807
continue;
760
808
}
761
809
}
762
810
763
811
char *filename;
764
812
if(plugindir == NULL){
765
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
813
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
814
dirst->d_name));
766
815
} else {
767
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
816
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
817
plugindir,
818
dirst->d_name));
768
819
}
769
820
if(ret < 0){
770
821
perror("asprintf");
771
822
continue;
772
823
}
773
824
774
ret = stat(filename, &st);
825
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
775
826
if(ret == -1){
776
827
perror("stat");
777
828
free(filename);
778
829
continue;
779
830
}
780
831
781
832
/* Ignore non-executable files */
782
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
833
if(not S_ISREG(st.st_mode)
834
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
783
835
if(debug){
784
836
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
785
837
" with bad type or mode\n", filename);
831
883
}
832
884
833
885
int pipefd[2];
834
ret = pipe(pipefd);
886
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
835
887
if(ret == -1){
836
888
perror("pipe");
837
889
exitstatus = EXIT_FAILURE;
851
903
goto fallback;
852
904
}
853
905
/* Block SIGCHLD until process is safely in process list */
854
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
906
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
907
&sigchld_action.sa_mask,
908
NULL));
855
909
if(ret < 0){
856
910
perror("sigprocmask");
857
911
exitstatus = EXIT_FAILURE;
858
912
goto fallback;
859
913
}
860
914
/* Starting a new process to be watched */
861
pid_t pid = fork();
915
pid_t pid;
916
do {
917
pid = fork();
918
} while(pid == -1 and errno == EINTR);
862
919
if(pid == -1){
863
920
perror("fork");
864
921
exitstatus = EXIT_FAILURE;
902
959
/* no return */
903
960
}
904
961
/* Parent process */
905
close(pipefd[1]); /* Close unused write end of pipe */
962
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
963
pipe */
906
964
free(filename);
907
965
plugin *new_plugin = getplugin(dirst->d_name);
908
966
if(new_plugin == NULL){
909
967
perror("getplugin");
910
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
968
ret = (int)(TEMP_FAILURE_RETRY
969
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
970
NULL)));
911
971
if(ret < 0){
912
972
perror("sigprocmask");
913
973
}
920
980
921
981
/* Unblock SIGCHLD so signal handler can be run if this process
922
982
has already completed */
923
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
983
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
984
&sigchld_action.sa_mask,
985
NULL));
924
986
if(ret < 0){
925
987
perror("sigprocmask");
926
988
exitstatus = EXIT_FAILURE;
927
989
goto fallback;
928
990
}
929
991
930
FD_SET(new_plugin->fd, &rfds_all);
992
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
993
-Wconversion */
931
994
932
995
if(maxfd < new_plugin->fd){
933
996
maxfd = new_plugin->fd;
934
997
}
935
998
}
936
999
937
closedir(dir);
1000
TEMP_FAILURE_RETRY(closedir(dir));
938
1001
dir = NULL;
1002
free_plugin(getplugin(NULL));
939
1003
940
1004
for(plugin *p = plugin_list; p != NULL; p = p->next){
941
1005
if(p->pid != 0){
952
1016
while(plugin_list){
953
1017
fd_set rfds = rfds_all;
954
1018
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
955
if(select_ret == -1){
1019
if(select_ret == -1 and errno != EINTR){
956
1020
perror("select");
957
1021
exitstatus = EXIT_FAILURE;
958
1022
goto fallback;
966
1030
if(not WIFEXITED(proc->status)
967
1031
or WEXITSTATUS(proc->status) != 0){
968
1032
/* Bad exit by plugin */
969
1033
970
1034
if(debug){
971
1035
if(WIFEXITED(proc->status)){
972
1036
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
975
1039
WEXITSTATUS(proc->status));
976
1040
} else if(WIFSIGNALED(proc->status)){
977
1041
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
978
" signal %d\n", proc->name,
1042
" signal %d: %s\n", proc->name,
979
1043
(intmax_t) (proc->pid),
980
WTERMSIG(proc->status));
1044
WTERMSIG(proc->status),
1045
strsignal(WTERMSIG(proc->status)));
981
1046
} else if(WCOREDUMP(proc->status)){
982
1047
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
983
1048
" core\n", proc->name, (intmax_t) (proc->pid));
985
1050
}
986
1051
987
1052
/* Remove the plugin */
988
FD_CLR(proc->fd, &rfds_all);
989
1053
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1054
-Wconversion */
1055
990
1056
/* Block signal while modifying process_list */
991
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1057
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1058
(SIG_BLOCK,
1059
&sigchld_action.sa_mask,
1060
NULL));
992
1061
if(ret < 0){
993
1062
perror("sigprocmask");
994
1063
exitstatus = EXIT_FAILURE;
1000
1069
proc = next_plugin;
1001
1070
1002
1071
/* We are done modifying process list, so unblock signal */
1003
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1004
NULL);
1072
ret = (int)(TEMP_FAILURE_RETRY
1073
(sigprocmask(SIG_UNBLOCK,
1074
&sigchld_action.sa_mask, NULL)));
1005
1075
if(ret < 0){
1006
1076
perror("sigprocmask");
1007
1077
exitstatus = EXIT_FAILURE;
1027
1097
}
1028
1098
1029
1099
/* This process has not completed. Does it have any output? */
1030
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1100
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1101
warning from
1102
-Wconversion */
1031
1103
/* This process had nothing to say at this time */
1032
1104
proc = proc->next;
1033
1105
continue;
1044
1116
proc->buffer_size += BUFFER_SIZE;
1045
1117
}
1046
1118
/* Read from the process */
1047
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1048
BUFFER_SIZE);
1119
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1120
proc->buffer
1121
+ proc->buffer_length,
1122
BUFFER_SIZE));
1049
1123
if(sret < 0){
1050
1124
/* Read error from this process; ignore the error */
1051
1125
proc = proc->next;
1059
1133
}
1060
1134
}
1061
1135
}
1062
1063
1136
1137
1064
1138
fallback:
1065
1139
1066
1140
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1113
1187
}
1114
1188
1115
1189
/* Wait for any remaining child processes to terminate */
1116
do{
1190
do {
1117
1191
ret = wait(NULL);
1118
1192
} while(ret >= 0);
1119
1193
if(errno != ECHILD){
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0