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 90
- compare with another revision
- download diff
- download tarball
- view history from revision 90
- Committer: Teddy Hogeborn
- Date: 2008-08-19 13:25:14 UTC
- Revision ID: teddy@fukt.bsnet.se-20080819132514-wawrvgmfjovg9poj
* Makefile (DOCBOOKTOMAN): Added "--xinclude".
* mandos-options.xml: New file; moved mandos(8) option descriptions
here.
* mandos.conf.xml: Add XInclude namespace.
(OPTIONS): New separate section with options from old "DESCRIPTION"
section. Changed all options to include a synopsis and
include its paragraph from "mandos-options.xml".
(FILES): Moved to before "EXAMPLES".
(BUGS): New section.
(EXAMPLES): Renamed to "EXAMPLE", as per man-pages(7). Unindented
example text.
* mandos.xml: Removed OVERVIEW entity. Add XInclude namespace.
(OPTIONS): Moved all descriptive paragraphs to "mandos-options.xml"
and just <xi:include/> them from here.
(OVERVIEW): Changed to do <xi:include/>.
* overview.xml: Added DOCTYPE; reportedly needed for XInclude to work.
* mandos-options.xml: New file; moved mandos(8) option descriptions
here.
* mandos.conf.xml: Add XInclude namespace.
(OPTIONS): New separate section with options from old "DESCRIPTION"
section. Changed all options to include a synopsis and
include its paragraph from "mandos-options.xml".
(FILES): Moved to before "EXAMPLES".
(BUGS): New section.
(EXAMPLES): Renamed to "EXAMPLE", as per man-pages(7). Unindented
example text.
* mandos.xml: Removed OVERVIEW entity. Add XInclude namespace.
(OPTIONS): Moved all descriptive paragraphs to "mandos-options.xml"
and just <xi:include/> them from here.
(OVERVIEW): Changed to do <xi:include/>.
* overview.xml: Added DOCTYPE; reportedly needed for XInclude to work.
- 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
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
/* Refuse to add an existing variable */
192
return true;
193
}
194
}
195
175
return add_to_char_array(def, &(p->environ), &(p->envc));
196
176
}
197
177
178
198
179
/*
199
180
* Based on the example in the GNU LibC manual chapter 13.13 "File
200
181
* Descriptor Flags".
211
192
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
212
193
}
213
194
195
process *process_list = NULL;
214
196
215
/* Mark processes as completed when they exit, and save their exit
197
/* Mark a process as completed when it exits, and save its exit
216
198
status. */
217
199
void handle_sigchld(__attribute__((unused)) int sig){
218
while(true){
219
plugin *proc = plugin_list;
220
int status;
221
pid_t pid = waitpid(-1, &status, WNOHANG);
222
if(pid == 0){
223
/* Only still running child processes */
224
break;
225
}
226
if(pid == -1){
227
if (errno != ECHILD){
228
perror("waitpid");
229
}
230
/* No child processes */
231
break;
232
}
233
234
/* A child exited, find it in process_list */
235
while(proc != NULL and proc->pid != pid){
236
proc = proc->next;
237
}
238
if(proc == NULL){
239
/* Process not found in process list */
240
continue;
241
}
242
proc->status = status;
243
proc->completed = true;
244
}
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;
245
216
}
246
217
247
/* Prints out a password to stdout */
248
218
bool print_out_password(const char *buffer, size_t length){
249
219
ssize_t ret;
250
220
if(length>0 and buffer[length-1] == '\n'){
260
230
return true;
261
231
}
262
232
263
/* Removes and free a plugin from the plugin list */
264
static void free_plugin(plugin *plugin_node){
265
266
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
267
free(*arg);
268
}
269
free(plugin_node->argv);
270
for(char **env = plugin_node->environ; *env != NULL; env++){
271
free(*env);
272
}
273
free(plugin_node->environ);
274
free(plugin_node->buffer);
275
276
/* Removes the plugin from the singly-linked list */
277
if(plugin_node == plugin_list){
278
/* First one - simple */
279
plugin_list = plugin_list->next;
280
} else {
281
/* Second one or later */
282
for(plugin *p = plugin_list; p != NULL; p = p->next){
283
if(p->next == plugin_node){
284
p->next = plugin_node->next;
285
break;
286
}
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;
287
239
}
288
}
289
290
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;
291
252
}
292
253
293
static void free_plugin_list(void){
294
while(plugin_list != NULL){
295
free_plugin(plugin_list);
296
}
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
}
297
268
}
298
269
299
270
int main(int argc, char *argv[]){
300
char *plugindir = NULL;
301
char *argfile = NULL;
271
const char *plugindir = "/lib/mandos/plugins.d";
272
const char *argfile = ARGFILE;
302
273
FILE *conffp;
303
274
size_t d_name_len;
304
275
DIR *dir = NULL;
327
298
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
328
299
if(ret == -1){
329
300
perror("sigaction");
330
exitstatus = EXIT_FAILURE;
301
exitstatus = EXIT_FAILURE;
331
302
goto fallback;
332
303
}
333
304
336
307
{ .name = "global-options", .key = 'g',
337
308
.arg = "OPTION[,OPTION[,...]]",
338
309
.doc = "Options passed to all plugins" },
339
{ .name = "global-env", .key = 'e',
310
{ .name = "global-envs", .key = 'e',
340
311
.arg = "VAR=value",
341
312
.doc = "Environment variable passed to all plugins" },
342
313
{ .name = "options-for", .key = 'o',
343
314
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
344
315
.doc = "Options passed only to specified plugin" },
345
{ .name = "env-for", .key = 'f',
316
{ .name = "envs-for", .key = 'f',
346
317
.arg = "PLUGIN:ENV=value",
347
318
.doc = "Environment variable passed to specified plugin" },
348
319
{ .name = "disable", .key = 'd',
351
322
{ .name = "plugin-dir", .key = 128,
352
323
.arg = "DIRECTORY",
353
324
.doc = "Specify a different plugin directory", .group = 2 },
354
{ .name = "config-file", .key = 129,
355
.arg = "FILE",
356
.doc = "Specify a different configuration file", .group = 2 },
357
{ .name = "userid", .key = 130,
358
.arg = "ID", .flags = 0,
359
.doc = "User ID the plugins will run as", .group = 3 },
360
{ .name = "groupid", .key = 131,
361
.arg = "ID", .flags = 0,
362
.doc = "Group ID the plugins will run as", .group = 3 },
363
{ .name = "debug", .key = 132,
364
.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 },
365
333
{ .name = NULL }
366
334
};
367
335
368
error_t parse_opt (int key, char *arg, __attribute__((unused))
369
struct argp_state *state) {
336
error_t parse_opt (int key, char *arg, struct argp_state *state) {
370
337
/* Get the INPUT argument from `argp_parse', which we know is a
371
338
pointer to our plugin list pointer. */
339
plugin **plugins = state->input;
372
340
switch (key) {
373
case 'g': /* --global-options */
341
case 'g':
374
342
if (arg != NULL){
375
343
char *p;
376
344
while((p = strsep(&arg, ",")) != NULL){
377
345
if(p[0] == '\0'){
378
346
continue;
379
347
}
380
if(not add_argument(getplugin(NULL), p)){
348
if(not add_argument(getplugin(NULL, plugins), p)){
381
349
perror("add_argument");
382
350
return ARGP_ERR_UNKNOWN;
383
351
}
384
352
}
385
353
}
386
354
break;
387
case 'e': /* --global-env */
355
case 'e':
388
356
if(arg == NULL){
389
357
break;
390
358
}
393
361
if(envdef == NULL){
394
362
break;
395
363
}
396
if(not add_environment(getplugin(NULL), envdef)){
364
if(not add_environment(getplugin(NULL, plugins), envdef)){
397
365
perror("add_environment");
398
366
}
399
367
}
400
368
break;
401
case 'o': /* --options-for */
369
case 'o':
402
370
if (arg != NULL){
403
371
char *p_name = strsep(&arg, ":");
404
372
if(p_name[0] == '\0'){
414
382
if(p[0] == '\0'){
415
383
continue;
416
384
}
417
if(not add_argument(getplugin(p_name), p)){
385
if(not add_argument(getplugin(p_name, plugins), p)){
418
386
perror("add_argument");
419
387
return ARGP_ERR_UNKNOWN;
420
388
}
422
390
}
423
391
}
424
392
break;
425
case 'f': /* --env-for */
393
case 'f':
426
394
if(arg == NULL){
427
395
break;
428
396
}
436
404
break;
437
405
}
438
406
envdef++;
439
if(not add_environment(getplugin(p_name), envdef)){
407
if(not add_environment(getplugin(p_name, plugins), envdef)){
440
408
perror("add_environment");
441
409
}
442
410
}
443
411
break;
444
case 'd': /* --disable */
412
case 'd':
445
413
if (arg != NULL){
446
plugin *p = getplugin(arg);
414
plugin *p = getplugin(arg, plugins);
447
415
if(p == NULL){
448
416
return ARGP_ERR_UNKNOWN;
449
417
}
450
418
p->disabled = true;
451
419
}
452
420
break;
453
case 128: /* --plugin-dir */
454
plugindir = strdup(arg);
455
if(plugindir == NULL){
456
perror("strdup");
457
}
421
case 128:
422
plugindir = arg;
458
423
break;
459
case 129: /* --config-file */
460
argfile = strdup(arg);
461
if(argfile == NULL){
462
perror("strdup");
463
}
464
break;
465
case 130: /* --userid */
424
case 129:
466
425
uid = (uid_t)strtol(arg, NULL, 10);
467
426
break;
468
case 131: /* --groupid */
427
case 130:
469
428
gid = (gid_t)strtol(arg, NULL, 10);
470
429
break;
471
case 132: /* --debug */
430
case 131:
472
431
debug = true;
473
432
break;
474
433
case ARGP_KEY_ARG:
482
441
return 0;
483
442
}
484
443
444
plugin *plugin_list = NULL;
445
485
446
struct argp argp = { .options = options, .parser = parse_opt,
486
447
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
487
448
.doc = "Mandos plugin runner -- Run plugins" };
488
449
489
ret = argp_parse (&argp, argc, argv, 0, 0, NULL);
450
ret = argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
490
451
if (ret == ARGP_ERR_UNKNOWN){
491
452
fprintf(stderr, "Unknown error while parsing arguments\n");
492
453
exitstatus = EXIT_FAILURE;
493
454
goto fallback;
494
455
}
495
456
496
/* Opens the configfile if aviable */
497
if (argfile == NULL){
498
conffp = fopen(AFILE, "r");
499
} else {
500
conffp = fopen(argfile, "r");
501
}
457
conffp = fopen(argfile, "r");
502
458
if(conffp != NULL){
503
459
char *org_line = NULL;
504
460
char *p, *arg, *new_arg, *line;
507
463
const char whitespace_delims[] = " \r\t\f\v\n";
508
464
const char comment_delim[] = "#";
509
465
510
custom_argc = 1;
511
custom_argv = malloc(sizeof(char*) * 2);
512
if(custom_argv == NULL){
513
perror("malloc");
514
exitstatus = EXIT_FAILURE;
515
goto fallback;
516
}
517
custom_argv[0] = argv[0];
518
custom_argv[1] = NULL;
519
520
/* for each line in the config file, strip whitespace and ignore
521
commented text */
522
466
while(true){
523
467
sret = getline(&org_line, &size, conffp);
524
468
if(sret == -1){
532
476
continue;
533
477
}
534
478
new_arg = strdup(p);
535
if(new_arg == NULL){
536
perror("strdup");
537
exitstatus = EXIT_FAILURE;
538
free(org_line);
539
goto fallback;
540
}
541
542
custom_argc += 1;
543
custom_argv = realloc(custom_argv, sizeof(char *)
544
* ((unsigned int) custom_argc + 1));
545
if(custom_argv == NULL){
546
perror("realloc");
547
exitstatus = EXIT_FAILURE;
548
free(org_line);
549
goto fallback;
550
}
551
custom_argv[custom_argc-1] = new_arg;
552
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
}
553
485
}
554
486
}
555
487
free(org_line);
562
494
goto fallback;
563
495
}
564
496
}
565
/* If there was any arguments from configuration file,
566
pass them to parser as command arguments */
497
567
498
if(custom_argv != NULL){
568
ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0, NULL);
499
custom_argv[0] = argv[0];
500
ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0, &plugin_list);
569
501
if (ret == ARGP_ERR_UNKNOWN){
570
502
fprintf(stderr, "Unknown error while parsing arguments\n");
571
503
exitstatus = EXIT_FAILURE;
586
518
}
587
519
}
588
520
}
589
590
/* Strip permissions down to nobody */
521
591
522
ret = setuid(uid);
592
523
if (ret == -1){
593
524
perror("setuid");
594
}
525
}
526
595
527
setgid(gid);
596
528
if (ret == -1){
597
529
perror("setgid");
598
530
}
599
600
if (plugindir == NULL){
601
dir = opendir(PDIR);
602
} else {
603
dir = opendir(plugindir);
604
}
605
531
532
dir = opendir(plugindir);
606
533
if(dir == NULL){
607
534
perror("Could not open plugin dir");
608
535
exitstatus = EXIT_FAILURE;
623
550
}
624
551
625
552
FD_ZERO(&rfds_all);
626
627
/* Read and execute any executable in the plugin directory*/
553
628
554
while(true){
629
555
dirst = readdir(dir);
630
556
661
587
break;
662
588
}
663
589
}
590
664
591
if(bad_name){
665
592
continue;
666
593
}
594
667
595
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
668
596
size_t suf_len = strlen(*suf);
669
597
if((d_name_len >= suf_len)
696
624
free(filename);
697
625
continue;
698
626
}
699
700
/* Ignore non-executable files */
627
701
628
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
702
629
if(debug){
703
630
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
706
633
free(filename);
707
634
continue;
708
635
}
709
710
plugin *p = getplugin(dirst->d_name);
636
plugin *p = getplugin(dirst->d_name, &plugin_list);
711
637
if(p == NULL){
712
638
perror("getplugin");
713
639
free(filename);
723
649
}
724
650
{
725
651
/* Add global arguments to argument list for this plugin */
726
plugin *g = getplugin(NULL);
652
plugin *g = getplugin(NULL, &plugin_list);
727
653
if(g != NULL){
728
654
for(char **a = g->argv + 1; *a != NULL; a++){
729
655
if(not add_argument(p, *a)){
754
680
}
755
681
}
756
682
757
int pipefd[2];
683
int pipefd[2];
758
684
ret = pipe(pipefd);
759
685
if (ret == -1){
760
686
perror("pipe");
761
687
exitstatus = EXIT_FAILURE;
762
688
goto fallback;
763
689
}
764
/* Ask OS to automatic close the pipe on exec */
765
690
ret = set_cloexec_flag(pipefd[0]);
766
691
if(ret < 0){
767
692
perror("set_cloexec_flag");
825
750
}
826
751
/* no return */
827
752
}
828
/* Parent process */
829
close(pipefd[1]); /* Close unused write end of pipe */
753
/* parent process */
830
754
free(filename);
831
plugin *new_plugin = getplugin(dirst->d_name);
832
if (new_plugin == NULL){
833
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");
834
759
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
835
760
if(ret < 0){
836
perror("sigprocmask");
761
perror("sigprocmask");
837
762
}
838
763
exitstatus = EXIT_FAILURE;
839
764
goto fallback;
840
765
}
841
766
842
new_plugin->pid = pid;
843
new_plugin->fd = pipefd[0];
844
767
*new_process = (struct process){ .pid = pid,
768
.fd = pipefd[0],
769
.next = process_list };
770
// List handling
771
process_list = new_process;
845
772
/* Unblock SIGCHLD so signal handler can be run if this process
846
773
has already completed */
847
774
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
851
778
goto fallback;
852
779
}
853
780
854
FD_SET(new_plugin->fd, &rfds_all);
781
FD_SET(new_process->fd, &rfds_all);
855
782
856
if (maxfd < new_plugin->fd){
857
maxfd = new_plugin->fd;
783
if (maxfd < new_process->fd){
784
maxfd = new_process->fd;
858
785
}
859
786
860
787
}
861
788
789
free_plugin_list(plugin_list);
790
862
791
closedir(dir);
863
792
dir = NULL;
864
865
for(plugin *p = plugin_list; p != NULL; p = p->next){
866
if(p->pid != 0){
867
break;
868
}
869
if(p->next == NULL){
870
fprintf(stderr, "No plugin processes started. Incorrect plugin"
871
" directory?\n");
872
free_plugin_list();
873
}
793
794
if (process_list == NULL){
795
fprintf(stderr, "No plugin processes started. Incorrect plugin"
796
" directory?\n");
797
process_list = NULL;
874
798
}
875
876
/* Main loop while running plugins exist */
877
while(plugin_list){
799
while(process_list){
878
800
fd_set rfds = rfds_all;
879
801
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
880
802
if (select_ret == -1){
884
806
}
885
807
/* OK, now either a process completed, or something can be read
886
808
from one of them */
887
for(plugin *proc = plugin_list; proc != NULL; proc = proc->next){
809
for(process *proc = process_list; proc ; proc = proc->next){
888
810
/* Is this process completely done? */
889
811
if(proc->eof and proc->completed){
890
812
/* Only accept the plugin output if it exited cleanly */
891
813
if(not WIFEXITED(proc->status)
892
814
or WEXITSTATUS(proc->status) != 0){
893
815
/* Bad exit by plugin */
894
895
816
if(debug){
896
817
if(WIFEXITED(proc->status)){
897
818
fprintf(stderr, "Plugin %u exited with status %d\n",
906
827
(unsigned int) (proc->pid));
907
828
}
908
829
}
909
910
830
/* Remove the plugin */
911
831
FD_CLR(proc->fd, &rfds_all);
912
913
832
/* Block signal while modifying process_list */
914
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
833
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
915
834
if(ret < 0){
916
835
perror("sigprocmask");
917
836
exitstatus = EXIT_FAILURE;
918
837
goto fallback;
919
838
}
920
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
}
921
852
/* We are done modifying process list, so unblock signal */
922
853
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
923
854
NULL);
924
855
if(ret < 0){
925
856
perror("sigprocmask");
926
exitstatus = EXIT_FAILURE;
927
goto fallback;
928
}
929
930
if(plugin_list == NULL){
931
break;
932
}
933
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;
934
864
}
935
936
865
/* This process exited nicely, so print its buffer */
937
866
938
bool bret = print_out_password(proc->buffer,
939
proc->buffer_length);
867
bool bret = print_out_password(proc->buffer, proc->buffer_length);
940
868
if(not bret){
941
869
perror("print_out_password");
942
870
exitstatus = EXIT_FAILURE;
943
871
}
944
872
goto fallback;
945
873
}
946
947
874
/* This process has not completed. Does it have any output? */
948
875
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
949
876
/* This process had nothing to say at this time */
979
906
980
907
fallback:
981
908
982
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
983
/* Fallback if all plugins failed, none are found or an error
984
occured */
909
if(process_list == NULL or exitstatus != EXIT_SUCCESS){
910
/* Fallback if all plugins failed, none are found or an error occured */
985
911
bool bret;
986
912
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
987
913
char *passwordbuffer = getpass("Password: ");
1000
926
}
1001
927
1002
928
if(custom_argv != NULL){
1003
for(char **arg = custom_argv+1; *arg != NULL; arg++){
929
for(char **arg = custom_argv; *arg != NULL; arg++){
1004
930
free(*arg);
1005
931
}
1006
932
free(custom_argv);
1007
933
}
934
free_plugin_list(plugin_list);
1008
935
1009
936
if(dir != NULL){
1010
937
closedir(dir);
1011
938
}
1012
939
1013
940
/* Free the process list and kill the processes */
1014
for(plugin *p = plugin_list; p != NULL; p = p->next){
1015
if(p->pid != 0){
1016
close(p->fd);
1017
ret = kill(p->pid, SIGTERM);
1018
if(ret == -1 and errno != ESRCH){
1019
/* Set-uid proccesses might not get closed */
1020
perror("kill");
1021
}
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");
1022
948
}
949
free(process_list->buffer);
950
free(process_list);
1023
951
}
1024
952
1025
953
/* Wait for any remaining child processes to terminate */
1029
957
if(errno != ECHILD){
1030
958
perror("wait");
1031
959
}
1032
1033
free_plugin_list();
1034
1035
free(plugindir);
1036
free(argfile);
1037
960
1038
961
return exitstatus;
1039
962
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0