To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to plugin-runner.c
- browse files at revision 137
- compare with another revision
- download diff
- download tarball
- view history from revision 137
- Committer: Teddy Hogeborn
- Date: 2008-09-02 06:03:08 UTC
- Revision ID: teddy@fukt.bsnet.se-20080902060308-8uhgsfjiwixuvz6j
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
(main/parse_opt_config_file): New function only for "--config-file".
(main): Parse options first using "parse_opt_config_file", then from
the config file, and lastly from the command line.
(main/parse_opt_config_file): New function only for "--config-file".
(main): Parse options first using "parse_opt_config_file", then from
the config file, and lastly from the command line.
- files added:
- .bzrignore
- 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 a 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
char *copy_name = strdup(name);
109
if(copy_name == NULL){
110
return NULL;
114
char *copy_name = NULL;
115
if(name != NULL){
116
copy_name = strdup(name);
117
if(copy_name == NULL){
118
return NULL;
119
}
111
120
}
112
121
113
122
*new_plugin = (plugin) { .name = copy_name,
114
123
.argc = 1,
115
.envc = 0,
116
124
.disabled = false,
117
.next = *plugin_list };
125
.next = plugin_list };
118
126
119
127
new_plugin->argv = malloc(sizeof(char *) * 2);
120
128
if (new_plugin->argv == NULL){
129
free(copy_name);
121
130
free(new_plugin);
122
131
return NULL;
123
132
}
124
133
new_plugin->argv[0] = copy_name;
125
134
new_plugin->argv[1] = NULL;
126
135
127
136
new_plugin->environ = malloc(sizeof(char *));
128
137
if(new_plugin->environ == NULL){
138
free(copy_name);
129
139
free(new_plugin->argv);
130
140
free(new_plugin);
131
141
return NULL;
132
142
}
133
143
new_plugin->environ[0] = NULL;
144
134
145
/* Append the new plugin to the list */
135
*plugin_list = new_plugin;
146
plugin_list = new_plugin;
136
147
return new_plugin;
137
148
}
138
149
168
179
}
169
180
170
181
/* Add to a plugin's environment */
171
static bool add_environment(plugin *p, const char *def){
182
static bool add_environment(plugin *p, const char *def, bool replace){
172
183
if(p == NULL){
173
184
return false;
174
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));
194
if(new == NULL){
195
return false;
196
}
197
*e = new;
198
strcpy(*e, def);
199
}
200
return true;
201
}
202
}
175
203
return add_to_char_array(def, &(p->environ), &(p->envc));
176
204
}
177
205
178
179
206
/*
180
207
* Based on the example in the GNU LibC manual chapter 13.13 "File
181
208
* Descriptor Flags".
192
219
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
193
220
}
194
221
195
process *process_list = NULL;
196
222
197
/* Mark a process as completed when it exits, and save its exit
223
/* Mark processes as completed when they exit, and save their exit
198
224
status. */
199
225
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
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
}
216
253
}
217
254
255
/* Prints out a password to stdout */
218
256
bool print_out_password(const char *buffer, size_t length){
219
257
ssize_t ret;
220
258
if(length>0 and buffer[length-1] == '\n'){
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;
298
335
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
299
336
if(ret == -1){
300
337
perror("sigaction");
301
exitstatus = EXIT_FAILURE;
338
exitstatus = EXIT_FAILURE;
302
339
goto fallback;
303
340
}
304
341
307
344
{ .name = "global-options", .key = 'g',
308
345
.arg = "OPTION[,OPTION[,...]]",
309
346
.doc = "Options passed to all plugins" },
310
{ .name = "global-envs", .key = 'e',
347
{ .name = "global-env", .key = 'e',
311
348
.arg = "VAR=value",
312
349
.doc = "Environment variable passed to all plugins" },
313
350
{ .name = "options-for", .key = 'o',
314
351
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
315
352
.doc = "Options passed only to specified plugin" },
316
{ .name = "envs-for", .key = 'f',
353
{ .name = "env-for", .key = 'f',
317
354
.arg = "PLUGIN:ENV=value",
318
355
.doc = "Environment variable passed to specified plugin" },
319
356
{ .name = "disable", .key = 'd',
322
359
{ .name = "plugin-dir", .key = 128,
323
360
.arg = "DIRECTORY",
324
361
.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 },
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 },
333
373
{ .name = NULL }
334
374
};
335
375
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;
376
error_t parse_opt (int key, char *arg, __attribute__((unused))
377
struct argp_state *state) {
340
378
switch (key) {
341
case 'g':
379
case 'g': /* --global-options */
342
380
if (arg != NULL){
343
381
char *p;
344
382
while((p = strsep(&arg, ",")) != NULL){
345
383
if(p[0] == '\0'){
346
384
continue;
347
385
}
348
if(not add_argument(getplugin(NULL, plugins), p)){
386
if(not add_argument(getplugin(NULL), p)){
349
387
perror("add_argument");
350
388
return ARGP_ERR_UNKNOWN;
351
389
}
352
390
}
353
391
}
354
392
break;
355
case 'e':
393
case 'e': /* --global-env */
356
394
if(arg == NULL){
357
395
break;
358
396
}
361
399
if(envdef == NULL){
362
400
break;
363
401
}
364
if(not add_environment(getplugin(NULL, plugins), envdef)){
402
if(not add_environment(getplugin(NULL), envdef, true)){
365
403
perror("add_environment");
366
404
}
367
405
}
368
406
break;
369
case 'o':
407
case 'o': /* --options-for */
370
408
if (arg != NULL){
371
409
char *p_name = strsep(&arg, ":");
372
410
if(p_name[0] == '\0'){
382
420
if(p[0] == '\0'){
383
421
continue;
384
422
}
385
if(not add_argument(getplugin(p_name, plugins), p)){
423
if(not add_argument(getplugin(p_name), p)){
386
424
perror("add_argument");
387
425
return ARGP_ERR_UNKNOWN;
388
426
}
390
428
}
391
429
}
392
430
break;
393
case 'f':
431
case 'f': /* --env-for */
394
432
if(arg == NULL){
395
433
break;
396
434
}
404
442
break;
405
443
}
406
444
envdef++;
407
if(not add_environment(getplugin(p_name, plugins), envdef)){
445
if(not add_environment(getplugin(p_name), envdef, true)){
408
446
perror("add_environment");
409
447
}
410
448
}
411
449
break;
412
case 'd':
450
case 'd': /* --disable */
413
451
if (arg != NULL){
414
plugin *p = getplugin(arg, plugins);
452
plugin *p = getplugin(arg);
415
453
if(p == NULL){
416
454
return ARGP_ERR_UNKNOWN;
417
455
}
418
456
p->disabled = true;
419
457
}
420
458
break;
421
case 128:
422
plugindir = arg;
423
break;
424
case 129:
459
case 128: /* --plugin-dir */
460
plugindir = strdup(arg);
461
if(plugindir == NULL){
462
perror("strdup");
463
}
464
break;
465
case 129: /* --config-file */
466
/* This is already done by parse_opt_config_file() */
467
break;
468
case 130: /* --userid */
425
469
uid = (uid_t)strtol(arg, NULL, 10);
426
470
break;
427
case 130:
471
case 131: /* --groupid */
428
472
gid = (gid_t)strtol(arg, NULL, 10);
429
473
break;
430
case 131:
474
case 132: /* --debug */
431
475
debug = true;
432
476
break;
433
477
case ARGP_KEY_ARG:
441
485
return 0;
442
486
}
443
487
444
plugin *plugin_list = NULL;
488
/* This option parser is the same as parse_opt() above, except it
489
ignores everything but the --config-file option. */
490
error_t parse_opt_config_file (int key, char *arg,
491
__attribute__((unused))
492
struct argp_state *state) {
493
switch (key) {
494
case 'g': /* --global-options */
495
case 'e': /* --global-env */
496
case 'o': /* --options-for */
497
case 'f': /* --env-for */
498
case 'd': /* --disable */
499
case 128: /* --plugin-dir */
500
break;
501
case 129: /* --config-file */
502
argfile = strdup(arg);
503
if(argfile == NULL){
504
perror("strdup");
505
}
506
break;
507
case 130: /* --userid */
508
case 131: /* --groupid */
509
case 132: /* --debug */
510
case ARGP_KEY_ARG:
511
case ARGP_KEY_END:
512
break;
513
default:
514
return ARGP_ERR_UNKNOWN;
515
}
516
return 0;
517
}
445
518
446
struct argp argp = { .options = options, .parser = parse_opt,
447
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
519
struct argp argp = { .options = options,
520
.parser = parse_opt_config_file,
521
.args_doc = "",
448
522
.doc = "Mandos plugin runner -- Run plugins" };
449
523
450
ret = argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
524
/* Parse using the parse_opt_config_file in order to get the custom
525
config file location, if any. */
526
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
451
527
if (ret == ARGP_ERR_UNKNOWN){
452
528
fprintf(stderr, "Unknown error while parsing arguments\n");
453
529
exitstatus = EXIT_FAILURE;
454
530
goto fallback;
455
531
}
456
457
conffp = fopen(argfile, "r");
532
533
/* Reset to the normal argument parser */
534
argp.parser = parse_opt;
535
536
/* Open the configfile if available */
537
if (argfile == NULL){
538
conffp = fopen(AFILE, "r");
539
} else {
540
conffp = fopen(argfile, "r");
541
}
458
542
if(conffp != NULL){
459
543
char *org_line = NULL;
460
544
char *p, *arg, *new_arg, *line;
463
547
const char whitespace_delims[] = " \r\t\f\v\n";
464
548
const char comment_delim[] = "#";
465
549
550
custom_argc = 1;
551
custom_argv = malloc(sizeof(char*) * 2);
552
if(custom_argv == NULL){
553
perror("malloc");
554
exitstatus = EXIT_FAILURE;
555
goto fallback;
556
}
557
custom_argv[0] = argv[0];
558
custom_argv[1] = NULL;
559
560
/* for each line in the config file, strip whitespace and ignore
561
commented text */
466
562
while(true){
467
563
sret = getline(&org_line, &size, conffp);
468
564
if(sret == -1){
476
572
continue;
477
573
}
478
574
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
}
575
if(new_arg == NULL){
576
perror("strdup");
577
exitstatus = EXIT_FAILURE;
578
free(org_line);
579
goto fallback;
580
}
581
582
custom_argc += 1;
583
custom_argv = realloc(custom_argv, sizeof(char *)
584
* ((unsigned int) custom_argc + 1));
585
if(custom_argv == NULL){
586
perror("realloc");
587
exitstatus = EXIT_FAILURE;
588
free(org_line);
589
goto fallback;
590
}
591
custom_argv[custom_argc-1] = new_arg;
592
custom_argv[custom_argc] = NULL;
485
593
}
486
594
}
487
595
free(org_line);
488
} else{
596
} else {
489
597
/* Check for harmful errors and go to fallback. Other errors might
490
598
not affect opening plugins */
491
599
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
494
602
goto fallback;
495
603
}
496
604
}
497
605
/* If there was any arguments from configuration file,
606
pass them to parser as command arguments */
498
607
if(custom_argv != NULL){
499
custom_argv[0] = argv[0];
500
ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0, &plugin_list);
608
ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
609
0, NULL);
501
610
if (ret == ARGP_ERR_UNKNOWN){
502
611
fprintf(stderr, "Unknown error while parsing arguments\n");
503
612
exitstatus = EXIT_FAILURE;
505
614
}
506
615
}
507
616
617
/* Parse actual command line arguments, to let them override the
618
config file */
619
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
620
if (ret == ARGP_ERR_UNKNOWN){
621
fprintf(stderr, "Unknown error while parsing arguments\n");
622
exitstatus = EXIT_FAILURE;
623
goto fallback;
624
}
625
508
626
if(debug){
509
627
for(plugin *p = plugin_list; p != NULL; p=p->next){
510
628
fprintf(stderr, "Plugin: %s has %d arguments\n",
519
637
}
520
638
}
521
639
640
/* Strip permissions down to nobody */
522
641
ret = setuid(uid);
523
642
if (ret == -1){
524
643
perror("setuid");
525
}
526
644
}
527
645
setgid(gid);
528
646
if (ret == -1){
529
647
perror("setgid");
530
648
}
531
649
532
dir = opendir(plugindir);
650
if (plugindir == NULL){
651
dir = opendir(PDIR);
652
} else {
653
dir = opendir(plugindir);
654
}
655
533
656
if(dir == NULL){
534
657
perror("Could not open plugin dir");
535
658
exitstatus = EXIT_FAILURE;
551
674
552
675
FD_ZERO(&rfds_all);
553
676
677
/* Read and execute any executable in the plugin directory*/
554
678
while(true){
555
679
dirst = readdir(dir);
556
680
557
// All directory entries have been processed
681
/* All directory entries have been processed */
558
682
if(dirst == NULL){
559
683
if (errno == EBADF){
560
684
perror("readdir");
566
690
567
691
d_name_len = strlen(dirst->d_name);
568
692
569
// Ignore dotfiles, backup files and other junk
693
/* Ignore dotfiles, backup files and other junk */
570
694
{
571
695
bool bad_name = false;
572
696
587
711
break;
588
712
}
589
713
}
590
591
714
if(bad_name){
592
715
continue;
593
716
}
594
595
717
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
596
718
size_t suf_len = strlen(*suf);
597
719
if((d_name_len >= suf_len)
624
746
free(filename);
625
747
continue;
626
748
}
627
749
750
/* Ignore non-executable files */
628
751
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
629
752
if(debug){
630
753
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
633
756
free(filename);
634
757
continue;
635
758
}
636
plugin *p = getplugin(dirst->d_name, &plugin_list);
759
760
plugin *p = getplugin(dirst->d_name);
637
761
if(p == NULL){
638
762
perror("getplugin");
639
763
free(filename);
649
773
}
650
774
{
651
775
/* Add global arguments to argument list for this plugin */
652
plugin *g = getplugin(NULL, &plugin_list);
776
plugin *g = getplugin(NULL);
653
777
if(g != NULL){
654
778
for(char **a = g->argv + 1; *a != NULL; a++){
655
779
if(not add_argument(p, *a)){
658
782
}
659
783
/* Add global environment variables */
660
784
for(char **e = g->environ; *e != NULL; e++){
661
if(not add_environment(p, *e)){
785
if(not add_environment(p, *e, false)){
662
786
perror("add_environment");
663
787
}
664
788
}
669
793
process, too. */
670
794
if(p->environ[0] != NULL){
671
795
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)){
796
if(not add_environment(p, *e, false)){
678
797
perror("add_environment");
679
798
}
680
799
}
681
800
}
682
801
683
int pipefd[2];
802
int pipefd[2];
684
803
ret = pipe(pipefd);
685
804
if (ret == -1){
686
805
perror("pipe");
687
806
exitstatus = EXIT_FAILURE;
688
807
goto fallback;
689
808
}
809
/* Ask OS to automatic close the pipe on exec */
690
810
ret = set_cloexec_flag(pipefd[0]);
691
811
if(ret < 0){
692
812
perror("set_cloexec_flag");
706
826
exitstatus = EXIT_FAILURE;
707
827
goto fallback;
708
828
}
709
// Starting a new process to be watched
829
/* Starting a new process to be watched */
710
830
pid_t pid = fork();
711
831
if(pid == -1){
712
832
perror("fork");
750
870
}
751
871
/* no return */
752
872
}
753
/* parent process */
873
/* Parent process */
874
close(pipefd[1]); /* Close unused write end of pipe */
754
875
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");
876
plugin *new_plugin = getplugin(dirst->d_name);
877
if (new_plugin == NULL){
878
perror("getplugin");
759
879
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
760
880
if(ret < 0){
761
perror("sigprocmask");
881
perror("sigprocmask");
762
882
}
763
883
exitstatus = EXIT_FAILURE;
764
884
goto fallback;
765
885
}
766
886
767
*new_process = (struct process){ .pid = pid,
768
.fd = pipefd[0],
769
.next = process_list };
770
// List handling
771
process_list = new_process;
887
new_plugin->pid = pid;
888
new_plugin->fd = pipefd[0];
889
772
890
/* Unblock SIGCHLD so signal handler can be run if this process
773
891
has already completed */
774
892
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
778
896
goto fallback;
779
897
}
780
898
781
FD_SET(new_process->fd, &rfds_all);
899
FD_SET(new_plugin->fd, &rfds_all);
782
900
783
if (maxfd < new_process->fd){
784
maxfd = new_process->fd;
901
if (maxfd < new_plugin->fd){
902
maxfd = new_plugin->fd;
785
903
}
786
904
787
905
}
788
906
789
free_plugin_list(plugin_list);
790
791
907
closedir(dir);
792
908
dir = NULL;
793
794
if (process_list == NULL){
795
fprintf(stderr, "No plugin processes started. Incorrect plugin"
796
" directory?\n");
797
process_list = NULL;
909
910
for(plugin *p = plugin_list; p != NULL; p = p->next){
911
if(p->pid != 0){
912
break;
913
}
914
if(p->next == NULL){
915
fprintf(stderr, "No plugin processes started. Incorrect plugin"
916
" directory?\n");
917
free_plugin_list();
918
}
798
919
}
799
while(process_list){
920
921
/* Main loop while running plugins exist */
922
while(plugin_list){
800
923
fd_set rfds = rfds_all;
801
924
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
802
925
if (select_ret == -1){
806
929
}
807
930
/* OK, now either a process completed, or something can be read
808
931
from one of them */
809
for(process *proc = process_list; proc ; proc = proc->next){
932
for(plugin *proc = plugin_list; proc != NULL; proc = proc->next){
810
933
/* Is this process completely done? */
811
934
if(proc->eof and proc->completed){
812
935
/* Only accept the plugin output if it exited cleanly */
813
936
if(not WIFEXITED(proc->status)
814
937
or WEXITSTATUS(proc->status) != 0){
815
938
/* Bad exit by plugin */
939
816
940
if(debug){
817
941
if(WIFEXITED(proc->status)){
818
942
fprintf(stderr, "Plugin %u exited with status %d\n",
827
951
(unsigned int) (proc->pid));
828
952
}
829
953
}
954
830
955
/* Remove the plugin */
831
956
FD_CLR(proc->fd, &rfds_all);
957
832
958
/* Block signal while modifying process_list */
833
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
959
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
834
960
if(ret < 0){
835
961
perror("sigprocmask");
836
962
exitstatus = EXIT_FAILURE;
837
963
goto fallback;
838
964
}
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
}
965
free_plugin(proc);
852
966
/* We are done modifying process list, so unblock signal */
853
967
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
854
968
NULL);
855
969
if(ret < 0){
856
970
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;
971
exitstatus = EXIT_FAILURE;
972
goto fallback;
973
}
974
975
if(plugin_list == NULL){
976
break;
977
}
978
continue;
864
979
}
980
865
981
/* This process exited nicely, so print its buffer */
866
982
867
bool bret = print_out_password(proc->buffer, proc->buffer_length);
983
bool bret = print_out_password(proc->buffer,
984
proc->buffer_length);
868
985
if(not bret){
869
986
perror("print_out_password");
870
987
exitstatus = EXIT_FAILURE;
871
988
}
872
989
goto fallback;
873
990
}
991
874
992
/* This process has not completed. Does it have any output? */
875
993
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
876
994
/* This process had nothing to say at this time */
906
1024
907
1025
fallback:
908
1026
909
if(process_list == NULL or exitstatus != EXIT_SUCCESS){
910
/* Fallback if all plugins failed, none are found or an error occured */
1027
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1028
/* Fallback if all plugins failed, none are found or an error
1029
occured */
911
1030
bool bret;
912
1031
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
913
1032
char *passwordbuffer = getpass("Password: ");
926
1045
}
927
1046
928
1047
if(custom_argv != NULL){
929
for(char **arg = custom_argv; *arg != NULL; arg++){
1048
for(char **arg = custom_argv+1; *arg != NULL; arg++){
930
1049
free(*arg);
931
1050
}
932
1051
free(custom_argv);
933
1052
}
934
free_plugin_list(plugin_list);
935
1053
936
1054
if(dir != NULL){
937
1055
closedir(dir);
938
1056
}
939
1057
940
1058
/* 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");
1059
for(plugin *p = plugin_list; p != NULL; p = p->next){
1060
if(p->pid != 0){
1061
close(p->fd);
1062
ret = kill(p->pid, SIGTERM);
1063
if(ret == -1 and errno != ESRCH){
1064
/* Set-uid proccesses might not get closed */
1065
perror("kill");
1066
}
948
1067
}
949
free(process_list->buffer);
950
free(process_list);
951
1068
}
952
1069
953
1070
/* Wait for any remaining child processes to terminate */
957
1074
if(errno != ECHILD){
958
1075
perror("wait");
959
1076
}
1077
1078
free_plugin_list();
1079
1080
free(plugindir);
1081
free(argfile);
960
1082
961
1083
return exitstatus;
962
1084
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0