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 410
- compare with another revision
- download diff
- download tarball
- view history from revision 410
- Committer: Teddy Hogeborn
- Date: 2009-11-19 18:31:28 UTC
- Revision ID: teddy@fukt.bsnet.se-20091119183128-ttstewh61xmtnil1
* Makefile (LINK_FORTIFY_LD): Bug fix: removed "-fPIE".
* mandos-keygen: Bug fix: Fix quoting for the "--password" option.
* mandos-keygen: Bug fix: Fix quoting for the "--password" option.
- files added:
- dbus-mandos.conf
- 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
*
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
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
29
EXIT_SUCCESS, realloc() */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
29
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(),
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
#include <dirent.h> /* DIR, struct dirent, opendir(),
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
45
46
readdir(), closedir(), dirfd() */
46
47
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
47
48
fcntl(), setuid(), setgid(),
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() */
71
#include <sysexits.h> /* EX_OSERR, EX_USAGE, EX_IOERR,
72
EX_CONFIG, EX_UNAVAILABLE, EX_OK */
68
73
69
74
#define BUFFER_SIZE 256
70
75
81
86
char **environ;
82
87
int envc;
83
88
bool disabled;
84
89
85
90
/* Variables used for running processes*/
86
91
pid_t pid;
87
92
int fd;
99
104
/* Gets an existing plugin based on name,
100
105
or if none is found, creates a new one */
101
106
static plugin *getplugin(char *name){
102
/* Check for exiting plugin with that name */
107
/* Check for existing plugin with that name */
103
108
for(plugin *p = plugin_list; p != NULL; p = p->next){
104
109
if((p->name == name)
105
110
or (p->name and name and (strcmp(p->name, name) == 0))){
107
112
}
108
113
}
109
114
/* Create a new plugin */
110
plugin *new_plugin = malloc(sizeof(plugin));
115
plugin *new_plugin = NULL;
116
do {
117
new_plugin = malloc(sizeof(plugin));
118
} while(new_plugin == NULL and errno == EINTR);
111
119
if(new_plugin == NULL){
112
120
return NULL;
113
121
}
114
122
char *copy_name = NULL;
115
123
if(name != NULL){
116
copy_name = strdup(name);
124
do {
125
copy_name = strdup(name);
126
} while(copy_name == NULL and errno == EINTR);
117
127
if(copy_name == NULL){
128
int e = errno;
118
129
free(new_plugin);
130
errno = e;
119
131
return NULL;
120
132
}
121
133
}
125
137
.disabled = false,
126
138
.next = plugin_list };
127
139
128
new_plugin->argv = malloc(sizeof(char *) * 2);
140
do {
141
new_plugin->argv = malloc(sizeof(char *) * 2);
142
} while(new_plugin->argv == NULL and errno == EINTR);
129
143
if(new_plugin->argv == NULL){
144
int e = errno;
130
145
free(copy_name);
131
146
free(new_plugin);
147
errno = e;
132
148
return NULL;
133
149
}
134
150
new_plugin->argv[0] = copy_name;
135
151
new_plugin->argv[1] = NULL;
136
152
137
new_plugin->environ = malloc(sizeof(char *));
153
do {
154
new_plugin->environ = malloc(sizeof(char *));
155
} while(new_plugin->environ == NULL and errno == EINTR);
138
156
if(new_plugin->environ == NULL){
157
int e = errno;
139
158
free(copy_name);
140
159
free(new_plugin->argv);
141
160
free(new_plugin);
161
errno = e;
142
162
return NULL;
143
163
}
144
164
new_plugin->environ[0] = NULL;
152
172
static bool add_to_char_array(const char *new, char ***array,
153
173
int *len){
154
174
/* Resize the pointed-to array to hold one more pointer */
155
*array = realloc(*array, sizeof(char *)
156
* (size_t) ((*len) + 2));
175
do {
176
*array = realloc(*array, sizeof(char *)
177
* (size_t) ((*len) + 2));
178
} while(*array == NULL and errno == EINTR);
157
179
/* Malloc check */
158
180
if(*array == NULL){
159
181
return false;
160
182
}
161
183
/* Make a copy of the new string */
162
char *copy = strdup(new);
184
char *copy;
185
do {
186
copy = strdup(new);
187
} while(copy == NULL and errno == EINTR);
163
188
if(copy == NULL){
164
189
return false;
165
190
}
191
216
if(strncmp(*e, def, namelen + 1) == 0){
192
217
/* It already exists */
193
218
if(replace){
194
char *new = realloc(*e, strlen(def) + 1);
219
char *new;
220
do {
221
new = realloc(*e, strlen(def) + 1);
222
} while(new == NULL and errno == EINTR);
195
223
if(new == NULL){
196
224
return false;
197
225
}
207
235
/*
208
236
* Based on the example in the GNU LibC manual chapter 13.13 "File
209
237
* Descriptor Flags".
210
* *Note File Descriptor Flags:(libc)Descriptor Flags.
238
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
211
239
*/
212
240
static int set_cloexec_flag(int fd){
213
int ret = fcntl(fd, F_GETFD, 0);
241
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
214
242
/* If reading the flags failed, return error indication now. */
215
243
if(ret < 0){
216
244
return ret;
217
245
}
218
246
/* Store modified flag word in the descriptor. */
219
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
247
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
248
ret | FD_CLOEXEC));
220
249
}
221
250
222
251
279
308
}
280
309
free(plugin_node->environ);
281
310
free(plugin_node->buffer);
282
311
283
312
/* Removes the plugin from the singly-linked list */
284
313
if(plugin_node == plugin_list){
285
314
/* First one - simple */
312
341
struct dirent *dirst;
313
342
struct stat st;
314
343
fd_set rfds_all;
315
int ret, numchars, maxfd = 0;
344
int ret, maxfd = 0;
316
345
ssize_t sret;
317
intmax_t tmpmax;
318
346
uid_t uid = 65534;
319
347
gid_t gid = 65534;
320
348
bool debug = false;
330
358
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
331
359
if(ret == -1){
332
360
perror("sigaddset");
333
exitstatus = EXIT_FAILURE;
361
exitstatus = EX_OSERR;
334
362
goto fallback;
335
363
}
336
364
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
337
365
if(ret == -1){
338
366
perror("sigaction");
339
exitstatus = EXIT_FAILURE;
367
exitstatus = EX_OSERR;
340
368
goto fallback;
341
369
}
342
370
374
402
.doc = "Group ID the plugins will run as", .group = 3 },
375
403
{ .name = "debug", .key = 132,
376
404
.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 },
377
414
{ .name = NULL }
378
415
};
379
416
380
error_t parse_opt(int key, char *arg, __attribute__((unused))
381
struct argp_state *state){
417
error_t parse_opt(int key, char *arg, struct argp_state *state){
418
errno = 0;
382
419
switch(key){
420
char *tmp;
421
intmax_t tmpmax;
383
422
case 'g': /* --global-options */
384
if(arg != NULL){
385
char *p;
386
while((p = strsep(&arg, ",")) != NULL){
387
if(p[0] == '\0'){
388
continue;
389
}
390
if(not add_argument(getplugin(NULL), p)){
391
perror("add_argument");
392
return ARGP_ERR_UNKNOWN;
423
{
424
char *plugin_option;
425
while((plugin_option = strsep(&arg, ",")) != NULL){
426
if(not add_argument(getplugin(NULL), plugin_option)){
427
break;
393
428
}
394
429
}
395
430
}
396
431
break;
397
432
case 'G': /* --global-env */
398
if(arg == NULL){
399
break;
400
}
401
if(not add_environment(getplugin(NULL), arg, true)){
402
perror("add_environment");
403
}
433
add_environment(getplugin(NULL), arg, true);
404
434
break;
405
435
case 'o': /* --options-for */
406
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)){
421
perror("add_argument");
422
return ARGP_ERR_UNKNOWN;
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;
423
454
}
424
455
}
425
456
}
426
457
break;
427
458
case 'E': /* --env-for */
428
if(arg == NULL){
429
break;
430
}
431
459
{
432
460
char *envdef = strchr(arg, ':');
433
461
if(envdef == NULL){
462
argp_error(state, "No colon in \"%s\"", arg);
463
errno = EINVAL;
434
464
break;
435
465
}
436
466
*envdef = '\0';
437
if(not add_environment(getplugin(arg), envdef+1, true)){
438
perror("add_environment");
467
envdef++;
468
if(arg[0] == '\0'){
469
argp_error(state, "Empty plugin name");
470
errno = EINVAL;
471
break;
439
472
}
473
add_environment(getplugin(arg), envdef, true);
440
474
}
441
475
break;
442
476
case 'd': /* --disable */
443
if(arg != NULL){
477
{
444
478
plugin *p = getplugin(arg);
445
if(p == NULL){
446
return ARGP_ERR_UNKNOWN;
479
if(p != NULL){
480
p->disabled = true;
447
481
}
448
p->disabled = true;
449
482
}
450
483
break;
451
484
case 'e': /* --enable */
452
if(arg != NULL){
485
{
453
486
plugin *p = getplugin(arg);
454
if(p == NULL){
455
return ARGP_ERR_UNKNOWN;
487
if(p != NULL){
488
p->disabled = false;
456
489
}
457
p->disabled = false;
458
490
}
459
491
break;
460
492
case 128: /* --plugin-dir */
461
493
free(plugindir);
462
494
plugindir = strdup(arg);
463
if(plugindir == NULL){
464
perror("strdup");
465
}
466
495
break;
467
496
case 129: /* --config-file */
468
497
/* This is already done by parse_opt_config_file() */
469
498
break;
470
499
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'){
474
fprintf(stderr, "Bad user ID number: \"%s\", using %"
475
PRIdMAX "\n", arg, (intmax_t)uid);
476
} else {
477
uid = (uid_t)tmpmax;
500
tmpmax = strtoimax(arg, &tmp, 10);
501
if(errno != 0 or tmp == arg or *tmp != '\0'
502
or tmpmax != (uid_t)tmpmax){
503
argp_error(state, "Bad user ID number: \"%s\", using %"
504
PRIdMAX, arg, (intmax_t)uid);
505
break;
478
506
}
507
uid = (uid_t)tmpmax;
479
508
break;
480
509
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'){
484
fprintf(stderr, "Bad group ID number: \"%s\", using %"
485
PRIdMAX "\n", arg, (intmax_t)gid);
486
} else {
487
gid = (gid_t)tmpmax;
510
tmpmax = strtoimax(arg, &tmp, 10);
511
if(errno != 0 or tmp == arg or *tmp != '\0'
512
or tmpmax != (gid_t)tmpmax){
513
argp_error(state, "Bad group ID number: \"%s\", using %"
514
PRIdMAX, arg, (intmax_t)gid);
515
break;
488
516
}
517
gid = (gid_t)tmpmax;
489
518
break;
490
519
case 132: /* --debug */
491
520
debug = true;
492
521
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;
493
536
/*
494
537
* When adding more options before this line, remember to also add a
495
538
* "case" to the "parse_opt_config_file" function below.
498
541
/* Cryptsetup always passes an argument, which is an empty
499
542
string if "none" was specified in /etc/crypttab. So if
500
543
argument was empty, we ignore it silently. */
501
if(arg[0] != '\0'){
502
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
544
if(arg[0] == '\0'){
545
break;
503
546
}
504
break;
505
case ARGP_KEY_END:
506
break;
507
547
default:
508
548
return ARGP_ERR_UNKNOWN;
509
549
}
510
return 0;
550
return errno; /* Set to 0 at start */
511
551
}
512
552
513
553
/* This option parser is the same as parse_opt() above, except it
515
555
error_t parse_opt_config_file(int key, char *arg,
516
556
__attribute__((unused))
517
557
struct argp_state *state){
558
errno = 0;
518
559
switch(key){
519
560
case 'g': /* --global-options */
520
561
case 'G': /* --global-env */
527
568
case 129: /* --config-file */
528
569
free(argfile);
529
570
argfile = strdup(arg);
530
if(argfile == NULL){
531
perror("strdup");
532
}
533
break;
571
break;
534
572
case 130: /* --userid */
535
573
case 131: /* --groupid */
536
574
case 132: /* --debug */
575
case '?': /* --help */
576
case -3: /* --usage */
577
case 'V': /* --version */
537
578
case ARGP_KEY_ARG:
538
case ARGP_KEY_END:
539
579
break;
540
580
default:
541
581
return ARGP_ERR_UNKNOWN;
542
582
}
543
return 0;
583
return errno;
544
584
}
545
585
546
586
struct argp argp = { .options = options,
550
590
551
591
/* Parse using parse_opt_config_file() in order to get the custom
552
592
config file location, if any. */
553
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
554
if(ret == ARGP_ERR_UNKNOWN){
555
fprintf(stderr, "Unknown error while parsing arguments\n");
556
exitstatus = EXIT_FAILURE;
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;
557
607
goto fallback;
558
608
}
559
609
565
615
conffp = fopen(AFILE, "r");
566
616
} else {
567
617
conffp = fopen(argfile, "r");
568
}
618
}
569
619
if(conffp != NULL){
570
620
char *org_line = NULL;
571
621
char *p, *arg, *new_arg, *line;
572
622
size_t size = 0;
573
623
const char whitespace_delims[] = " \r\t\f\v\n";
574
624
const char comment_delim[] = "#";
575
625
576
626
custom_argc = 1;
577
627
custom_argv = malloc(sizeof(char*) * 2);
578
628
if(custom_argv == NULL){
579
629
perror("malloc");
580
exitstatus = EXIT_FAILURE;
630
exitstatus = EX_OSERR;
581
631
goto fallback;
582
632
}
583
633
custom_argv[0] = argv[0];
584
634
custom_argv[1] = NULL;
585
635
586
636
/* for each line in the config file, strip whitespace and ignore
587
637
commented text */
588
638
while(true){
590
640
if(sret == -1){
591
641
break;
592
642
}
593
643
594
644
line = org_line;
595
645
arg = strsep(&line, comment_delim);
596
646
while((p = strsep(&arg, whitespace_delims)) != NULL){
600
650
new_arg = strdup(p);
601
651
if(new_arg == NULL){
602
652
perror("strdup");
603
exitstatus = EXIT_FAILURE;
653
exitstatus = EX_OSERR;
604
654
free(org_line);
605
655
goto fallback;
606
656
}
610
660
* ((unsigned int) custom_argc + 1));
611
661
if(custom_argv == NULL){
612
662
perror("realloc");
613
exitstatus = EXIT_FAILURE;
663
exitstatus = EX_OSERR;
614
664
free(org_line);
615
665
goto fallback;
616
666
}
617
667
custom_argv[custom_argc-1] = new_arg;
618
custom_argv[custom_argc] = NULL;
668
custom_argv[custom_argc] = NULL;
619
669
}
620
670
}
671
do {
672
ret = fclose(conffp);
673
} while(ret == EOF and errno == EINTR);
674
if(ret == EOF){
675
perror("fclose");
676
exitstatus = EX_IOERR;
677
goto fallback;
678
}
621
679
free(org_line);
622
680
} else {
623
681
/* Check for harmful errors and go to fallback. Other errors might
624
682
not affect opening plugins */
625
683
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
626
684
perror("fopen");
627
exitstatus = EXIT_FAILURE;
685
exitstatus = EX_OSERR;
628
686
goto fallback;
629
687
}
630
688
}
631
/* If there was any arguments from configuration file,
632
pass them to parser as command arguments */
689
/* If there were any arguments from the configuration file, pass
690
them to parser as command line arguments */
633
691
if(custom_argv != NULL){
634
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
635
0, NULL);
636
if(ret == ARGP_ERR_UNKNOWN){
637
fprintf(stderr, "Unknown error while parsing arguments\n");
638
exitstatus = EXIT_FAILURE;
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;
639
706
goto fallback;
640
707
}
641
708
}
642
709
643
710
/* Parse actual command line arguments, to let them override the
644
711
config file */
645
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
646
if(ret == ARGP_ERR_UNKNOWN){
647
fprintf(stderr, "Unknown error while parsing arguments\n");
648
exitstatus = EXIT_FAILURE;
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;
649
726
goto fallback;
650
727
}
651
728
673
750
perror("setuid");
674
751
}
675
752
676
if(plugindir == NULL){
677
dir = opendir(PDIR);
678
} else {
679
dir = opendir(plugindir);
680
}
681
682
if(dir == NULL){
683
perror("Could not open plugin dir");
684
exitstatus = EXIT_FAILURE;
685
goto fallback;
686
}
687
688
/* Set the FD_CLOEXEC flag on the directory, if possible */
753
/* Open plugin directory with close_on_exec flag */
689
754
{
690
int dir_fd = dirfd(dir);
691
if(dir_fd >= 0){
692
ret = set_cloexec_flag(dir_fd);
693
if(ret < 0){
694
perror("set_cloexec_flag");
695
exitstatus = EXIT_FAILURE;
696
goto fallback;
697
}
755
int dir_fd = -1;
756
if(plugindir == NULL){
757
dir_fd = open(PDIR, O_RDONLY |
758
#ifdef O_CLOEXEC
759
O_CLOEXEC
760
#else /* not O_CLOEXEC */
761
0
762
#endif /* not O_CLOEXEC */
763
);
764
} else {
765
dir_fd = open(plugindir, O_RDONLY |
766
#ifdef O_CLOEXEC
767
O_CLOEXEC
768
#else /* not O_CLOEXEC */
769
0
770
#endif /* not O_CLOEXEC */
771
);
772
}
773
if(dir_fd == -1){
774
perror("Could not open plugin dir");
775
exitstatus = EX_UNAVAILABLE;
776
goto fallback;
777
}
778
779
#ifndef O_CLOEXEC
780
/* Set the FD_CLOEXEC flag on the directory */
781
ret = set_cloexec_flag(dir_fd);
782
if(ret < 0){
783
perror("set_cloexec_flag");
784
TEMP_FAILURE_RETRY(close(dir_fd));
785
exitstatus = EX_OSERR;
786
goto fallback;
787
}
788
#endif /* O_CLOEXEC */
789
790
dir = fdopendir(dir_fd);
791
if(dir == NULL){
792
perror("Could not open plugin dir");
793
TEMP_FAILURE_RETRY(close(dir_fd));
794
exitstatus = EX_OSERR;
795
goto fallback;
698
796
}
699
797
}
700
798
702
800
703
801
/* Read and execute any executable in the plugin directory*/
704
802
while(true){
705
dirst = readdir(dir);
803
do {
804
dirst = readdir(dir);
805
} while(dirst == NULL and errno == EINTR);
706
806
707
807
/* All directory entries have been processed */
708
808
if(dirst == NULL){
709
809
if(errno == EBADF){
710
810
perror("readdir");
711
exitstatus = EXIT_FAILURE;
811
exitstatus = EX_IOERR;
712
812
goto fallback;
713
813
}
714
814
break;
759
859
continue;
760
860
}
761
861
}
762
862
763
863
char *filename;
764
864
if(plugindir == NULL){
765
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
865
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
866
dirst->d_name));
766
867
} else {
767
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
868
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
869
plugindir,
870
dirst->d_name));
768
871
}
769
872
if(ret < 0){
770
873
perror("asprintf");
771
874
continue;
772
875
}
773
876
774
ret = stat(filename, &st);
877
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
775
878
if(ret == -1){
776
879
perror("stat");
777
880
free(filename);
778
881
continue;
779
882
}
780
883
781
884
/* Ignore non-executable files */
782
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
885
if(not S_ISREG(st.st_mode)
886
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
783
887
if(debug){
784
888
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
785
889
" with bad type or mode\n", filename);
831
935
}
832
936
833
937
int pipefd[2];
834
ret = pipe(pipefd);
938
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
835
939
if(ret == -1){
836
940
perror("pipe");
837
exitstatus = EXIT_FAILURE;
941
exitstatus = EX_OSERR;
838
942
goto fallback;
839
943
}
840
944
/* Ask OS to automatic close the pipe on exec */
841
945
ret = set_cloexec_flag(pipefd[0]);
842
946
if(ret < 0){
843
947
perror("set_cloexec_flag");
844
exitstatus = EXIT_FAILURE;
948
exitstatus = EX_OSERR;
845
949
goto fallback;
846
950
}
847
951
ret = set_cloexec_flag(pipefd[1]);
848
952
if(ret < 0){
849
953
perror("set_cloexec_flag");
850
exitstatus = EXIT_FAILURE;
954
exitstatus = EX_OSERR;
851
955
goto fallback;
852
956
}
853
957
/* Block SIGCHLD until process is safely in process list */
854
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
958
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
959
&sigchld_action.sa_mask,
960
NULL));
855
961
if(ret < 0){
856
962
perror("sigprocmask");
857
exitstatus = EXIT_FAILURE;
963
exitstatus = EX_OSERR;
858
964
goto fallback;
859
965
}
860
966
/* Starting a new process to be watched */
861
pid_t pid = fork();
967
pid_t pid;
968
do {
969
pid = fork();
970
} while(pid == -1 and errno == EINTR);
862
971
if(pid == -1){
863
972
perror("fork");
864
exitstatus = EXIT_FAILURE;
973
exitstatus = EX_OSERR;
865
974
goto fallback;
866
975
}
867
976
if(pid == 0){
869
978
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
870
979
if(ret < 0){
871
980
perror("sigaction");
872
_exit(EXIT_FAILURE);
981
_exit(EX_OSERR);
873
982
}
874
983
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
875
984
if(ret < 0){
876
985
perror("sigprocmask");
877
_exit(EXIT_FAILURE);
986
_exit(EX_OSERR);
878
987
}
879
988
880
989
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
881
990
if(ret == -1){
882
991
perror("dup2");
883
_exit(EXIT_FAILURE);
992
_exit(EX_OSERR);
884
993
}
885
994
886
995
if(dirfd(dir) < 0){
891
1000
if(p->environ[0] == NULL){
892
1001
if(execv(filename, p->argv) < 0){
893
1002
perror("execv");
894
_exit(EXIT_FAILURE);
1003
_exit(EX_OSERR);
895
1004
}
896
1005
} else {
897
1006
if(execve(filename, p->argv, p->environ) < 0){
898
1007
perror("execve");
899
_exit(EXIT_FAILURE);
1008
_exit(EX_OSERR);
900
1009
}
901
1010
}
902
1011
/* no return */
903
1012
}
904
1013
/* Parent process */
905
close(pipefd[1]); /* Close unused write end of pipe */
1014
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1015
pipe */
906
1016
free(filename);
907
1017
plugin *new_plugin = getplugin(dirst->d_name);
908
1018
if(new_plugin == NULL){
909
1019
perror("getplugin");
910
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1020
ret = (int)(TEMP_FAILURE_RETRY
1021
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1022
NULL)));
911
1023
if(ret < 0){
912
1024
perror("sigprocmask");
913
1025
}
914
exitstatus = EXIT_FAILURE;
1026
exitstatus = EX_OSERR;
915
1027
goto fallback;
916
1028
}
917
1029
920
1032
921
1033
/* Unblock SIGCHLD so signal handler can be run if this process
922
1034
has already completed */
923
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1035
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1036
&sigchld_action.sa_mask,
1037
NULL));
924
1038
if(ret < 0){
925
1039
perror("sigprocmask");
926
exitstatus = EXIT_FAILURE;
1040
exitstatus = EX_OSERR;
927
1041
goto fallback;
928
1042
}
929
1043
930
FD_SET(new_plugin->fd, &rfds_all);
1044
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1045
-Wconversion */
931
1046
932
1047
if(maxfd < new_plugin->fd){
933
1048
maxfd = new_plugin->fd;
934
1049
}
935
1050
}
936
1051
937
closedir(dir);
1052
TEMP_FAILURE_RETRY(closedir(dir));
938
1053
dir = NULL;
1054
free_plugin(getplugin(NULL));
939
1055
940
1056
for(plugin *p = plugin_list; p != NULL; p = p->next){
941
1057
if(p->pid != 0){
952
1068
while(plugin_list){
953
1069
fd_set rfds = rfds_all;
954
1070
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
955
if(select_ret == -1){
1071
if(select_ret == -1 and errno != EINTR){
956
1072
perror("select");
957
exitstatus = EXIT_FAILURE;
1073
exitstatus = EX_OSERR;
958
1074
goto fallback;
959
1075
}
960
1076
/* OK, now either a process completed, or something can be read
966
1082
if(not WIFEXITED(proc->status)
967
1083
or WEXITSTATUS(proc->status) != 0){
968
1084
/* Bad exit by plugin */
969
1085
970
1086
if(debug){
971
1087
if(WIFEXITED(proc->status)){
972
1088
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
975
1091
WEXITSTATUS(proc->status));
976
1092
} else if(WIFSIGNALED(proc->status)){
977
1093
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
978
" signal %d\n", proc->name,
1094
" signal %d: %s\n", proc->name,
979
1095
(intmax_t) (proc->pid),
980
WTERMSIG(proc->status));
1096
WTERMSIG(proc->status),
1097
strsignal(WTERMSIG(proc->status)));
981
1098
} else if(WCOREDUMP(proc->status)){
982
1099
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
983
1100
" core\n", proc->name, (intmax_t) (proc->pid));
985
1102
}
986
1103
987
1104
/* Remove the plugin */
988
FD_CLR(proc->fd, &rfds_all);
989
1105
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1106
-Wconversion */
1107
990
1108
/* Block signal while modifying process_list */
991
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1109
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1110
(SIG_BLOCK,
1111
&sigchld_action.sa_mask,
1112
NULL));
992
1113
if(ret < 0){
993
1114
perror("sigprocmask");
994
exitstatus = EXIT_FAILURE;
1115
exitstatus = EX_OSERR;
995
1116
goto fallback;
996
1117
}
997
1118
1000
1121
proc = next_plugin;
1001
1122
1002
1123
/* We are done modifying process list, so unblock signal */
1003
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1004
NULL);
1124
ret = (int)(TEMP_FAILURE_RETRY
1125
(sigprocmask(SIG_UNBLOCK,
1126
&sigchld_action.sa_mask, NULL)));
1005
1127
if(ret < 0){
1006
1128
perror("sigprocmask");
1007
exitstatus = EXIT_FAILURE;
1129
exitstatus = EX_OSERR;
1008
1130
goto fallback;
1009
1131
}
1010
1132
1021
1143
proc->buffer_length);
1022
1144
if(not bret){
1023
1145
perror("print_out_password");
1024
exitstatus = EXIT_FAILURE;
1146
exitstatus = EX_IOERR;
1025
1147
}
1026
1148
goto fallback;
1027
1149
}
1028
1150
1029
1151
/* This process has not completed. Does it have any output? */
1030
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1152
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1153
warning from
1154
-Wconversion */
1031
1155
/* This process had nothing to say at this time */
1032
1156
proc = proc->next;
1033
1157
continue;
1038
1162
+ (size_t) BUFFER_SIZE);
1039
1163
if(proc->buffer == NULL){
1040
1164
perror("malloc");
1041
exitstatus = EXIT_FAILURE;
1165
exitstatus = EX_OSERR;
1042
1166
goto fallback;
1043
1167
}
1044
1168
proc->buffer_size += BUFFER_SIZE;
1045
1169
}
1046
1170
/* Read from the process */
1047
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1048
BUFFER_SIZE);
1171
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1172
proc->buffer
1173
+ proc->buffer_length,
1174
BUFFER_SIZE));
1049
1175
if(sret < 0){
1050
1176
/* Read error from this process; ignore the error */
1051
1177
proc = proc->next;
1059
1185
}
1060
1186
}
1061
1187
}
1062
1063
1188
1189
1064
1190
fallback:
1065
1191
1066
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1192
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1193
and exitstatus != EX_OK)){
1067
1194
/* Fallback if all plugins failed, none are found or an error
1068
1195
occured */
1069
1196
bool bret;
1078
1205
bret = print_out_password(passwordbuffer, len);
1079
1206
if(not bret){
1080
1207
perror("print_out_password");
1081
exitstatus = EXIT_FAILURE;
1208
exitstatus = EX_IOERR;
1082
1209
}
1083
1210
}
1084
1211
1086
1213
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1087
1214
if(ret == -1){
1088
1215
perror("sigaction");
1089
exitstatus = EXIT_FAILURE;
1216
exitstatus = EX_OSERR;
1090
1217
}
1091
1218
1092
1219
if(custom_argv != NULL){
1113
1240
}
1114
1241
1115
1242
/* Wait for any remaining child processes to terminate */
1116
do{
1243
do {
1117
1244
ret = wait(NULL);
1118
1245
} while(ret >= 0);
1119
1246
if(errno != ECHILD){
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0