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