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