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 271
- compare with another revision
- download diff
- download tarball
- view history from revision 271
- Committer: Teddy Hogeborn
- Date: 2009-01-15 05:27:55 UTC
- mfrom: (237.2.9 mandos-release)
- Revision ID: teddy@fukt.bsnet.se-20090115052755-luw0gjx8727p24o3
Merge from release branch.
- 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
*
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(), WTERMSIG(),
42
WCOREDUMP() */
41
WEXITSTATUS() */
43
42
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
44
43
#include <iso646.h> /* and, or, not */
45
44
#include <dirent.h> /* DIR, struct dirent, opendir(),
53
52
close() */
54
53
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
55
54
FD_CLOEXEC */
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal() */
55
#include <string.h> /* strsep, strlen(), asprintf() */
58
56
#include <errno.h> /* errno */
59
57
#include <argp.h> /* struct argp_option, struct
60
58
argp_state, struct argp,
64
62
#include <signal.h> /* struct sigaction, sigemptyset(),
65
63
sigaddset(), sigaction(),
66
64
sigprocmask(), SIG_BLOCK, SIGCHLD,
67
SIG_UNBLOCK, kill(), sig_atomic_t
68
*/
65
SIG_UNBLOCK, kill() */
69
66
#include <errno.h> /* errno, EBADF */
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
67
#include <inttypes.h> /* intmax_t, SCNdMAX, PRIdMAX, */
71
68
72
69
#define BUFFER_SIZE 256
73
70
84
81
char **environ;
85
82
int envc;
86
83
bool disabled;
87
84
88
85
/* Variables used for running processes*/
89
86
pid_t pid;
90
87
int fd;
92
89
size_t buffer_size;
93
90
size_t buffer_length;
94
91
bool eof;
95
volatile sig_atomic_t completed;
96
int status;
92
volatile bool completed;
93
volatile int status;
97
94
struct plugin *next;
98
95
} plugin;
99
96
110
107
}
111
108
}
112
109
/* 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);
110
plugin *new_plugin = malloc(sizeof(plugin));
117
111
if(new_plugin == NULL){
118
112
return NULL;
119
113
}
120
114
char *copy_name = NULL;
121
115
if(name != NULL){
122
do {
123
copy_name = strdup(name);
124
} while(copy_name == NULL and errno == EINTR);
116
copy_name = strdup(name);
125
117
if(copy_name == NULL){
126
free(new_plugin);
127
118
return NULL;
128
119
}
129
120
}
130
121
131
*new_plugin = (plugin){ .name = copy_name,
132
.argc = 1,
133
.disabled = false,
134
.next = plugin_list };
122
*new_plugin = (plugin) { .name = copy_name,
123
.argc = 1,
124
.disabled = false,
125
.next = plugin_list };
135
126
136
do {
137
new_plugin->argv = malloc(sizeof(char *) * 2);
138
} while(new_plugin->argv == NULL and errno == EINTR);
127
new_plugin->argv = malloc(sizeof(char *) * 2);
139
128
if(new_plugin->argv == NULL){
140
129
free(copy_name);
141
130
free(new_plugin);
144
133
new_plugin->argv[0] = copy_name;
145
134
new_plugin->argv[1] = NULL;
146
135
147
do {
148
new_plugin->environ = malloc(sizeof(char *));
149
} while(new_plugin->environ == NULL and errno == EINTR);
136
new_plugin->environ = malloc(sizeof(char *));
150
137
if(new_plugin->environ == NULL){
151
138
free(copy_name);
152
139
free(new_plugin->argv);
164
151
static bool add_to_char_array(const char *new, char ***array,
165
152
int *len){
166
153
/* 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);
154
*array = realloc(*array, sizeof(char *)
155
* (size_t) ((*len) + 2));
171
156
/* Malloc check */
172
157
if(*array == NULL){
173
158
return false;
174
159
}
175
160
/* Make a copy of the new string */
176
char *copy;
177
do {
178
copy = strdup(new);
179
} while(copy == NULL and errno == EINTR);
161
char *copy = strdup(new);
180
162
if(copy == NULL){
181
163
return false;
182
164
}
208
190
if(strncmp(*e, def, namelen + 1) == 0){
209
191
/* It already exists */
210
192
if(replace){
211
char *new;
212
do {
213
new = realloc(*e, strlen(def) + 1);
214
} while(new == NULL and errno == EINTR);
193
char *new = realloc(*e, strlen(def) + 1);
215
194
if(new == NULL){
216
195
return false;
217
196
}
227
206
/*
228
207
* Based on the example in the GNU LibC manual chapter 13.13 "File
229
208
* Descriptor Flags".
230
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
209
* *Note File Descriptor Flags:(libc)Descriptor Flags.
231
210
*/
232
211
static int set_cloexec_flag(int fd){
233
int ret = TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
212
int ret = fcntl(fd, F_GETFD, 0);
234
213
/* If reading the flags failed, return error indication now. */
235
214
if(ret < 0){
236
215
return ret;
237
216
}
238
217
/* Store modified flag word in the descriptor. */
239
return TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD, ret | FD_CLOEXEC));
218
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
240
219
}
241
220
242
221
243
222
/* Mark processes as completed when they exit, and save their exit
244
223
status. */
245
224
static void handle_sigchld(__attribute__((unused)) int sig){
246
int old_errno = errno;
247
225
while(true){
248
226
plugin *proc = plugin_list;
249
227
int status;
253
231
break;
254
232
}
255
233
if(pid == -1){
256
if(errno == ECHILD){
257
/* No child processes */
258
break;
234
if(errno != ECHILD){
235
perror("waitpid");
259
236
}
260
perror("waitpid");
237
/* No child processes */
238
break;
261
239
}
262
240
263
241
/* A child exited, find it in process_list */
269
247
continue;
270
248
}
271
249
proc->status = status;
272
proc->completed = 1;
250
proc->completed = true;
273
251
}
274
errno = old_errno;
275
252
}
276
253
277
254
/* Prints out a password to stdout */
299
276
}
300
277
free(plugin_node->environ);
301
278
free(plugin_node->buffer);
302
279
303
280
/* Removes the plugin from the singly-linked list */
304
281
if(plugin_node == plugin_list){
305
282
/* First one - simple */
332
309
struct dirent *dirst;
333
310
struct stat st;
334
311
fd_set rfds_all;
335
int ret, maxfd = 0;
312
int ret, numchars, maxfd = 0;
336
313
ssize_t sret;
314
intmax_t tmpmax;
337
315
uid_t uid = 65534;
338
316
gid_t gid = 65534;
339
317
bool debug = false;
397
375
};
398
376
399
377
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;
378
struct argp_state *state) {
379
switch(key) {
404
380
case 'g': /* --global-options */
405
381
if(arg != NULL){
406
char *plugin_option;
407
while((plugin_option = strsep(&arg, ",")) != NULL){
408
if(plugin_option[0] == '\0'){
382
char *p;
383
while((p = strsep(&arg, ",")) != NULL){
384
if(p[0] == '\0'){
409
385
continue;
410
386
}
411
if(not add_argument(getplugin(NULL), plugin_option)){
387
if(not add_argument(getplugin(NULL), p)){
412
388
perror("add_argument");
413
389
return ARGP_ERR_UNKNOWN;
414
390
}
425
401
break;
426
402
case 'o': /* --options-for */
427
403
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)){
404
char *p_name = strsep(&arg, ":");
405
if(p_name[0] == '\0' or arg == NULL){
406
break;
407
}
408
char *opt = strsep(&arg, ":");
409
if(opt[0] == '\0' or opt == NULL){
410
break;
411
}
412
char *p;
413
while((p = strsep(&opt, ",")) != NULL){
414
if(p[0] == '\0'){
415
continue;
416
}
417
if(not add_argument(getplugin(p_name), p)){
435
418
perror("add_argument");
436
419
return ARGP_ERR_UNKNOWN;
437
420
}
476
459
plugindir = strdup(arg);
477
460
if(plugindir == NULL){
478
461
perror("strdup");
479
}
462
}
480
463
break;
481
464
case 129: /* --config-file */
482
465
/* This is already done by parse_opt_config_file() */
483
466
break;
484
467
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){
468
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
469
if(ret < 1 or tmpmax != (uid_t)tmpmax
470
or arg[numchars] != '\0'){
489
471
fprintf(stderr, "Bad user ID number: \"%s\", using %"
490
472
PRIdMAX "\n", arg, (intmax_t)uid);
491
473
} else {
493
475
}
494
476
break;
495
477
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){
478
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
479
if(ret < 1 or tmpmax != (gid_t)tmpmax
480
or arg[numchars] != '\0'){
500
481
fprintf(stderr, "Bad group ID number: \"%s\", using %"
501
482
PRIdMAX "\n", arg, (intmax_t)gid);
502
483
} else {
530
511
ignores everything but the --config-file option. */
531
512
error_t parse_opt_config_file(int key, char *arg,
532
513
__attribute__((unused))
533
struct argp_state *state){
534
switch(key){
514
struct argp_state *state) {
515
switch(key) {
535
516
case 'g': /* --global-options */
536
517
case 'G': /* --global-env */
537
518
case 'o': /* --options-for */
546
527
if(argfile == NULL){
547
528
perror("strdup");
548
529
}
549
break;
530
break;
550
531
case 130: /* --userid */
551
532
case 131: /* --groupid */
552
533
case 132: /* --debug */
581
562
conffp = fopen(AFILE, "r");
582
563
} else {
583
564
conffp = fopen(argfile, "r");
584
}
565
}
585
566
if(conffp != NULL){
586
567
char *org_line = NULL;
587
568
char *p, *arg, *new_arg, *line;
588
569
size_t size = 0;
589
570
const char whitespace_delims[] = " \r\t\f\v\n";
590
571
const char comment_delim[] = "#";
591
572
592
573
custom_argc = 1;
593
574
custom_argv = malloc(sizeof(char*) * 2);
594
575
if(custom_argv == NULL){
598
579
}
599
580
custom_argv[0] = argv[0];
600
581
custom_argv[1] = NULL;
601
582
602
583
/* for each line in the config file, strip whitespace and ignore
603
584
commented text */
604
585
while(true){
606
587
if(sret == -1){
607
588
break;
608
589
}
609
590
610
591
line = org_line;
611
592
arg = strsep(&line, comment_delim);
612
593
while((p = strsep(&arg, whitespace_delims)) != NULL){
631
612
goto fallback;
632
613
}
633
614
custom_argv[custom_argc-1] = new_arg;
634
custom_argv[custom_argc] = NULL;
615
custom_argv[custom_argc] = NULL;
635
616
}
636
617
}
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
618
free(org_line);
646
619
} else {
647
620
/* Check for harmful errors and go to fallback. Other errors might
688
661
}
689
662
690
663
/* Strip permissions down to nobody */
664
ret = setuid(uid);
665
if(ret == -1){
666
perror("setuid");
667
}
691
668
setgid(gid);
692
669
if(ret == -1){
693
670
perror("setgid");
694
671
}
695
ret = setuid(uid);
696
if(ret == -1){
697
perror("setuid");
698
}
699
672
700
673
if(plugindir == NULL){
701
674
dir = opendir(PDIR);
726
699
727
700
/* Read and execute any executable in the plugin directory*/
728
701
while(true){
729
do {
730
dirst = readdir(dir);
731
} while(dirst == NULL and errno == EINTR);
702
dirst = readdir(dir);
732
703
733
704
/* All directory entries have been processed */
734
705
if(dirst == NULL){
785
756
continue;
786
757
}
787
758
}
788
759
789
760
char *filename;
790
761
if(plugindir == NULL){
791
ret = TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
792
dirst->d_name));
762
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
793
763
} else {
794
ret = TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s", plugindir,
795
dirst->d_name));
764
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
796
765
}
797
766
if(ret < 0){
798
767
perror("asprintf");
799
768
continue;
800
769
}
801
770
802
ret = TEMP_FAILURE_RETRY(stat(filename, &st));
771
ret = stat(filename, &st);
803
772
if(ret == -1){
804
773
perror("stat");
805
774
free(filename);
806
775
continue;
807
776
}
808
777
809
778
/* Ignore non-executable files */
810
if(not S_ISREG(st.st_mode)
811
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
779
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
812
780
if(debug){
813
781
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
814
782
" with bad type or mode\n", filename);
860
828
}
861
829
862
830
int pipefd[2];
863
ret = TEMP_FAILURE_RETRY(pipe(pipefd));
831
ret = pipe(pipefd);
864
832
if(ret == -1){
865
833
perror("pipe");
866
834
exitstatus = EXIT_FAILURE;
880
848
goto fallback;
881
849
}
882
850
/* Block SIGCHLD until process is safely in process list */
883
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
884
&sigchld_action.sa_mask,
885
NULL));
851
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
886
852
if(ret < 0){
887
853
perror("sigprocmask");
888
854
exitstatus = EXIT_FAILURE;
889
855
goto fallback;
890
856
}
891
857
/* Starting a new process to be watched */
892
pid_t pid;
893
do {
894
pid = fork();
895
} while(pid == -1 and errno == EINTR);
858
pid_t pid = fork();
896
859
if(pid == -1){
897
860
perror("fork");
898
861
exitstatus = EXIT_FAILURE;
936
899
/* no return */
937
900
}
938
901
/* Parent process */
939
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
940
pipe */
902
close(pipefd[1]); /* Close unused write end of pipe */
941
903
free(filename);
942
904
plugin *new_plugin = getplugin(dirst->d_name);
943
905
if(new_plugin == NULL){
944
906
perror("getplugin");
945
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
946
&sigchld_action.sa_mask,
947
NULL));
907
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
948
908
if(ret < 0){
949
909
perror("sigprocmask");
950
910
}
957
917
958
918
/* Unblock SIGCHLD so signal handler can be run if this process
959
919
has already completed */
960
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
961
&sigchld_action.sa_mask,
962
NULL));
920
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
963
921
if(ret < 0){
964
922
perror("sigprocmask");
965
923
exitstatus = EXIT_FAILURE;
973
931
}
974
932
}
975
933
976
TEMP_FAILURE_RETRY(closedir(dir));
934
closedir(dir);
977
935
dir = NULL;
978
free_plugin(getplugin(NULL));
979
936
980
937
for(plugin *p = plugin_list; p != NULL; p = p->next){
981
938
if(p->pid != 0){
992
949
while(plugin_list){
993
950
fd_set rfds = rfds_all;
994
951
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
995
if(select_ret == -1 and errno != EINTR){
952
if(select_ret == -1){
996
953
perror("select");
997
954
exitstatus = EXIT_FAILURE;
998
955
goto fallback;
1001
958
from one of them */
1002
959
for(plugin *proc = plugin_list; proc != NULL;){
1003
960
/* Is this process completely done? */
1004
if(proc->completed and proc->eof){
961
if(proc->eof and proc->completed){
1005
962
/* Only accept the plugin output if it exited cleanly */
1006
963
if(not WIFEXITED(proc->status)
1007
964
or WEXITSTATUS(proc->status) != 0){
1008
965
/* Bad exit by plugin */
1009
966
1010
967
if(debug){
1011
968
if(WIFEXITED(proc->status)){
1012
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1013
" status %d\n", proc->name,
1014
(intmax_t) (proc->pid),
969
fprintf(stderr, "Plugin %" PRIdMAX " exited with status"
970
" %d\n", (intmax_t) (proc->pid),
1015
971
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)));
972
} else if(WIFSIGNALED(proc->status)) {
973
fprintf(stderr, "Plugin %" PRIdMAX " killed by signal"
974
" %d\n", (intmax_t) (proc->pid),
975
WTERMSIG(proc->status));
1022
976
} else if(WCOREDUMP(proc->status)){
1023
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1024
" core\n", proc->name, (intmax_t) (proc->pid));
977
fprintf(stderr, "Plugin %" PRIdMAX " dumped core\n",
978
(intmax_t) (proc->pid));
1025
979
}
1026
980
}
1027
981
1028
982
/* Remove the plugin */
1029
983
FD_CLR(proc->fd, &rfds_all);
1030
984
1031
985
/* Block signal while modifying process_list */
1032
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1033
&sigchld_action.sa_mask,
1034
NULL));
986
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1035
987
if(ret < 0){
1036
988
perror("sigprocmask");
1037
989
exitstatus = EXIT_FAILURE;
1043
995
proc = next_plugin;
1044
996
1045
997
/* We are done modifying process list, so unblock signal */
1046
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1047
&sigchld_action.sa_mask,
1048
NULL));
998
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
999
NULL);
1049
1000
if(ret < 0){
1050
1001
perror("sigprocmask");
1051
1002
exitstatus = EXIT_FAILURE;
1088
1039
proc->buffer_size += BUFFER_SIZE;
1089
1040
}
1090
1041
/* Read from the process */
1091
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1092
proc->buffer
1093
+ proc->buffer_length,
1094
BUFFER_SIZE));
1042
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1043
BUFFER_SIZE);
1095
1044
if(sret < 0){
1096
1045
/* Read error from this process; ignore the error */
1097
1046
proc = proc->next;
1105
1054
}
1106
1055
}
1107
1056
}
1108
1109
1057
1058
1110
1059
fallback:
1111
1060
1112
1061
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1159
1108
}
1160
1109
1161
1110
/* Wait for any remaining child processes to terminate */
1162
do {
1111
do{
1163
1112
ret = wait(NULL);
1164
1113
} while(ret >= 0);
1165
1114
if(errno != ECHILD){
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0