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