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