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 89
- compare with another revision
- download diff
- download tarball
- view history from revision 89
- Committer: Teddy Hogeborn
- Date: 2008-08-18 23:55:28 UTC
- Revision ID: teddy@fukt.bsnet.se-20080818235528-dn628nlbrtzl7z4f
* Makefile: Bug fix: fixed creation of man pages for section 5 pages.
* mandos (main): Changed from requiring "[server]" in mandos.conf(5)
to requiring "[DEFAULT]".
* mandos.conf ([server]): Renamed to "[DEFAULT]".
* mandos.conf.xml: Removed <?xml-stylesheet>. New entity "&OVERVIEW;"
referring to "overview.xml".
(DESCRIPTION): Updated to specify the syntax more precisely. Use
<varname> around the option names.
* mandos (main): Changed from requiring "[server]" in mandos.conf(5)
to requiring "[DEFAULT]".
* mandos.conf ([server]): Renamed to "[DEFAULT]".
* mandos.conf.xml: Removed <?xml-stylesheet>. New entity "&OVERVIEW;"
referring to "overview.xml".
(DESCRIPTION): Updated to specify the syntax more precisely. Use
<varname> around the option names.
- files removed:
- .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,
60
error_t */
59
ARGP_KEY_END, ARGP_KEY_ARG, error_t */
61
60
#include <signal.h> /* struct sigaction, sigemptyset(),
62
61
sigaddset(), sigaction(),
63
62
sigprocmask(), SIG_BLOCK, SIGCHLD,
65
64
#include <errno.h> /* errno, EBADF */
66
65
67
66
#define BUFFER_SIZE 256
68
69
#define PDIR "/lib/mandos/plugins.d"
70
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
67
#define ARGFILE "/conf/conf.d/mandos/plugin-runner.conf"
71
68
72
69
const char *argp_program_version = "plugin-runner 1.0";
73
70
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
74
71
75
struct plugin;
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;
76
85
77
86
typedef struct plugin{
78
87
char *name; /* can be NULL or any plugin name */
81
90
char **environ;
82
91
int envc;
83
92
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;
94
93
struct plugin *next;
95
94
} plugin;
96
95
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){
96
static plugin *getplugin(char *name, plugin **plugin_list){
97
for (plugin *p = *plugin_list; p != NULL; p = p->next){
104
98
if ((p->name == name)
105
99
or (p->name and name and (strcmp(p->name, name) == 0))){
106
100
return p;
111
105
if (new_plugin == NULL){
112
106
return NULL;
113
107
}
114
char *copy_name = NULL;
115
if(name != NULL){
116
copy_name = strdup(name);
117
if(copy_name == NULL){
118
return NULL;
119
}
108
char *copy_name = strdup(name);
109
if(copy_name == NULL){
110
return NULL;
120
111
}
121
112
122
113
*new_plugin = (plugin) { .name = copy_name,
123
114
.argc = 1,
115
.envc = 0,
124
116
.disabled = false,
125
.next = plugin_list };
117
.next = *plugin_list };
126
118
127
119
new_plugin->argv = malloc(sizeof(char *) * 2);
128
120
if (new_plugin->argv == NULL){
129
free(copy_name);
130
121
free(new_plugin);
131
122
return NULL;
132
123
}
133
124
new_plugin->argv[0] = copy_name;
134
125
new_plugin->argv[1] = NULL;
135
126
136
127
new_plugin->environ = malloc(sizeof(char *));
137
128
if(new_plugin->environ == NULL){
138
free(copy_name);
139
129
free(new_plugin->argv);
140
130
free(new_plugin);
141
131
return NULL;
142
132
}
143
133
new_plugin->environ[0] = NULL;
144
145
134
/* Append the new plugin to the list */
146
plugin_list = new_plugin;
135
*plugin_list = new_plugin;
147
136
return new_plugin;
148
137
}
149
138
179
168
}
180
169
181
170
/* Add to a plugin's environment */
182
static bool add_environment(plugin *p, const char *def, bool replace){
171
static bool add_environment(plugin *p, const char *def){
183
172
if(p == NULL){
184
173
return false;
185
174
}
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
}
203
175
return add_to_char_array(def, &(p->environ), &(p->envc));
204
176
}
205
177
178
206
179
/*
207
180
* Based on the example in the GNU LibC manual chapter 13.13 "File
208
181
* Descriptor Flags".
219
192
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
220
193
}
221
194
195
process *process_list = NULL;
222
196
223
/* Mark processes as completed when they exit, and save their exit
197
/* Mark a process as completed when it exits, and save its exit
224
198
status. */
225
199
void handle_sigchld(__attribute__((unused)) int sig){
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
}
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;
253
216
}
254
217
255
/* Prints out a password to stdout */
256
218
bool print_out_password(const char *buffer, size_t length){
257
219
ssize_t ret;
258
220
if(length>0 and buffer[length-1] == '\n'){
268
230
return true;
269
231
}
270
232
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
}
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;
295
239
}
296
}
297
298
free(plugin_node);
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;
299
252
}
300
253
301
static void free_plugin_list(void){
302
while(plugin_list != NULL){
303
free_plugin(plugin_list);
304
}
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
}
305
268
}
306
269
307
270
int main(int argc, char *argv[]){
308
char *plugindir = NULL;
309
char *argfile = NULL;
271
const char *plugindir = "/lib/mandos/plugins.d";
272
const char *argfile = ARGFILE;
310
273
FILE *conffp;
311
274
size_t d_name_len;
312
275
DIR *dir = NULL;
335
298
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
336
299
if(ret == -1){
337
300
perror("sigaction");
338
exitstatus = EXIT_FAILURE;
301
exitstatus = EXIT_FAILURE;
339
302
goto fallback;
340
303
}
341
304
344
307
{ .name = "global-options", .key = 'g',
345
308
.arg = "OPTION[,OPTION[,...]]",
346
309
.doc = "Options passed to all plugins" },
347
{ .name = "global-env", .key = 'e',
310
{ .name = "global-envs", .key = 'e',
348
311
.arg = "VAR=value",
349
312
.doc = "Environment variable passed to all plugins" },
350
313
{ .name = "options-for", .key = 'o',
351
314
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
352
315
.doc = "Options passed only to specified plugin" },
353
{ .name = "env-for", .key = 'f',
316
{ .name = "envs-for", .key = 'f',
354
317
.arg = "PLUGIN:ENV=value",
355
318
.doc = "Environment variable passed to specified plugin" },
356
319
{ .name = "disable", .key = 'd',
359
322
{ .name = "plugin-dir", .key = 128,
360
323
.arg = "DIRECTORY",
361
324
.doc = "Specify a different plugin directory", .group = 2 },
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 },
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 },
373
333
{ .name = NULL }
374
334
};
375
335
376
error_t parse_opt (int key, char *arg, __attribute__((unused))
377
struct argp_state *state) {
336
error_t parse_opt (int key, char *arg, struct argp_state *state) {
378
337
/* Get the INPUT argument from `argp_parse', which we know is a
379
338
pointer to our plugin list pointer. */
339
plugin **plugins = state->input;
380
340
switch (key) {
381
case 'g': /* --global-options */
341
case 'g':
382
342
if (arg != NULL){
383
343
char *p;
384
344
while((p = strsep(&arg, ",")) != NULL){
385
345
if(p[0] == '\0'){
386
346
continue;
387
347
}
388
if(not add_argument(getplugin(NULL), p)){
348
if(not add_argument(getplugin(NULL, plugins), p)){
389
349
perror("add_argument");
390
350
return ARGP_ERR_UNKNOWN;
391
351
}
392
352
}
393
353
}
394
354
break;
395
case 'e': /* --global-env */
355
case 'e':
396
356
if(arg == NULL){
397
357
break;
398
358
}
401
361
if(envdef == NULL){
402
362
break;
403
363
}
404
if(not add_environment(getplugin(NULL), envdef, true)){
364
if(not add_environment(getplugin(NULL, plugins), envdef)){
405
365
perror("add_environment");
406
366
}
407
367
}
408
368
break;
409
case 'o': /* --options-for */
369
case 'o':
410
370
if (arg != NULL){
411
371
char *p_name = strsep(&arg, ":");
412
372
if(p_name[0] == '\0'){
422
382
if(p[0] == '\0'){
423
383
continue;
424
384
}
425
if(not add_argument(getplugin(p_name), p)){
385
if(not add_argument(getplugin(p_name, plugins), p)){
426
386
perror("add_argument");
427
387
return ARGP_ERR_UNKNOWN;
428
388
}
430
390
}
431
391
}
432
392
break;
433
case 'f': /* --env-for */
393
case 'f':
434
394
if(arg == NULL){
435
395
break;
436
396
}
444
404
break;
445
405
}
446
406
envdef++;
447
if(not add_environment(getplugin(p_name), envdef, true)){
407
if(not add_environment(getplugin(p_name, plugins), envdef)){
448
408
perror("add_environment");
449
409
}
450
410
}
451
411
break;
452
case 'd': /* --disable */
412
case 'd':
453
413
if (arg != NULL){
454
plugin *p = getplugin(arg);
414
plugin *p = getplugin(arg, plugins);
455
415
if(p == NULL){
456
416
return ARGP_ERR_UNKNOWN;
457
417
}
458
418
p->disabled = true;
459
419
}
460
420
break;
461
case 128: /* --plugin-dir */
462
plugindir = strdup(arg);
463
if(plugindir == NULL){
464
perror("strdup");
465
}
421
case 128:
422
plugindir = arg;
466
423
break;
467
case 129: /* --config-file */
468
argfile = strdup(arg);
469
if(argfile == NULL){
470
perror("strdup");
471
}
472
break;
473
case 130: /* --userid */
424
case 129:
474
425
uid = (uid_t)strtol(arg, NULL, 10);
475
426
break;
476
case 131: /* --groupid */
427
case 130:
477
428
gid = (gid_t)strtol(arg, NULL, 10);
478
429
break;
479
case 132: /* --debug */
430
case 131:
480
431
debug = true;
481
432
break;
482
433
case ARGP_KEY_ARG:
490
441
return 0;
491
442
}
492
443
444
plugin *plugin_list = NULL;
445
493
446
struct argp argp = { .options = options, .parser = parse_opt,
494
.args_doc = "",
447
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
495
448
.doc = "Mandos plugin runner -- Run plugins" };
496
449
497
/* Open the configfile if available */
498
if (argfile == NULL){
499
conffp = fopen(AFILE, "r");
500
} else {
501
conffp = fopen(argfile, "r");
502
}
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");
503
458
if(conffp != NULL){
504
459
char *org_line = NULL;
505
460
char *p, *arg, *new_arg, *line;
508
463
const char whitespace_delims[] = " \r\t\f\v\n";
509
464
const char comment_delim[] = "#";
510
465
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 */
523
466
while(true){
524
467
sret = getline(&org_line, &size, conffp);
525
468
if(sret == -1){
533
476
continue;
534
477
}
535
478
new_arg = strdup(p);
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;
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
}
554
485
}
555
486
}
556
487
free(org_line);
557
} else {
488
} else{
558
489
/* Check for harmful errors and go to fallback. Other errors might
559
490
not affect opening plugins */
560
491
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
563
494
goto fallback;
564
495
}
565
496
}
566
/* If there was any arguments from configuration file,
567
pass them to parser as command arguments */
497
568
498
if(custom_argv != NULL){
569
ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
570
0, NULL);
499
custom_argv[0] = argv[0];
500
ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0, &plugin_list);
571
501
if (ret == ARGP_ERR_UNKNOWN){
572
502
fprintf(stderr, "Unknown error while parsing arguments\n");
573
503
exitstatus = EXIT_FAILURE;
575
505
}
576
506
}
577
507
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
587
508
if(debug){
588
509
for(plugin *p = plugin_list; p != NULL; p=p->next){
589
510
fprintf(stderr, "Plugin: %s has %d arguments\n",
598
519
}
599
520
}
600
521
601
/* Strip permissions down to nobody */
602
522
ret = setuid(uid);
603
523
if (ret == -1){
604
524
perror("setuid");
605
}
525
}
526
606
527
setgid(gid);
607
528
if (ret == -1){
608
529
perror("setgid");
609
530
}
610
531
611
if (plugindir == NULL){
612
dir = opendir(PDIR);
613
} else {
614
dir = opendir(plugindir);
615
}
616
532
dir = opendir(plugindir);
617
533
if(dir == NULL){
618
534
perror("Could not open plugin dir");
619
535
exitstatus = EXIT_FAILURE;
635
551
636
552
FD_ZERO(&rfds_all);
637
553
638
/* Read and execute any executable in the plugin directory*/
639
554
while(true){
640
555
dirst = readdir(dir);
641
556
642
/* All directory entries have been processed */
557
// All directory entries have been processed
643
558
if(dirst == NULL){
644
559
if (errno == EBADF){
645
560
perror("readdir");
651
566
652
567
d_name_len = strlen(dirst->d_name);
653
568
654
/* Ignore dotfiles, backup files and other junk */
569
// Ignore dotfiles, backup files and other junk
655
570
{
656
571
bool bad_name = false;
657
572
672
587
break;
673
588
}
674
589
}
590
675
591
if(bad_name){
676
592
continue;
677
593
}
594
678
595
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
679
596
size_t suf_len = strlen(*suf);
680
597
if((d_name_len >= suf_len)
707
624
free(filename);
708
625
continue;
709
626
}
710
711
/* Ignore non-executable files */
627
712
628
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
713
629
if(debug){
714
630
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
717
633
free(filename);
718
634
continue;
719
635
}
720
721
plugin *p = getplugin(dirst->d_name);
636
plugin *p = getplugin(dirst->d_name, &plugin_list);
722
637
if(p == NULL){
723
638
perror("getplugin");
724
639
free(filename);
734
649
}
735
650
{
736
651
/* Add global arguments to argument list for this plugin */
737
plugin *g = getplugin(NULL);
652
plugin *g = getplugin(NULL, &plugin_list);
738
653
if(g != NULL){
739
654
for(char **a = g->argv + 1; *a != NULL; a++){
740
655
if(not add_argument(p, *a)){
743
658
}
744
659
/* Add global environment variables */
745
660
for(char **e = g->environ; *e != NULL; e++){
746
if(not add_environment(p, *e, false)){
661
if(not add_environment(p, *e)){
747
662
perror("add_environment");
748
663
}
749
664
}
754
669
process, too. */
755
670
if(p->environ[0] != NULL){
756
671
for(char **e = environ; *e != NULL; e++){
757
if(not add_environment(p, *e, false)){
672
char *copy = strdup(*e);
673
if(copy == NULL){
674
perror("strdup");
675
continue;
676
}
677
if(not add_environment(p, copy)){
758
678
perror("add_environment");
759
679
}
760
680
}
761
681
}
762
682
763
int pipefd[2];
683
int pipefd[2];
764
684
ret = pipe(pipefd);
765
685
if (ret == -1){
766
686
perror("pipe");
767
687
exitstatus = EXIT_FAILURE;
768
688
goto fallback;
769
689
}
770
/* Ask OS to automatic close the pipe on exec */
771
690
ret = set_cloexec_flag(pipefd[0]);
772
691
if(ret < 0){
773
692
perror("set_cloexec_flag");
787
706
exitstatus = EXIT_FAILURE;
788
707
goto fallback;
789
708
}
790
/* Starting a new process to be watched */
709
// Starting a new process to be watched
791
710
pid_t pid = fork();
792
711
if(pid == -1){
793
712
perror("fork");
831
750
}
832
751
/* no return */
833
752
}
834
/* Parent process */
835
close(pipefd[1]); /* Close unused write end of pipe */
753
/* parent process */
836
754
free(filename);
837
plugin *new_plugin = getplugin(dirst->d_name);
838
if (new_plugin == NULL){
839
perror("getplugin");
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");
840
759
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
841
760
if(ret < 0){
842
perror("sigprocmask");
761
perror("sigprocmask");
843
762
}
844
763
exitstatus = EXIT_FAILURE;
845
764
goto fallback;
846
765
}
847
766
848
new_plugin->pid = pid;
849
new_plugin->fd = pipefd[0];
850
767
*new_process = (struct process){ .pid = pid,
768
.fd = pipefd[0],
769
.next = process_list };
770
// List handling
771
process_list = new_process;
851
772
/* Unblock SIGCHLD so signal handler can be run if this process
852
773
has already completed */
853
774
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
857
778
goto fallback;
858
779
}
859
780
860
FD_SET(new_plugin->fd, &rfds_all);
781
FD_SET(new_process->fd, &rfds_all);
861
782
862
if (maxfd < new_plugin->fd){
863
maxfd = new_plugin->fd;
783
if (maxfd < new_process->fd){
784
maxfd = new_process->fd;
864
785
}
865
786
866
787
}
867
788
789
free_plugin_list(plugin_list);
790
868
791
closedir(dir);
869
792
dir = 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
}
793
794
if (process_list == NULL){
795
fprintf(stderr, "No plugin processes started. Incorrect plugin"
796
" directory?\n");
797
process_list = NULL;
880
798
}
881
882
/* Main loop while running plugins exist */
883
while(plugin_list){
799
while(process_list){
884
800
fd_set rfds = rfds_all;
885
801
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
886
802
if (select_ret == -1){
890
806
}
891
807
/* OK, now either a process completed, or something can be read
892
808
from one of them */
893
for(plugin *proc = plugin_list; proc != NULL; proc = proc->next){
809
for(process *proc = process_list; proc ; proc = proc->next){
894
810
/* Is this process completely done? */
895
811
if(proc->eof and proc->completed){
896
812
/* Only accept the plugin output if it exited cleanly */
897
813
if(not WIFEXITED(proc->status)
898
814
or WEXITSTATUS(proc->status) != 0){
899
815
/* Bad exit by plugin */
900
901
816
if(debug){
902
817
if(WIFEXITED(proc->status)){
903
818
fprintf(stderr, "Plugin %u exited with status %d\n",
912
827
(unsigned int) (proc->pid));
913
828
}
914
829
}
915
916
830
/* Remove the plugin */
917
831
FD_CLR(proc->fd, &rfds_all);
918
919
832
/* Block signal while modifying process_list */
920
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
833
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
921
834
if(ret < 0){
922
835
perror("sigprocmask");
923
836
exitstatus = EXIT_FAILURE;
924
837
goto fallback;
925
838
}
926
free_plugin(proc);
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
}
927
852
/* We are done modifying process list, so unblock signal */
928
853
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
929
854
NULL);
930
855
if(ret < 0){
931
856
perror("sigprocmask");
932
exitstatus = EXIT_FAILURE;
933
goto fallback;
934
}
935
936
if(plugin_list == NULL){
937
break;
938
}
939
continue;
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;
940
864
}
941
942
865
/* This process exited nicely, so print its buffer */
943
866
944
bool bret = print_out_password(proc->buffer,
945
proc->buffer_length);
867
bool bret = print_out_password(proc->buffer, proc->buffer_length);
946
868
if(not bret){
947
869
perror("print_out_password");
948
870
exitstatus = EXIT_FAILURE;
949
871
}
950
872
goto fallback;
951
873
}
952
953
874
/* This process has not completed. Does it have any output? */
954
875
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
955
876
/* This process had nothing to say at this time */
985
906
986
907
fallback:
987
908
988
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
989
/* Fallback if all plugins failed, none are found or an error
990
occured */
909
if(process_list == NULL or exitstatus != EXIT_SUCCESS){
910
/* Fallback if all plugins failed, none are found or an error occured */
991
911
bool bret;
992
912
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
993
913
char *passwordbuffer = getpass("Password: ");
1006
926
}
1007
927
1008
928
if(custom_argv != NULL){
1009
for(char **arg = custom_argv+1; *arg != NULL; arg++){
929
for(char **arg = custom_argv; *arg != NULL; arg++){
1010
930
free(*arg);
1011
931
}
1012
932
free(custom_argv);
1013
933
}
934
free_plugin_list(plugin_list);
1014
935
1015
936
if(dir != NULL){
1016
937
closedir(dir);
1017
938
}
1018
939
1019
940
/* Free the process list and kill the processes */
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
}
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");
1028
948
}
949
free(process_list->buffer);
950
free(process_list);
1029
951
}
1030
952
1031
953
/* Wait for any remaining child processes to terminate */
1035
957
if(errno != ECHILD){
1036
958
perror("wait");
1037
959
}
1038
1039
free_plugin_list();
1040
1041
free(plugindir);
1042
free(argfile);
1043
960
1044
961
return exitstatus;
1045
962
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0