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 364
- compare with another revision
- download diff
- download tarball
- view history from revision 364
- Committer: Teddy Hogeborn
- Date: 2009-09-07 23:48:17 UTC
- Revision ID: teddy@fukt.bsnet.se-20090907234817-op1lgg9gpruejsiv
* initramfs-tools-hook: Bug fix: Really install user-supplied plugins.
Bug fix: Warn about empty plugin directory.
Bug fix: Warn about empty plugin directory.
- 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
*
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
45
#include <dirent.h> /* DIR, struct dirent, opendir(),
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 = 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 TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD, ret | FD_CLOEXEC));
220
240
}
221
241
222
242
279
299
}
280
300
free(plugin_node->environ);
281
301
free(plugin_node->buffer);
282
302
283
303
/* Removes the plugin from the singly-linked list */
284
304
if(plugin_node == plugin_list){
285
305
/* First one - simple */
312
332
struct dirent *dirst;
313
333
struct stat st;
314
334
fd_set rfds_all;
315
int ret, numchars, maxfd = 0;
335
int ret, maxfd = 0;
316
336
ssize_t sret;
317
intmax_t tmpmax;
318
337
uid_t uid = 65534;
319
338
gid_t gid = 65534;
320
339
bool debug = false;
380
399
error_t parse_opt(int key, char *arg, __attribute__((unused))
381
400
struct argp_state *state){
382
401
switch(key){
402
char *tmp;
403
intmax_t tmpmax;
383
404
case 'g': /* --global-options */
384
405
if(arg != NULL){
385
char *p;
386
while((p = strsep(&arg, ",")) != NULL){
387
if(p[0] == '\0'){
406
char *plugin_option;
407
while((plugin_option = strsep(&arg, ",")) != NULL){
408
if(plugin_option[0] == '\0'){
388
409
continue;
389
410
}
390
if(not add_argument(getplugin(NULL), p)){
411
if(not add_argument(getplugin(NULL), plugin_option)){
391
412
perror("add_argument");
392
413
return ARGP_ERR_UNKNOWN;
393
414
}
404
425
break;
405
426
case 'o': /* --options-for */
406
427
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)){
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)){
421
435
perror("add_argument");
422
436
return ARGP_ERR_UNKNOWN;
423
437
}
462
476
plugindir = strdup(arg);
463
477
if(plugindir == NULL){
464
478
perror("strdup");
465
}
479
}
466
480
break;
467
481
case 129: /* --config-file */
468
482
/* This is already done by parse_opt_config_file() */
469
483
break;
470
484
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'){
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){
474
489
fprintf(stderr, "Bad user ID number: \"%s\", using %"
475
490
PRIdMAX "\n", arg, (intmax_t)uid);
476
491
} else {
478
493
}
479
494
break;
480
495
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'){
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){
484
500
fprintf(stderr, "Bad group ID number: \"%s\", using %"
485
501
PRIdMAX "\n", arg, (intmax_t)gid);
486
502
} else {
530
546
if(argfile == NULL){
531
547
perror("strdup");
532
548
}
533
break;
549
break;
534
550
case 130: /* --userid */
535
551
case 131: /* --groupid */
536
552
case 132: /* --debug */
565
581
conffp = fopen(AFILE, "r");
566
582
} else {
567
583
conffp = fopen(argfile, "r");
568
}
584
}
569
585
if(conffp != NULL){
570
586
char *org_line = NULL;
571
587
char *p, *arg, *new_arg, *line;
572
588
size_t size = 0;
573
589
const char whitespace_delims[] = " \r\t\f\v\n";
574
590
const char comment_delim[] = "#";
575
591
576
592
custom_argc = 1;
577
593
custom_argv = malloc(sizeof(char*) * 2);
578
594
if(custom_argv == NULL){
582
598
}
583
599
custom_argv[0] = argv[0];
584
600
custom_argv[1] = NULL;
585
601
586
602
/* for each line in the config file, strip whitespace and ignore
587
603
commented text */
588
604
while(true){
590
606
if(sret == -1){
591
607
break;
592
608
}
593
609
594
610
line = org_line;
595
611
arg = strsep(&line, comment_delim);
596
612
while((p = strsep(&arg, whitespace_delims)) != NULL){
615
631
goto fallback;
616
632
}
617
633
custom_argv[custom_argc-1] = new_arg;
618
custom_argv[custom_argc] = NULL;
634
custom_argv[custom_argc] = NULL;
619
635
}
620
636
}
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
}
621
645
free(org_line);
622
646
} else {
623
647
/* Check for harmful errors and go to fallback. Other errors might
702
726
703
727
/* Read and execute any executable in the plugin directory*/
704
728
while(true){
705
dirst = readdir(dir);
729
do {
730
dirst = readdir(dir);
731
} while(dirst == NULL and errno == EINTR);
706
732
707
733
/* All directory entries have been processed */
708
734
if(dirst == NULL){
759
785
continue;
760
786
}
761
787
}
762
788
763
789
char *filename;
764
790
if(plugindir == NULL){
765
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
791
ret = TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
792
dirst->d_name));
766
793
} else {
767
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
794
ret = TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s", plugindir,
795
dirst->d_name));
768
796
}
769
797
if(ret < 0){
770
798
perror("asprintf");
771
799
continue;
772
800
}
773
801
774
ret = stat(filename, &st);
802
ret = TEMP_FAILURE_RETRY(stat(filename, &st));
775
803
if(ret == -1){
776
804
perror("stat");
777
805
free(filename);
778
806
continue;
779
807
}
780
808
781
809
/* Ignore non-executable files */
782
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
810
if(not S_ISREG(st.st_mode)
811
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
783
812
if(debug){
784
813
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
785
814
" with bad type or mode\n", filename);
831
860
}
832
861
833
862
int pipefd[2];
834
ret = pipe(pipefd);
863
ret = TEMP_FAILURE_RETRY(pipe(pipefd));
835
864
if(ret == -1){
836
865
perror("pipe");
837
866
exitstatus = EXIT_FAILURE;
851
880
goto fallback;
852
881
}
853
882
/* Block SIGCHLD until process is safely in process list */
854
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
883
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
884
&sigchld_action.sa_mask,
885
NULL));
855
886
if(ret < 0){
856
887
perror("sigprocmask");
857
888
exitstatus = EXIT_FAILURE;
858
889
goto fallback;
859
890
}
860
891
/* Starting a new process to be watched */
861
pid_t pid = fork();
892
pid_t pid;
893
do {
894
pid = fork();
895
} while(pid == -1 and errno == EINTR);
862
896
if(pid == -1){
863
897
perror("fork");
864
898
exitstatus = EXIT_FAILURE;
902
936
/* no return */
903
937
}
904
938
/* Parent process */
905
close(pipefd[1]); /* Close unused write end of pipe */
939
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
940
pipe */
906
941
free(filename);
907
942
plugin *new_plugin = getplugin(dirst->d_name);
908
943
if(new_plugin == NULL){
909
944
perror("getplugin");
910
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
945
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
946
&sigchld_action.sa_mask,
947
NULL));
911
948
if(ret < 0){
912
949
perror("sigprocmask");
913
950
}
920
957
921
958
/* Unblock SIGCHLD so signal handler can be run if this process
922
959
has already completed */
923
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
960
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
961
&sigchld_action.sa_mask,
962
NULL));
924
963
if(ret < 0){
925
964
perror("sigprocmask");
926
965
exitstatus = EXIT_FAILURE;
934
973
}
935
974
}
936
975
937
closedir(dir);
976
TEMP_FAILURE_RETRY(closedir(dir));
938
977
dir = NULL;
978
free_plugin(getplugin(NULL));
939
979
940
980
for(plugin *p = plugin_list; p != NULL; p = p->next){
941
981
if(p->pid != 0){
952
992
while(plugin_list){
953
993
fd_set rfds = rfds_all;
954
994
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
955
if(select_ret == -1){
995
if(select_ret == -1 and errno != EINTR){
956
996
perror("select");
957
997
exitstatus = EXIT_FAILURE;
958
998
goto fallback;
966
1006
if(not WIFEXITED(proc->status)
967
1007
or WEXITSTATUS(proc->status) != 0){
968
1008
/* Bad exit by plugin */
969
1009
970
1010
if(debug){
971
1011
if(WIFEXITED(proc->status)){
972
fprintf(stderr, "Plugin %" PRIdMAX " exited with status"
973
" %d\n", (intmax_t) (proc->pid),
1012
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1013
" status %d\n", proc->name,
1014
(intmax_t) (proc->pid),
974
1015
WEXITSTATUS(proc->status));
975
1016
} else if(WIFSIGNALED(proc->status)){
976
fprintf(stderr, "Plugin %" PRIdMAX " killed by signal"
977
" %d\n", (intmax_t) (proc->pid),
978
WTERMSIG(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)));
979
1022
} else if(WCOREDUMP(proc->status)){
980
fprintf(stderr, "Plugin %" PRIdMAX " dumped core\n",
981
(intmax_t) (proc->pid));
1023
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1024
" core\n", proc->name, (intmax_t) (proc->pid));
982
1025
}
983
1026
}
984
1027
985
1028
/* Remove the plugin */
986
1029
FD_CLR(proc->fd, &rfds_all);
987
1030
988
1031
/* Block signal while modifying process_list */
989
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1032
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1033
&sigchld_action.sa_mask,
1034
NULL));
990
1035
if(ret < 0){
991
1036
perror("sigprocmask");
992
1037
exitstatus = EXIT_FAILURE;
998
1043
proc = next_plugin;
999
1044
1000
1045
/* We are done modifying process list, so unblock signal */
1001
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1002
NULL);
1046
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1047
&sigchld_action.sa_mask,
1048
NULL));
1003
1049
if(ret < 0){
1004
1050
perror("sigprocmask");
1005
1051
exitstatus = EXIT_FAILURE;
1042
1088
proc->buffer_size += BUFFER_SIZE;
1043
1089
}
1044
1090
/* Read from the process */
1045
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1046
BUFFER_SIZE);
1091
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1092
proc->buffer
1093
+ proc->buffer_length,
1094
BUFFER_SIZE));
1047
1095
if(sret < 0){
1048
1096
/* Read error from this process; ignore the error */
1049
1097
proc = proc->next;
1057
1105
}
1058
1106
}
1059
1107
}
1060
1061
1108
1109
1062
1110
fallback:
1063
1111
1064
1112
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1111
1159
}
1112
1160
1113
1161
/* Wait for any remaining child processes to terminate */
1114
do{
1162
do {
1115
1163
ret = wait(NULL);
1116
1164
} while(ret >= 0);
1117
1165
if(errno != ECHILD){
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0