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