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