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