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