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 392
- compare with another revision
- download diff
- download tarball
- view history from revision 392
- Committer: Teddy Hogeborn
- Date: 2009-10-22 00:05:01 UTC
- Revision ID: teddy@fukt.bsnet.se-20091022000501-g792e99q5g1wkyet
Merge from release branch.
- files removed:
- dbus-mandos.conf
- files modified:
- Makefile
added
removed
plugin-runner.c
25
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
26
asprintf(), O_CLOEXEC */
27
27
#include <stddef.h> /* size_t, NULL */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
29
realloc() */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
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 */
54
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
55
55
FD_CLOEXEC */
56
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal(), strcmp(), strncmp() */
57
strsignal() */
58
58
#include <errno.h> /* errno */
59
59
#include <argp.h> /* struct argp_option, struct
60
60
argp_state, struct argp,
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, EX_IOERR,
72
EX_CONFIG, EX_UNAVAILABLE, EX_OK */
73
71
74
72
#define BUFFER_SIZE 256
75
73
104
102
/* Gets an existing plugin based on name,
105
103
or if none is found, creates a new one */
106
104
static plugin *getplugin(char *name){
107
/* Check for existing plugin with that name */
105
/* Check for exiting plugin with that name */
108
106
for(plugin *p = plugin_list; p != NULL; p = p->next){
109
107
if((p->name == name)
110
108
or (p->name and name and (strcmp(p->name, name) == 0))){
125
123
copy_name = strdup(name);
126
124
} while(copy_name == NULL and errno == EINTR);
127
125
if(copy_name == NULL){
128
int e = errno;
129
126
free(new_plugin);
130
errno = e;
131
127
return NULL;
132
128
}
133
129
}
141
137
new_plugin->argv = malloc(sizeof(char *) * 2);
142
138
} while(new_plugin->argv == NULL and errno == EINTR);
143
139
if(new_plugin->argv == NULL){
144
int e = errno;
145
140
free(copy_name);
146
141
free(new_plugin);
147
errno = e;
148
142
return NULL;
149
143
}
150
144
new_plugin->argv[0] = copy_name;
154
148
new_plugin->environ = malloc(sizeof(char *));
155
149
} while(new_plugin->environ == NULL and errno == EINTR);
156
150
if(new_plugin->environ == NULL){
157
int e = errno;
158
151
free(copy_name);
159
152
free(new_plugin->argv);
160
153
free(new_plugin);
161
errno = e;
162
154
return NULL;
163
155
}
164
156
new_plugin->environ[0] = NULL;
358
350
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
359
351
if(ret == -1){
360
352
perror("sigaddset");
361
exitstatus = EX_OSERR;
353
exitstatus = EXIT_FAILURE;
362
354
goto fallback;
363
355
}
364
356
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
365
357
if(ret == -1){
366
358
perror("sigaction");
367
exitstatus = EX_OSERR;
359
exitstatus = EXIT_FAILURE;
368
360
goto fallback;
369
361
}
370
362
402
394
.doc = "Group ID the plugins will run as", .group = 3 },
403
395
{ .name = "debug", .key = 132,
404
396
.doc = "Debug mode", .group = 4 },
405
/*
406
* These reproduce what we would get without ARGP_NO_HELP
407
*/
408
{ .name = "help", .key = '?',
409
.doc = "Give this help list", .group = -1 },
410
{ .name = "usage", .key = -3,
411
.doc = "Give a short usage message", .group = -1 },
412
{ .name = "version", .key = 'V',
413
.doc = "Print program version", .group = -1 },
414
397
{ .name = NULL }
415
398
};
416
399
417
error_t parse_opt(int key, char *arg, struct argp_state *state){
418
errno = 0;
400
error_t parse_opt(int key, char *arg, __attribute__((unused))
401
struct argp_state *state){
419
402
switch(key){
420
403
char *tmp;
421
404
intmax_t tmpmax;
422
405
case 'g': /* --global-options */
423
{
406
if(arg != NULL){
424
407
char *plugin_option;
425
408
while((plugin_option = strsep(&arg, ",")) != NULL){
409
if(plugin_option[0] == '\0'){
410
continue;
411
}
426
412
if(not add_argument(getplugin(NULL), plugin_option)){
427
break;
413
perror("add_argument");
414
return ARGP_ERR_UNKNOWN;
428
415
}
429
416
}
430
417
}
431
418
break;
432
419
case 'G': /* --global-env */
433
add_environment(getplugin(NULL), arg, true);
420
if(arg == NULL){
421
break;
422
}
423
if(not add_environment(getplugin(NULL), arg, true)){
424
perror("add_environment");
425
}
434
426
break;
435
427
case 'o': /* --options-for */
436
{
437
char *option_list = strchr(arg, ':');
438
if(option_list == NULL){
439
argp_error(state, "No colon in \"%s\"", arg);
440
errno = EINVAL;
441
break;
442
}
443
*option_list = '\0';
444
option_list++;
445
if(arg[0] == '\0'){
446
argp_error(state, "Empty plugin name");
447
errno = EINVAL;
448
break;
449
}
450
char *option;
451
while((option = strsep(&option_list, ",")) != NULL){
452
if(not add_argument(getplugin(arg), option)){
453
break;
428
if(arg != NULL){
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)){
436
perror("add_argument");
437
return ARGP_ERR_UNKNOWN;
454
438
}
455
439
}
456
440
}
457
441
break;
458
442
case 'E': /* --env-for */
443
if(arg == NULL){
444
break;
445
}
459
446
{
460
447
char *envdef = strchr(arg, ':');
461
448
if(envdef == NULL){
462
argp_error(state, "No colon in \"%s\"", arg);
463
errno = EINVAL;
464
449
break;
465
450
}
466
451
*envdef = '\0';
467
envdef++;
468
if(arg[0] == '\0'){
469
argp_error(state, "Empty plugin name");
470
errno = EINVAL;
471
break;
452
if(not add_environment(getplugin(arg), envdef+1, true)){
453
perror("add_environment");
472
454
}
473
add_environment(getplugin(arg), envdef, true);
474
455
}
475
456
break;
476
457
case 'd': /* --disable */
477
{
458
if(arg != NULL){
478
459
plugin *p = getplugin(arg);
479
if(p != NULL){
480
p->disabled = true;
460
if(p == NULL){
461
return ARGP_ERR_UNKNOWN;
481
462
}
463
p->disabled = true;
482
464
}
483
465
break;
484
466
case 'e': /* --enable */
485
{
467
if(arg != NULL){
486
468
plugin *p = getplugin(arg);
487
if(p != NULL){
488
p->disabled = false;
469
if(p == NULL){
470
return ARGP_ERR_UNKNOWN;
489
471
}
472
p->disabled = false;
490
473
}
491
474
break;
492
475
case 128: /* --plugin-dir */
493
476
free(plugindir);
494
477
plugindir = strdup(arg);
478
if(plugindir == NULL){
479
perror("strdup");
480
}
495
481
break;
496
482
case 129: /* --config-file */
497
483
/* This is already done by parse_opt_config_file() */
498
484
break;
499
485
case 130: /* --userid */
486
errno = 0;
500
487
tmpmax = strtoimax(arg, &tmp, 10);
501
488
if(errno != 0 or tmp == arg or *tmp != '\0'
502
489
or tmpmax != (uid_t)tmpmax){
503
argp_error(state, "Bad user ID number: \"%s\", using %"
504
PRIdMAX, arg, (intmax_t)uid);
505
break;
490
fprintf(stderr, "Bad user ID number: \"%s\", using %"
491
PRIdMAX "\n", arg, (intmax_t)uid);
492
} else {
493
uid = (uid_t)tmpmax;
506
494
}
507
uid = (uid_t)tmpmax;
508
495
break;
509
496
case 131: /* --groupid */
497
errno = 0;
510
498
tmpmax = strtoimax(arg, &tmp, 10);
511
499
if(errno != 0 or tmp == arg or *tmp != '\0'
512
500
or tmpmax != (gid_t)tmpmax){
513
argp_error(state, "Bad group ID number: \"%s\", using %"
514
PRIdMAX, arg, (intmax_t)gid);
515
break;
501
fprintf(stderr, "Bad group ID number: \"%s\", using %"
502
PRIdMAX "\n", arg, (intmax_t)gid);
503
} else {
504
gid = (gid_t)tmpmax;
516
505
}
517
gid = (gid_t)tmpmax;
518
506
break;
519
507
case 132: /* --debug */
520
508
debug = true;
521
509
break;
522
/*
523
* These reproduce what we would get without ARGP_NO_HELP
524
*/
525
case '?': /* --help */
526
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
527
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
528
case -3: /* --usage */
529
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
530
argp_state_help(state, state->out_stream,
531
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
532
case 'V': /* --version */
533
fprintf(state->out_stream, "%s\n", argp_program_version);
534
exit(EXIT_SUCCESS);
535
break;
536
510
/*
537
511
* When adding more options before this line, remember to also add a
538
512
* "case" to the "parse_opt_config_file" function below.
541
515
/* Cryptsetup always passes an argument, which is an empty
542
516
string if "none" was specified in /etc/crypttab. So if
543
517
argument was empty, we ignore it silently. */
544
if(arg[0] == '\0'){
545
break;
518
if(arg[0] != '\0'){
519
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
546
520
}
521
break;
522
case ARGP_KEY_END:
523
break;
547
524
default:
548
525
return ARGP_ERR_UNKNOWN;
549
526
}
550
return errno; /* Set to 0 at start */
527
return 0;
551
528
}
552
529
553
530
/* This option parser is the same as parse_opt() above, except it
555
532
error_t parse_opt_config_file(int key, char *arg,
556
533
__attribute__((unused))
557
534
struct argp_state *state){
558
errno = 0;
559
535
switch(key){
560
536
case 'g': /* --global-options */
561
537
case 'G': /* --global-env */
568
544
case 129: /* --config-file */
569
545
free(argfile);
570
546
argfile = strdup(arg);
547
if(argfile == NULL){
548
perror("strdup");
549
}
571
550
break;
572
551
case 130: /* --userid */
573
552
case 131: /* --groupid */
574
553
case 132: /* --debug */
575
case '?': /* --help */
576
case -3: /* --usage */
577
case 'V': /* --version */
578
554
case ARGP_KEY_ARG:
555
case ARGP_KEY_END:
579
556
break;
580
557
default:
581
558
return ARGP_ERR_UNKNOWN;
582
559
}
583
return errno;
560
return 0;
584
561
}
585
562
586
563
struct argp argp = { .options = options,
590
567
591
568
/* Parse using parse_opt_config_file() in order to get the custom
592
569
config file location, if any. */
593
ret = argp_parse(&argp, argc, argv,
594
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
595
NULL, NULL);
596
switch(ret){
597
case 0:
598
break;
599
case ENOMEM:
600
default:
601
errno = ret;
602
perror("argp_parse");
603
exitstatus = EX_OSERR;
604
goto fallback;
605
case EINVAL:
606
exitstatus = EX_USAGE;
570
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
571
if(ret == ARGP_ERR_UNKNOWN){
572
fprintf(stderr, "Unknown error while parsing arguments\n");
573
exitstatus = EXIT_FAILURE;
607
574
goto fallback;
608
575
}
609
576
627
594
custom_argv = malloc(sizeof(char*) * 2);
628
595
if(custom_argv == NULL){
629
596
perror("malloc");
630
exitstatus = EX_OSERR;
597
exitstatus = EXIT_FAILURE;
631
598
goto fallback;
632
599
}
633
600
custom_argv[0] = argv[0];
650
617
new_arg = strdup(p);
651
618
if(new_arg == NULL){
652
619
perror("strdup");
653
exitstatus = EX_OSERR;
620
exitstatus = EXIT_FAILURE;
654
621
free(org_line);
655
622
goto fallback;
656
623
}
660
627
* ((unsigned int) custom_argc + 1));
661
628
if(custom_argv == NULL){
662
629
perror("realloc");
663
exitstatus = EX_OSERR;
630
exitstatus = EXIT_FAILURE;
664
631
free(org_line);
665
632
goto fallback;
666
633
}
673
640
} while(ret == EOF and errno == EINTR);
674
641
if(ret == EOF){
675
642
perror("fclose");
676
exitstatus = EX_IOERR;
643
exitstatus = EXIT_FAILURE;
677
644
goto fallback;
678
645
}
679
646
free(org_line);
682
649
not affect opening plugins */
683
650
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
684
651
perror("fopen");
685
exitstatus = EX_OSERR;
652
exitstatus = EXIT_FAILURE;
686
653
goto fallback;
687
654
}
688
655
}
689
/* If there were any arguments from the configuration file, pass
690
them to parser as command line arguments */
656
/* If there was any arguments from configuration file,
657
pass them to parser as command arguments */
691
658
if(custom_argv != NULL){
692
ret = argp_parse(&argp, custom_argc, custom_argv,
693
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
694
NULL, NULL);
695
switch(ret){
696
case 0:
697
break;
698
case ENOMEM:
699
default:
700
errno = ret;
701
perror("argp_parse");
702
exitstatus = EX_OSERR;
703
goto fallback;
704
case EINVAL:
705
exitstatus = EX_CONFIG;
659
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
660
0, NULL);
661
if(ret == ARGP_ERR_UNKNOWN){
662
fprintf(stderr, "Unknown error while parsing arguments\n");
663
exitstatus = EXIT_FAILURE;
706
664
goto fallback;
707
665
}
708
666
}
709
667
710
668
/* Parse actual command line arguments, to let them override the
711
669
config file */
712
ret = argp_parse(&argp, argc, argv,
713
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
714
NULL, NULL);
715
switch(ret){
716
case 0:
717
break;
718
case ENOMEM:
719
default:
720
errno = ret;
721
perror("argp_parse");
722
exitstatus = EX_OSERR;
723
goto fallback;
724
case EINVAL:
725
exitstatus = EX_USAGE;
670
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
671
if(ret == ARGP_ERR_UNKNOWN){
672
fprintf(stderr, "Unknown error while parsing arguments\n");
673
exitstatus = EXIT_FAILURE;
726
674
goto fallback;
727
675
}
728
676
772
720
}
773
721
if(dir_fd == -1){
774
722
perror("Could not open plugin dir");
775
exitstatus = EX_UNAVAILABLE;
723
exitstatus = EXIT_FAILURE;
776
724
goto fallback;
777
725
}
778
726
782
730
if(ret < 0){
783
731
perror("set_cloexec_flag");
784
732
TEMP_FAILURE_RETRY(close(dir_fd));
785
exitstatus = EX_OSERR;
733
exitstatus = EXIT_FAILURE;
786
734
goto fallback;
787
735
}
788
736
#endif /* O_CLOEXEC */
791
739
if(dir == NULL){
792
740
perror("Could not open plugin dir");
793
741
TEMP_FAILURE_RETRY(close(dir_fd));
794
exitstatus = EX_OSERR;
742
exitstatus = EXIT_FAILURE;
795
743
goto fallback;
796
744
}
797
745
}
808
756
if(dirst == NULL){
809
757
if(errno == EBADF){
810
758
perror("readdir");
811
exitstatus = EX_IOERR;
759
exitstatus = EXIT_FAILURE;
812
760
goto fallback;
813
761
}
814
762
break;
844
792
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
845
793
size_t suf_len = strlen(*suf);
846
794
if((d_name_len >= suf_len)
847
and (strcmp((dirst->d_name) + d_name_len-suf_len, *suf)
795
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
848
796
== 0)){
849
797
if(debug){
850
798
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
938
886
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
939
887
if(ret == -1){
940
888
perror("pipe");
941
exitstatus = EX_OSERR;
889
exitstatus = EXIT_FAILURE;
942
890
goto fallback;
943
891
}
944
892
/* Ask OS to automatic close the pipe on exec */
945
893
ret = set_cloexec_flag(pipefd[0]);
946
894
if(ret < 0){
947
895
perror("set_cloexec_flag");
948
exitstatus = EX_OSERR;
896
exitstatus = EXIT_FAILURE;
949
897
goto fallback;
950
898
}
951
899
ret = set_cloexec_flag(pipefd[1]);
952
900
if(ret < 0){
953
901
perror("set_cloexec_flag");
954
exitstatus = EX_OSERR;
902
exitstatus = EXIT_FAILURE;
955
903
goto fallback;
956
904
}
957
905
/* Block SIGCHLD until process is safely in process list */
960
908
NULL));
961
909
if(ret < 0){
962
910
perror("sigprocmask");
963
exitstatus = EX_OSERR;
911
exitstatus = EXIT_FAILURE;
964
912
goto fallback;
965
913
}
966
914
/* Starting a new process to be watched */
970
918
} while(pid == -1 and errno == EINTR);
971
919
if(pid == -1){
972
920
perror("fork");
973
exitstatus = EX_OSERR;
921
exitstatus = EXIT_FAILURE;
974
922
goto fallback;
975
923
}
976
924
if(pid == 0){
978
926
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
979
927
if(ret < 0){
980
928
perror("sigaction");
981
_exit(EX_OSERR);
929
_exit(EXIT_FAILURE);
982
930
}
983
931
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
984
932
if(ret < 0){
985
933
perror("sigprocmask");
986
_exit(EX_OSERR);
934
_exit(EXIT_FAILURE);
987
935
}
988
936
989
937
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
990
938
if(ret == -1){
991
939
perror("dup2");
992
_exit(EX_OSERR);
940
_exit(EXIT_FAILURE);
993
941
}
994
942
995
943
if(dirfd(dir) < 0){
1000
948
if(p->environ[0] == NULL){
1001
949
if(execv(filename, p->argv) < 0){
1002
950
perror("execv");
1003
_exit(EX_OSERR);
951
_exit(EXIT_FAILURE);
1004
952
}
1005
953
} else {
1006
954
if(execve(filename, p->argv, p->environ) < 0){
1007
955
perror("execve");
1008
_exit(EX_OSERR);
956
_exit(EXIT_FAILURE);
1009
957
}
1010
958
}
1011
959
/* no return */
1023
971
if(ret < 0){
1024
972
perror("sigprocmask");
1025
973
}
1026
exitstatus = EX_OSERR;
974
exitstatus = EXIT_FAILURE;
1027
975
goto fallback;
1028
976
}
1029
977
1037
985
NULL));
1038
986
if(ret < 0){
1039
987
perror("sigprocmask");
1040
exitstatus = EX_OSERR;
988
exitstatus = EXIT_FAILURE;
1041
989
goto fallback;
1042
990
}
1043
991
1070
1018
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
1071
1019
if(select_ret == -1 and errno != EINTR){
1072
1020
perror("select");
1073
exitstatus = EX_OSERR;
1021
exitstatus = EXIT_FAILURE;
1074
1022
goto fallback;
1075
1023
}
1076
1024
/* OK, now either a process completed, or something can be read
1112
1060
NULL));
1113
1061
if(ret < 0){
1114
1062
perror("sigprocmask");
1115
exitstatus = EX_OSERR;
1063
exitstatus = EXIT_FAILURE;
1116
1064
goto fallback;
1117
1065
}
1118
1066
1126
1074
&sigchld_action.sa_mask, NULL)));
1127
1075
if(ret < 0){
1128
1076
perror("sigprocmask");
1129
exitstatus = EX_OSERR;
1077
exitstatus = EXIT_FAILURE;
1130
1078
goto fallback;
1131
1079
}
1132
1080
1143
1091
proc->buffer_length);
1144
1092
if(not bret){
1145
1093
perror("print_out_password");
1146
exitstatus = EX_IOERR;
1094
exitstatus = EXIT_FAILURE;
1147
1095
}
1148
1096
goto fallback;
1149
1097
}
1162
1110
+ (size_t) BUFFER_SIZE);
1163
1111
if(proc->buffer == NULL){
1164
1112
perror("malloc");
1165
exitstatus = EX_OSERR;
1113
exitstatus = EXIT_FAILURE;
1166
1114
goto fallback;
1167
1115
}
1168
1116
proc->buffer_size += BUFFER_SIZE;
1189
1137
1190
1138
fallback:
1191
1139
1192
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1193
and exitstatus != EX_OK)){
1140
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1194
1141
/* Fallback if all plugins failed, none are found or an error
1195
1142
occured */
1196
1143
bool bret;
1205
1152
bret = print_out_password(passwordbuffer, len);
1206
1153
if(not bret){
1207
1154
perror("print_out_password");
1208
exitstatus = EX_IOERR;
1155
exitstatus = EXIT_FAILURE;
1209
1156
}
1210
1157
}
1211
1158
1213
1160
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1214
1161
if(ret == -1){
1215
1162
perror("sigaction");
1216
exitstatus = EX_OSERR;
1163
exitstatus = EXIT_FAILURE;
1217
1164
}
1218
1165
1219
1166
if(custom_argv != NULL){
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0