To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to plugin-runner.c
- browse files at revision 237.2.67
- compare with another revision
- download diff
- download tarball
- view history from revision 237.2.67
- Committer: Teddy Hogeborn
- Date: 2009-02-09 02:01:13 UTC
- mto: (24.1.133 mandos) (237.4.2 mandos-pipe-ipc) (299.1.1 release) (300.1.1 release) (301.1.1 release)
- mto: This revision was merged to the branch mainline in revision 250.
- 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 added:
- .bzr-builddeb
- debian
- debian/po
- 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
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,2009 Teddy Hogeborn
6
* Copyright © 2008,2009 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
27
28
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
28
29
EXIT_SUCCESS, realloc() */
29
30
#include <stdbool.h> /* bool, true, false */
30
#include <stdio.h> /* perror, popen(), fileno(),
31
fprintf(), stderr, STDOUT_FILENO */
31
#include <stdio.h> /* perror, fileno(), fprintf(),
32
stderr, STDOUT_FILENO */
32
33
#include <sys/types.h> /* DIR, opendir(), stat(), struct
33
34
stat, waitpid(), WIFEXITED(),
34
35
WEXITSTATUS(), wait(), pid_t,
46
47
fcntl(), setuid(), setgid(),
47
48
F_GETFD, F_SETFD, FD_CLOEXEC,
48
49
access(), pipe(), fork(), close()
49
dup2, STDOUT_FILENO, _exit(),
50
dup2(), STDOUT_FILENO, _exit(),
50
51
execv(), write(), read(),
51
52
close() */
52
53
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
63
64
sigprocmask(), SIG_BLOCK, SIGCHLD,
64
65
SIG_UNBLOCK, kill() */
65
66
#include <errno.h> /* errno, EBADF */
67
#include <inttypes.h> /* intmax_t, SCNdMAX, PRIdMAX, */
66
68
67
69
#define BUFFER_SIZE 256
68
70
69
71
#define PDIR "/lib/mandos/plugins.d"
70
72
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
71
73
72
const char *argp_program_version = "plugin-runner 1.0";
74
const char *argp_program_version = "plugin-runner " VERSION;
73
75
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
74
76
75
struct process;
76
77
typedef struct process{
78
pid_t pid;
79
int fd;
80
char *buffer;
81
size_t buffer_size;
82
size_t buffer_length;
83
bool eof;
84
volatile bool completed;
85
volatile int status;
86
struct process *next;
87
} process;
88
89
77
typedef struct plugin{
90
78
char *name; /* can be NULL or any plugin name */
91
79
char **argv;
93
81
char **environ;
94
82
int envc;
95
83
bool disabled;
84
85
/* Variables used for running processes*/
86
pid_t pid;
87
int fd;
88
char *buffer;
89
size_t buffer_size;
90
size_t buffer_length;
91
bool eof;
92
volatile sig_atomic_t completed;
93
int status;
96
94
struct plugin *next;
97
95
} plugin;
98
96
99
static plugin *getplugin(char *name, plugin **plugin_list){
100
for (plugin *p = *plugin_list; p != NULL; p = p->next){
101
if ((p->name == name)
102
or (p->name and name and (strcmp(p->name, name) == 0))){
97
static plugin *plugin_list = NULL;
98
99
/* Gets an existing plugin based on name,
100
or if none is found, creates a new one */
101
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))){
103
106
return p;
104
107
}
105
108
}
106
109
/* Create a new plugin */
107
110
plugin *new_plugin = malloc(sizeof(plugin));
108
if (new_plugin == NULL){
111
if(new_plugin == NULL){
109
112
return NULL;
110
113
}
111
114
char *copy_name = NULL;
112
115
if(name != NULL){
113
116
copy_name = strdup(name);
114
117
if(copy_name == NULL){
118
free(new_plugin);
115
119
return NULL;
116
120
}
117
121
}
118
122
119
*new_plugin = (plugin) { .name = copy_name,
120
.argc = 1,
121
.envc = 0,
122
.disabled = false,
123
.next = *plugin_list };
123
*new_plugin = (plugin){ .name = copy_name,
124
.argc = 1,
125
.disabled = false,
126
.next = plugin_list };
124
127
125
128
new_plugin->argv = malloc(sizeof(char *) * 2);
126
if (new_plugin->argv == NULL){
129
if(new_plugin->argv == NULL){
127
130
free(copy_name);
128
131
free(new_plugin);
129
132
return NULL;
130
133
}
131
134
new_plugin->argv[0] = copy_name;
132
135
new_plugin->argv[1] = NULL;
133
136
134
137
new_plugin->environ = malloc(sizeof(char *));
135
138
if(new_plugin->environ == NULL){
136
139
free(copy_name);
139
142
return NULL;
140
143
}
141
144
new_plugin->environ[0] = NULL;
145
142
146
/* Append the new plugin to the list */
143
*plugin_list = new_plugin;
147
plugin_list = new_plugin;
144
148
return new_plugin;
145
149
}
146
150
176
180
}
177
181
178
182
/* Add to a plugin's environment */
179
static bool add_environment(plugin *p, const char *def){
183
static bool add_environment(plugin *p, const char *def, bool replace){
180
184
if(p == NULL){
181
185
return false;
182
186
}
187
/* namelen = length of name of environment variable */
188
size_t namelen = (size_t)(strchrnul(def, '=') - def);
189
/* Search for this environment variable */
190
for(char **e = p->environ; *e != NULL; e++){
191
if(strncmp(*e, def, namelen + 1) == 0){
192
/* It already exists */
193
if(replace){
194
char *new = realloc(*e, strlen(def) + 1);
195
if(new == NULL){
196
return false;
197
}
198
*e = new;
199
strcpy(*e, def);
200
}
201
return true;
202
}
203
}
183
204
return add_to_char_array(def, &(p->environ), &(p->envc));
184
205
}
185
206
186
187
207
/*
188
208
* Based on the example in the GNU LibC manual chapter 13.13 "File
189
209
* Descriptor Flags".
190
210
* *Note File Descriptor Flags:(libc)Descriptor Flags.
191
211
*/
192
static int set_cloexec_flag(int fd)
193
{
212
static int set_cloexec_flag(int fd){
194
213
int ret = fcntl(fd, F_GETFD, 0);
195
214
/* If reading the flags failed, return error indication now. */
196
215
if(ret < 0){
200
219
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
201
220
}
202
221
203
process *process_list = NULL;
204
222
205
223
/* Mark processes as completed when they exit, and save their exit
206
224
status. */
207
void handle_sigchld(__attribute__((unused)) int sig){
225
static void handle_sigchld(__attribute__((unused)) int sig){
226
int old_errno = errno;
208
227
while(true){
209
process *proc = process_list;
228
plugin *proc = plugin_list;
210
229
int status;
211
230
pid_t pid = waitpid(-1, &status, WNOHANG);
212
231
if(pid == 0){
214
233
break;
215
234
}
216
235
if(pid == -1){
217
if (errno != ECHILD){
218
perror("waitpid");
236
if(errno == ECHILD){
237
/* No child processes */
238
break;
219
239
}
220
/* No child processes */
221
break;
240
perror("waitpid");
222
241
}
223
242
224
243
/* A child exited, find it in process_list */
225
244
while(proc != NULL and proc->pid != pid){
226
245
proc = proc->next;
230
249
continue;
231
250
}
232
251
proc->status = status;
233
proc->completed = true;
252
proc->completed = 1;
234
253
}
254
errno = old_errno;
235
255
}
236
256
237
bool print_out_password(const char *buffer, size_t length){
257
/* Prints out a password to stdout */
258
static bool print_out_password(const char *buffer, size_t length){
238
259
ssize_t ret;
239
if(length>0 and buffer[length-1] == '\n'){
240
length--;
241
}
242
260
for(size_t written = 0; written < length; written += (size_t)ret){
243
261
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,
244
262
length - written));
249
267
return true;
250
268
}
251
269
252
static void free_plugin_list(plugin *plugin_list){
253
for(plugin *next; plugin_list != NULL; plugin_list = next){
254
next = plugin_list->next;
255
for(char **arg = plugin_list->argv; *arg != NULL; arg++){
256
free(*arg);
257
}
258
free(plugin_list->argv);
259
for(char **env = plugin_list->environ; *env != NULL; env++){
260
free(*env);
261
}
262
free(plugin_list->environ);
263
free(plugin_list);
270
/* Removes and free a plugin from the plugin list */
271
static void free_plugin(plugin *plugin_node){
272
273
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
274
free(*arg);
275
}
276
free(plugin_node->argv);
277
for(char **env = plugin_node->environ; *env != NULL; env++){
278
free(*env);
279
}
280
free(plugin_node->environ);
281
free(plugin_node->buffer);
282
283
/* Removes the plugin from the singly-linked list */
284
if(plugin_node == plugin_list){
285
/* First one - simple */
286
plugin_list = plugin_list->next;
287
} else {
288
/* Second one or later */
289
for(plugin *p = plugin_list; p != NULL; p = p->next){
290
if(p->next == plugin_node){
291
p->next = plugin_node->next;
292
break;
293
}
294
}
295
}
296
297
free(plugin_node);
298
}
299
300
static void free_plugin_list(void){
301
while(plugin_list != NULL){
302
free_plugin(plugin_list);
264
303
}
265
304
}
266
305
273
312
struct dirent *dirst;
274
313
struct stat st;
275
314
fd_set rfds_all;
276
int ret, maxfd = 0;
315
int ret, numchars, maxfd = 0;
316
ssize_t sret;
317
intmax_t tmpmax;
277
318
uid_t uid = 65534;
278
319
gid_t gid = 65534;
279
320
bool debug = false;
304
345
{ .name = "global-options", .key = 'g',
305
346
.arg = "OPTION[,OPTION[,...]]",
306
347
.doc = "Options passed to all plugins" },
307
{ .name = "global-envs", .key = 'e',
348
{ .name = "global-env", .key = 'G',
308
349
.arg = "VAR=value",
309
350
.doc = "Environment variable passed to all plugins" },
310
351
{ .name = "options-for", .key = 'o',
311
352
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
312
353
.doc = "Options passed only to specified plugin" },
313
{ .name = "envs-for", .key = 'f',
354
{ .name = "env-for", .key = 'E',
314
355
.arg = "PLUGIN:ENV=value",
315
356
.doc = "Environment variable passed to specified plugin" },
316
357
{ .name = "disable", .key = 'd',
317
358
.arg = "PLUGIN",
318
359
.doc = "Disable a specific plugin", .group = 1 },
360
{ .name = "enable", .key = 'e',
361
.arg = "PLUGIN",
362
.doc = "Enable a specific plugin", .group = 1 },
319
363
{ .name = "plugin-dir", .key = 128,
320
364
.arg = "DIRECTORY",
321
365
.doc = "Specify a different plugin directory", .group = 2 },
333
377
{ .name = NULL }
334
378
};
335
379
336
error_t parse_opt (int key, char *arg, struct argp_state *state) {
337
/* Get the INPUT argument from `argp_parse', which we know is a
338
pointer to our plugin list pointer. */
339
plugin **plugins = state->input;
340
switch (key) {
341
case 'g':
342
if (arg != NULL){
380
error_t parse_opt(int key, char *arg, __attribute__((unused))
381
struct argp_state *state){
382
switch(key){
383
case 'g': /* --global-options */
384
if(arg != NULL){
343
385
char *p;
344
386
while((p = strsep(&arg, ",")) != NULL){
345
387
if(p[0] == '\0'){
346
388
continue;
347
389
}
348
if(not add_argument(getplugin(NULL, plugins), p)){
390
if(not add_argument(getplugin(NULL), p)){
349
391
perror("add_argument");
350
392
return ARGP_ERR_UNKNOWN;
351
393
}
352
394
}
353
395
}
354
396
break;
355
case 'e':
397
case 'G': /* --global-env */
356
398
if(arg == NULL){
357
399
break;
358
400
}
359
{
360
char *envdef = strdup(arg);
361
if(envdef == NULL){
362
break;
363
}
364
if(not add_environment(getplugin(NULL, plugins), envdef)){
365
perror("add_environment");
366
}
401
if(not add_environment(getplugin(NULL), arg, true)){
402
perror("add_environment");
367
403
}
368
404
break;
369
case 'o':
370
if (arg != NULL){
405
case 'o': /* --options-for */
406
if(arg != NULL){
371
407
char *p_name = strsep(&arg, ":");
372
if(p_name[0] == '\0'){
408
if(p_name[0] == '\0' or arg == NULL){
373
409
break;
374
410
}
375
411
char *opt = strsep(&arg, ":");
376
if(opt[0] == '\0'){
412
if(opt[0] == '\0' or opt == NULL){
377
413
break;
378
414
}
379
if(opt != NULL){
380
char *p;
381
while((p = strsep(&opt, ",")) != NULL){
382
if(p[0] == '\0'){
383
continue;
384
}
385
if(not add_argument(getplugin(p_name, plugins), p)){
386
perror("add_argument");
387
return ARGP_ERR_UNKNOWN;
388
}
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;
389
423
}
390
424
}
391
425
}
392
426
break;
393
case 'f':
427
case 'E': /* --env-for */
394
428
if(arg == NULL){
395
429
break;
396
430
}
399
433
if(envdef == NULL){
400
434
break;
401
435
}
402
char *p_name = strndup(arg, (size_t) (envdef-arg));
403
if(p_name == NULL){
404
break;
405
}
406
envdef++;
407
if(not add_environment(getplugin(p_name, plugins), envdef)){
436
*envdef = '\0';
437
if(not add_environment(getplugin(arg), envdef+1, true)){
408
438
perror("add_environment");
409
439
}
410
440
}
411
441
break;
412
case 'd':
413
if (arg != NULL){
414
plugin *p = getplugin(arg, plugins);
442
case 'd': /* --disable */
443
if(arg != NULL){
444
plugin *p = getplugin(arg);
415
445
if(p == NULL){
416
446
return ARGP_ERR_UNKNOWN;
417
447
}
418
448
p->disabled = true;
419
449
}
420
450
break;
421
case 128:
451
case 'e': /* --enable */
452
if(arg != NULL){
453
plugin *p = getplugin(arg);
454
if(p == NULL){
455
return ARGP_ERR_UNKNOWN;
456
}
457
p->disabled = false;
458
}
459
break;
460
case 128: /* --plugin-dir */
461
free(plugindir);
422
462
plugindir = strdup(arg);
423
463
if(plugindir == NULL){
424
464
perror("strdup");
425
465
}
426
466
break;
427
case 129:
467
case 129: /* --config-file */
468
/* This is already done by parse_opt_config_file() */
469
break;
470
case 130: /* --userid */
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;
478
}
479
break;
480
case 131: /* --groupid */
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;
488
}
489
break;
490
case 132: /* --debug */
491
debug = true;
492
break;
493
/*
494
* When adding more options before this line, remember to also add a
495
* "case" to the "parse_opt_config_file" function below.
496
*/
497
case ARGP_KEY_ARG:
498
/* Cryptsetup always passes an argument, which is an empty
499
string if "none" was specified in /etc/crypttab. So if
500
argument was empty, we ignore it silently. */
501
if(arg[0] != '\0'){
502
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
503
}
504
break;
505
case ARGP_KEY_END:
506
break;
507
default:
508
return ARGP_ERR_UNKNOWN;
509
}
510
return 0;
511
}
512
513
/* This option parser is the same as parse_opt() above, except it
514
ignores everything but the --config-file option. */
515
error_t parse_opt_config_file(int key, char *arg,
516
__attribute__((unused))
517
struct argp_state *state){
518
switch(key){
519
case 'g': /* --global-options */
520
case 'G': /* --global-env */
521
case 'o': /* --options-for */
522
case 'E': /* --env-for */
523
case 'd': /* --disable */
524
case 'e': /* --enable */
525
case 128: /* --plugin-dir */
526
break;
527
case 129: /* --config-file */
528
free(argfile);
428
529
argfile = strdup(arg);
429
530
if(argfile == NULL){
430
531
perror("strdup");
431
532
}
432
533
break;
433
case 130:
434
uid = (uid_t)strtol(arg, NULL, 10);
435
break;
436
case 131:
437
gid = (gid_t)strtol(arg, NULL, 10);
438
break;
439
case 132:
440
debug = true;
441
break;
534
case 130: /* --userid */
535
case 131: /* --groupid */
536
case 132: /* --debug */
442
537
case ARGP_KEY_ARG:
443
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
444
break;
445
538
case ARGP_KEY_END:
446
539
break;
447
540
default:
450
543
return 0;
451
544
}
452
545
453
plugin *plugin_list = NULL;
454
455
struct argp argp = { .options = options, .parser = parse_opt,
456
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
546
struct argp argp = { .options = options,
547
.parser = parse_opt_config_file,
548
.args_doc = "",
457
549
.doc = "Mandos plugin runner -- Run plugins" };
458
550
459
ret = argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
460
if (ret == ARGP_ERR_UNKNOWN){
551
/* Parse using parse_opt_config_file() in order to get the custom
552
config file location, if any. */
553
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
554
if(ret == ARGP_ERR_UNKNOWN){
461
555
fprintf(stderr, "Unknown error while parsing arguments\n");
462
556
exitstatus = EXIT_FAILURE;
463
557
goto fallback;
464
558
}
465
466
if (argfile == NULL){
559
560
/* Reset to the normal argument parser */
561
argp.parser = parse_opt;
562
563
/* Open the configfile if available */
564
if(argfile == NULL){
467
565
conffp = fopen(AFILE, "r");
468
566
} else {
469
567
conffp = fopen(argfile, "r");
470
}
471
568
}
472
569
if(conffp != NULL){
473
570
char *org_line = NULL;
474
571
char *p, *arg, *new_arg, *line;
475
572
size_t size = 0;
476
ssize_t sret;
477
573
const char whitespace_delims[] = " \r\t\f\v\n";
478
574
const char comment_delim[] = "#";
479
575
486
582
}
487
583
custom_argv[0] = argv[0];
488
584
custom_argv[1] = NULL;
489
585
586
/* for each line in the config file, strip whitespace and ignore
587
commented text */
490
588
while(true){
491
589
sret = getline(&org_line, &size, conffp);
492
590
if(sret == -1){
521
619
}
522
620
}
523
621
free(org_line);
524
} else{
622
} else {
525
623
/* Check for harmful errors and go to fallback. Other errors might
526
624
not affect opening plugins */
527
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
625
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
528
626
perror("fopen");
529
627
exitstatus = EXIT_FAILURE;
530
628
goto fallback;
531
629
}
532
630
}
533
631
/* If there was any arguments from configuration file,
632
pass them to parser as command arguments */
534
633
if(custom_argv != NULL){
535
ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0, &plugin_list);
536
if (ret == ARGP_ERR_UNKNOWN){
634
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
635
0, NULL);
636
if(ret == ARGP_ERR_UNKNOWN){
537
637
fprintf(stderr, "Unknown error while parsing arguments\n");
538
638
exitstatus = EXIT_FAILURE;
539
639
goto fallback;
540
640
}
541
641
}
542
642
643
/* Parse actual command line arguments, to let them override the
644
config file */
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;
649
goto fallback;
650
}
651
543
652
if(debug){
544
653
for(plugin *p = plugin_list; p != NULL; p=p->next){
545
654
fprintf(stderr, "Plugin: %s has %d arguments\n",
547
656
for(char **a = p->argv; *a != NULL; a++){
548
657
fprintf(stderr, "\tArg: %s\n", *a);
549
658
}
550
fprintf(stderr, "...and %u environment variables\n", p->envc);
659
fprintf(stderr, "...and %d environment variables\n", p->envc);
551
660
for(char **a = p->environ; *a != NULL; a++){
552
661
fprintf(stderr, "\t%s\n", *a);
553
662
}
554
663
}
555
664
}
556
665
666
/* Strip permissions down to nobody */
667
setgid(gid);
668
if(ret == -1){
669
perror("setgid");
670
}
557
671
ret = setuid(uid);
558
if (ret == -1){
672
if(ret == -1){
559
673
perror("setuid");
560
674
}
561
675
562
setgid(gid);
563
if (ret == -1){
564
perror("setgid");
565
}
566
567
if (plugindir == NULL){
676
if(plugindir == NULL){
568
677
dir = opendir(PDIR);
569
678
} else {
570
679
dir = opendir(plugindir);
591
700
592
701
FD_ZERO(&rfds_all);
593
702
703
/* Read and execute any executable in the plugin directory*/
594
704
while(true){
595
705
dirst = readdir(dir);
596
706
597
// All directory entries have been processed
707
/* All directory entries have been processed */
598
708
if(dirst == NULL){
599
if (errno == EBADF){
709
if(errno == EBADF){
600
710
perror("readdir");
601
711
exitstatus = EXIT_FAILURE;
602
712
goto fallback;
606
716
607
717
d_name_len = strlen(dirst->d_name);
608
718
609
// Ignore dotfiles, backup files and other junk
719
/* Ignore dotfiles, backup files and other junk */
610
720
{
611
721
bool bad_name = false;
612
722
614
724
615
725
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
616
726
".dpkg-old",
727
".dpkg-bak",
617
728
".dpkg-divert", NULL };
618
729
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
619
730
size_t pre_len = strlen(*pre);
627
738
break;
628
739
}
629
740
}
630
631
741
if(bad_name){
632
742
continue;
633
743
}
634
635
744
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
636
745
size_t suf_len = strlen(*suf);
637
746
if((d_name_len >= suf_len)
652
761
}
653
762
654
763
char *filename;
655
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
764
if(plugindir == NULL){
765
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
766
} else {
767
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
768
}
656
769
if(ret < 0){
657
770
perror("asprintf");
658
771
continue;
659
772
}
660
773
661
774
ret = stat(filename, &st);
662
if (ret == -1){
775
if(ret == -1){
663
776
perror("stat");
664
777
free(filename);
665
778
continue;
666
779
}
667
668
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
780
781
/* Ignore non-executable files */
782
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
669
783
if(debug){
670
784
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
671
785
" with bad type or mode\n", filename);
673
787
free(filename);
674
788
continue;
675
789
}
676
plugin *p = getplugin(dirst->d_name, &plugin_list);
790
791
plugin *p = getplugin(dirst->d_name);
677
792
if(p == NULL){
678
793
perror("getplugin");
679
794
free(filename);
689
804
}
690
805
{
691
806
/* Add global arguments to argument list for this plugin */
692
plugin *g = getplugin(NULL, &plugin_list);
807
plugin *g = getplugin(NULL);
693
808
if(g != NULL){
694
809
for(char **a = g->argv + 1; *a != NULL; a++){
695
810
if(not add_argument(p, *a)){
698
813
}
699
814
/* Add global environment variables */
700
815
for(char **e = g->environ; *e != NULL; e++){
701
if(not add_environment(p, *e)){
816
if(not add_environment(p, *e, false)){
702
817
perror("add_environment");
703
818
}
704
819
}
709
824
process, too. */
710
825
if(p->environ[0] != NULL){
711
826
for(char **e = environ; *e != NULL; e++){
712
char *copy = strdup(*e);
713
if(copy == NULL){
714
perror("strdup");
715
continue;
716
}
717
if(not add_environment(p, copy)){
827
if(not add_environment(p, *e, false)){
718
828
perror("add_environment");
719
829
}
720
830
}
722
832
723
833
int pipefd[2];
724
834
ret = pipe(pipefd);
725
if (ret == -1){
835
if(ret == -1){
726
836
perror("pipe");
727
837
exitstatus = EXIT_FAILURE;
728
838
goto fallback;
729
839
}
840
/* Ask OS to automatic close the pipe on exec */
730
841
ret = set_cloexec_flag(pipefd[0]);
731
842
if(ret < 0){
732
843
perror("set_cloexec_flag");
740
851
goto fallback;
741
852
}
742
853
/* Block SIGCHLD until process is safely in process list */
743
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
854
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
744
855
if(ret < 0){
745
856
perror("sigprocmask");
746
857
exitstatus = EXIT_FAILURE;
747
858
goto fallback;
748
859
}
749
// Starting a new process to be watched
860
/* Starting a new process to be watched */
750
861
pid_t pid = fork();
751
862
if(pid == -1){
752
863
perror("fork");
760
871
perror("sigaction");
761
872
_exit(EXIT_FAILURE);
762
873
}
763
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
874
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
764
875
if(ret < 0){
765
876
perror("sigprocmask");
766
877
_exit(EXIT_FAILURE);
767
878
}
768
879
769
880
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
770
881
if(ret == -1){
771
882
perror("dup2");
790
901
}
791
902
/* no return */
792
903
}
793
/* parent process */
904
/* Parent process */
905
close(pipefd[1]); /* Close unused write end of pipe */
794
906
free(filename);
795
close(pipefd[1]); /* close unused write end of pipe */
796
process *new_process = malloc(sizeof(process));
797
if (new_process == NULL){
798
perror("malloc");
799
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
907
plugin *new_plugin = getplugin(dirst->d_name);
908
if(new_plugin == NULL){
909
perror("getplugin");
910
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
800
911
if(ret < 0){
801
perror("sigprocmask");
912
perror("sigprocmask");
802
913
}
803
914
exitstatus = EXIT_FAILURE;
804
915
goto fallback;
805
916
}
806
917
807
*new_process = (struct process){ .pid = pid,
808
.fd = pipefd[0],
809
.next = process_list };
810
// List handling
811
process_list = new_process;
918
new_plugin->pid = pid;
919
new_plugin->fd = pipefd[0];
920
812
921
/* Unblock SIGCHLD so signal handler can be run if this process
813
922
has already completed */
814
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
923
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
815
924
if(ret < 0){
816
925
perror("sigprocmask");
817
926
exitstatus = EXIT_FAILURE;
818
927
goto fallback;
819
928
}
820
929
821
FD_SET(new_process->fd, &rfds_all);
930
FD_SET(new_plugin->fd, &rfds_all);
822
931
823
if (maxfd < new_process->fd){
824
maxfd = new_process->fd;
932
if(maxfd < new_plugin->fd){
933
maxfd = new_plugin->fd;
825
934
}
826
827
935
}
828
829
free_plugin_list(plugin_list);
830
plugin_list = NULL;
831
936
832
937
closedir(dir);
833
938
dir = NULL;
834
835
if (process_list == NULL){
836
fprintf(stderr, "No plugin processes started. Incorrect plugin"
837
" directory?\n");
838
process_list = NULL;
939
940
for(plugin *p = plugin_list; p != NULL; p = p->next){
941
if(p->pid != 0){
942
break;
943
}
944
if(p->next == NULL){
945
fprintf(stderr, "No plugin processes started. Incorrect plugin"
946
" directory?\n");
947
free_plugin_list();
948
}
839
949
}
840
while(process_list){
950
951
/* Main loop while running plugins exist */
952
while(plugin_list){
841
953
fd_set rfds = rfds_all;
842
954
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
843
if (select_ret == -1){
955
if(select_ret == -1){
844
956
perror("select");
845
957
exitstatus = EXIT_FAILURE;
846
958
goto fallback;
847
959
}
848
960
/* OK, now either a process completed, or something can be read
849
961
from one of them */
850
for(process *proc = process_list; proc ; proc = proc->next){
962
for(plugin *proc = plugin_list; proc != NULL;){
851
963
/* Is this process completely done? */
852
if(proc->eof and proc->completed){
964
if(proc->completed and proc->eof){
853
965
/* Only accept the plugin output if it exited cleanly */
854
966
if(not WIFEXITED(proc->status)
855
967
or WEXITSTATUS(proc->status) != 0){
856
968
/* Bad exit by plugin */
969
857
970
if(debug){
858
971
if(WIFEXITED(proc->status)){
859
fprintf(stderr, "Plugin %u exited with status %d\n",
860
(unsigned int) (proc->pid),
972
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
973
" status %d\n", proc->name,
974
(intmax_t) (proc->pid),
861
975
WEXITSTATUS(proc->status));
862
} else if(WIFSIGNALED(proc->status)) {
863
fprintf(stderr, "Plugin %u killed by signal %d\n",
864
(unsigned int) (proc->pid),
976
} else if(WIFSIGNALED(proc->status)){
977
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
978
" signal %d\n", proc->name,
979
(intmax_t) (proc->pid),
865
980
WTERMSIG(proc->status));
866
981
} else if(WCOREDUMP(proc->status)){
867
fprintf(stderr, "Plugin %d dumped core\n",
868
(unsigned int) (proc->pid));
982
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
983
" core\n", proc->name, (intmax_t) (proc->pid));
869
984
}
870
985
}
986
871
987
/* Remove the plugin */
872
988
FD_CLR(proc->fd, &rfds_all);
989
873
990
/* Block signal while modifying process_list */
874
991
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
875
992
if(ret < 0){
877
994
exitstatus = EXIT_FAILURE;
878
995
goto fallback;
879
996
}
880
/* Delete this process entry from the list */
881
if(process_list == proc){
882
/* First one - simple */
883
process_list = proc->next;
884
} else {
885
/* Second one or later */
886
for(process *p = process_list; p != NULL; p = p->next){
887
if(p->next == proc){
888
p->next = proc->next;
889
break;
890
}
891
}
892
}
997
998
plugin *next_plugin = proc->next;
999
free_plugin(proc);
1000
proc = next_plugin;
1001
893
1002
/* We are done modifying process list, so unblock signal */
894
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
895
NULL);
1003
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1004
NULL);
896
1005
if(ret < 0){
897
1006
perror("sigprocmask");
898
}
899
free(proc->buffer);
900
free(proc);
901
/* We deleted this process from the list, so we can't go
902
proc->next. Therefore, start over from the beginning of
903
the process list */
904
break;
1007
exitstatus = EXIT_FAILURE;
1008
goto fallback;
1009
}
1010
1011
if(plugin_list == NULL){
1012
break;
1013
}
1014
1015
continue;
905
1016
}
1017
906
1018
/* This process exited nicely, so print its buffer */
907
1019
908
1020
bool bret = print_out_password(proc->buffer,
909
1021
proc->buffer_length);
910
1022
if(not bret){
913
1025
}
914
1026
goto fallback;
915
1027
}
1028
916
1029
/* This process has not completed. Does it have any output? */
917
1030
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
918
1031
/* This process had nothing to say at this time */
1032
proc = proc->next;
919
1033
continue;
920
1034
}
921
1035
/* Before reading, make the process' data buffer large enough */
922
1036
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
923
1037
proc->buffer = realloc(proc->buffer, proc->buffer_size
924
1038
+ (size_t) BUFFER_SIZE);
925
if (proc->buffer == NULL){
1039
if(proc->buffer == NULL){
926
1040
perror("malloc");
927
1041
exitstatus = EXIT_FAILURE;
928
1042
goto fallback;
930
1044
proc->buffer_size += BUFFER_SIZE;
931
1045
}
932
1046
/* Read from the process */
933
ret = read(proc->fd, proc->buffer + proc->buffer_length,
934
BUFFER_SIZE);
935
if(ret < 0){
1047
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1048
BUFFER_SIZE);
1049
if(sret < 0){
936
1050
/* Read error from this process; ignore the error */
1051
proc = proc->next;
937
1052
continue;
938
1053
}
939
if(ret == 0){
1054
if(sret == 0){
940
1055
/* got EOF */
941
1056
proc->eof = true;
942
1057
} else {
943
proc->buffer_length += (size_t) ret;
1058
proc->buffer_length += (size_t) sret;
944
1059
}
945
1060
}
946
1061
}
948
1063
949
1064
fallback:
950
1065
951
if(process_list == NULL or exitstatus != EXIT_SUCCESS){
1066
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
952
1067
/* Fallback if all plugins failed, none are found or an error
953
1068
occured */
954
1069
bool bret;
955
1070
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
956
1071
char *passwordbuffer = getpass("Password: ");
957
bret = print_out_password(passwordbuffer, strlen(passwordbuffer));
1072
size_t len = strlen(passwordbuffer);
1073
/* Strip trailing newline */
1074
if(len > 0 and passwordbuffer[len-1] == '\n'){
1075
passwordbuffer[len-1] = '\0'; /* not strictly necessary */
1076
len--;
1077
}
1078
bret = print_out_password(passwordbuffer, len);
958
1079
if(not bret){
959
1080
perror("print_out_password");
960
1081
exitstatus = EXIT_FAILURE;
967
1088
perror("sigaction");
968
1089
exitstatus = EXIT_FAILURE;
969
1090
}
970
1091
971
1092
if(custom_argv != NULL){
972
1093
for(char **arg = custom_argv+1; *arg != NULL; arg++){
973
1094
free(*arg);
974
1095
}
975
1096
free(custom_argv);
976
1097
}
977
free_plugin_list(plugin_list);
978
1098
979
1099
if(dir != NULL){
980
1100
closedir(dir);
981
1101
}
982
1102
983
/* Free the process list and kill the processes */
984
for(process *next; process_list != NULL; process_list = next){
985
next = process_list->next;
986
close(process_list->fd);
987
ret = kill(process_list->pid, SIGTERM);
988
if(ret == -1 and errno != ESRCH){
989
/* set-uid proccesses migth not get closed */
990
perror("kill");
1103
/* Kill the processes */
1104
for(plugin *p = plugin_list; p != NULL; p = p->next){
1105
if(p->pid != 0){
1106
close(p->fd);
1107
ret = kill(p->pid, SIGTERM);
1108
if(ret == -1 and errno != ESRCH){
1109
/* Set-uid proccesses might not get closed */
1110
perror("kill");
1111
}
991
1112
}
992
free(process_list->buffer);
993
free(process_list);
994
1113
}
995
1114
996
1115
/* Wait for any remaining child processes to terminate */
1000
1119
if(errno != ECHILD){
1001
1120
perror("wait");
1002
1121
}
1003
1122
1123
free_plugin_list();
1124
1004
1125
free(plugindir);
1005
1126
free(argfile);
1006
1127
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0