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 395
- compare with another revision
- download diff
- download tarball
- view history from revision 395
- Committer: Teddy Hogeborn
- Date: 2009-10-26 21:16:16 UTC
- Revision ID: teddy@fukt.bsnet.se-20091026211616-38e9wynf4428ip2l
Merge from release branch.
- files modified:
- Makefile
added
removed
plugin-runner.c
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(),
42
42
WCOREDUMP() */
43
43
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
44
44
#include <iso646.h> /* and, or, not */
45
#include <dirent.h> /* DIR, struct dirent, opendir(),
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
46
46
readdir(), closedir(), dirfd() */
47
47
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
48
48
fcntl(), setuid(), setgid(),
68
68
*/
69
69
#include <errno.h> /* errno, EBADF */
70
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
71
#include <sysexits.h> /* EX_OSERR, EX_USAGE */
71
72
72
73
#define BUFFER_SIZE 256
73
74
102
103
/* Gets an existing plugin based on name,
103
104
or if none is found, creates a new one */
104
105
static plugin *getplugin(char *name){
105
/* Check for exiting plugin with that name */
106
/* Check for existing plugin with that name */
106
107
for(plugin *p = plugin_list; p != NULL; p = p->next){
107
108
if((p->name == name)
108
109
or (p->name and name and (strcmp(p->name, name) == 0))){
123
124
copy_name = strdup(name);
124
125
} while(copy_name == NULL and errno == EINTR);
125
126
if(copy_name == NULL){
127
int e = errno;
126
128
free(new_plugin);
129
errno = e;
127
130
return NULL;
128
131
}
129
132
}
137
140
new_plugin->argv = malloc(sizeof(char *) * 2);
138
141
} while(new_plugin->argv == NULL and errno == EINTR);
139
142
if(new_plugin->argv == NULL){
143
int e = errno;
140
144
free(copy_name);
141
145
free(new_plugin);
146
errno = e;
142
147
return NULL;
143
148
}
144
149
new_plugin->argv[0] = copy_name;
148
153
new_plugin->environ = malloc(sizeof(char *));
149
154
} while(new_plugin->environ == NULL and errno == EINTR);
150
155
if(new_plugin->environ == NULL){
156
int e = errno;
151
157
free(copy_name);
152
158
free(new_plugin->argv);
153
159
free(new_plugin);
160
errno = e;
154
161
return NULL;
155
162
}
156
163
new_plugin->environ[0] = NULL;
230
237
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
231
238
*/
232
239
static int set_cloexec_flag(int fd){
233
int ret = TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
240
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
234
241
/* If reading the flags failed, return error indication now. */
235
242
if(ret < 0){
236
243
return ret;
237
244
}
238
245
/* Store modified flag word in the descriptor. */
239
return TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD, ret | FD_CLOEXEC));
246
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
247
ret | FD_CLOEXEC));
240
248
}
241
249
242
250
393
401
.doc = "Group ID the plugins will run as", .group = 3 },
394
402
{ .name = "debug", .key = 132,
395
403
.doc = "Debug mode", .group = 4 },
404
/*
405
* These reproduce what we would get without ARGP_NO_HELP
406
*/
407
{ .name = "help", .key = '?',
408
.doc = "Give this help list", .group = -1 },
409
{ .name = "usage", .key = -3,
410
.doc = "Give a short usage message", .group = -1 },
411
{ .name = "version", .key = 'V',
412
.doc = "Print program version", .group = -1 },
396
413
{ .name = NULL }
397
414
};
398
415
399
error_t parse_opt(int key, char *arg, __attribute__((unused))
400
struct argp_state *state){
416
error_t parse_opt(int key, char *arg, struct argp_state *state){
417
errno = 0;
401
418
switch(key){
402
419
char *tmp;
403
420
intmax_t tmpmax;
404
421
case 'g': /* --global-options */
405
if(arg != NULL){
422
{
406
423
char *plugin_option;
407
424
while((plugin_option = strsep(&arg, ",")) != NULL){
408
if(plugin_option[0] == '\0'){
409
continue;
410
}
411
425
if(not add_argument(getplugin(NULL), plugin_option)){
412
perror("add_argument");
413
return ARGP_ERR_UNKNOWN;
426
break;
414
427
}
415
428
}
416
429
}
417
430
break;
418
431
case 'G': /* --global-env */
419
if(arg == NULL){
420
break;
421
}
422
if(not add_environment(getplugin(NULL), arg, true)){
423
perror("add_environment");
424
}
432
add_environment(getplugin(NULL), arg, true);
425
433
break;
426
434
case 'o': /* --options-for */
427
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)){
435
perror("add_argument");
436
return ARGP_ERR_UNKNOWN;
435
{
436
char *option_list = strchr(arg, ':');
437
if(option_list == NULL){
438
argp_error(state, "No colon in \"%s\"", arg);
439
errno = EINVAL;
440
break;
441
}
442
*option_list = '\0';
443
option_list++;
444
if(arg[0] == '\0'){
445
argp_error(state, "Empty plugin name");
446
errno = EINVAL;
447
break;
448
}
449
char *option;
450
while((option = strsep(&option_list, ",")) != NULL){
451
if(not add_argument(getplugin(arg), option)){
452
break;
437
453
}
438
454
}
439
455
}
440
456
break;
441
457
case 'E': /* --env-for */
442
if(arg == NULL){
443
break;
444
}
445
458
{
446
459
char *envdef = strchr(arg, ':');
447
460
if(envdef == NULL){
461
argp_error(state, "No colon in \"%s\"", arg);
462
errno = EINVAL;
448
463
break;
449
464
}
450
465
*envdef = '\0';
451
if(not add_environment(getplugin(arg), envdef+1, true)){
452
perror("add_environment");
466
envdef++;
467
if(arg[0] == '\0'){
468
argp_error(state, "Empty plugin name");
469
errno = EINVAL;
470
break;
453
471
}
472
add_environment(getplugin(arg), envdef, true);
454
473
}
455
474
break;
456
475
case 'd': /* --disable */
457
if(arg != NULL){
476
{
458
477
plugin *p = getplugin(arg);
459
if(p == NULL){
460
return ARGP_ERR_UNKNOWN;
478
if(p != NULL){
479
p->disabled = true;
461
480
}
462
p->disabled = true;
463
481
}
464
482
break;
465
483
case 'e': /* --enable */
466
if(arg != NULL){
484
{
467
485
plugin *p = getplugin(arg);
468
if(p == NULL){
469
return ARGP_ERR_UNKNOWN;
486
if(p != NULL){
487
p->disabled = false;
470
488
}
471
p->disabled = false;
472
489
}
473
490
break;
474
491
case 128: /* --plugin-dir */
475
492
free(plugindir);
476
493
plugindir = strdup(arg);
477
if(plugindir == NULL){
478
perror("strdup");
479
}
480
494
break;
481
495
case 129: /* --config-file */
482
496
/* This is already done by parse_opt_config_file() */
483
497
break;
484
498
case 130: /* --userid */
485
errno = 0;
486
499
tmpmax = strtoimax(arg, &tmp, 10);
487
500
if(errno != 0 or tmp == arg or *tmp != '\0'
488
501
or tmpmax != (uid_t)tmpmax){
489
fprintf(stderr, "Bad user ID number: \"%s\", using %"
490
PRIdMAX "\n", arg, (intmax_t)uid);
491
} else {
492
uid = (uid_t)tmpmax;
502
argp_error(state, "Bad user ID number: \"%s\", using %"
503
PRIdMAX, arg, (intmax_t)uid);
504
break;
493
505
}
506
uid = (uid_t)tmpmax;
494
507
break;
495
508
case 131: /* --groupid */
496
errno = 0;
497
509
tmpmax = strtoimax(arg, &tmp, 10);
498
510
if(errno != 0 or tmp == arg or *tmp != '\0'
499
511
or tmpmax != (gid_t)tmpmax){
500
fprintf(stderr, "Bad group ID number: \"%s\", using %"
501
PRIdMAX "\n", arg, (intmax_t)gid);
502
} else {
503
gid = (gid_t)tmpmax;
512
argp_error(state, "Bad group ID number: \"%s\", using %"
513
PRIdMAX, arg, (intmax_t)gid);
514
break;
504
515
}
516
gid = (gid_t)tmpmax;
505
517
break;
506
518
case 132: /* --debug */
507
519
debug = true;
508
520
break;
521
/*
522
* These reproduce what we would get without ARGP_NO_HELP
523
*/
524
case '?': /* --help */
525
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
526
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
527
case -3: /* --usage */
528
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
529
argp_state_help(state, state->out_stream,
530
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
531
case 'V': /* --version */
532
fprintf(state->out_stream, "%s\n", argp_program_version);
533
exit(EXIT_SUCCESS);
534
break;
509
535
/*
510
536
* When adding more options before this line, remember to also add a
511
537
* "case" to the "parse_opt_config_file" function below.
514
540
/* Cryptsetup always passes an argument, which is an empty
515
541
string if "none" was specified in /etc/crypttab. So if
516
542
argument was empty, we ignore it silently. */
517
if(arg[0] != '\0'){
518
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
543
if(arg[0] == '\0'){
544
break;
519
545
}
520
break;
521
case ARGP_KEY_END:
522
break;
523
546
default:
524
547
return ARGP_ERR_UNKNOWN;
525
548
}
526
return 0;
549
return errno; /* Set to 0 at start */
527
550
}
528
551
529
552
/* This option parser is the same as parse_opt() above, except it
531
554
error_t parse_opt_config_file(int key, char *arg,
532
555
__attribute__((unused))
533
556
struct argp_state *state){
557
errno = 0;
534
558
switch(key){
535
559
case 'g': /* --global-options */
536
560
case 'G': /* --global-env */
543
567
case 129: /* --config-file */
544
568
free(argfile);
545
569
argfile = strdup(arg);
546
if(argfile == NULL){
547
perror("strdup");
548
}
549
570
break;
550
571
case 130: /* --userid */
551
572
case 131: /* --groupid */
552
573
case 132: /* --debug */
574
case '?': /* --help */
575
case -3: /* --usage */
576
case 'V': /* --version */
553
577
case ARGP_KEY_ARG:
554
case ARGP_KEY_END:
555
578
break;
556
579
default:
557
580
return ARGP_ERR_UNKNOWN;
558
581
}
559
return 0;
582
return errno;
560
583
}
561
584
562
585
struct argp argp = { .options = options,
566
589
567
590
/* Parse using parse_opt_config_file() in order to get the custom
568
591
config file location, if any. */
569
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
570
if(ret == ARGP_ERR_UNKNOWN){
571
fprintf(stderr, "Unknown error while parsing arguments\n");
572
exitstatus = EXIT_FAILURE;
592
ret = argp_parse(&argp, argc, argv,
593
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
594
NULL, NULL);
595
switch(ret){
596
case 0:
597
break;
598
case ENOMEM:
599
default:
600
errno = ret;
601
perror("argp_parse");
602
exitstatus = EX_OSERR;
603
goto fallback;
604
case EINVAL:
605
exitstatus = EX_USAGE;
573
606
goto fallback;
574
607
}
575
608
652
685
goto fallback;
653
686
}
654
687
}
655
/* If there was any arguments from configuration file,
656
pass them to parser as command arguments */
688
/* If there were any arguments from the configuration file, pass
689
them to parser as command line arguments */
657
690
if(custom_argv != NULL){
658
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
659
0, NULL);
660
if(ret == ARGP_ERR_UNKNOWN){
661
fprintf(stderr, "Unknown error while parsing arguments\n");
662
exitstatus = EXIT_FAILURE;
691
ret = argp_parse(&argp, custom_argc, custom_argv,
692
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
693
NULL, NULL);
694
switch(ret){
695
case 0:
696
break;
697
case ENOMEM:
698
default:
699
errno = ret;
700
perror("argp_parse");
701
exitstatus = EX_OSERR;
702
goto fallback;
703
case EINVAL:
704
exitstatus = EX_CONFIG;
663
705
goto fallback;
664
706
}
665
707
}
666
708
667
709
/* Parse actual command line arguments, to let them override the
668
710
config file */
669
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
670
if(ret == ARGP_ERR_UNKNOWN){
671
fprintf(stderr, "Unknown error while parsing arguments\n");
672
exitstatus = EXIT_FAILURE;
711
ret = argp_parse(&argp, argc, argv,
712
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
713
NULL, NULL);
714
switch(ret){
715
case 0:
716
break;
717
case ENOMEM:
718
default:
719
errno = ret;
720
perror("argp_parse");
721
exitstatus = EX_OSERR;
722
goto fallback;
723
case EINVAL:
724
exitstatus = EX_USAGE;
673
725
goto fallback;
674
726
}
675
727
697
749
perror("setuid");
698
750
}
699
751
700
if(plugindir == NULL){
701
dir = opendir(PDIR);
702
} else {
703
dir = opendir(plugindir);
704
}
705
706
if(dir == NULL){
707
perror("Could not open plugin dir");
708
exitstatus = EXIT_FAILURE;
709
goto fallback;
710
}
711
712
/* Set the FD_CLOEXEC flag on the directory, if possible */
752
/* Open plugin directory with close_on_exec flag */
713
753
{
714
int dir_fd = dirfd(dir);
715
if(dir_fd >= 0){
716
ret = set_cloexec_flag(dir_fd);
717
if(ret < 0){
718
perror("set_cloexec_flag");
719
exitstatus = EXIT_FAILURE;
720
goto fallback;
721
}
754
int dir_fd = -1;
755
if(plugindir == NULL){
756
dir_fd = open(PDIR, O_RDONLY |
757
#ifdef O_CLOEXEC
758
O_CLOEXEC
759
#else /* not O_CLOEXEC */
760
0
761
#endif /* not O_CLOEXEC */
762
);
763
} else {
764
dir_fd = open(plugindir, O_RDONLY |
765
#ifdef O_CLOEXEC
766
O_CLOEXEC
767
#else /* not O_CLOEXEC */
768
0
769
#endif /* not O_CLOEXEC */
770
);
771
}
772
if(dir_fd == -1){
773
perror("Could not open plugin dir");
774
exitstatus = EXIT_FAILURE;
775
goto fallback;
776
}
777
778
#ifndef O_CLOEXEC
779
/* Set the FD_CLOEXEC flag on the directory */
780
ret = set_cloexec_flag(dir_fd);
781
if(ret < 0){
782
perror("set_cloexec_flag");
783
TEMP_FAILURE_RETRY(close(dir_fd));
784
exitstatus = EXIT_FAILURE;
785
goto fallback;
786
}
787
#endif /* O_CLOEXEC */
788
789
dir = fdopendir(dir_fd);
790
if(dir == NULL){
791
perror("Could not open plugin dir");
792
TEMP_FAILURE_RETRY(close(dir_fd));
793
exitstatus = EXIT_FAILURE;
794
goto fallback;
722
795
}
723
796
}
724
797
788
861
789
862
char *filename;
790
863
if(plugindir == NULL){
791
ret = TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
792
dirst->d_name));
864
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
865
dirst->d_name));
793
866
} else {
794
ret = TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s", plugindir,
795
dirst->d_name));
867
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
868
plugindir,
869
dirst->d_name));
796
870
}
797
871
if(ret < 0){
798
872
perror("asprintf");
799
873
continue;
800
874
}
801
875
802
ret = TEMP_FAILURE_RETRY(stat(filename, &st));
876
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
803
877
if(ret == -1){
804
878
perror("stat");
805
879
free(filename);
860
934
}
861
935
862
936
int pipefd[2];
863
ret = TEMP_FAILURE_RETRY(pipe(pipefd));
937
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
864
938
if(ret == -1){
865
939
perror("pipe");
866
940
exitstatus = EXIT_FAILURE;
880
954
goto fallback;
881
955
}
882
956
/* Block SIGCHLD until process is safely in process list */
883
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
884
&sigchld_action.sa_mask,
885
NULL));
957
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
958
&sigchld_action.sa_mask,
959
NULL));
886
960
if(ret < 0){
887
961
perror("sigprocmask");
888
962
exitstatus = EXIT_FAILURE;
942
1016
plugin *new_plugin = getplugin(dirst->d_name);
943
1017
if(new_plugin == NULL){
944
1018
perror("getplugin");
945
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
946
&sigchld_action.sa_mask,
947
NULL));
1019
ret = (int)(TEMP_FAILURE_RETRY
1020
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1021
NULL)));
948
1022
if(ret < 0){
949
1023
perror("sigprocmask");
950
1024
}
957
1031
958
1032
/* Unblock SIGCHLD so signal handler can be run if this process
959
1033
has already completed */
960
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
961
&sigchld_action.sa_mask,
962
NULL));
1034
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1035
&sigchld_action.sa_mask,
1036
NULL));
963
1037
if(ret < 0){
964
1038
perror("sigprocmask");
965
1039
exitstatus = EXIT_FAILURE;
966
1040
goto fallback;
967
1041
}
968
1042
969
FD_SET(new_plugin->fd, &rfds_all);
1043
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1044
-Wconversion */
970
1045
971
1046
if(maxfd < new_plugin->fd){
972
1047
maxfd = new_plugin->fd;
1026
1101
}
1027
1102
1028
1103
/* Remove the plugin */
1029
FD_CLR(proc->fd, &rfds_all);
1104
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1105
-Wconversion */
1030
1106
1031
1107
/* Block signal while modifying process_list */
1032
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1033
&sigchld_action.sa_mask,
1034
NULL));
1108
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1109
(SIG_BLOCK,
1110
&sigchld_action.sa_mask,
1111
NULL));
1035
1112
if(ret < 0){
1036
1113
perror("sigprocmask");
1037
1114
exitstatus = EXIT_FAILURE;
1043
1120
proc = next_plugin;
1044
1121
1045
1122
/* We are done modifying process list, so unblock signal */
1046
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1047
&sigchld_action.sa_mask,
1048
NULL));
1123
ret = (int)(TEMP_FAILURE_RETRY
1124
(sigprocmask(SIG_UNBLOCK,
1125
&sigchld_action.sa_mask, NULL)));
1049
1126
if(ret < 0){
1050
1127
perror("sigprocmask");
1051
1128
exitstatus = EXIT_FAILURE;
1071
1148
}
1072
1149
1073
1150
/* This process has not completed. Does it have any output? */
1074
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1151
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1152
warning from
1153
-Wconversion */
1075
1154
/* This process had nothing to say at this time */
1076
1155
proc = proc->next;
1077
1156
continue;
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0