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 882
- compare with another revision
- download diff
- download tarball
- view history from revision 882
- Committer: Teddy Hogeborn
- Date: 2016-10-09 22:35:41 UTC
- Revision ID: teddy@recompile.se-20161009223541-2g2xrvfii5m5ibjw
Stop the GnuPG agent after Debian package installation
* debian/mandos-client.postinst (create_key): Stop GPG agent after
running mandos-keygen.
* debian/mandos-client.postinst (create_key): Stop GPG agent after
running mandos-keygen.
- files added:
- DBUS-API
- debian/source
- debian/upstream
- network-hooks.d
- plugin-helpers
- files modified:
- .bzrignore
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
*
5
* Copyright © 2008,2009 Teddy Hogeborn
6
* Copyright © 2008,2009 Björn Påhlsson
5
* Copyright © 2008-2016 Teddy Hogeborn
6
* Copyright © 2008-2016 Björn Påhlsson
7
7
*
8
8
* This program is free software: you can redistribute it and/or
9
9
* modify it under the terms of the GNU General Public License as
19
19
* along with this program. If not, see
20
20
* <http://www.gnu.org/licenses/>.
21
21
*
22
* Contact the authors at <mandos@fukt.bsnet.se>.
22
* Contact the authors at <mandos@recompile.se>.
23
23
*/
24
24
25
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
asprintf() */
26
O_CLOEXEC, pipe2() */
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
#include <stdio.h> /* perror, fileno(), fprintf(),
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, opendir(), stat(), struct
34
stat, waitpid(), WIFEXITED(),
35
WEXITSTATUS(), wait(), pid_t,
36
uid_t, gid_t, getuid(), getgid(),
37
dirfd() */
31
#include <stdio.h> /* fileno(), fprintf(),
32
stderr, STDOUT_FILENO, fclose() */
33
#include <sys/types.h> /* fstat(), struct stat, waitpid(),
34
WIFEXITED(), WEXITSTATUS(), wait(),
35
pid_t, uid_t, gid_t, getuid(),
36
getgid() */
38
37
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
39
38
FD_SET(), FD_ISSET(), FD_CLR */
40
39
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
41
WEXITSTATUS() */
42
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
40
WEXITSTATUS(), WTERMSIG() */
41
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
43
42
#include <iso646.h> /* and, or, not */
44
#include <dirent.h> /* DIR, struct dirent, opendir(),
45
readdir(), closedir(), dirfd() */
46
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
47
fcntl(), setuid(), setgid(),
48
F_GETFD, F_SETFD, FD_CLOEXEC,
49
access(), pipe(), fork(), close()
50
dup2(), STDOUT_FILENO, _exit(),
51
execv(), write(), read(),
52
close() */
43
#include <dirent.h> /* struct dirent, scandirat() */
44
#include <unistd.h> /* fcntl(), F_GETFD, F_SETFD,
45
FD_CLOEXEC, write(), STDOUT_FILENO,
46
struct stat, fstat(), close(),
47
setgid(), setuid(), S_ISREG(),
48
faccessat() pipe2(), fork(),
49
_exit(), dup2(), fexecve(), read()
50
*/
53
51
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
54
FD_CLOEXEC */
55
#include <string.h> /* strsep, strlen(), asprintf() */
52
FD_CLOEXEC, openat(), scandirat(),
53
pipe2() */
54
#include <string.h> /* strsep, strlen(), strsignal(),
55
strcmp(), strncmp() */
56
56
#include <errno.h> /* errno */
57
57
#include <argp.h> /* struct argp_option, struct
58
58
argp_state, struct argp,
66
66
*/
67
67
#include <errno.h> /* errno, EBADF */
68
68
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
69
#include <sysexits.h> /* EX_OSERR, EX_USAGE, EX_IOERR,
70
EX_CONFIG, EX_UNAVAILABLE, EX_OK */
71
#include <errno.h> /* errno */
72
#include <error.h> /* error() */
73
#include <fnmatch.h> /* fnmatch() */
69
74
70
75
#define BUFFER_SIZE 256
71
76
72
77
#define PDIR "/lib/mandos/plugins.d"
78
#define PHDIR "/lib/mandos/plugin-helpers"
73
79
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
74
80
75
81
const char *argp_program_version = "plugin-runner " VERSION;
76
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
82
const char *argp_program_bug_address = "<mandos@recompile.se>";
77
83
78
84
typedef struct plugin{
79
85
char *name; /* can be NULL or any plugin name */
99
105
100
106
/* Gets an existing plugin based on name,
101
107
or if none is found, creates a new one */
108
__attribute__((warn_unused_result))
102
109
static plugin *getplugin(char *name){
103
/* Check for exiting plugin with that name */
110
/* Check for existing plugin with that name */
104
111
for(plugin *p = plugin_list; p != NULL; p = p->next){
105
112
if((p->name == name)
106
113
or (p->name and name and (strcmp(p->name, name) == 0))){
108
115
}
109
116
}
110
117
/* Create a new plugin */
111
plugin *new_plugin = malloc(sizeof(plugin));
118
plugin *new_plugin = NULL;
119
do {
120
new_plugin = malloc(sizeof(plugin));
121
} while(new_plugin == NULL and errno == EINTR);
112
122
if(new_plugin == NULL){
113
123
return NULL;
114
124
}
115
125
char *copy_name = NULL;
116
126
if(name != NULL){
117
copy_name = strdup(name);
127
do {
128
copy_name = strdup(name);
129
} while(copy_name == NULL and errno == EINTR);
118
130
if(copy_name == NULL){
131
int e = errno;
119
132
free(new_plugin);
133
errno = e;
120
134
return NULL;
121
135
}
122
136
}
126
140
.disabled = false,
127
141
.next = plugin_list };
128
142
129
new_plugin->argv = malloc(sizeof(char *) * 2);
143
do {
144
new_plugin->argv = malloc(sizeof(char *) * 2);
145
} while(new_plugin->argv == NULL and errno == EINTR);
130
146
if(new_plugin->argv == NULL){
147
int e = errno;
131
148
free(copy_name);
132
149
free(new_plugin);
150
errno = e;
133
151
return NULL;
134
152
}
135
153
new_plugin->argv[0] = copy_name;
136
154
new_plugin->argv[1] = NULL;
137
155
138
new_plugin->environ = malloc(sizeof(char *));
156
do {
157
new_plugin->environ = malloc(sizeof(char *));
158
} while(new_plugin->environ == NULL and errno == EINTR);
139
159
if(new_plugin->environ == NULL){
160
int e = errno;
140
161
free(copy_name);
141
162
free(new_plugin->argv);
142
163
free(new_plugin);
164
errno = e;
143
165
return NULL;
144
166
}
145
167
new_plugin->environ[0] = NULL;
150
172
}
151
173
152
174
/* Helper function for add_argument and add_environment */
175
__attribute__((nonnull, warn_unused_result))
153
176
static bool add_to_char_array(const char *new, char ***array,
154
177
int *len){
155
178
/* Resize the pointed-to array to hold one more pointer */
156
*array = realloc(*array, sizeof(char *)
157
* (size_t) ((*len) + 2));
179
char **new_array = NULL;
180
do {
181
new_array = realloc(*array, sizeof(char *)
182
* (size_t) ((*len) + 2));
183
} while(new_array == NULL and errno == EINTR);
158
184
/* Malloc check */
159
if(*array == NULL){
185
if(new_array == NULL){
160
186
return false;
161
187
}
188
*array = new_array;
162
189
/* Make a copy of the new string */
163
char *copy = strdup(new);
190
char *copy;
191
do {
192
copy = strdup(new);
193
} while(copy == NULL and errno == EINTR);
164
194
if(copy == NULL){
165
195
return false;
166
196
}
173
203
}
174
204
175
205
/* Add to a plugin's argument vector */
206
__attribute__((nonnull(2), warn_unused_result))
176
207
static bool add_argument(plugin *p, const char *arg){
177
208
if(p == NULL){
178
209
return false;
181
212
}
182
213
183
214
/* Add to a plugin's environment */
215
__attribute__((nonnull(2), warn_unused_result))
184
216
static bool add_environment(plugin *p, const char *def, bool replace){
185
217
if(p == NULL){
186
218
return false;
188
220
/* namelen = length of name of environment variable */
189
221
size_t namelen = (size_t)(strchrnul(def, '=') - def);
190
222
/* Search for this environment variable */
191
for(char **e = p->environ; *e != NULL; e++){
192
if(strncmp(*e, def, namelen + 1) == 0){
223
for(char **envdef = p->environ; *envdef != NULL; envdef++){
224
if(strncmp(*envdef, def, namelen + 1) == 0){
193
225
/* It already exists */
194
226
if(replace){
195
char *new = realloc(*e, strlen(def) + 1);
196
if(new == NULL){
227
char *new_envdef;
228
do {
229
new_envdef = realloc(*envdef, strlen(def) + 1);
230
} while(new_envdef == NULL and errno == EINTR);
231
if(new_envdef == NULL){
197
232
return false;
198
233
}
199
*e = new;
200
strcpy(*e, def);
234
*envdef = new_envdef;
235
strcpy(*envdef, def);
201
236
}
202
237
return true;
203
238
}
205
240
return add_to_char_array(def, &(p->environ), &(p->envc));
206
241
}
207
242
243
#ifndef O_CLOEXEC
208
244
/*
209
245
* Based on the example in the GNU LibC manual chapter 13.13 "File
210
246
* Descriptor Flags".
211
* *Note File Descriptor Flags:(libc)Descriptor Flags.
247
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
212
248
*/
249
__attribute__((warn_unused_result))
213
250
static int set_cloexec_flag(int fd){
214
int ret = fcntl(fd, F_GETFD, 0);
251
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
215
252
/* If reading the flags failed, return error indication now. */
216
253
if(ret < 0){
217
254
return ret;
218
255
}
219
256
/* Store modified flag word in the descriptor. */
220
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
257
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
258
ret | FD_CLOEXEC));
221
259
}
260
#endif /* not O_CLOEXEC */
222
261
223
262
224
263
/* Mark processes as completed when they exit, and save their exit
238
277
/* No child processes */
239
278
break;
240
279
}
241
perror("waitpid");
280
error(0, errno, "waitpid");
242
281
}
243
282
244
283
/* A child exited, find it in process_list */
256
295
}
257
296
258
297
/* Prints out a password to stdout */
298
__attribute__((nonnull, warn_unused_result))
259
299
static bool print_out_password(const char *buffer, size_t length){
260
300
ssize_t ret;
261
301
for(size_t written = 0; written < length; written += (size_t)ret){
269
309
}
270
310
271
311
/* Removes and free a plugin from the plugin list */
312
__attribute__((nonnull))
272
313
static void free_plugin(plugin *plugin_node){
273
314
274
315
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
306
347
307
348
int main(int argc, char *argv[]){
308
349
char *plugindir = NULL;
350
char *pluginhelperdir = NULL;
309
351
char *argfile = NULL;
310
352
FILE *conffp;
311
size_t d_name_len;
312
DIR *dir = NULL;
313
struct dirent *dirst;
353
struct dirent **direntries = NULL;
314
354
struct stat st;
315
355
fd_set rfds_all;
316
356
int ret, maxfd = 0;
317
357
ssize_t sret;
318
intmax_t tmpmax;
319
358
uid_t uid = 65534;
320
359
gid_t gid = 65534;
321
360
bool debug = false;
325
364
.sa_flags = SA_NOCLDSTOP };
326
365
char **custom_argv = NULL;
327
366
int custom_argc = 0;
367
int dir_fd = -1;
328
368
329
369
/* Establish a signal handler */
330
370
sigemptyset(&sigchld_action.sa_mask);
331
371
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
332
372
if(ret == -1){
333
perror("sigaddset");
334
exitstatus = EXIT_FAILURE;
373
error(0, errno, "sigaddset");
374
exitstatus = EX_OSERR;
335
375
goto fallback;
336
376
}
337
377
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
338
378
if(ret == -1){
339
perror("sigaction");
340
exitstatus = EXIT_FAILURE;
379
error(0, errno, "sigaction");
380
exitstatus = EX_OSERR;
341
381
goto fallback;
342
382
}
343
383
375
415
.doc = "Group ID the plugins will run as", .group = 3 },
376
416
{ .name = "debug", .key = 132,
377
417
.doc = "Debug mode", .group = 4 },
418
{ .name = "plugin-helper-dir", .key = 133,
419
.arg = "DIRECTORY",
420
.doc = "Specify a different plugin helper directory",
421
.group = 2 },
422
/*
423
* These reproduce what we would get without ARGP_NO_HELP
424
*/
425
{ .name = "help", .key = '?',
426
.doc = "Give this help list", .group = -1 },
427
{ .name = "usage", .key = -3,
428
.doc = "Give a short usage message", .group = -1 },
429
{ .name = "version", .key = 'V',
430
.doc = "Print program version", .group = -1 },
378
431
{ .name = NULL }
379
432
};
380
433
381
error_t parse_opt(int key, char *arg, __attribute__((unused))
382
struct argp_state *state){
383
char *tmp;
434
__attribute__((nonnull(3)))
435
error_t parse_opt(int key, char *arg, struct argp_state *state){
436
errno = 0;
384
437
switch(key){
438
char *tmp;
439
intmax_t tmp_id;
385
440
case 'g': /* --global-options */
386
if(arg != NULL){
441
{
387
442
char *plugin_option;
388
443
while((plugin_option = strsep(&arg, ",")) != NULL){
389
if(plugin_option[0] == '\0'){
390
continue;
391
}
392
444
if(not add_argument(getplugin(NULL), plugin_option)){
393
perror("add_argument");
394
return ARGP_ERR_UNKNOWN;
445
break;
395
446
}
396
447
}
448
errno = 0;
397
449
}
398
450
break;
399
451
case 'G': /* --global-env */
400
if(arg == NULL){
401
break;
402
}
403
if(not add_environment(getplugin(NULL), arg, true)){
404
perror("add_environment");
452
if(add_environment(getplugin(NULL), arg, true)){
453
errno = 0;
405
454
}
406
455
break;
407
456
case 'o': /* --options-for */
408
if(arg != NULL){
409
char *plugin_name = strsep(&arg, ":");
410
if(plugin_name[0] == '\0'){
411
break;
412
}
413
char *plugin_option;
414
while((plugin_option = strsep(&arg, ",")) != NULL){
415
if(not add_argument(getplugin(plugin_name), plugin_option)){
416
perror("add_argument");
417
return ARGP_ERR_UNKNOWN;
457
{
458
char *option_list = strchr(arg, ':');
459
if(option_list == NULL){
460
argp_error(state, "No colon in \"%s\"", arg);
461
errno = EINVAL;
462
break;
463
}
464
*option_list = '\0';
465
option_list++;
466
if(arg[0] == '\0'){
467
argp_error(state, "Empty plugin name");
468
errno = EINVAL;
469
break;
470
}
471
char *option;
472
while((option = strsep(&option_list, ",")) != NULL){
473
if(not add_argument(getplugin(arg), option)){
474
break;
418
475
}
419
476
}
477
errno = 0;
420
478
}
421
479
break;
422
480
case 'E': /* --env-for */
423
if(arg == NULL){
424
break;
425
}
426
481
{
427
482
char *envdef = strchr(arg, ':');
428
483
if(envdef == NULL){
484
argp_error(state, "No colon in \"%s\"", arg);
485
errno = EINVAL;
429
486
break;
430
487
}
431
488
*envdef = '\0';
432
if(not add_environment(getplugin(arg), envdef+1, true)){
433
perror("add_environment");
489
envdef++;
490
if(arg[0] == '\0'){
491
argp_error(state, "Empty plugin name");
492
errno = EINVAL;
493
break;
494
}
495
if(add_environment(getplugin(arg), envdef, true)){
496
errno = 0;
434
497
}
435
498
}
436
499
break;
437
500
case 'd': /* --disable */
438
if(arg != NULL){
501
{
439
502
plugin *p = getplugin(arg);
440
if(p == NULL){
441
return ARGP_ERR_UNKNOWN;
503
if(p != NULL){
504
p->disabled = true;
505
errno = 0;
442
506
}
443
p->disabled = true;
444
507
}
445
508
break;
446
509
case 'e': /* --enable */
447
if(arg != NULL){
510
{
448
511
plugin *p = getplugin(arg);
449
if(p == NULL){
450
return ARGP_ERR_UNKNOWN;
512
if(p != NULL){
513
p->disabled = false;
514
errno = 0;
451
515
}
452
p->disabled = false;
453
516
}
454
517
break;
455
518
case 128: /* --plugin-dir */
456
519
free(plugindir);
457
520
plugindir = strdup(arg);
458
if(plugindir == NULL){
459
perror("strdup");
460
}
521
if(plugindir != NULL){
522
errno = 0;
523
}
461
524
break;
462
525
case 129: /* --config-file */
463
526
/* This is already done by parse_opt_config_file() */
464
527
break;
465
528
case 130: /* --userid */
466
errno = 0;
467
tmpmax = strtoimax(arg, &tmp, 10);
529
tmp_id = strtoimax(arg, &tmp, 10);
468
530
if(errno != 0 or tmp == arg or *tmp != '\0'
469
or tmpmax != (uid_t)tmpmax){
470
fprintf(stderr, "Bad user ID number: \"%s\", using %"
471
PRIdMAX "\n", arg, (intmax_t)uid);
472
} else {
473
uid = (uid_t)tmpmax;
531
or tmp_id != (uid_t)tmp_id){
532
argp_error(state, "Bad user ID number: \"%s\", using %"
533
PRIdMAX, arg, (intmax_t)uid);
534
break;
474
535
}
536
uid = (uid_t)tmp_id;
537
errno = 0;
475
538
break;
476
539
case 131: /* --groupid */
477
errno = 0;
478
tmpmax = strtoimax(arg, &tmp, 10);
540
tmp_id = strtoimax(arg, &tmp, 10);
479
541
if(errno != 0 or tmp == arg or *tmp != '\0'
480
or tmpmax != (gid_t)tmpmax){
481
fprintf(stderr, "Bad group ID number: \"%s\", using %"
482
PRIdMAX "\n", arg, (intmax_t)gid);
483
} else {
484
gid = (gid_t)tmpmax;
542
or tmp_id != (gid_t)tmp_id){
543
argp_error(state, "Bad group ID number: \"%s\", using %"
544
PRIdMAX, arg, (intmax_t)gid);
545
break;
485
546
}
547
gid = (gid_t)tmp_id;
548
errno = 0;
486
549
break;
487
550
case 132: /* --debug */
488
551
debug = true;
489
552
break;
553
case 133: /* --plugin-helper-dir */
554
free(pluginhelperdir);
555
pluginhelperdir = strdup(arg);
556
if(pluginhelperdir != NULL){
557
errno = 0;
558
}
559
break;
560
/*
561
* These reproduce what we would get without ARGP_NO_HELP
562
*/
563
case '?': /* --help */
564
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
565
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
566
case -3: /* --usage */
567
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
568
argp_state_help(state, state->out_stream,
569
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
570
case 'V': /* --version */
571
fprintf(state->out_stream, "%s\n", argp_program_version);
572
exit(EXIT_SUCCESS);
573
break;
490
574
/*
491
575
* When adding more options before this line, remember to also add a
492
576
* "case" to the "parse_opt_config_file" function below.
495
579
/* Cryptsetup always passes an argument, which is an empty
496
580
string if "none" was specified in /etc/crypttab. So if
497
581
argument was empty, we ignore it silently. */
498
if(arg[0] != '\0'){
499
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
582
if(arg[0] == '\0'){
583
break;
500
584
}
501
break;
502
case ARGP_KEY_END:
503
break;
504
585
default:
505
586
return ARGP_ERR_UNKNOWN;
506
587
}
507
return 0;
588
return errno; /* Set to 0 at start */
508
589
}
509
590
510
591
/* This option parser is the same as parse_opt() above, except it
512
593
error_t parse_opt_config_file(int key, char *arg,
513
594
__attribute__((unused))
514
595
struct argp_state *state){
596
errno = 0;
515
597
switch(key){
516
598
case 'g': /* --global-options */
517
599
case 'G': /* --global-env */
524
606
case 129: /* --config-file */
525
607
free(argfile);
526
608
argfile = strdup(arg);
527
if(argfile == NULL){
528
perror("strdup");
609
if(argfile != NULL){
610
errno = 0;
529
611
}
530
break;
612
break;
531
613
case 130: /* --userid */
532
614
case 131: /* --groupid */
533
615
case 132: /* --debug */
616
case 133: /* --plugin-helper-dir */
617
case '?': /* --help */
618
case -3: /* --usage */
619
case 'V': /* --version */
534
620
case ARGP_KEY_ARG:
535
case ARGP_KEY_END:
536
621
break;
537
622
default:
538
623
return ARGP_ERR_UNKNOWN;
539
624
}
540
return 0;
625
return errno;
541
626
}
542
627
543
628
struct argp argp = { .options = options,
547
632
548
633
/* Parse using parse_opt_config_file() in order to get the custom
549
634
config file location, if any. */
550
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
551
if(ret == ARGP_ERR_UNKNOWN){
552
fprintf(stderr, "Unknown error while parsing arguments\n");
553
exitstatus = EXIT_FAILURE;
635
ret = argp_parse(&argp, argc, argv,
636
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
637
NULL, NULL);
638
switch(ret){
639
case 0:
640
break;
641
case ENOMEM:
642
default:
643
errno = ret;
644
error(0, errno, "argp_parse");
645
exitstatus = EX_OSERR;
646
goto fallback;
647
case EINVAL:
648
exitstatus = EX_USAGE;
554
649
goto fallback;
555
650
}
556
651
562
657
conffp = fopen(AFILE, "r");
563
658
} else {
564
659
conffp = fopen(argfile, "r");
565
}
660
}
566
661
if(conffp != NULL){
567
662
char *org_line = NULL;
568
663
char *p, *arg, *new_arg, *line;
573
668
custom_argc = 1;
574
669
custom_argv = malloc(sizeof(char*) * 2);
575
670
if(custom_argv == NULL){
576
perror("malloc");
577
exitstatus = EXIT_FAILURE;
671
error(0, errno, "malloc");
672
exitstatus = EX_OSERR;
578
673
goto fallback;
579
674
}
580
675
custom_argv[0] = argv[0];
596
691
}
597
692
new_arg = strdup(p);
598
693
if(new_arg == NULL){
599
perror("strdup");
600
exitstatus = EXIT_FAILURE;
694
error(0, errno, "strdup");
695
exitstatus = EX_OSERR;
601
696
free(org_line);
602
697
goto fallback;
603
698
}
604
699
605
700
custom_argc += 1;
606
custom_argv = realloc(custom_argv, sizeof(char *)
607
* ((unsigned int) custom_argc + 1));
608
if(custom_argv == NULL){
609
perror("realloc");
610
exitstatus = EXIT_FAILURE;
611
free(org_line);
612
goto fallback;
701
{
702
char **new_argv = realloc(custom_argv, sizeof(char *)
703
* ((size_t)custom_argc + 1));
704
if(new_argv == NULL){
705
error(0, errno, "realloc");
706
exitstatus = EX_OSERR;
707
free(new_arg);
708
free(org_line);
709
goto fallback;
710
} else {
711
custom_argv = new_argv;
712
}
613
713
}
614
714
custom_argv[custom_argc-1] = new_arg;
615
custom_argv[custom_argc] = NULL;
715
custom_argv[custom_argc] = NULL;
616
716
}
617
717
}
718
do {
719
ret = fclose(conffp);
720
} while(ret == EOF and errno == EINTR);
721
if(ret == EOF){
722
error(0, errno, "fclose");
723
exitstatus = EX_IOERR;
724
goto fallback;
725
}
618
726
free(org_line);
619
727
} else {
620
728
/* Check for harmful errors and go to fallback. Other errors might
621
729
not affect opening plugins */
622
730
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
623
perror("fopen");
624
exitstatus = EXIT_FAILURE;
731
error(0, errno, "fopen");
732
exitstatus = EX_OSERR;
625
733
goto fallback;
626
734
}
627
735
}
628
/* If there was any arguments from configuration file,
629
pass them to parser as command arguments */
736
/* If there were any arguments from the configuration file, pass
737
them to parser as command line arguments */
630
738
if(custom_argv != NULL){
631
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
632
0, NULL);
633
if(ret == ARGP_ERR_UNKNOWN){
634
fprintf(stderr, "Unknown error while parsing arguments\n");
635
exitstatus = EXIT_FAILURE;
739
ret = argp_parse(&argp, custom_argc, custom_argv,
740
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
741
NULL, NULL);
742
switch(ret){
743
case 0:
744
break;
745
case ENOMEM:
746
default:
747
errno = ret;
748
error(0, errno, "argp_parse");
749
exitstatus = EX_OSERR;
750
goto fallback;
751
case EINVAL:
752
exitstatus = EX_CONFIG;
636
753
goto fallback;
637
754
}
638
755
}
639
756
640
757
/* Parse actual command line arguments, to let them override the
641
758
config file */
642
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
643
if(ret == ARGP_ERR_UNKNOWN){
644
fprintf(stderr, "Unknown error while parsing arguments\n");
645
exitstatus = EXIT_FAILURE;
646
goto fallback;
759
ret = argp_parse(&argp, argc, argv,
760
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
761
NULL, NULL);
762
switch(ret){
763
case 0:
764
break;
765
case ENOMEM:
766
default:
767
errno = ret;
768
error(0, errno, "argp_parse");
769
exitstatus = EX_OSERR;
770
goto fallback;
771
case EINVAL:
772
exitstatus = EX_USAGE;
773
goto fallback;
774
}
775
776
{
777
char *pluginhelperenv;
778
bool bret = true;
779
ret = asprintf(&pluginhelperenv, "MANDOSPLUGINHELPERDIR=%s",
780
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
781
if(ret != -1){
782
bret = add_environment(getplugin(NULL), pluginhelperenv, true);
783
}
784
if(ret == -1 or not bret){
785
error(0, errno, "Failed to set MANDOSPLUGINHELPERDIR"
786
" environment variable to \"%s\" for all plugins\n",
787
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
788
}
789
if(ret != -1){
790
free(pluginhelperenv);
791
}
647
792
}
648
793
649
794
if(debug){
660
805
}
661
806
}
662
807
663
/* Strip permissions down to nobody */
664
setgid(gid);
808
if(getuid() == 0){
809
/* Work around Debian bug #633582:
810
<https://bugs.debian.org/633582> */
811
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
812
if(plugindir_fd == -1){
813
if(errno != ENOENT){
814
error(0, errno, "open(\"" PDIR "\")");
815
}
816
} else {
817
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
818
if(ret == -1){
819
error(0, errno, "fstat");
820
} else {
821
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
822
ret = fchown(plugindir_fd, uid, gid);
823
if(ret == -1){
824
error(0, errno, "fchown");
825
}
826
}
827
}
828
close(plugindir_fd);
829
}
830
}
831
832
/* Lower permissions */
833
ret = setgid(gid);
665
834
if(ret == -1){
666
perror("setgid");
835
error(0, errno, "setgid");
667
836
}
668
837
ret = setuid(uid);
669
838
if(ret == -1){
670
perror("setuid");
671
}
672
673
if(plugindir == NULL){
674
dir = opendir(PDIR);
675
} else {
676
dir = opendir(plugindir);
677
}
678
679
if(dir == NULL){
680
perror("Could not open plugin dir");
681
exitstatus = EXIT_FAILURE;
682
goto fallback;
683
}
684
685
/* Set the FD_CLOEXEC flag on the directory, if possible */
839
error(0, errno, "setuid");
840
}
841
842
/* Open plugin directory with close_on_exec flag */
686
843
{
687
int dir_fd = dirfd(dir);
688
if(dir_fd >= 0){
689
ret = set_cloexec_flag(dir_fd);
690
if(ret < 0){
691
perror("set_cloexec_flag");
692
exitstatus = EXIT_FAILURE;
693
goto fallback;
844
dir_fd = open(plugindir != NULL ? plugindir : PDIR, O_RDONLY |
845
#ifdef O_CLOEXEC
846
O_CLOEXEC
847
#else /* not O_CLOEXEC */
848
0
849
#endif /* not O_CLOEXEC */
850
);
851
if(dir_fd == -1){
852
error(0, errno, "Could not open plugin dir");
853
exitstatus = EX_UNAVAILABLE;
854
goto fallback;
855
}
856
857
#ifndef O_CLOEXEC
858
/* Set the FD_CLOEXEC flag on the directory */
859
ret = set_cloexec_flag(dir_fd);
860
if(ret < 0){
861
error(0, errno, "set_cloexec_flag");
862
exitstatus = EX_OSERR;
863
goto fallback;
864
}
865
#endif /* O_CLOEXEC */
866
}
867
868
int good_name(const struct dirent * const dirent){
869
const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new",
870
"*.dpkg-old", "*.dpkg-bak",
871
"*.dpkg-divert", NULL };
872
#ifdef __GNUC__
873
#pragma GCC diagnostic push
874
#pragma GCC diagnostic ignored "-Wcast-qual"
875
#endif
876
for(const char **pat = (const char **)patterns;
877
*pat != NULL; pat++){
878
#ifdef __GNUC__
879
#pragma GCC diagnostic pop
880
#endif
881
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
882
!= FNM_NOMATCH){
883
if(debug){
884
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
885
" matching pattern %s\n", dirent->d_name, *pat);
886
}
887
return 0;
694
888
}
695
889
}
890
return 1;
891
}
892
893
int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
894
alphasort);
895
if(numplugins == -1){
896
error(0, errno, "Could not scan plugin dir");
897
direntries = NULL;
898
exitstatus = EX_OSERR;
899
goto fallback;
696
900
}
697
901
698
902
FD_ZERO(&rfds_all);
699
903
700
904
/* Read and execute any executable in the plugin directory*/
701
while(true){
702
dirst = readdir(dir);
703
704
/* All directory entries have been processed */
705
if(dirst == NULL){
706
if(errno == EBADF){
707
perror("readdir");
708
exitstatus = EXIT_FAILURE;
709
goto fallback;
710
}
711
break;
712
}
713
714
d_name_len = strlen(dirst->d_name);
715
716
/* Ignore dotfiles, backup files and other junk */
717
{
718
bool bad_name = false;
719
720
const char const *bad_prefixes[] = { ".", "#", NULL };
721
722
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
723
".dpkg-old",
724
".dpkg-bak",
725
".dpkg-divert", NULL };
726
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
727
size_t pre_len = strlen(*pre);
728
if((d_name_len >= pre_len)
729
and strncmp((dirst->d_name), *pre, pre_len) == 0){
730
if(debug){
731
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
732
" with bad prefix %s\n", dirst->d_name, *pre);
733
}
734
bad_name = true;
735
break;
736
}
737
}
738
if(bad_name){
739
continue;
740
}
741
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
742
size_t suf_len = strlen(*suf);
743
if((d_name_len >= suf_len)
744
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
745
== 0)){
746
if(debug){
747
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
748
" with bad suffix %s\n", dirst->d_name, *suf);
749
}
750
bad_name = true;
751
break;
752
}
753
}
754
755
if(bad_name){
756
continue;
757
}
758
}
759
760
char *filename;
761
if(plugindir == NULL){
762
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
763
} else {
764
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
765
}
766
if(ret < 0){
767
perror("asprintf");
905
for(int i = 0; i < numplugins; i++){
906
907
int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY);
908
if(plugin_fd == -1){
909
error(0, errno, "Could not open plugin");
910
free(direntries[i]);
768
911
continue;
769
912
}
770
771
ret = stat(filename, &st);
913
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
772
914
if(ret == -1){
773
perror("stat");
774
free(filename);
915
error(0, errno, "stat");
916
close(plugin_fd);
917
free(direntries[i]);
775
918
continue;
776
919
}
777
920
778
921
/* Ignore non-executable files */
779
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
922
if(not S_ISREG(st.st_mode)
923
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
924
X_OK, 0)) != 0)){
780
925
if(debug){
781
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
782
" with bad type or mode\n", filename);
926
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
927
" with bad type or mode\n",
928
plugindir != NULL ? plugindir : PDIR,
929
direntries[i]->d_name);
783
930
}
784
free(filename);
931
close(plugin_fd);
932
free(direntries[i]);
785
933
continue;
786
934
}
787
935
788
plugin *p = getplugin(dirst->d_name);
936
plugin *p = getplugin(direntries[i]->d_name);
789
937
if(p == NULL){
790
perror("getplugin");
791
free(filename);
938
error(0, errno, "getplugin");
939
close(plugin_fd);
940
free(direntries[i]);
792
941
continue;
793
942
}
794
943
if(p->disabled){
795
944
if(debug){
796
945
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
797
dirst->d_name);
946
direntries[i]->d_name);
798
947
}
799
free(filename);
948
close(plugin_fd);
949
free(direntries[i]);
800
950
continue;
801
951
}
802
952
{
805
955
if(g != NULL){
806
956
for(char **a = g->argv + 1; *a != NULL; a++){
807
957
if(not add_argument(p, *a)){
808
perror("add_argument");
958
error(0, errno, "add_argument");
809
959
}
810
960
}
811
961
/* Add global environment variables */
812
962
for(char **e = g->environ; *e != NULL; e++){
813
963
if(not add_environment(p, *e, false)){
814
perror("add_environment");
964
error(0, errno, "add_environment");
815
965
}
816
966
}
817
967
}
818
968
}
819
/* If this plugin has any environment variables, we will call
820
using execve and need to duplicate the environment from this
821
process, too. */
969
/* If this plugin has any environment variables, we need to
970
duplicate the environment from this process, too. */
822
971
if(p->environ[0] != NULL){
823
972
for(char **e = environ; *e != NULL; e++){
824
973
if(not add_environment(p, *e, false)){
825
perror("add_environment");
974
error(0, errno, "add_environment");
826
975
}
827
976
}
828
977
}
829
978
830
979
int pipefd[2];
831
ret = pipe(pipefd);
980
#ifndef O_CLOEXEC
981
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
982
#else /* O_CLOEXEC */
983
ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC));
984
#endif /* O_CLOEXEC */
832
985
if(ret == -1){
833
perror("pipe");
834
exitstatus = EXIT_FAILURE;
835
goto fallback;
836
}
986
error(0, errno, "pipe");
987
exitstatus = EX_OSERR;
988
free(direntries[i]);
989
goto fallback;
990
}
991
if(pipefd[0] >= FD_SETSIZE){
992
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
993
FD_SETSIZE);
994
close(pipefd[0]);
995
close(pipefd[1]);
996
exitstatus = EX_OSERR;
997
free(direntries[i]);
998
goto fallback;
999
}
1000
#ifndef O_CLOEXEC
837
1001
/* Ask OS to automatic close the pipe on exec */
838
1002
ret = set_cloexec_flag(pipefd[0]);
839
1003
if(ret < 0){
840
perror("set_cloexec_flag");
841
exitstatus = EXIT_FAILURE;
1004
error(0, errno, "set_cloexec_flag");
1005
close(pipefd[0]);
1006
close(pipefd[1]);
1007
exitstatus = EX_OSERR;
1008
free(direntries[i]);
842
1009
goto fallback;
843
1010
}
844
1011
ret = set_cloexec_flag(pipefd[1]);
845
1012
if(ret < 0){
846
perror("set_cloexec_flag");
847
exitstatus = EXIT_FAILURE;
1013
error(0, errno, "set_cloexec_flag");
1014
close(pipefd[0]);
1015
close(pipefd[1]);
1016
exitstatus = EX_OSERR;
1017
free(direntries[i]);
848
1018
goto fallback;
849
1019
}
1020
#endif /* not O_CLOEXEC */
850
1021
/* Block SIGCHLD until process is safely in process list */
851
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1022
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1023
&sigchld_action.sa_mask,
1024
NULL));
852
1025
if(ret < 0){
853
perror("sigprocmask");
854
exitstatus = EXIT_FAILURE;
1026
error(0, errno, "sigprocmask");
1027
exitstatus = EX_OSERR;
1028
free(direntries[i]);
855
1029
goto fallback;
856
1030
}
857
1031
/* Starting a new process to be watched */
858
pid_t pid = fork();
1032
pid_t pid;
1033
do {
1034
pid = fork();
1035
} while(pid == -1 and errno == EINTR);
859
1036
if(pid == -1){
860
perror("fork");
861
exitstatus = EXIT_FAILURE;
1037
error(0, errno, "fork");
1038
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1039
&sigchld_action.sa_mask, NULL));
1040
close(pipefd[0]);
1041
close(pipefd[1]);
1042
exitstatus = EX_OSERR;
1043
free(direntries[i]);
862
1044
goto fallback;
863
1045
}
864
1046
if(pid == 0){
865
1047
/* this is the child process */
866
1048
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
867
1049
if(ret < 0){
868
perror("sigaction");
869
_exit(EXIT_FAILURE);
1050
error(0, errno, "sigaction");
1051
_exit(EX_OSERR);
870
1052
}
871
1053
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
872
1054
if(ret < 0){
873
perror("sigprocmask");
874
_exit(EXIT_FAILURE);
1055
error(0, errno, "sigprocmask");
1056
_exit(EX_OSERR);
875
1057
}
876
1058
877
1059
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
878
1060
if(ret == -1){
879
perror("dup2");
880
_exit(EXIT_FAILURE);
1061
error(0, errno, "dup2");
1062
_exit(EX_OSERR);
881
1063
}
882
1064
883
if(dirfd(dir) < 0){
884
/* If dir has no file descriptor, we could not set FD_CLOEXEC
885
above and must now close it manually here. */
886
closedir(dir);
887
}
888
if(p->environ[0] == NULL){
889
if(execv(filename, p->argv) < 0){
890
perror("execv");
891
_exit(EXIT_FAILURE);
892
}
893
} else {
894
if(execve(filename, p->argv, p->environ) < 0){
895
perror("execve");
896
_exit(EXIT_FAILURE);
897
}
1065
if(fexecve(plugin_fd, p->argv,
1066
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1067
error(0, errno, "fexecve for %s/%s",
1068
plugindir != NULL ? plugindir : PDIR,
1069
direntries[i]->d_name);
1070
_exit(EX_OSERR);
898
1071
}
899
1072
/* no return */
900
1073
}
901
1074
/* Parent process */
902
1075
close(pipefd[1]); /* Close unused write end of pipe */
903
free(filename);
904
plugin *new_plugin = getplugin(dirst->d_name);
1076
close(plugin_fd);
1077
plugin *new_plugin = getplugin(direntries[i]->d_name);
905
1078
if(new_plugin == NULL){
906
perror("getplugin");
907
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1079
error(0, errno, "getplugin");
1080
ret = (int)(TEMP_FAILURE_RETRY
1081
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1082
NULL)));
908
1083
if(ret < 0){
909
perror("sigprocmask");
1084
error(0, errno, "sigprocmask");
910
1085
}
911
exitstatus = EXIT_FAILURE;
1086
exitstatus = EX_OSERR;
1087
free(direntries[i]);
912
1088
goto fallback;
913
1089
}
1090
free(direntries[i]);
914
1091
915
1092
new_plugin->pid = pid;
916
1093
new_plugin->fd = pipefd[0];
917
1094
918
1095
/* Unblock SIGCHLD so signal handler can be run if this process
919
1096
has already completed */
920
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1097
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1098
&sigchld_action.sa_mask,
1099
NULL));
921
1100
if(ret < 0){
922
perror("sigprocmask");
923
exitstatus = EXIT_FAILURE;
1101
error(0, errno, "sigprocmask");
1102
exitstatus = EX_OSERR;
924
1103
goto fallback;
925
1104
}
926
1105
931
1110
}
932
1111
}
933
1112
934
closedir(dir);
935
dir = NULL;
1113
free(direntries);
1114
direntries = NULL;
1115
close(dir_fd);
1116
dir_fd = -1;
936
1117
free_plugin(getplugin(NULL));
937
1118
938
1119
for(plugin *p = plugin_list; p != NULL; p = p->next){
950
1131
while(plugin_list){
951
1132
fd_set rfds = rfds_all;
952
1133
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
953
if(select_ret == -1){
954
perror("select");
955
exitstatus = EXIT_FAILURE;
1134
if(select_ret == -1 and errno != EINTR){
1135
error(0, errno, "select");
1136
exitstatus = EX_OSERR;
956
1137
goto fallback;
957
1138
}
958
1139
/* OK, now either a process completed, or something can be read
973
1154
WEXITSTATUS(proc->status));
974
1155
} else if(WIFSIGNALED(proc->status)){
975
1156
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
976
" signal %d\n", proc->name,
1157
" signal %d: %s\n", proc->name,
977
1158
(intmax_t) (proc->pid),
978
WTERMSIG(proc->status));
979
} else if(WCOREDUMP(proc->status)){
980
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
981
" core\n", proc->name, (intmax_t) (proc->pid));
1159
WTERMSIG(proc->status),
1160
strsignal(WTERMSIG(proc->status)));
982
1161
}
983
1162
}
984
1163
986
1165
FD_CLR(proc->fd, &rfds_all);
987
1166
988
1167
/* Block signal while modifying process_list */
989
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1168
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1169
(SIG_BLOCK,
1170
&sigchld_action.sa_mask,
1171
NULL));
990
1172
if(ret < 0){
991
perror("sigprocmask");
992
exitstatus = EXIT_FAILURE;
1173
error(0, errno, "sigprocmask");
1174
exitstatus = EX_OSERR;
993
1175
goto fallback;
994
1176
}
995
1177
998
1180
proc = next_plugin;
999
1181
1000
1182
/* We are done modifying process list, so unblock signal */
1001
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1002
NULL);
1183
ret = (int)(TEMP_FAILURE_RETRY
1184
(sigprocmask(SIG_UNBLOCK,
1185
&sigchld_action.sa_mask, NULL)));
1003
1186
if(ret < 0){
1004
perror("sigprocmask");
1005
exitstatus = EXIT_FAILURE;
1187
error(0, errno, "sigprocmask");
1188
exitstatus = EX_OSERR;
1006
1189
goto fallback;
1007
1190
}
1008
1191
1018
1201
bool bret = print_out_password(proc->buffer,
1019
1202
proc->buffer_length);
1020
1203
if(not bret){
1021
perror("print_out_password");
1022
exitstatus = EXIT_FAILURE;
1204
error(0, errno, "print_out_password");
1205
exitstatus = EX_IOERR;
1023
1206
}
1024
1207
goto fallback;
1025
1208
}
1032
1215
}
1033
1216
/* Before reading, make the process' data buffer large enough */
1034
1217
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1035
proc->buffer = realloc(proc->buffer, proc->buffer_size
1036
+ (size_t) BUFFER_SIZE);
1037
if(proc->buffer == NULL){
1038
perror("malloc");
1039
exitstatus = EXIT_FAILURE;
1218
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1219
+ (size_t) BUFFER_SIZE);
1220
if(new_buffer == NULL){
1221
error(0, errno, "malloc");
1222
exitstatus = EX_OSERR;
1040
1223
goto fallback;
1041
1224
}
1225
proc->buffer = new_buffer;
1042
1226
proc->buffer_size += BUFFER_SIZE;
1043
1227
}
1044
1228
/* Read from the process */
1045
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1046
BUFFER_SIZE);
1229
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1230
proc->buffer
1231
+ proc->buffer_length,
1232
BUFFER_SIZE));
1047
1233
if(sret < 0){
1048
1234
/* Read error from this process; ignore the error */
1049
1235
proc = proc->next;
1061
1247
1062
1248
fallback:
1063
1249
1064
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1250
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1251
and exitstatus != EX_OK)){
1065
1252
/* Fallback if all plugins failed, none are found or an error
1066
1253
occured */
1067
1254
bool bret;
1075
1262
}
1076
1263
bret = print_out_password(passwordbuffer, len);
1077
1264
if(not bret){
1078
perror("print_out_password");
1079
exitstatus = EXIT_FAILURE;
1265
error(0, errno, "print_out_password");
1266
exitstatus = EX_IOERR;
1080
1267
}
1081
1268
}
1082
1269
1083
1270
/* Restore old signal handler */
1084
1271
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1085
1272
if(ret == -1){
1086
perror("sigaction");
1087
exitstatus = EXIT_FAILURE;
1273
error(0, errno, "sigaction");
1274
exitstatus = EX_OSERR;
1088
1275
}
1089
1276
1090
1277
if(custom_argv != NULL){
1094
1281
free(custom_argv);
1095
1282
}
1096
1283
1097
if(dir != NULL){
1098
closedir(dir);
1284
free(direntries);
1285
1286
if(dir_fd != -1){
1287
close(dir_fd);
1099
1288
}
1100
1289
1101
1290
/* Kill the processes */
1105
1294
ret = kill(p->pid, SIGTERM);
1106
1295
if(ret == -1 and errno != ESRCH){
1107
1296
/* Set-uid proccesses might not get closed */
1108
perror("kill");
1297
error(0, errno, "kill");
1109
1298
}
1110
1299
}
1111
1300
}
1112
1301
1113
1302
/* Wait for any remaining child processes to terminate */
1114
do{
1303
do {
1115
1304
ret = wait(NULL);
1116
1305
} while(ret >= 0);
1117
1306
if(errno != ECHILD){
1118
perror("wait");
1307
error(0, errno, "wait");
1119
1308
}
1120
1309
1121
1310
free_plugin_list();
1122
1311
1123
1312
free(plugindir);
1313
free(pluginhelperdir);
1124
1314
free(argfile);
1125
1315
1126
1316
return exitstatus;
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0