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