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