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 77
- compare with another revision
- download diff
- download tarball
- view history from revision 77
- Committer: Teddy Hogeborn
- Date: 2008-08-15 21:09:25 UTC
- mfrom: (24.1.52 mandos)
- Revision ID: teddy@fukt.bsnet.se-20080815210925-32718zu3nrlotix5
Merge.
* plugin-runner.c (ARGFILE): Renamed to "plugin-runner.conf".
* plugin-runner.c (ARGFILE): Renamed to "plugin-runner.conf".
- files added:
- network-protocol.txt
- files removed:
- mandos-keygen.xml
- files modified:
- Makefile
added
removed
plugin-runner.c
21
21
* Contact the authors at <mandos@fukt.bsnet.se>.
22
22
*/
23
23
24
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
25
asprintf() */
24
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline() */
25
26
26
#include <stddef.h> /* size_t, NULL */
27
27
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
28
28
EXIT_SUCCESS, realloc() */
51
51
close() */
52
52
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
53
53
FD_CLOEXEC */
54
#include <string.h> /* strsep, strlen(), asprintf() */
54
#include <string.h> /* strsep, strlen(), strcpy(),
55
strcat() */
55
56
#include <errno.h> /* errno */
56
57
#include <argp.h> /* struct argp_option, struct
57
58
argp_state, struct argp,
87
88
char *name; /* can be NULL or any plugin name */
88
89
char **argv;
89
90
int argc;
90
char **environ;
91
int envc;
92
91
bool disabled;
93
92
struct plugin *next;
94
93
} plugin;
103
102
/* Create a new plugin */
104
103
plugin *new_plugin = malloc(sizeof(plugin));
105
104
if (new_plugin == NULL){
106
return NULL;
107
}
108
char *copy_name = strdup(name);
109
if(copy_name == NULL){
110
return NULL;
111
}
112
113
*new_plugin = (plugin) { .name = copy_name,
114
.argc = 1,
115
.envc = 0,
116
.disabled = false,
117
.next = *plugin_list };
118
105
perror("malloc");
106
exit(EXIT_FAILURE);
107
}
108
new_plugin->name = name;
119
109
new_plugin->argv = malloc(sizeof(char *) * 2);
120
110
if (new_plugin->argv == NULL){
121
free(new_plugin);
122
return NULL;
111
perror("malloc");
112
exit(EXIT_FAILURE);
123
113
}
124
new_plugin->argv[0] = copy_name;
114
new_plugin->argv[0] = name;
125
115
new_plugin->argv[1] = NULL;
126
127
new_plugin->environ = malloc(sizeof(char *));
128
if(new_plugin->environ == NULL){
129
free(new_plugin->argv);
130
free(new_plugin);
131
return NULL;
132
}
133
new_plugin->environ[0] = NULL;
116
new_plugin->argc = 1;
117
new_plugin->disabled = false;
118
new_plugin->next = *plugin_list;
134
119
/* Append the new plugin to the list */
135
120
*plugin_list = new_plugin;
136
121
return new_plugin;
137
122
}
138
123
139
/* Helper function for add_argument and add_environment */
140
static bool add_to_char_array(const char *new, char ***array,
141
int *len){
142
/* Resize the pointed-to array to hold one more pointer */
143
*array = realloc(*array, sizeof(char *)
144
* (size_t) ((*len) + 2));
145
/* Malloc check */
146
if(*array == NULL){
147
return false;
148
}
149
/* Make a copy of the new string */
150
char *copy = strdup(new);
151
if(copy == NULL){
152
return false;
153
}
154
/* Insert the copy */
155
(*array)[*len] = copy;
156
(*len)++;
157
/* Add a new terminating NULL pointer to the last element */
158
(*array)[*len] = NULL;
159
return true;
160
}
161
162
/* Add to a plugin's argument vector */
163
static bool add_argument(plugin *p, const char *arg){
164
if(p == NULL){
165
return false;
166
}
167
return add_to_char_array(arg, &(p->argv), &(p->argc));
168
}
169
170
/* Add to a plugin's environment */
171
static bool add_environment(plugin *p, const char *def){
172
if(p == NULL){
173
return false;
174
}
175
return add_to_char_array(def, &(p->environ), &(p->envc));
176
}
177
124
static void addargument(plugin *p, char *arg){
125
p->argv[p->argc] = arg;
126
p->argv = realloc(p->argv, sizeof(char *) * (size_t)(p->argc + 2));
127
if (p->argv == NULL){
128
perror("malloc");
129
exit(EXIT_FAILURE);
130
}
131
p->argc++;
132
p->argv[p->argc] = NULL;
133
}
178
134
179
135
/*
180
136
* Based on the example in the GNU LibC manual chapter 13.13 "File
230
186
return true;
231
187
}
232
188
233
char **add_to_argv(char **argv, int *argc, char *arg){
189
char ** addcustomargument(char **argv, int *argc, char *arg){
190
234
191
if (argv == NULL){
235
192
*argc = 1;
236
193
argv = malloc(sizeof(char*) * 2);
251
208
return argv;
252
209
}
253
210
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
}
268
}
269
270
211
int main(int argc, char *argv[]){
271
212
const char *plugindir = "/lib/mandos/plugins.d";
272
213
const char *argfile = ARGFILE;
290
231
/* Establish a signal handler */
291
232
sigemptyset(&sigchld_action.sa_mask);
292
233
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
293
if(ret == -1){
234
if(ret < 0){
294
235
perror("sigaddset");
295
exitstatus = EXIT_FAILURE;
296
goto fallback;
236
exit(EXIT_FAILURE);
297
237
}
298
238
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
299
if(ret == -1){
239
if(ret < 0){
300
240
perror("sigaction");
301
exitstatus = EXIT_FAILURE;
302
goto fallback;
241
exit(EXIT_FAILURE);
303
242
}
304
243
305
244
/* The options we understand. */
307
246
{ .name = "global-options", .key = 'g',
308
247
.arg = "OPTION[,OPTION[,...]]",
309
248
.doc = "Options passed to all plugins" },
310
{ .name = "global-envs", .key = 'e',
311
.arg = "VAR=value",
312
.doc = "Environment variable passed to all plugins" },
313
249
{ .name = "options-for", .key = 'o',
314
250
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
315
251
.doc = "Options passed only to specified plugin" },
316
{ .name = "envs-for", .key = 'f',
317
.arg = "PLUGIN:ENV=value",
318
.doc = "Environment variable passed to specified plugin" },
319
252
{ .name = "disable", .key = 'd',
320
253
.arg = "PLUGIN",
321
254
.doc = "Disable a specific plugin", .group = 1 },
345
278
if(p[0] == '\0'){
346
279
continue;
347
280
}
348
if(not add_argument(getplugin(NULL, plugins), p)){
349
perror("add_argument");
350
return ARGP_ERR_UNKNOWN;
351
}
352
}
353
}
354
break;
355
case 'e':
356
if(arg == NULL){
357
break;
358
}
359
{
360
char *envdef = strdup(arg);
361
if(envdef == NULL){
362
break;
363
}
364
if(not add_environment(getplugin(NULL, plugins), envdef)){
365
perror("add_environment");
281
addargument(getplugin(NULL, plugins), p);
366
282
}
367
283
}
368
284
break;
369
285
case 'o':
370
286
if (arg != NULL){
371
char *p_name = strsep(&arg, ":");
372
if(p_name[0] == '\0'){
287
char *name = strsep(&arg, ":");
288
if(name[0] == '\0'){
373
289
break;
374
290
}
375
291
char *opt = strsep(&arg, ":");
382
298
if(p[0] == '\0'){
383
299
continue;
384
300
}
385
if(not add_argument(getplugin(p_name, plugins), p)){
386
perror("add_argument");
387
return ARGP_ERR_UNKNOWN;
388
}
301
addargument(getplugin(name, plugins), p);
389
302
}
390
303
}
391
304
}
392
305
break;
393
case 'f':
394
if(arg == NULL){
395
break;
396
}
397
{
398
char *envdef = strchr(arg, ':');
399
if(envdef == NULL){
400
break;
401
}
402
char *p_name = strndup(arg, (size_t) (envdef-arg));
403
if(p_name == NULL){
404
break;
405
}
406
envdef++;
407
if(not add_environment(getplugin(p_name, plugins), envdef)){
408
perror("add_environment");
409
}
410
}
411
break;
412
306
case 'd':
413
307
if (arg != NULL){
414
plugin *p = getplugin(arg, plugins);
415
if(p == NULL){
416
return ARGP_ERR_UNKNOWN;
417
}
418
p->disabled = true;
308
getplugin(arg, plugins)->disabled = true;
419
309
}
420
310
break;
421
311
case 128:
431
321
debug = true;
432
322
break;
433
323
case ARGP_KEY_ARG:
434
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
324
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
435
325
break;
436
326
case ARGP_KEY_END:
437
327
break;
451
341
if (ret == ARGP_ERR_UNKNOWN){
452
342
fprintf(stderr, "Unknown error while parsing arguments\n");
453
343
exitstatus = EXIT_FAILURE;
454
goto fallback;
344
goto end;
455
345
}
456
346
457
347
conffp = fopen(argfile, "r");
458
348
if(conffp != NULL){
459
349
char *org_line = NULL;
460
char *p, *arg, *new_arg, *line;
461
350
size_t size = 0;
462
351
ssize_t sret;
352
char *p, *arg, *new_arg, *line;
463
353
const char whitespace_delims[] = " \r\t\f\v\n";
464
354
const char comment_delim[] = "#";
465
355
476
366
continue;
477
367
}
478
368
new_arg = strdup(p);
479
custom_argv = add_to_argv(custom_argv, &custom_argc, new_arg);
369
custom_argv = addcustomargument(custom_argv, &custom_argc, new_arg);
480
370
if (custom_argv == NULL){
481
perror("add_to_argv");
371
perror("addcustomargument");
482
372
exitstatus = EXIT_FAILURE;
483
goto fallback;
373
goto end;
484
374
}
485
375
}
486
376
}
491
381
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
492
382
perror("fopen");
493
383
exitstatus = EXIT_FAILURE;
494
goto fallback;
384
goto end;
495
385
}
496
386
}
497
387
501
391
if (ret == ARGP_ERR_UNKNOWN){
502
392
fprintf(stderr, "Unknown error while parsing arguments\n");
503
393
exitstatus = EXIT_FAILURE;
504
goto fallback;
394
goto end;
505
395
}
506
396
}
507
397
512
402
for(char **a = p->argv; *a != NULL; a++){
513
403
fprintf(stderr, "\tArg: %s\n", *a);
514
404
}
515
fprintf(stderr, "...and %u environment variables\n", p->envc);
516
for(char **a = p->environ; *a != NULL; a++){
517
fprintf(stderr, "\t%s\n", *a);
518
}
519
405
}
520
406
}
521
407
533
419
if(dir == NULL){
534
420
perror("Could not open plugin dir");
535
421
exitstatus = EXIT_FAILURE;
536
goto fallback;
422
goto end;
537
423
}
538
424
539
425
/* Set the FD_CLOEXEC flag on the directory, if possible */
544
430
if(ret < 0){
545
431
perror("set_cloexec_flag");
546
432
exitstatus = EXIT_FAILURE;
547
goto fallback;
433
goto end;
548
434
}
549
435
}
550
436
}
559
445
if (errno == EBADF){
560
446
perror("readdir");
561
447
exitstatus = EXIT_FAILURE;
562
goto fallback;
448
goto end;
563
449
}
564
450
break;
565
451
}
610
496
continue;
611
497
}
612
498
}
613
614
char *filename;
615
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
616
if(ret < 0){
617
perror("asprintf");
499
500
char *filename = malloc(d_name_len + strlen(plugindir) + 2);
501
if (filename == NULL){
502
perror("malloc");
618
503
continue;
619
504
}
505
strcpy(filename, plugindir); /* Spurious warning */
506
strcat(filename, "/"); /* Spurious warning */
507
strcat(filename, dirst->d_name); /* Spurious warning */
620
508
621
509
ret = stat(filename, &st);
622
510
if (ret == -1){
633
521
free(filename);
634
522
continue;
635
523
}
636
plugin *p = getplugin(dirst->d_name, &plugin_list);
637
if(p == NULL){
638
perror("getplugin");
639
free(filename);
640
continue;
641
}
642
if(p->disabled){
524
if(getplugin(dirst->d_name, &plugin_list)->disabled){
643
525
if(debug){
644
526
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
645
527
dirst->d_name);
647
529
free(filename);
648
530
continue;
649
531
}
532
plugin *p = getplugin(dirst->d_name, &plugin_list);
650
533
{
651
534
/* Add global arguments to argument list for this plugin */
652
535
plugin *g = getplugin(NULL, &plugin_list);
653
if(g != NULL){
654
for(char **a = g->argv + 1; *a != NULL; a++){
655
if(not add_argument(p, *a)){
656
perror("add_argument");
657
}
658
}
659
/* Add global environment variables */
660
for(char **e = g->environ; *e != NULL; e++){
661
if(not add_environment(p, *e)){
662
perror("add_environment");
663
}
664
}
665
}
666
}
667
/* If this plugin has any environment variables, we will call
668
using execve and need to duplicate the environment from this
669
process, too. */
670
if(p->environ[0] != NULL){
671
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)){
678
perror("add_environment");
679
}
680
}
681
}
682
536
for(char **a = g->argv + 1; *a != NULL; a++){
537
addargument(p, *a);
538
}
539
}
683
540
int pipefd[2];
684
541
ret = pipe(pipefd);
685
542
if (ret == -1){
686
543
perror("pipe");
687
544
exitstatus = EXIT_FAILURE;
688
goto fallback;
545
goto end;
689
546
}
690
547
ret = set_cloexec_flag(pipefd[0]);
691
548
if(ret < 0){
692
549
perror("set_cloexec_flag");
693
550
exitstatus = EXIT_FAILURE;
694
goto fallback;
551
goto end;
695
552
}
696
553
ret = set_cloexec_flag(pipefd[1]);
697
554
if(ret < 0){
698
555
perror("set_cloexec_flag");
699
556
exitstatus = EXIT_FAILURE;
700
goto fallback;
557
goto end;
701
558
}
702
559
/* Block SIGCHLD until process is safely in process list */
703
560
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
704
561
if(ret < 0){
705
562
perror("sigprocmask");
706
563
exitstatus = EXIT_FAILURE;
707
goto fallback;
564
goto end;
708
565
}
709
566
// Starting a new process to be watched
710
567
pid_t pid = fork();
711
568
if(pid == -1){
712
569
perror("fork");
713
570
exitstatus = EXIT_FAILURE;
714
goto fallback;
571
goto end;
715
572
}
716
573
if(pid == 0){
717
574
/* this is the child process */
737
594
above and must now close it manually here. */
738
595
closedir(dir);
739
596
}
740
if(p->environ[0] == NULL){
741
if(execv(filename, p->argv) < 0){
742
perror("execv");
743
_exit(EXIT_FAILURE);
744
}
745
} else {
746
if(execve(filename, p->argv, p->environ) < 0){
747
perror("execve");
748
_exit(EXIT_FAILURE);
749
}
597
if(execv(filename, p->argv) < 0){
598
perror("execv");
599
_exit(EXIT_FAILURE);
750
600
}
751
601
/* no return */
752
602
}
761
611
perror("sigprocmask");
762
612
}
763
613
exitstatus = EXIT_FAILURE;
764
goto fallback;
614
goto end;
765
615
}
766
616
767
617
*new_process = (struct process){ .pid = pid,
775
625
if(ret < 0){
776
626
perror("sigprocmask");
777
627
exitstatus = EXIT_FAILURE;
778
goto fallback;
628
goto end;
779
629
}
780
630
781
631
FD_SET(new_process->fd, &rfds_all);
786
636
787
637
}
788
638
789
free_plugin_list(plugin_list);
639
/* Free the plugin list */
640
for(plugin *next; plugin_list != NULL; plugin_list = next){
641
next = plugin_list->next;
642
free(plugin_list->argv);
643
free(plugin_list);
644
}
790
645
791
646
closedir(dir);
792
647
dir = NULL;
802
657
if (select_ret == -1){
803
658
perror("select");
804
659
exitstatus = EXIT_FAILURE;
805
goto fallback;
660
goto end;
806
661
}
807
662
/* OK, now either a process completed, or something can be read
808
663
from one of them */
834
689
if(ret < 0){
835
690
perror("sigprocmask");
836
691
exitstatus = EXIT_FAILURE;
837
goto fallback;
692
goto end;
838
693
}
839
694
/* Delete this process entry from the list */
840
695
if(process_list == proc){
869
724
perror("print_out_password");
870
725
exitstatus = EXIT_FAILURE;
871
726
}
872
goto fallback;
727
goto end;
873
728
}
874
729
/* This process has not completed. Does it have any output? */
875
730
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
883
738
if (proc->buffer == NULL){
884
739
perror("malloc");
885
740
exitstatus = EXIT_FAILURE;
886
goto fallback;
741
goto end;
887
742
}
888
743
proc->buffer_size += BUFFER_SIZE;
889
744
}
904
759
}
905
760
906
761
907
fallback:
762
end:
908
763
909
764
if(process_list == NULL or exitstatus != EXIT_SUCCESS){
910
765
/* Fallback if all plugins failed, none are found or an error occured */
915
770
if(not bret){
916
771
perror("print_out_password");
917
772
exitstatus = EXIT_FAILURE;
773
goto end;
918
774
}
919
775
}
920
776
921
777
/* Restore old signal handler */
922
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
923
if(ret == -1){
924
perror("sigaction");
925
exitstatus = EXIT_FAILURE;
926
}
927
928
if(custom_argv != NULL){
929
for(char **arg = custom_argv; *arg != NULL; arg++){
930
free(*arg);
931
}
932
free(custom_argv);
933
}
934
free_plugin_list(plugin_list);
778
sigaction(SIGCHLD, &old_sigchld_action, NULL);
779
780
free(custom_argv);
781
782
/* Free the plugin list */
783
for(plugin *next; plugin_list != NULL; plugin_list = next){
784
next = plugin_list->next;
785
free(plugin_list->argv);
786
free(plugin_list);
787
}
935
788
936
789
if(dir != NULL){
937
790
closedir(dir);
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0