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 304
- compare with another revision
- download diff
- download tarball
- view history from revision 304
- Committer: Teddy Hogeborn
- Date: 2009-02-09 02:01:13 UTC
- Revision ID: teddy@fukt.bsnet.se-20090209020113-726hq380zvp8zt97
Four new interrelated features:
1. Support using a different network interface via both initramfs.conf
(the DEVICE setting) and the kernel command line (sixth field of
the "ip=" option as in Linux' Documentation/nfsroot.txt).
2. Support connecting to a specified Mandos server directly using a
kernel command line option ("mandos=connect:<ADDRESS>:<PORT>").
3. Support connecting directly to an IPv4 address (and port) using the
"--connect" option of mandos-client.
4. Support an empty string to the --interface option to mandos-client.
* Makefile (WARN): Increase strictness by changing to
"-Wstrict-aliasing=1".
* debian/mandos-client.README.Debian (Use the Correct Network
Interface): Changed to refer to initramfs.conf and nfsroot.txt.
(Test the Server): Improve wording.
(Non-local Connection): New section.
* initramfs-tools-script: Obey DEVICE environment variable and setting
from "/conf/initramfs.conf". Also let any
"ip=" kernel command line option override
it. Support new "mandos=connect" option.
Call "configure_networking" to set up IP
address on interface if necessary.
* plugin-runner.conf: Change example.
* plugins.d/mandos-client.c: Some whitespace and comment changes.
(start_mandos_communication): Take an additional argument for
address family, all callers changed.
Connect to an IPv4 address if address
family is AF_INET. Only set IPv6
scope_id for link-local addresses.
(main): Accept empty interface name; this will not bring up any
interface and leave the interface as unspecified. Also do
not restore kernel log level if lowering it failed.
* plugins.d/mandos-client.xml (OPTIONS): Document that the
"--interface" option accepts
an empty string.
(EXAMPLE): Change example IPv6 address to a link-local address.
1. Support using a different network interface via both initramfs.conf
(the DEVICE setting) and the kernel command line (sixth field of
the "ip=" option as in Linux' Documentation/nfsroot.txt).
2. Support connecting to a specified Mandos server directly using a
kernel command line option ("mandos=connect:<ADDRESS>:<PORT>").
3. Support connecting directly to an IPv4 address (and port) using the
"--connect" option of mandos-client.
4. Support an empty string to the --interface option to mandos-client.
* Makefile (WARN): Increase strictness by changing to
"-Wstrict-aliasing=1".
* debian/mandos-client.README.Debian (Use the Correct Network
Interface): Changed to refer to initramfs.conf and nfsroot.txt.
(Test the Server): Improve wording.
(Non-local Connection): New section.
* initramfs-tools-script: Obey DEVICE environment variable and setting
from "/conf/initramfs.conf". Also let any
"ip=" kernel command line option override
it. Support new "mandos=connect" option.
Call "configure_networking" to set up IP
address on interface if necessary.
* plugin-runner.conf: Change example.
* plugins.d/mandos-client.c: Some whitespace and comment changes.
(start_mandos_communication): Take an additional argument for
address family, all callers changed.
Connect to an IPv4 address if address
family is AF_INET. Only set IPv6
scope_id for link-local addresses.
(main): Accept empty interface name; this will not bring up any
interface and leave the interface as unspecified. Also do
not restore kernel log level if lowering it failed.
* plugins.d/mandos-client.xml (OPTIONS): Document that the
"--interface" option accepts
an empty string.
(EXAMPLE): Change example IPv6 address to a link-local address.
- files removed:
- DBUS-API
- debian/source
- network-hooks.d
- files modified:
- .bzrignore
added
removed
plugin-runner.c
1
/* -*- coding: utf-8; mode: c; mode: orgtbl -*- */
1
/* -*- coding: utf-8 -*- */
2
2
/*
3
3
* Mandos plugin runner - Run Mandos plugins
4
4
*
5
* Copyright © 2008-2011 Teddy Hogeborn
6
* Copyright © 2008-2011 Björn Påhlsson
5
* Copyright © 2008,2009 Teddy Hogeborn
6
* Copyright © 2008,2009 Björn Påhlsson
7
7
*
8
8
* This program is free software: you can redistribute it and/or
9
9
* modify it under the terms of the GNU General Public License as
19
19
* along with this program. If not, see
20
20
* <http://www.gnu.org/licenses/>.
21
21
*
22
* Contact the authors at <mandos@recompile.se>.
22
* Contact the authors at <mandos@fukt.bsnet.se>.
23
23
*/
24
24
25
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
asprintf(), O_CLOEXEC */
26
asprintf() */
27
27
#include <stddef.h> /* size_t, NULL */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
29
realloc() */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
29
EXIT_SUCCESS, realloc() */
30
30
#include <stdbool.h> /* bool, true, false */
31
#include <stdio.h> /* fileno(), fprintf(),
31
#include <stdio.h> /* perror, fileno(), fprintf(),
32
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, fdopendir(), stat(), struct
33
#include <sys/types.h> /* DIR, opendir(), stat(), struct
34
34
stat, waitpid(), WIFEXITED(),
35
35
WEXITSTATUS(), wait(), pid_t,
36
36
uid_t, gid_t, getuid(), getgid(),
38
38
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
39
39
FD_SET(), FD_ISSET(), FD_CLR */
40
40
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
41
WEXITSTATUS(), WTERMSIG(),
42
WCOREDUMP() */
41
WEXITSTATUS() */
43
42
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
44
43
#include <iso646.h> /* and, or, not */
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
44
#include <dirent.h> /* DIR, struct dirent, opendir(),
46
45
readdir(), closedir(), dirfd() */
47
46
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
48
47
fcntl(), setuid(), setgid(),
53
52
close() */
54
53
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
55
54
FD_CLOEXEC */
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal(), strcmp(), strncmp() */
55
#include <string.h> /* strsep, strlen(), asprintf() */
58
56
#include <errno.h> /* errno */
59
57
#include <argp.h> /* struct argp_option, struct
60
58
argp_state, struct argp,
64
62
#include <signal.h> /* struct sigaction, sigemptyset(),
65
63
sigaddset(), sigaction(),
66
64
sigprocmask(), SIG_BLOCK, SIGCHLD,
67
SIG_UNBLOCK, kill(), sig_atomic_t
68
*/
65
SIG_UNBLOCK, kill() */
69
66
#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() */
67
#include <inttypes.h> /* intmax_t, SCNdMAX, PRIdMAX, */
75
68
76
69
#define BUFFER_SIZE 256
77
70
79
72
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
80
73
81
74
const char *argp_program_version = "plugin-runner " VERSION;
82
const char *argp_program_bug_address = "<mandos@recompile.se>";
75
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
83
76
84
77
typedef struct plugin{
85
78
char *name; /* can be NULL or any plugin name */
88
81
char **environ;
89
82
int envc;
90
83
bool disabled;
91
84
92
85
/* Variables used for running processes*/
93
86
pid_t pid;
94
87
int fd;
106
99
/* Gets an existing plugin based on name,
107
100
or if none is found, creates a new one */
108
101
static plugin *getplugin(char *name){
109
/* Check for existing plugin with that name */
102
/* Check for exiting plugin with that name */
110
103
for(plugin *p = plugin_list; p != NULL; p = p->next){
111
104
if((p->name == name)
112
105
or (p->name and name and (strcmp(p->name, name) == 0))){
114
107
}
115
108
}
116
109
/* Create a new plugin */
117
plugin *new_plugin = NULL;
118
do {
119
new_plugin = malloc(sizeof(plugin));
120
} while(new_plugin == NULL and errno == EINTR);
110
plugin *new_plugin = malloc(sizeof(plugin));
121
111
if(new_plugin == NULL){
122
112
return NULL;
123
113
}
124
114
char *copy_name = NULL;
125
115
if(name != NULL){
126
do {
127
copy_name = strdup(name);
128
} while(copy_name == NULL and errno == EINTR);
116
copy_name = strdup(name);
129
117
if(copy_name == NULL){
130
int e = errno;
131
118
free(new_plugin);
132
errno = e;
133
119
return NULL;
134
120
}
135
121
}
139
125
.disabled = false,
140
126
.next = plugin_list };
141
127
142
do {
143
new_plugin->argv = malloc(sizeof(char *) * 2);
144
} while(new_plugin->argv == NULL and errno == EINTR);
128
new_plugin->argv = malloc(sizeof(char *) * 2);
145
129
if(new_plugin->argv == NULL){
146
int e = errno;
147
130
free(copy_name);
148
131
free(new_plugin);
149
errno = e;
150
132
return NULL;
151
133
}
152
134
new_plugin->argv[0] = copy_name;
153
135
new_plugin->argv[1] = NULL;
154
136
155
do {
156
new_plugin->environ = malloc(sizeof(char *));
157
} while(new_plugin->environ == NULL and errno == EINTR);
137
new_plugin->environ = malloc(sizeof(char *));
158
138
if(new_plugin->environ == NULL){
159
int e = errno;
160
139
free(copy_name);
161
140
free(new_plugin->argv);
162
141
free(new_plugin);
163
errno = e;
164
142
return NULL;
165
143
}
166
144
new_plugin->environ[0] = NULL;
171
149
}
172
150
173
151
/* Helper function for add_argument and add_environment */
174
__attribute__((nonnull))
175
152
static bool add_to_char_array(const char *new, char ***array,
176
153
int *len){
177
154
/* Resize the pointed-to array to hold one more pointer */
178
do {
179
*array = realloc(*array, sizeof(char *)
180
* (size_t) ((*len) + 2));
181
} while(*array == NULL and errno == EINTR);
155
*array = realloc(*array, sizeof(char *)
156
* (size_t) ((*len) + 2));
182
157
/* Malloc check */
183
158
if(*array == NULL){
184
159
return false;
185
160
}
186
161
/* Make a copy of the new string */
187
char *copy;
188
do {
189
copy = strdup(new);
190
} while(copy == NULL and errno == EINTR);
162
char *copy = strdup(new);
191
163
if(copy == NULL){
192
164
return false;
193
165
}
200
172
}
201
173
202
174
/* Add to a plugin's argument vector */
203
__attribute__((nonnull(2)))
204
175
static bool add_argument(plugin *p, const char *arg){
205
176
if(p == NULL){
206
177
return false;
209
180
}
210
181
211
182
/* Add to a plugin's environment */
212
__attribute__((nonnull(2)))
213
183
static bool add_environment(plugin *p, const char *def, bool replace){
214
184
if(p == NULL){
215
185
return false;
221
191
if(strncmp(*e, def, namelen + 1) == 0){
222
192
/* It already exists */
223
193
if(replace){
224
char *new;
225
do {
226
new = realloc(*e, strlen(def) + 1);
227
} while(new == NULL and errno == EINTR);
194
char *new = realloc(*e, strlen(def) + 1);
228
195
if(new == NULL){
229
196
return false;
230
197
}
240
207
/*
241
208
* Based on the example in the GNU LibC manual chapter 13.13 "File
242
209
* Descriptor Flags".
243
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
210
* *Note File Descriptor Flags:(libc)Descriptor Flags.
244
211
*/
245
212
static int set_cloexec_flag(int fd){
246
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
213
int ret = fcntl(fd, F_GETFD, 0);
247
214
/* If reading the flags failed, return error indication now. */
248
215
if(ret < 0){
249
216
return ret;
250
217
}
251
218
/* Store modified flag word in the descriptor. */
252
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
253
ret | FD_CLOEXEC));
219
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
254
220
}
255
221
256
222
271
237
/* No child processes */
272
238
break;
273
239
}
274
error(0, errno, "waitpid");
240
perror("waitpid");
275
241
}
276
242
277
243
/* A child exited, find it in process_list */
289
255
}
290
256
291
257
/* Prints out a password to stdout */
292
__attribute__((nonnull))
293
258
static bool print_out_password(const char *buffer, size_t length){
294
259
ssize_t ret;
295
260
for(size_t written = 0; written < length; written += (size_t)ret){
303
268
}
304
269
305
270
/* Removes and free a plugin from the plugin list */
306
__attribute__((nonnull))
307
271
static void free_plugin(plugin *plugin_node){
308
272
309
273
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
315
279
}
316
280
free(plugin_node->environ);
317
281
free(plugin_node->buffer);
318
282
319
283
/* Removes the plugin from the singly-linked list */
320
284
if(plugin_node == plugin_list){
321
285
/* First one - simple */
348
312
struct dirent *dirst;
349
313
struct stat st;
350
314
fd_set rfds_all;
351
int ret, maxfd = 0;
315
int ret, numchars, maxfd = 0;
352
316
ssize_t sret;
317
intmax_t tmpmax;
353
318
uid_t uid = 65534;
354
319
gid_t gid = 65534;
355
320
bool debug = false;
364
329
sigemptyset(&sigchld_action.sa_mask);
365
330
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
366
331
if(ret == -1){
367
error(0, errno, "sigaddset");
368
exitstatus = EX_OSERR;
332
perror("sigaddset");
333
exitstatus = EXIT_FAILURE;
369
334
goto fallback;
370
335
}
371
336
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
372
337
if(ret == -1){
373
error(0, errno, "sigaction");
374
exitstatus = EX_OSERR;
338
perror("sigaction");
339
exitstatus = EXIT_FAILURE;
375
340
goto fallback;
376
341
}
377
342
409
374
.doc = "Group ID the plugins will run as", .group = 3 },
410
375
{ .name = "debug", .key = 132,
411
376
.doc = "Debug mode", .group = 4 },
412
/*
413
* These reproduce what we would get without ARGP_NO_HELP
414
*/
415
{ .name = "help", .key = '?',
416
.doc = "Give this help list", .group = -1 },
417
{ .name = "usage", .key = -3,
418
.doc = "Give a short usage message", .group = -1 },
419
{ .name = "version", .key = 'V',
420
.doc = "Print program version", .group = -1 },
421
377
{ .name = NULL }
422
378
};
423
379
424
__attribute__((nonnull(3)))
425
error_t parse_opt(int key, char *arg, struct argp_state *state){
426
errno = 0;
380
error_t parse_opt(int key, char *arg, __attribute__((unused))
381
struct argp_state *state){
427
382
switch(key){
428
char *tmp;
429
intmax_t tmpmax;
430
383
case 'g': /* --global-options */
431
{
432
char *plugin_option;
433
while((plugin_option = strsep(&arg, ",")) != NULL){
434
if(not add_argument(getplugin(NULL), plugin_option)){
435
break;
384
if(arg != NULL){
385
char *p;
386
while((p = strsep(&arg, ",")) != NULL){
387
if(p[0] == '\0'){
388
continue;
389
}
390
if(not add_argument(getplugin(NULL), p)){
391
perror("add_argument");
392
return ARGP_ERR_UNKNOWN;
436
393
}
437
394
}
438
395
}
439
396
break;
440
397
case 'G': /* --global-env */
441
add_environment(getplugin(NULL), arg, true);
398
if(arg == NULL){
399
break;
400
}
401
if(not add_environment(getplugin(NULL), arg, true)){
402
perror("add_environment");
403
}
442
404
break;
443
405
case 'o': /* --options-for */
444
{
445
char *option_list = strchr(arg, ':');
446
if(option_list == NULL){
447
argp_error(state, "No colon in \"%s\"", arg);
448
errno = EINVAL;
449
break;
450
}
451
*option_list = '\0';
452
option_list++;
453
if(arg[0] == '\0'){
454
argp_error(state, "Empty plugin name");
455
errno = EINVAL;
456
break;
457
}
458
char *option;
459
while((option = strsep(&option_list, ",")) != NULL){
460
if(not add_argument(getplugin(arg), option)){
461
break;
406
if(arg != NULL){
407
char *p_name = strsep(&arg, ":");
408
if(p_name[0] == '\0' or arg == NULL){
409
break;
410
}
411
char *opt = strsep(&arg, ":");
412
if(opt[0] == '\0' or opt == NULL){
413
break;
414
}
415
char *p;
416
while((p = strsep(&opt, ",")) != NULL){
417
if(p[0] == '\0'){
418
continue;
419
}
420
if(not add_argument(getplugin(p_name), p)){
421
perror("add_argument");
422
return ARGP_ERR_UNKNOWN;
462
423
}
463
424
}
464
425
}
465
426
break;
466
427
case 'E': /* --env-for */
428
if(arg == NULL){
429
break;
430
}
467
431
{
468
432
char *envdef = strchr(arg, ':');
469
433
if(envdef == NULL){
470
argp_error(state, "No colon in \"%s\"", arg);
471
errno = EINVAL;
472
434
break;
473
435
}
474
436
*envdef = '\0';
475
envdef++;
476
if(arg[0] == '\0'){
477
argp_error(state, "Empty plugin name");
478
errno = EINVAL;
479
break;
437
if(not add_environment(getplugin(arg), envdef+1, true)){
438
perror("add_environment");
480
439
}
481
add_environment(getplugin(arg), envdef, true);
482
440
}
483
441
break;
484
442
case 'd': /* --disable */
485
{
443
if(arg != NULL){
486
444
plugin *p = getplugin(arg);
487
if(p != NULL){
488
p->disabled = true;
445
if(p == NULL){
446
return ARGP_ERR_UNKNOWN;
489
447
}
448
p->disabled = true;
490
449
}
491
450
break;
492
451
case 'e': /* --enable */
493
{
452
if(arg != NULL){
494
453
plugin *p = getplugin(arg);
495
if(p != NULL){
496
p->disabled = false;
454
if(p == NULL){
455
return ARGP_ERR_UNKNOWN;
497
456
}
457
p->disabled = false;
498
458
}
499
459
break;
500
460
case 128: /* --plugin-dir */
501
461
free(plugindir);
502
462
plugindir = strdup(arg);
463
if(plugindir == NULL){
464
perror("strdup");
465
}
503
466
break;
504
467
case 129: /* --config-file */
505
468
/* This is already done by parse_opt_config_file() */
506
469
break;
507
470
case 130: /* --userid */
508
tmpmax = strtoimax(arg, &tmp, 10);
509
if(errno != 0 or tmp == arg or *tmp != '\0'
510
or tmpmax != (uid_t)tmpmax){
511
argp_error(state, "Bad user ID number: \"%s\", using %"
512
PRIdMAX, arg, (intmax_t)uid);
513
break;
471
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
472
if(ret < 1 or tmpmax != (uid_t)tmpmax
473
or arg[numchars] != '\0'){
474
fprintf(stderr, "Bad user ID number: \"%s\", using %"
475
PRIdMAX "\n", arg, (intmax_t)uid);
476
} else {
477
uid = (uid_t)tmpmax;
514
478
}
515
uid = (uid_t)tmpmax;
516
479
break;
517
480
case 131: /* --groupid */
518
tmpmax = strtoimax(arg, &tmp, 10);
519
if(errno != 0 or tmp == arg or *tmp != '\0'
520
or tmpmax != (gid_t)tmpmax){
521
argp_error(state, "Bad group ID number: \"%s\", using %"
522
PRIdMAX, arg, (intmax_t)gid);
523
break;
481
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
482
if(ret < 1 or tmpmax != (gid_t)tmpmax
483
or arg[numchars] != '\0'){
484
fprintf(stderr, "Bad group ID number: \"%s\", using %"
485
PRIdMAX "\n", arg, (intmax_t)gid);
486
} else {
487
gid = (gid_t)tmpmax;
524
488
}
525
gid = (gid_t)tmpmax;
526
489
break;
527
490
case 132: /* --debug */
528
491
debug = true;
529
492
break;
530
/*
531
* These reproduce what we would get without ARGP_NO_HELP
532
*/
533
case '?': /* --help */
534
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
535
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
536
case -3: /* --usage */
537
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
538
argp_state_help(state, state->out_stream,
539
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
540
case 'V': /* --version */
541
fprintf(state->out_stream, "%s\n", argp_program_version);
542
exit(EXIT_SUCCESS);
543
break;
544
493
/*
545
494
* When adding more options before this line, remember to also add a
546
495
* "case" to the "parse_opt_config_file" function below.
549
498
/* Cryptsetup always passes an argument, which is an empty
550
499
string if "none" was specified in /etc/crypttab. So if
551
500
argument was empty, we ignore it silently. */
552
if(arg[0] == '\0'){
553
break;
501
if(arg[0] != '\0'){
502
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
554
503
}
504
break;
505
case ARGP_KEY_END:
506
break;
555
507
default:
556
508
return ARGP_ERR_UNKNOWN;
557
509
}
558
return errno; /* Set to 0 at start */
510
return 0;
559
511
}
560
512
561
513
/* This option parser is the same as parse_opt() above, except it
563
515
error_t parse_opt_config_file(int key, char *arg,
564
516
__attribute__((unused))
565
517
struct argp_state *state){
566
errno = 0;
567
518
switch(key){
568
519
case 'g': /* --global-options */
569
520
case 'G': /* --global-env */
576
527
case 129: /* --config-file */
577
528
free(argfile);
578
529
argfile = strdup(arg);
579
break;
530
if(argfile == NULL){
531
perror("strdup");
532
}
533
break;
580
534
case 130: /* --userid */
581
535
case 131: /* --groupid */
582
536
case 132: /* --debug */
583
case '?': /* --help */
584
case -3: /* --usage */
585
case 'V': /* --version */
586
537
case ARGP_KEY_ARG:
538
case ARGP_KEY_END:
587
539
break;
588
540
default:
589
541
return ARGP_ERR_UNKNOWN;
590
542
}
591
return errno;
543
return 0;
592
544
}
593
545
594
546
struct argp argp = { .options = options,
598
550
599
551
/* Parse using parse_opt_config_file() in order to get the custom
600
552
config file location, if any. */
601
ret = argp_parse(&argp, argc, argv,
602
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
603
NULL, NULL);
604
switch(ret){
605
case 0:
606
break;
607
case ENOMEM:
608
default:
609
errno = ret;
610
error(0, errno, "argp_parse");
611
exitstatus = EX_OSERR;
612
goto fallback;
613
case EINVAL:
614
exitstatus = EX_USAGE;
553
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
554
if(ret == ARGP_ERR_UNKNOWN){
555
fprintf(stderr, "Unknown error while parsing arguments\n");
556
exitstatus = EXIT_FAILURE;
615
557
goto fallback;
616
558
}
617
559
623
565
conffp = fopen(AFILE, "r");
624
566
} else {
625
567
conffp = fopen(argfile, "r");
626
}
568
}
627
569
if(conffp != NULL){
628
570
char *org_line = NULL;
629
571
char *p, *arg, *new_arg, *line;
630
572
size_t size = 0;
631
573
const char whitespace_delims[] = " \r\t\f\v\n";
632
574
const char comment_delim[] = "#";
633
575
634
576
custom_argc = 1;
635
577
custom_argv = malloc(sizeof(char*) * 2);
636
578
if(custom_argv == NULL){
637
error(0, errno, "malloc");
638
exitstatus = EX_OSERR;
579
perror("malloc");
580
exitstatus = EXIT_FAILURE;
639
581
goto fallback;
640
582
}
641
583
custom_argv[0] = argv[0];
642
584
custom_argv[1] = NULL;
643
585
644
586
/* for each line in the config file, strip whitespace and ignore
645
587
commented text */
646
588
while(true){
648
590
if(sret == -1){
649
591
break;
650
592
}
651
593
652
594
line = org_line;
653
595
arg = strsep(&line, comment_delim);
654
596
while((p = strsep(&arg, whitespace_delims)) != NULL){
657
599
}
658
600
new_arg = strdup(p);
659
601
if(new_arg == NULL){
660
error(0, errno, "strdup");
661
exitstatus = EX_OSERR;
602
perror("strdup");
603
exitstatus = EXIT_FAILURE;
662
604
free(org_line);
663
605
goto fallback;
664
606
}
667
609
custom_argv = realloc(custom_argv, sizeof(char *)
668
610
* ((unsigned int) custom_argc + 1));
669
611
if(custom_argv == NULL){
670
error(0, errno, "realloc");
671
exitstatus = EX_OSERR;
612
perror("realloc");
613
exitstatus = EXIT_FAILURE;
672
614
free(org_line);
673
615
goto fallback;
674
616
}
675
617
custom_argv[custom_argc-1] = new_arg;
676
custom_argv[custom_argc] = NULL;
618
custom_argv[custom_argc] = NULL;
677
619
}
678
620
}
679
do {
680
ret = fclose(conffp);
681
} while(ret == EOF and errno == EINTR);
682
if(ret == EOF){
683
error(0, errno, "fclose");
684
exitstatus = EX_IOERR;
685
goto fallback;
686
}
687
621
free(org_line);
688
622
} else {
689
623
/* Check for harmful errors and go to fallback. Other errors might
690
624
not affect opening plugins */
691
625
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
692
error(0, errno, "fopen");
693
exitstatus = EX_OSERR;
626
perror("fopen");
627
exitstatus = EXIT_FAILURE;
694
628
goto fallback;
695
629
}
696
630
}
697
/* If there were any arguments from the configuration file, pass
698
them to parser as command line arguments */
631
/* If there was any arguments from configuration file,
632
pass them to parser as command arguments */
699
633
if(custom_argv != NULL){
700
ret = argp_parse(&argp, custom_argc, custom_argv,
701
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
702
NULL, NULL);
703
switch(ret){
704
case 0:
705
break;
706
case ENOMEM:
707
default:
708
errno = ret;
709
error(0, errno, "argp_parse");
710
exitstatus = EX_OSERR;
711
goto fallback;
712
case EINVAL:
713
exitstatus = EX_CONFIG;
634
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
635
0, NULL);
636
if(ret == ARGP_ERR_UNKNOWN){
637
fprintf(stderr, "Unknown error while parsing arguments\n");
638
exitstatus = EXIT_FAILURE;
714
639
goto fallback;
715
640
}
716
641
}
717
642
718
643
/* Parse actual command line arguments, to let them override the
719
644
config file */
720
ret = argp_parse(&argp, argc, argv,
721
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
722
NULL, NULL);
723
switch(ret){
724
case 0:
725
break;
726
case ENOMEM:
727
default:
728
errno = ret;
729
error(0, errno, "argp_parse");
730
exitstatus = EX_OSERR;
731
goto fallback;
732
case EINVAL:
733
exitstatus = EX_USAGE;
645
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
646
if(ret == ARGP_ERR_UNKNOWN){
647
fprintf(stderr, "Unknown error while parsing arguments\n");
648
exitstatus = EXIT_FAILURE;
734
649
goto fallback;
735
650
}
736
651
748
663
}
749
664
}
750
665
751
if(getuid() == 0){
752
/* Work around Debian bug #633582:
753
<http://bugs.debian.org/633582> */
754
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
755
if(plugindir_fd == -1){
756
error(0, errno, "open");
757
} else {
758
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
759
if(ret == -1){
760
error(0, errno, "fstat");
761
} else {
762
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
763
ret = fchown(plugindir_fd, uid, gid);
764
if(ret == -1){
765
error(0, errno, "fchown");
766
}
767
}
768
}
769
TEMP_FAILURE_RETRY(close(plugindir_fd));
770
}
771
}
772
773
/* Lower permissions */
666
/* Strip permissions down to nobody */
774
667
setgid(gid);
775
668
if(ret == -1){
776
error(0, errno, "setgid");
669
perror("setgid");
777
670
}
778
671
ret = setuid(uid);
779
672
if(ret == -1){
780
error(0, errno, "setuid");
781
}
782
783
/* Open plugin directory with close_on_exec flag */
673
perror("setuid");
674
}
675
676
if(plugindir == NULL){
677
dir = opendir(PDIR);
678
} else {
679
dir = opendir(plugindir);
680
}
681
682
if(dir == NULL){
683
perror("Could not open plugin dir");
684
exitstatus = EXIT_FAILURE;
685
goto fallback;
686
}
687
688
/* Set the FD_CLOEXEC flag on the directory, if possible */
784
689
{
785
int dir_fd = -1;
786
if(plugindir == NULL){
787
dir_fd = open(PDIR, O_RDONLY |
788
#ifdef O_CLOEXEC
789
O_CLOEXEC
790
#else /* not O_CLOEXEC */
791
0
792
#endif /* not O_CLOEXEC */
793
);
794
} else {
795
dir_fd = open(plugindir, O_RDONLY |
796
#ifdef O_CLOEXEC
797
O_CLOEXEC
798
#else /* not O_CLOEXEC */
799
0
800
#endif /* not O_CLOEXEC */
801
);
802
}
803
if(dir_fd == -1){
804
error(0, errno, "Could not open plugin dir");
805
exitstatus = EX_UNAVAILABLE;
806
goto fallback;
807
}
808
809
#ifndef O_CLOEXEC
810
/* Set the FD_CLOEXEC flag on the directory */
811
ret = set_cloexec_flag(dir_fd);
812
if(ret < 0){
813
error(0, errno, "set_cloexec_flag");
814
TEMP_FAILURE_RETRY(close(dir_fd));
815
exitstatus = EX_OSERR;
816
goto fallback;
817
}
818
#endif /* O_CLOEXEC */
819
820
dir = fdopendir(dir_fd);
821
if(dir == NULL){
822
error(0, errno, "Could not open plugin dir");
823
TEMP_FAILURE_RETRY(close(dir_fd));
824
exitstatus = EX_OSERR;
825
goto fallback;
690
int dir_fd = dirfd(dir);
691
if(dir_fd >= 0){
692
ret = set_cloexec_flag(dir_fd);
693
if(ret < 0){
694
perror("set_cloexec_flag");
695
exitstatus = EXIT_FAILURE;
696
goto fallback;
697
}
826
698
}
827
699
}
828
700
830
702
831
703
/* Read and execute any executable in the plugin directory*/
832
704
while(true){
833
do {
834
dirst = readdir(dir);
835
} while(dirst == NULL and errno == EINTR);
705
dirst = readdir(dir);
836
706
837
707
/* All directory entries have been processed */
838
708
if(dirst == NULL){
839
709
if(errno == EBADF){
840
error(0, errno, "readdir");
841
exitstatus = EX_IOERR;
710
perror("readdir");
711
exitstatus = EXIT_FAILURE;
842
712
goto fallback;
843
713
}
844
714
break;
874
744
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
875
745
size_t suf_len = strlen(*suf);
876
746
if((d_name_len >= suf_len)
877
and (strcmp((dirst->d_name) + d_name_len-suf_len, *suf)
747
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
878
748
== 0)){
879
749
if(debug){
880
750
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
889
759
continue;
890
760
}
891
761
}
892
762
893
763
char *filename;
894
764
if(plugindir == NULL){
895
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
896
dirst->d_name));
765
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
897
766
} else {
898
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
899
plugindir,
900
dirst->d_name));
767
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
901
768
}
902
769
if(ret < 0){
903
error(0, errno, "asprintf");
770
perror("asprintf");
904
771
continue;
905
772
}
906
773
907
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
774
ret = stat(filename, &st);
908
775
if(ret == -1){
909
error(0, errno, "stat");
776
perror("stat");
910
777
free(filename);
911
778
continue;
912
779
}
913
780
914
781
/* Ignore non-executable files */
915
if(not S_ISREG(st.st_mode)
916
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
782
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
917
783
if(debug){
918
784
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
919
785
" with bad type or mode\n", filename);
924
790
925
791
plugin *p = getplugin(dirst->d_name);
926
792
if(p == NULL){
927
error(0, errno, "getplugin");
793
perror("getplugin");
928
794
free(filename);
929
795
continue;
930
796
}
942
808
if(g != NULL){
943
809
for(char **a = g->argv + 1; *a != NULL; a++){
944
810
if(not add_argument(p, *a)){
945
error(0, errno, "add_argument");
811
perror("add_argument");
946
812
}
947
813
}
948
814
/* Add global environment variables */
949
815
for(char **e = g->environ; *e != NULL; e++){
950
816
if(not add_environment(p, *e, false)){
951
error(0, errno, "add_environment");
817
perror("add_environment");
952
818
}
953
819
}
954
820
}
959
825
if(p->environ[0] != NULL){
960
826
for(char **e = environ; *e != NULL; e++){
961
827
if(not add_environment(p, *e, false)){
962
error(0, errno, "add_environment");
828
perror("add_environment");
963
829
}
964
830
}
965
831
}
966
832
967
833
int pipefd[2];
968
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
834
ret = pipe(pipefd);
969
835
if(ret == -1){
970
error(0, errno, "pipe");
971
exitstatus = EX_OSERR;
836
perror("pipe");
837
exitstatus = EXIT_FAILURE;
972
838
goto fallback;
973
839
}
974
840
/* Ask OS to automatic close the pipe on exec */
975
841
ret = set_cloexec_flag(pipefd[0]);
976
842
if(ret < 0){
977
error(0, errno, "set_cloexec_flag");
978
exitstatus = EX_OSERR;
843
perror("set_cloexec_flag");
844
exitstatus = EXIT_FAILURE;
979
845
goto fallback;
980
846
}
981
847
ret = set_cloexec_flag(pipefd[1]);
982
848
if(ret < 0){
983
error(0, errno, "set_cloexec_flag");
984
exitstatus = EX_OSERR;
849
perror("set_cloexec_flag");
850
exitstatus = EXIT_FAILURE;
985
851
goto fallback;
986
852
}
987
853
/* Block SIGCHLD until process is safely in process list */
988
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
989
&sigchld_action.sa_mask,
990
NULL));
854
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
991
855
if(ret < 0){
992
error(0, errno, "sigprocmask");
993
exitstatus = EX_OSERR;
856
perror("sigprocmask");
857
exitstatus = EXIT_FAILURE;
994
858
goto fallback;
995
859
}
996
860
/* Starting a new process to be watched */
997
pid_t pid;
998
do {
999
pid = fork();
1000
} while(pid == -1 and errno == EINTR);
861
pid_t pid = fork();
1001
862
if(pid == -1){
1002
error(0, errno, "fork");
1003
exitstatus = EX_OSERR;
863
perror("fork");
864
exitstatus = EXIT_FAILURE;
1004
865
goto fallback;
1005
866
}
1006
867
if(pid == 0){
1007
868
/* this is the child process */
1008
869
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1009
870
if(ret < 0){
1010
error(0, errno, "sigaction");
1011
_exit(EX_OSERR);
871
perror("sigaction");
872
_exit(EXIT_FAILURE);
1012
873
}
1013
874
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1014
875
if(ret < 0){
1015
error(0, errno, "sigprocmask");
1016
_exit(EX_OSERR);
876
perror("sigprocmask");
877
_exit(EXIT_FAILURE);
1017
878
}
1018
879
1019
880
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1020
881
if(ret == -1){
1021
error(0, errno, "dup2");
1022
_exit(EX_OSERR);
882
perror("dup2");
883
_exit(EXIT_FAILURE);
1023
884
}
1024
885
1025
886
if(dirfd(dir) < 0){
1029
890
}
1030
891
if(p->environ[0] == NULL){
1031
892
if(execv(filename, p->argv) < 0){
1032
error(0, errno, "execv for %s", filename);
1033
_exit(EX_OSERR);
893
perror("execv");
894
_exit(EXIT_FAILURE);
1034
895
}
1035
896
} else {
1036
897
if(execve(filename, p->argv, p->environ) < 0){
1037
error(0, errno, "execve for %s", filename);
1038
_exit(EX_OSERR);
898
perror("execve");
899
_exit(EXIT_FAILURE);
1039
900
}
1040
901
}
1041
902
/* no return */
1042
903
}
1043
904
/* Parent process */
1044
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1045
pipe */
905
close(pipefd[1]); /* Close unused write end of pipe */
1046
906
free(filename);
1047
907
plugin *new_plugin = getplugin(dirst->d_name);
1048
908
if(new_plugin == NULL){
1049
error(0, errno, "getplugin");
1050
ret = (int)(TEMP_FAILURE_RETRY
1051
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1052
NULL)));
909
perror("getplugin");
910
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1053
911
if(ret < 0){
1054
error(0, errno, "sigprocmask");
912
perror("sigprocmask");
1055
913
}
1056
exitstatus = EX_OSERR;
914
exitstatus = EXIT_FAILURE;
1057
915
goto fallback;
1058
916
}
1059
917
1062
920
1063
921
/* Unblock SIGCHLD so signal handler can be run if this process
1064
922
has already completed */
1065
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1066
&sigchld_action.sa_mask,
1067
NULL));
923
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1068
924
if(ret < 0){
1069
error(0, errno, "sigprocmask");
1070
exitstatus = EX_OSERR;
925
perror("sigprocmask");
926
exitstatus = EXIT_FAILURE;
1071
927
goto fallback;
1072
928
}
1073
929
1074
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1075
-Wconversion */
930
FD_SET(new_plugin->fd, &rfds_all);
1076
931
1077
932
if(maxfd < new_plugin->fd){
1078
933
maxfd = new_plugin->fd;
1079
934
}
1080
935
}
1081
936
1082
TEMP_FAILURE_RETRY(closedir(dir));
937
closedir(dir);
1083
938
dir = NULL;
1084
free_plugin(getplugin(NULL));
1085
939
1086
940
for(plugin *p = plugin_list; p != NULL; p = p->next){
1087
941
if(p->pid != 0){
1098
952
while(plugin_list){
1099
953
fd_set rfds = rfds_all;
1100
954
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
1101
if(select_ret == -1 and errno != EINTR){
1102
error(0, errno, "select");
1103
exitstatus = EX_OSERR;
955
if(select_ret == -1){
956
perror("select");
957
exitstatus = EXIT_FAILURE;
1104
958
goto fallback;
1105
959
}
1106
960
/* OK, now either a process completed, or something can be read
1112
966
if(not WIFEXITED(proc->status)
1113
967
or WEXITSTATUS(proc->status) != 0){
1114
968
/* Bad exit by plugin */
1115
969
1116
970
if(debug){
1117
971
if(WIFEXITED(proc->status)){
1118
972
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1121
975
WEXITSTATUS(proc->status));
1122
976
} else if(WIFSIGNALED(proc->status)){
1123
977
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1124
" signal %d: %s\n", proc->name,
978
" signal %d\n", proc->name,
1125
979
(intmax_t) (proc->pid),
1126
WTERMSIG(proc->status),
1127
strsignal(WTERMSIG(proc->status)));
980
WTERMSIG(proc->status));
1128
981
} else if(WCOREDUMP(proc->status)){
1129
982
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1130
983
" core\n", proc->name, (intmax_t) (proc->pid));
1132
985
}
1133
986
1134
987
/* Remove the plugin */
1135
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1136
-Wconversion */
1137
988
FD_CLR(proc->fd, &rfds_all);
989
1138
990
/* Block signal while modifying process_list */
1139
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1140
(SIG_BLOCK,
1141
&sigchld_action.sa_mask,
1142
NULL));
991
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1143
992
if(ret < 0){
1144
error(0, errno, "sigprocmask");
1145
exitstatus = EX_OSERR;
993
perror("sigprocmask");
994
exitstatus = EXIT_FAILURE;
1146
995
goto fallback;
1147
996
}
1148
997
1151
1000
proc = next_plugin;
1152
1001
1153
1002
/* We are done modifying process list, so unblock signal */
1154
ret = (int)(TEMP_FAILURE_RETRY
1155
(sigprocmask(SIG_UNBLOCK,
1156
&sigchld_action.sa_mask, NULL)));
1003
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1004
NULL);
1157
1005
if(ret < 0){
1158
error(0, errno, "sigprocmask");
1159
exitstatus = EX_OSERR;
1006
perror("sigprocmask");
1007
exitstatus = EXIT_FAILURE;
1160
1008
goto fallback;
1161
1009
}
1162
1010
1172
1020
bool bret = print_out_password(proc->buffer,
1173
1021
proc->buffer_length);
1174
1022
if(not bret){
1175
error(0, errno, "print_out_password");
1176
exitstatus = EX_IOERR;
1023
perror("print_out_password");
1024
exitstatus = EXIT_FAILURE;
1177
1025
}
1178
1026
goto fallback;
1179
1027
}
1180
1028
1181
1029
/* This process has not completed. Does it have any output? */
1182
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1183
warning from
1184
-Wconversion */
1030
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1185
1031
/* This process had nothing to say at this time */
1186
1032
proc = proc->next;
1187
1033
continue;
1191
1037
proc->buffer = realloc(proc->buffer, proc->buffer_size
1192
1038
+ (size_t) BUFFER_SIZE);
1193
1039
if(proc->buffer == NULL){
1194
error(0, errno, "malloc");
1195
exitstatus = EX_OSERR;
1040
perror("malloc");
1041
exitstatus = EXIT_FAILURE;
1196
1042
goto fallback;
1197
1043
}
1198
1044
proc->buffer_size += BUFFER_SIZE;
1199
1045
}
1200
1046
/* Read from the process */
1201
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1202
proc->buffer
1203
+ proc->buffer_length,
1204
BUFFER_SIZE));
1047
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1048
BUFFER_SIZE);
1205
1049
if(sret < 0){
1206
1050
/* Read error from this process; ignore the error */
1207
1051
proc = proc->next;
1215
1059
}
1216
1060
}
1217
1061
}
1218
1219
1062
1063
1220
1064
fallback:
1221
1065
1222
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1223
and exitstatus != EX_OK)){
1066
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1224
1067
/* Fallback if all plugins failed, none are found or an error
1225
1068
occured */
1226
1069
bool bret;
1234
1077
}
1235
1078
bret = print_out_password(passwordbuffer, len);
1236
1079
if(not bret){
1237
error(0, errno, "print_out_password");
1238
exitstatus = EX_IOERR;
1080
perror("print_out_password");
1081
exitstatus = EXIT_FAILURE;
1239
1082
}
1240
1083
}
1241
1084
1242
1085
/* Restore old signal handler */
1243
1086
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1244
1087
if(ret == -1){
1245
error(0, errno, "sigaction");
1246
exitstatus = EX_OSERR;
1088
perror("sigaction");
1089
exitstatus = EXIT_FAILURE;
1247
1090
}
1248
1091
1249
1092
if(custom_argv != NULL){
1264
1107
ret = kill(p->pid, SIGTERM);
1265
1108
if(ret == -1 and errno != ESRCH){
1266
1109
/* Set-uid proccesses might not get closed */
1267
error(0, errno, "kill");
1110
perror("kill");
1268
1111
}
1269
1112
}
1270
1113
}
1271
1114
1272
1115
/* Wait for any remaining child processes to terminate */
1273
do {
1116
do{
1274
1117
ret = wait(NULL);
1275
1118
} while(ret >= 0);
1276
1119
if(errno != ECHILD){
1277
error(0, errno, "wait");
1120
perror("wait");
1278
1121
}
1279
1122
1280
1123
free_plugin_list();
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0