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