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:
- .bzr-builddeb
- debian
- debian/po
- debian/source
- 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-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, popen(), fileno(),
31
fprintf(), stderr, STDOUT_FILENO */
32
#include <sys/types.h> /* DIR, opendir(), stat(), struct
31
#include <stdio.h> /* fileno(), fprintf(),
32
stderr, STDOUT_FILENO */
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(),
47
49
F_GETFD, F_SETFD, FD_CLOEXEC,
48
50
access(), pipe(), fork(), close()
49
dup2, STDOUT_FILENO, _exit(),
51
dup2(), STDOUT_FILENO, _exit(),
50
52
execv(), write(), read(),
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>";
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
}
206
243
/*
207
244
* Based on the example in the GNU LibC manual chapter 13.13 "File
208
245
* Descriptor Flags".
209
* *Note File Descriptor Flags:(libc)Descriptor Flags.
246
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
210
247
*/
211
static int set_cloexec_flag(int fd)
212
{
213
int ret = fcntl(fd, F_GETFD, 0);
248
__attribute__((warn_unused_result))
249
static int set_cloexec_flag(int fd){
250
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
214
251
/* If reading the flags failed, return error indication now. */
215
252
if(ret < 0){
216
253
return ret;
217
254
}
218
255
/* Store modified flag word in the descriptor. */
219
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
256
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
257
ret | FD_CLOEXEC));
220
258
}
221
259
222
260
223
261
/* Mark processes as completed when they exit, and save their exit
224
262
status. */
225
void handle_sigchld(__attribute__((unused)) int sig){
263
static void handle_sigchld(__attribute__((unused)) int sig){
264
int old_errno = errno;
226
265
while(true){
227
266
plugin *proc = plugin_list;
228
267
int status;
232
271
break;
233
272
}
234
273
if(pid == -1){
235
if (errno != ECHILD){
236
perror("waitpid");
274
if(errno == ECHILD){
275
/* No child processes */
276
break;
237
277
}
238
/* No child processes */
239
break;
278
error(0, errno, "waitpid");
240
279
}
241
280
242
281
/* A child exited, find it in process_list */
248
287
continue;
249
288
}
250
289
proc->status = status;
251
proc->completed = true;
290
proc->completed = 1;
252
291
}
292
errno = old_errno;
253
293
}
254
294
255
295
/* Prints out a password to stdout */
256
bool print_out_password(const char *buffer, size_t length){
296
__attribute__((nonnull, warn_unused_result))
297
static bool print_out_password(const char *buffer, size_t length){
257
298
ssize_t ret;
258
299
for(size_t written = 0; written < length; written += (size_t)ret){
259
300
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,
266
307
}
267
308
268
309
/* Removes and free a plugin from the plugin list */
310
__attribute__((nonnull))
269
311
static void free_plugin(plugin *plugin_node){
270
312
271
313
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
277
319
}
278
320
free(plugin_node->environ);
279
321
free(plugin_node->buffer);
280
322
281
323
/* Removes the plugin from the singly-linked list */
282
324
if(plugin_node == plugin_list){
283
325
/* First one - simple */
311
353
struct stat st;
312
354
fd_set rfds_all;
313
355
int ret, maxfd = 0;
356
ssize_t sret;
314
357
uid_t uid = 65534;
315
358
gid_t gid = 65534;
316
359
bool debug = false;
325
368
sigemptyset(&sigchld_action.sa_mask);
326
369
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
327
370
if(ret == -1){
328
perror("sigaddset");
329
exitstatus = EXIT_FAILURE;
371
error(0, errno, "sigaddset");
372
exitstatus = EX_OSERR;
330
373
goto fallback;
331
374
}
332
375
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
333
376
if(ret == -1){
334
perror("sigaction");
335
exitstatus = EXIT_FAILURE;
377
error(0, errno, "sigaction");
378
exitstatus = EX_OSERR;
336
379
goto fallback;
337
380
}
338
381
370
413
.doc = "Group ID the plugins will run as", .group = 3 },
371
414
{ .name = "debug", .key = 132,
372
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 },
373
425
{ .name = NULL }
374
426
};
375
427
376
error_t parse_opt (int key, char *arg, __attribute__((unused))
377
struct argp_state *state) {
378
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;
379
434
case 'g': /* --global-options */
380
if (arg != NULL){
381
char *p;
382
while((p = strsep(&arg, ",")) != NULL){
383
if(p[0] == '\0'){
384
continue;
385
}
386
if(not add_argument(getplugin(NULL), p)){
387
perror("add_argument");
388
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;
389
440
}
390
441
}
442
errno = 0;
391
443
}
392
444
break;
393
445
case 'G': /* --global-env */
394
if(arg == NULL){
395
break;
396
}
397
{
398
char *envdef = strdup(arg);
399
if(envdef == NULL){
400
break;
401
}
402
if(not add_environment(getplugin(NULL), envdef, true)){
403
perror("add_environment");
404
}
446
if(add_environment(getplugin(NULL), arg, true)){
447
errno = 0;
405
448
}
406
449
break;
407
450
case 'o': /* --options-for */
408
if (arg != NULL){
409
char *p_name = strsep(&arg, ":");
410
if(p_name[0] == '\0' or arg == NULL){
411
break;
412
}
413
char *opt = strsep(&arg, ":");
414
if(opt[0] == '\0' or opt == NULL){
415
break;
416
}
417
char *p;
418
while((p = strsep(&opt, ",")) != NULL){
419
if(p[0] == '\0'){
420
continue;
421
}
422
if(not add_argument(getplugin(p_name), p)){
423
perror("add_argument");
424
return ARGP_ERR_UNKNOWN;
425
}
426
}
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;
427
472
}
428
473
break;
429
474
case 'E': /* --env-for */
430
if(arg == NULL){
431
break;
432
}
433
475
{
434
476
char *envdef = strchr(arg, ':');
435
477
if(envdef == NULL){
436
break;
437
}
438
char *p_name = strndup(arg, (size_t) (envdef-arg));
439
if(p_name == NULL){
440
break;
441
}
478
argp_error(state, "No colon in \"%s\"", arg);
479
errno = EINVAL;
480
break;
481
}
482
*envdef = '\0';
442
483
envdef++;
443
if(not add_environment(getplugin(p_name), envdef, true)){
444
perror("add_environment");
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;
445
491
}
446
492
}
447
493
break;
448
494
case 'd': /* --disable */
449
if (arg != NULL){
495
{
450
496
plugin *p = getplugin(arg);
451
if(p == NULL){
452
return ARGP_ERR_UNKNOWN;
497
if(p != NULL){
498
p->disabled = true;
499
errno = 0;
453
500
}
454
p->disabled = true;
455
501
}
456
502
break;
457
503
case 'e': /* --enable */
458
if (arg != NULL){
504
{
459
505
plugin *p = getplugin(arg);
460
if(p == NULL){
461
return ARGP_ERR_UNKNOWN;
506
if(p != NULL){
507
p->disabled = false;
508
errno = 0;
462
509
}
463
p->disabled = false;
464
510
}
465
511
break;
466
512
case 128: /* --plugin-dir */
513
free(plugindir);
467
514
plugindir = strdup(arg);
468
if(plugindir == NULL){
469
perror("strdup");
470
}
515
if(plugindir != NULL){
516
errno = 0;
517
}
471
518
break;
472
519
case 129: /* --config-file */
473
520
/* This is already done by parse_opt_config_file() */
474
521
break;
475
522
case 130: /* --userid */
476
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;
477
532
break;
478
533
case 131: /* --groupid */
479
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;
480
543
break;
481
544
case 132: /* --debug */
482
545
debug = true;
483
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
*/
484
565
case ARGP_KEY_ARG:
485
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
486
break;
487
case ARGP_KEY_END:
488
break;
566
/* Cryptsetup always passes an argument, which is an empty
567
string if "none" was specified in /etc/crypttab. So if
568
argument was empty, we ignore it silently. */
569
if(arg[0] == '\0'){
570
break;
571
}
489
572
default:
490
573
return ARGP_ERR_UNKNOWN;
491
574
}
492
return 0;
575
return errno; /* Set to 0 at start */
493
576
}
494
577
495
578
/* This option parser is the same as parse_opt() above, except it
496
579
ignores everything but the --config-file option. */
497
error_t parse_opt_config_file (int key, char *arg,
498
__attribute__((unused))
499
struct argp_state *state) {
500
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){
501
585
case 'g': /* --global-options */
502
586
case 'G': /* --global-env */
503
587
case 'o': /* --options-for */
507
591
case 128: /* --plugin-dir */
508
592
break;
509
593
case 129: /* --config-file */
594
free(argfile);
510
595
argfile = strdup(arg);
511
if(argfile == NULL){
512
perror("strdup");
596
if(argfile != NULL){
597
errno = 0;
513
598
}
514
break;
599
break;
515
600
case 130: /* --userid */
516
601
case 131: /* --groupid */
517
602
case 132: /* --debug */
603
case '?': /* --help */
604
case -3: /* --usage */
605
case 'V': /* --version */
518
606
case ARGP_KEY_ARG:
519
case ARGP_KEY_END:
520
607
break;
521
608
default:
522
609
return ARGP_ERR_UNKNOWN;
523
610
}
524
return 0;
611
return errno;
525
612
}
526
613
527
614
struct argp argp = { .options = options,
529
616
.args_doc = "",
530
617
.doc = "Mandos plugin runner -- Run plugins" };
531
618
532
/* 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
533
620
config file location, if any. */
534
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
535
if (ret == ARGP_ERR_UNKNOWN){
536
fprintf(stderr, "Unknown error while parsing arguments\n");
537
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;
538
635
goto fallback;
539
636
}
540
637
542
639
argp.parser = parse_opt;
543
640
544
641
/* Open the configfile if available */
545
if (argfile == NULL){
642
if(argfile == NULL){
546
643
conffp = fopen(AFILE, "r");
547
644
} else {
548
645
conffp = fopen(argfile, "r");
549
}
646
}
550
647
if(conffp != NULL){
551
648
char *org_line = NULL;
552
649
char *p, *arg, *new_arg, *line;
553
650
size_t size = 0;
554
ssize_t sret;
555
651
const char whitespace_delims[] = " \r\t\f\v\n";
556
652
const char comment_delim[] = "#";
557
653
558
654
custom_argc = 1;
559
655
custom_argv = malloc(sizeof(char*) * 2);
560
656
if(custom_argv == NULL){
561
perror("malloc");
562
exitstatus = EXIT_FAILURE;
657
error(0, errno, "malloc");
658
exitstatus = EX_OSERR;
563
659
goto fallback;
564
660
}
565
661
custom_argv[0] = argv[0];
566
662
custom_argv[1] = NULL;
567
663
568
664
/* for each line in the config file, strip whitespace and ignore
569
665
commented text */
570
666
while(true){
572
668
if(sret == -1){
573
669
break;
574
670
}
575
671
576
672
line = org_line;
577
673
arg = strsep(&line, comment_delim);
578
674
while((p = strsep(&arg, whitespace_delims)) != NULL){
581
677
}
582
678
new_arg = strdup(p);
583
679
if(new_arg == NULL){
584
perror("strdup");
585
exitstatus = EXIT_FAILURE;
680
error(0, errno, "strdup");
681
exitstatus = EX_OSERR;
586
682
free(org_line);
587
683
goto fallback;
588
684
}
589
685
590
686
custom_argc += 1;
591
custom_argv = realloc(custom_argv, sizeof(char *)
592
* ((unsigned int) custom_argc + 1));
593
if(custom_argv == NULL){
594
perror("realloc");
595
exitstatus = EXIT_FAILURE;
596
free(org_line);
597
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
}
598
700
}
599
701
custom_argv[custom_argc-1] = new_arg;
600
custom_argv[custom_argc] = NULL;
702
custom_argv[custom_argc] = NULL;
601
703
}
602
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
}
603
713
free(org_line);
604
714
} else {
605
715
/* Check for harmful errors and go to fallback. Other errors might
606
716
not affect opening plugins */
607
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
608
perror("fopen");
609
exitstatus = EXIT_FAILURE;
717
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
718
error(0, errno, "fopen");
719
exitstatus = EX_OSERR;
610
720
goto fallback;
611
721
}
612
722
}
613
/* If there was any arguments from configuration file,
614
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 */
615
725
if(custom_argv != NULL){
616
ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
617
0, NULL);
618
if (ret == ARGP_ERR_UNKNOWN){
619
fprintf(stderr, "Unknown error while parsing arguments\n");
620
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;
621
740
goto fallback;
622
741
}
623
742
}
624
743
625
744
/* Parse actual command line arguments, to let them override the
626
745
config file */
627
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
628
if (ret == ARGP_ERR_UNKNOWN){
629
fprintf(stderr, "Unknown error while parsing arguments\n");
630
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;
631
760
goto fallback;
632
761
}
633
762
638
767
for(char **a = p->argv; *a != NULL; a++){
639
768
fprintf(stderr, "\tArg: %s\n", *a);
640
769
}
641
fprintf(stderr, "...and %u environment variables\n", p->envc);
770
fprintf(stderr, "...and %d environment variables\n", p->envc);
642
771
for(char **a = p->environ; *a != NULL; a++){
643
772
fprintf(stderr, "\t%s\n", *a);
644
773
}
645
774
}
646
775
}
647
776
648
/* 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
}
649
804
ret = setuid(uid);
650
if (ret == -1){
651
perror("setuid");
652
}
653
setgid(gid);
654
if (ret == -1){
655
perror("setgid");
656
}
657
658
if (plugindir == NULL){
659
dir = opendir(PDIR);
660
} else {
661
dir = opendir(plugindir);
662
}
663
664
if(dir == NULL){
665
perror("Could not open plugin dir");
666
exitstatus = EXIT_FAILURE;
667
goto fallback;
668
}
669
670
/* 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 */
671
810
{
672
int dir_fd = dirfd(dir);
673
if(dir_fd >= 0){
674
ret = set_cloexec_flag(dir_fd);
675
if(ret < 0){
676
perror("set_cloexec_flag");
677
exitstatus = EXIT_FAILURE;
678
goto fallback;
679
}
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;
680
852
}
681
853
}
682
854
684
856
685
857
/* Read and execute any executable in the plugin directory*/
686
858
while(true){
687
dirst = readdir(dir);
859
do {
860
dirst = readdir(dir);
861
} while(dirst == NULL and errno == EINTR);
688
862
689
863
/* All directory entries have been processed */
690
864
if(dirst == NULL){
691
if (errno == EBADF){
692
perror("readdir");
693
exitstatus = EXIT_FAILURE;
865
if(errno == EBADF){
866
error(0, errno, "readdir");
867
exitstatus = EX_IOERR;
694
868
goto fallback;
695
869
}
696
870
break;
702
876
{
703
877
bool bad_name = false;
704
878
705
const char const *bad_prefixes[] = { ".", "#", NULL };
879
const char * const bad_prefixes[] = { ".", "#", NULL };
706
880
707
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
881
const char * const bad_suffixes[] = { "~", "#", ".dpkg-new",
708
882
".dpkg-old",
883
".dpkg-bak",
709
884
".dpkg-divert", NULL };
710
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
711
894
size_t pre_len = strlen(*pre);
712
895
if((d_name_len >= pre_len)
713
896
and strncmp((dirst->d_name), *pre, pre_len) == 0){
722
905
if(bad_name){
723
906
continue;
724
907
}
725
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
726
917
size_t suf_len = strlen(*suf);
727
918
if((d_name_len >= suf_len)
728
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
919
and (strcmp((dirst->d_name) + d_name_len-suf_len, *suf)
729
920
== 0)){
730
921
if(debug){
731
922
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
740
931
continue;
741
932
}
742
933
}
743
934
744
935
char *filename;
745
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
936
if(plugindir == NULL){
937
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
938
dirst->d_name));
939
} else {
940
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
941
plugindir,
942
dirst->d_name));
943
}
746
944
if(ret < 0){
747
perror("asprintf");
945
error(0, errno, "asprintf");
748
946
continue;
749
947
}
750
948
751
ret = stat(filename, &st);
752
if (ret == -1){
753
perror("stat");
949
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
950
if(ret == -1){
951
error(0, errno, "stat");
754
952
free(filename);
755
953
continue;
756
954
}
757
955
758
956
/* Ignore non-executable files */
759
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)){
760
959
if(debug){
761
960
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
762
961
" with bad type or mode\n", filename);
767
966
768
967
plugin *p = getplugin(dirst->d_name);
769
968
if(p == NULL){
770
perror("getplugin");
969
error(0, errno, "getplugin");
771
970
free(filename);
772
971
continue;
773
972
}
785
984
if(g != NULL){
786
985
for(char **a = g->argv + 1; *a != NULL; a++){
787
986
if(not add_argument(p, *a)){
788
perror("add_argument");
987
error(0, errno, "add_argument");
789
988
}
790
989
}
791
990
/* Add global environment variables */
792
991
for(char **e = g->environ; *e != NULL; e++){
793
992
if(not add_environment(p, *e, false)){
794
perror("add_environment");
993
error(0, errno, "add_environment");
795
994
}
796
995
}
797
996
}
802
1001
if(p->environ[0] != NULL){
803
1002
for(char **e = environ; *e != NULL; e++){
804
1003
if(not add_environment(p, *e, false)){
805
perror("add_environment");
1004
error(0, errno, "add_environment");
806
1005
}
807
1006
}
808
1007
}
809
1008
810
1009
int pipefd[2];
811
ret = pipe(pipefd);
812
if (ret == -1){
813
perror("pipe");
814
exitstatus = EXIT_FAILURE;
1010
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
1011
if(ret == -1){
1012
error(0, errno, "pipe");
1013
exitstatus = EX_OSERR;
815
1014
goto fallback;
816
1015
}
817
1016
/* Ask OS to automatic close the pipe on exec */
818
1017
ret = set_cloexec_flag(pipefd[0]);
819
1018
if(ret < 0){
820
perror("set_cloexec_flag");
821
exitstatus = EXIT_FAILURE;
1019
error(0, errno, "set_cloexec_flag");
1020
exitstatus = EX_OSERR;
822
1021
goto fallback;
823
1022
}
824
1023
ret = set_cloexec_flag(pipefd[1]);
825
1024
if(ret < 0){
826
perror("set_cloexec_flag");
827
exitstatus = EXIT_FAILURE;
1025
error(0, errno, "set_cloexec_flag");
1026
exitstatus = EX_OSERR;
828
1027
goto fallback;
829
1028
}
830
1029
/* Block SIGCHLD until process is safely in process list */
831
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));
832
1033
if(ret < 0){
833
perror("sigprocmask");
834
exitstatus = EXIT_FAILURE;
1034
error(0, errno, "sigprocmask");
1035
exitstatus = EX_OSERR;
835
1036
goto fallback;
836
1037
}
837
1038
/* Starting a new process to be watched */
838
pid_t pid = fork();
1039
pid_t pid;
1040
do {
1041
pid = fork();
1042
} while(pid == -1 and errno == EINTR);
839
1043
if(pid == -1){
840
perror("fork");
841
exitstatus = EXIT_FAILURE;
1044
error(0, errno, "fork");
1045
exitstatus = EX_OSERR;
842
1046
goto fallback;
843
1047
}
844
1048
if(pid == 0){
845
1049
/* this is the child process */
846
1050
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
847
1051
if(ret < 0){
848
perror("sigaction");
849
_exit(EXIT_FAILURE);
1052
error(0, errno, "sigaction");
1053
_exit(EX_OSERR);
850
1054
}
851
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1055
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
852
1056
if(ret < 0){
853
perror("sigprocmask");
854
_exit(EXIT_FAILURE);
1057
error(0, errno, "sigprocmask");
1058
_exit(EX_OSERR);
855
1059
}
856
1060
857
1061
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
858
1062
if(ret == -1){
859
perror("dup2");
860
_exit(EXIT_FAILURE);
1063
error(0, errno, "dup2");
1064
_exit(EX_OSERR);
861
1065
}
862
1066
863
1067
if(dirfd(dir) < 0){
867
1071
}
868
1072
if(p->environ[0] == NULL){
869
1073
if(execv(filename, p->argv) < 0){
870
perror("execv");
871
_exit(EXIT_FAILURE);
1074
error(0, errno, "execv for %s", filename);
1075
_exit(EX_OSERR);
872
1076
}
873
1077
} else {
874
1078
if(execve(filename, p->argv, p->environ) < 0){
875
perror("execve");
876
_exit(EXIT_FAILURE);
1079
error(0, errno, "execve for %s", filename);
1080
_exit(EX_OSERR);
877
1081
}
878
1082
}
879
1083
/* no return */
880
1084
}
881
1085
/* Parent process */
882
close(pipefd[1]); /* Close unused write end of pipe */
1086
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1087
pipe */
883
1088
free(filename);
884
1089
plugin *new_plugin = getplugin(dirst->d_name);
885
if (new_plugin == NULL){
886
perror("getplugin");
887
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)));
888
1095
if(ret < 0){
889
perror("sigprocmask");
1096
error(0, errno, "sigprocmask");
890
1097
}
891
exitstatus = EXIT_FAILURE;
1098
exitstatus = EX_OSERR;
892
1099
goto fallback;
893
1100
}
894
1101
897
1104
898
1105
/* Unblock SIGCHLD so signal handler can be run if this process
899
1106
has already completed */
900
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));
901
1110
if(ret < 0){
902
perror("sigprocmask");
903
exitstatus = EXIT_FAILURE;
1111
error(0, errno, "sigprocmask");
1112
exitstatus = EX_OSERR;
904
1113
goto fallback;
905
1114
}
906
1115
907
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
908
1130
909
if (maxfd < new_plugin->fd){
1131
if(maxfd < new_plugin->fd){
910
1132
maxfd = new_plugin->fd;
911
1133
}
912
913
1134
}
914
1135
915
closedir(dir);
1136
TEMP_FAILURE_RETRY(closedir(dir));
916
1137
dir = NULL;
917
1138
free_plugin(getplugin(NULL));
1139
918
1140
for(plugin *p = plugin_list; p != NULL; p = p->next){
919
1141
if(p->pid != 0){
920
1142
break;
925
1147
free_plugin_list();
926
1148
}
927
1149
}
928
1150
929
1151
/* Main loop while running plugins exist */
930
1152
while(plugin_list){
931
1153
fd_set rfds = rfds_all;
932
1154
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
933
if (select_ret == -1){
934
perror("select");
935
exitstatus = EXIT_FAILURE;
1155
if(select_ret == -1 and errno != EINTR){
1156
error(0, errno, "select");
1157
exitstatus = EX_OSERR;
936
1158
goto fallback;
937
1159
}
938
1160
/* OK, now either a process completed, or something can be read
939
1161
from one of them */
940
for(plugin *proc = plugin_list; proc != NULL; proc = proc->next){
1162
for(plugin *proc = plugin_list; proc != NULL;){
941
1163
/* Is this process completely done? */
942
if(proc->eof and proc->completed){
1164
if(proc->completed and proc->eof){
943
1165
/* Only accept the plugin output if it exited cleanly */
944
1166
if(not WIFEXITED(proc->status)
945
1167
or WEXITSTATUS(proc->status) != 0){
946
1168
/* Bad exit by plugin */
947
1169
948
1170
if(debug){
949
1171
if(WIFEXITED(proc->status)){
950
fprintf(stderr, "Plugin %u exited with status %d\n",
951
(unsigned int) (proc->pid),
1172
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1173
" status %d\n", proc->name,
1174
(intmax_t) (proc->pid),
952
1175
WEXITSTATUS(proc->status));
953
} else if(WIFSIGNALED(proc->status)) {
954
fprintf(stderr, "Plugin %u killed by signal %d\n",
955
(unsigned int) (proc->pid),
956
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)));
957
1182
} else if(WCOREDUMP(proc->status)){
958
fprintf(stderr, "Plugin %d dumped core\n",
959
(unsigned int) (proc->pid));
1183
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1184
" core\n", proc->name, (intmax_t) (proc->pid));
960
1185
}
961
1186
}
962
1187
963
1188
/* Remove the plugin */
964
FD_CLR(proc->fd, &rfds_all);
965
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
966
1204
/* Block signal while modifying process_list */
967
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));
968
1209
if(ret < 0){
969
perror("sigprocmask");
970
exitstatus = EXIT_FAILURE;
1210
error(0, errno, "sigprocmask");
1211
exitstatus = EX_OSERR;
971
1212
goto fallback;
972
1213
}
1214
1215
plugin *next_plugin = proc->next;
973
1216
free_plugin(proc);
1217
proc = next_plugin;
1218
974
1219
/* We are done modifying process list, so unblock signal */
975
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
976
NULL);
1220
ret = (int)(TEMP_FAILURE_RETRY
1221
(sigprocmask(SIG_UNBLOCK,
1222
&sigchld_action.sa_mask, NULL)));
977
1223
if(ret < 0){
978
perror("sigprocmask");
979
exitstatus = EXIT_FAILURE;
1224
error(0, errno, "sigprocmask");
1225
exitstatus = EX_OSERR;
980
1226
goto fallback;
981
1227
}
982
1228
983
1229
if(plugin_list == NULL){
984
1230
break;
985
1231
}
1232
986
1233
continue;
987
1234
}
988
1235
989
1236
/* This process exited nicely, so print its buffer */
990
1237
991
1238
bool bret = print_out_password(proc->buffer,
992
1239
proc->buffer_length);
993
1240
if(not bret){
994
perror("print_out_password");
995
exitstatus = EXIT_FAILURE;
1241
error(0, errno, "print_out_password");
1242
exitstatus = EX_IOERR;
996
1243
}
997
1244
goto fallback;
998
1245
}
999
1246
1000
1247
/* This process has not completed. Does it have any output? */
1001
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
1002
1265
/* This process had nothing to say at this time */
1266
proc = proc->next;
1003
1267
continue;
1004
1268
}
1005
1269
/* Before reading, make the process' data buffer large enough */
1006
1270
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1007
proc->buffer = realloc(proc->buffer, proc->buffer_size
1008
+ (size_t) BUFFER_SIZE);
1009
if (proc->buffer == NULL){
1010
perror("malloc");
1011
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;
1012
1276
goto fallback;
1013
1277
}
1278
proc->buffer = new_buffer;
1014
1279
proc->buffer_size += BUFFER_SIZE;
1015
1280
}
1016
1281
/* Read from the process */
1017
ret = read(proc->fd, proc->buffer + proc->buffer_length,
1018
BUFFER_SIZE);
1019
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){
1020
1287
/* Read error from this process; ignore the error */
1288
proc = proc->next;
1021
1289
continue;
1022
1290
}
1023
if(ret == 0){
1291
if(sret == 0){
1024
1292
/* got EOF */
1025
1293
proc->eof = true;
1026
1294
} else {
1027
proc->buffer_length += (size_t) ret;
1295
proc->buffer_length += (size_t) sret;
1028
1296
}
1029
1297
}
1030
1298
}
1031
1032
1299
1300
1033
1301
fallback:
1034
1302
1035
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1303
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1304
and exitstatus != EX_OK)){
1036
1305
/* Fallback if all plugins failed, none are found or an error
1037
1306
occured */
1038
1307
bool bret;
1046
1315
}
1047
1316
bret = print_out_password(passwordbuffer, len);
1048
1317
if(not bret){
1049
perror("print_out_password");
1050
exitstatus = EXIT_FAILURE;
1318
error(0, errno, "print_out_password");
1319
exitstatus = EX_IOERR;
1051
1320
}
1052
1321
}
1053
1322
1054
1323
/* Restore old signal handler */
1055
1324
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1056
1325
if(ret == -1){
1057
perror("sigaction");
1058
exitstatus = EXIT_FAILURE;
1326
error(0, errno, "sigaction");
1327
exitstatus = EX_OSERR;
1059
1328
}
1060
1329
1061
1330
if(custom_argv != NULL){
1062
1331
for(char **arg = custom_argv+1; *arg != NULL; arg++){
1063
1332
free(*arg);
1069
1338
closedir(dir);
1070
1339
}
1071
1340
1072
/* Free the process list and kill the processes */
1341
/* Kill the processes */
1073
1342
for(plugin *p = plugin_list; p != NULL; p = p->next){
1074
1343
if(p->pid != 0){
1075
1344
close(p->fd);
1076
1345
ret = kill(p->pid, SIGTERM);
1077
1346
if(ret == -1 and errno != ESRCH){
1078
1347
/* Set-uid proccesses might not get closed */
1079
perror("kill");
1348
error(0, errno, "kill");
1080
1349
}
1081
1350
}
1082
1351
}
1083
1352
1084
1353
/* Wait for any remaining child processes to terminate */
1085
do{
1354
do {
1086
1355
ret = wait(NULL);
1087
1356
} while(ret >= 0);
1088
1357
if(errno != ECHILD){
1089
perror("wait");
1358
error(0, errno, "wait");
1090
1359
}
1091
1360
1092
1361
free_plugin_list();
1093
1362
1094
1363
free(plugindir);
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0