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 136
- compare with another revision
- download diff
- download tarball
- view history from revision 136
- Committer: Teddy Hogeborn
- Date: 2008-09-01 16:53:17 UTC
- Revision ID: teddy@fukt.bsnet.se-20080901165317-77dccp81zyqimt2j
* plugin-runner.c (add_environment): Override existing environment
variables when asked to do so.
All callers changed.
(main): Removed old argp.args_doc string. Parse argument file
before normal command line arguments. Use ARGP_IN_ORDER
flag in both calls to argp_parse. Do not strdup() strings
to be sent to add_environment().
* plugin-runner.xml (OPTIONS): Document "--global-env" and "--envs-for".
(FILES): Note that the config file is parsed before the command line
options.
variables when asked to do so.
All callers changed.
(main): Removed old argp.args_doc string. Parse argument file
before normal command line arguments. Use ARGP_IN_ORDER
flag in both calls to argp_parse. Do not strdup() strings
to be sent to add_environment().
* plugin-runner.xml (OPTIONS): Document "--global-env" and "--envs-for".
(FILES): Note that the config file is parsed before the command line
options.
- 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) {
376
error_t parse_opt (int key, char *arg, __attribute__((unused))
377
struct argp_state *state) {
337
378
/* Get the INPUT argument from `argp_parse', which we know is a
338
379
pointer to our plugin list pointer. */
339
plugin **plugins = state->input;
340
380
switch (key) {
341
case 'g':
381
case 'g': /* --global-options */
342
382
if (arg != NULL){
343
383
char *p;
344
384
while((p = strsep(&arg, ",")) != NULL){
345
385
if(p[0] == '\0'){
346
386
continue;
347
387
}
348
if(not add_argument(getplugin(NULL, plugins), p)){
388
if(not add_argument(getplugin(NULL), p)){
349
389
perror("add_argument");
350
390
return ARGP_ERR_UNKNOWN;
351
391
}
352
392
}
353
393
}
354
394
break;
355
case 'e':
395
case 'e': /* --global-env */
356
396
if(arg == NULL){
357
397
break;
358
398
}
361
401
if(envdef == NULL){
362
402
break;
363
403
}
364
if(not add_environment(getplugin(NULL, plugins), envdef)){
404
if(not add_environment(getplugin(NULL), envdef, true)){
365
405
perror("add_environment");
366
406
}
367
407
}
368
408
break;
369
case 'o':
409
case 'o': /* --options-for */
370
410
if (arg != NULL){
371
411
char *p_name = strsep(&arg, ":");
372
412
if(p_name[0] == '\0'){
382
422
if(p[0] == '\0'){
383
423
continue;
384
424
}
385
if(not add_argument(getplugin(p_name, plugins), p)){
425
if(not add_argument(getplugin(p_name), p)){
386
426
perror("add_argument");
387
427
return ARGP_ERR_UNKNOWN;
388
428
}
390
430
}
391
431
}
392
432
break;
393
case 'f':
433
case 'f': /* --env-for */
394
434
if(arg == NULL){
395
435
break;
396
436
}
404
444
break;
405
445
}
406
446
envdef++;
407
if(not add_environment(getplugin(p_name, plugins), envdef)){
447
if(not add_environment(getplugin(p_name), envdef, true)){
408
448
perror("add_environment");
409
449
}
410
450
}
411
451
break;
412
case 'd':
452
case 'd': /* --disable */
413
453
if (arg != NULL){
414
plugin *p = getplugin(arg, plugins);
454
plugin *p = getplugin(arg);
415
455
if(p == NULL){
416
456
return ARGP_ERR_UNKNOWN;
417
457
}
418
458
p->disabled = true;
419
459
}
420
460
break;
421
case 128:
422
plugindir = arg;
461
case 128: /* --plugin-dir */
462
plugindir = strdup(arg);
463
if(plugindir == NULL){
464
perror("strdup");
465
}
423
466
break;
424
case 129:
467
case 129: /* --config-file */
468
argfile = strdup(arg);
469
if(argfile == NULL){
470
perror("strdup");
471
}
472
break;
473
case 130: /* --userid */
425
474
uid = (uid_t)strtol(arg, NULL, 10);
426
475
break;
427
case 130:
476
case 131: /* --groupid */
428
477
gid = (gid_t)strtol(arg, NULL, 10);
429
478
break;
430
case 131:
479
case 132: /* --debug */
431
480
debug = true;
432
481
break;
433
482
case ARGP_KEY_ARG:
441
490
return 0;
442
491
}
443
492
444
plugin *plugin_list = NULL;
445
446
493
struct argp argp = { .options = options, .parser = parse_opt,
447
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
494
.args_doc = "",
448
495
.doc = "Mandos plugin runner -- Run plugins" };
449
496
450
ret = argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
451
if (ret == ARGP_ERR_UNKNOWN){
452
fprintf(stderr, "Unknown error while parsing arguments\n");
453
exitstatus = EXIT_FAILURE;
454
goto fallback;
455
}
456
457
conffp = fopen(argfile, "r");
497
/* Open the configfile if available */
498
if (argfile == NULL){
499
conffp = fopen(AFILE, "r");
500
} else {
501
conffp = fopen(argfile, "r");
502
}
458
503
if(conffp != NULL){
459
504
char *org_line = NULL;
460
505
char *p, *arg, *new_arg, *line;
463
508
const char whitespace_delims[] = " \r\t\f\v\n";
464
509
const char comment_delim[] = "#";
465
510
511
custom_argc = 1;
512
custom_argv = malloc(sizeof(char*) * 2);
513
if(custom_argv == NULL){
514
perror("malloc");
515
exitstatus = EXIT_FAILURE;
516
goto fallback;
517
}
518
custom_argv[0] = argv[0];
519
custom_argv[1] = NULL;
520
521
/* for each line in the config file, strip whitespace and ignore
522
commented text */
466
523
while(true){
467
524
sret = getline(&org_line, &size, conffp);
468
525
if(sret == -1){
476
533
continue;
477
534
}
478
535
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
}
536
if(new_arg == NULL){
537
perror("strdup");
538
exitstatus = EXIT_FAILURE;
539
free(org_line);
540
goto fallback;
541
}
542
543
custom_argc += 1;
544
custom_argv = realloc(custom_argv, sizeof(char *)
545
* ((unsigned int) custom_argc + 1));
546
if(custom_argv == NULL){
547
perror("realloc");
548
exitstatus = EXIT_FAILURE;
549
free(org_line);
550
goto fallback;
551
}
552
custom_argv[custom_argc-1] = new_arg;
553
custom_argv[custom_argc] = NULL;
485
554
}
486
555
}
487
556
free(org_line);
488
} else{
557
} else {
489
558
/* Check for harmful errors and go to fallback. Other errors might
490
559
not affect opening plugins */
491
560
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
494
563
goto fallback;
495
564
}
496
565
}
497
566
/* If there was any arguments from configuration file,
567
pass them to parser as command arguments */
498
568
if(custom_argv != NULL){
499
custom_argv[0] = argv[0];
500
ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0, &plugin_list);
569
ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
570
0, NULL);
501
571
if (ret == ARGP_ERR_UNKNOWN){
502
572
fprintf(stderr, "Unknown error while parsing arguments\n");
503
573
exitstatus = EXIT_FAILURE;
505
575
}
506
576
}
507
577
578
/* Parse actual command line arguments, to let them override the
579
config file */
580
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
581
if (ret == ARGP_ERR_UNKNOWN){
582
fprintf(stderr, "Unknown error while parsing arguments\n");
583
exitstatus = EXIT_FAILURE;
584
goto fallback;
585
}
586
508
587
if(debug){
509
588
for(plugin *p = plugin_list; p != NULL; p=p->next){
510
589
fprintf(stderr, "Plugin: %s has %d arguments\n",
519
598
}
520
599
}
521
600
601
/* Strip permissions down to nobody */
522
602
ret = setuid(uid);
523
603
if (ret == -1){
524
604
perror("setuid");
525
}
526
605
}
527
606
setgid(gid);
528
607
if (ret == -1){
529
608
perror("setgid");
530
609
}
531
610
532
dir = opendir(plugindir);
611
if (plugindir == NULL){
612
dir = opendir(PDIR);
613
} else {
614
dir = opendir(plugindir);
615
}
616
533
617
if(dir == NULL){
534
618
perror("Could not open plugin dir");
535
619
exitstatus = EXIT_FAILURE;
551
635
552
636
FD_ZERO(&rfds_all);
553
637
638
/* Read and execute any executable in the plugin directory*/
554
639
while(true){
555
640
dirst = readdir(dir);
556
641
557
// All directory entries have been processed
642
/* All directory entries have been processed */
558
643
if(dirst == NULL){
559
644
if (errno == EBADF){
560
645
perror("readdir");
566
651
567
652
d_name_len = strlen(dirst->d_name);
568
653
569
// Ignore dotfiles, backup files and other junk
654
/* Ignore dotfiles, backup files and other junk */
570
655
{
571
656
bool bad_name = false;
572
657
587
672
break;
588
673
}
589
674
}
590
591
675
if(bad_name){
592
676
continue;
593
677
}
594
595
678
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
596
679
size_t suf_len = strlen(*suf);
597
680
if((d_name_len >= suf_len)
624
707
free(filename);
625
708
continue;
626
709
}
627
710
711
/* Ignore non-executable files */
628
712
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
629
713
if(debug){
630
714
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
633
717
free(filename);
634
718
continue;
635
719
}
636
plugin *p = getplugin(dirst->d_name, &plugin_list);
720
721
plugin *p = getplugin(dirst->d_name);
637
722
if(p == NULL){
638
723
perror("getplugin");
639
724
free(filename);
649
734
}
650
735
{
651
736
/* Add global arguments to argument list for this plugin */
652
plugin *g = getplugin(NULL, &plugin_list);
737
plugin *g = getplugin(NULL);
653
738
if(g != NULL){
654
739
for(char **a = g->argv + 1; *a != NULL; a++){
655
740
if(not add_argument(p, *a)){
658
743
}
659
744
/* Add global environment variables */
660
745
for(char **e = g->environ; *e != NULL; e++){
661
if(not add_environment(p, *e)){
746
if(not add_environment(p, *e, false)){
662
747
perror("add_environment");
663
748
}
664
749
}
669
754
process, too. */
670
755
if(p->environ[0] != NULL){
671
756
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)){
757
if(not add_environment(p, *e, false)){
678
758
perror("add_environment");
679
759
}
680
760
}
681
761
}
682
762
683
int pipefd[2];
763
int pipefd[2];
684
764
ret = pipe(pipefd);
685
765
if (ret == -1){
686
766
perror("pipe");
687
767
exitstatus = EXIT_FAILURE;
688
768
goto fallback;
689
769
}
770
/* Ask OS to automatic close the pipe on exec */
690
771
ret = set_cloexec_flag(pipefd[0]);
691
772
if(ret < 0){
692
773
perror("set_cloexec_flag");
706
787
exitstatus = EXIT_FAILURE;
707
788
goto fallback;
708
789
}
709
// Starting a new process to be watched
790
/* Starting a new process to be watched */
710
791
pid_t pid = fork();
711
792
if(pid == -1){
712
793
perror("fork");
750
831
}
751
832
/* no return */
752
833
}
753
/* parent process */
834
/* Parent process */
835
close(pipefd[1]); /* Close unused write end of pipe */
754
836
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");
837
plugin *new_plugin = getplugin(dirst->d_name);
838
if (new_plugin == NULL){
839
perror("getplugin");
759
840
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
760
841
if(ret < 0){
761
perror("sigprocmask");
842
perror("sigprocmask");
762
843
}
763
844
exitstatus = EXIT_FAILURE;
764
845
goto fallback;
765
846
}
766
847
767
*new_process = (struct process){ .pid = pid,
768
.fd = pipefd[0],
769
.next = process_list };
770
// List handling
771
process_list = new_process;
848
new_plugin->pid = pid;
849
new_plugin->fd = pipefd[0];
850
772
851
/* Unblock SIGCHLD so signal handler can be run if this process
773
852
has already completed */
774
853
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
778
857
goto fallback;
779
858
}
780
859
781
FD_SET(new_process->fd, &rfds_all);
860
FD_SET(new_plugin->fd, &rfds_all);
782
861
783
if (maxfd < new_process->fd){
784
maxfd = new_process->fd;
862
if (maxfd < new_plugin->fd){
863
maxfd = new_plugin->fd;
785
864
}
786
865
787
866
}
788
867
789
free_plugin_list(plugin_list);
790
791
868
closedir(dir);
792
869
dir = NULL;
793
794
if (process_list == NULL){
795
fprintf(stderr, "No plugin processes started. Incorrect plugin"
796
" directory?\n");
797
process_list = NULL;
870
871
for(plugin *p = plugin_list; p != NULL; p = p->next){
872
if(p->pid != 0){
873
break;
874
}
875
if(p->next == NULL){
876
fprintf(stderr, "No plugin processes started. Incorrect plugin"
877
" directory?\n");
878
free_plugin_list();
879
}
798
880
}
799
while(process_list){
881
882
/* Main loop while running plugins exist */
883
while(plugin_list){
800
884
fd_set rfds = rfds_all;
801
885
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
802
886
if (select_ret == -1){
806
890
}
807
891
/* OK, now either a process completed, or something can be read
808
892
from one of them */
809
for(process *proc = process_list; proc ; proc = proc->next){
893
for(plugin *proc = plugin_list; proc != NULL; proc = proc->next){
810
894
/* Is this process completely done? */
811
895
if(proc->eof and proc->completed){
812
896
/* Only accept the plugin output if it exited cleanly */
813
897
if(not WIFEXITED(proc->status)
814
898
or WEXITSTATUS(proc->status) != 0){
815
899
/* Bad exit by plugin */
900
816
901
if(debug){
817
902
if(WIFEXITED(proc->status)){
818
903
fprintf(stderr, "Plugin %u exited with status %d\n",
827
912
(unsigned int) (proc->pid));
828
913
}
829
914
}
915
830
916
/* Remove the plugin */
831
917
FD_CLR(proc->fd, &rfds_all);
918
832
919
/* Block signal while modifying process_list */
833
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
920
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
834
921
if(ret < 0){
835
922
perror("sigprocmask");
836
923
exitstatus = EXIT_FAILURE;
837
924
goto fallback;
838
925
}
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
}
926
free_plugin(proc);
852
927
/* We are done modifying process list, so unblock signal */
853
928
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
854
929
NULL);
855
930
if(ret < 0){
856
931
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;
932
exitstatus = EXIT_FAILURE;
933
goto fallback;
934
}
935
936
if(plugin_list == NULL){
937
break;
938
}
939
continue;
864
940
}
941
865
942
/* This process exited nicely, so print its buffer */
866
943
867
bool bret = print_out_password(proc->buffer, proc->buffer_length);
944
bool bret = print_out_password(proc->buffer,
945
proc->buffer_length);
868
946
if(not bret){
869
947
perror("print_out_password");
870
948
exitstatus = EXIT_FAILURE;
871
949
}
872
950
goto fallback;
873
951
}
952
874
953
/* This process has not completed. Does it have any output? */
875
954
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
876
955
/* This process had nothing to say at this time */
906
985
907
986
fallback:
908
987
909
if(process_list == NULL or exitstatus != EXIT_SUCCESS){
910
/* Fallback if all plugins failed, none are found or an error occured */
988
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
989
/* Fallback if all plugins failed, none are found or an error
990
occured */
911
991
bool bret;
912
992
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
913
993
char *passwordbuffer = getpass("Password: ");
926
1006
}
927
1007
928
1008
if(custom_argv != NULL){
929
for(char **arg = custom_argv; *arg != NULL; arg++){
1009
for(char **arg = custom_argv+1; *arg != NULL; arg++){
930
1010
free(*arg);
931
1011
}
932
1012
free(custom_argv);
933
1013
}
934
free_plugin_list(plugin_list);
935
1014
936
1015
if(dir != NULL){
937
1016
closedir(dir);
938
1017
}
939
1018
940
1019
/* 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");
1020
for(plugin *p = plugin_list; p != NULL; p = p->next){
1021
if(p->pid != 0){
1022
close(p->fd);
1023
ret = kill(p->pid, SIGTERM);
1024
if(ret == -1 and errno != ESRCH){
1025
/* Set-uid proccesses might not get closed */
1026
perror("kill");
1027
}
948
1028
}
949
free(process_list->buffer);
950
free(process_list);
951
1029
}
952
1030
953
1031
/* Wait for any remaining child processes to terminate */
957
1035
if(errno != ECHILD){
958
1036
perror("wait");
959
1037
}
1038
1039
free_plugin_list();
1040
1041
free(plugindir);
1042
free(argfile);
960
1043
961
1044
return exitstatus;
962
1045
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0