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