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 149
- compare with another revision
- download diff
- download tarball
- view history from revision 149
- Committer: Teddy Hogeborn
- Date: 2008-09-03 19:13:50 UTC
- mfrom: (24.1.83 mandos)
- Revision ID: teddy@fukt.bsnet.se-20080903191350-la2y2wuxt67xjslb
* mandos-keygen.xml (BUGS): Commented out.
* mandos.xml (BUGS): Note non-checking of expire time of OpenPGP keys.
* mandos.xml (BUGS): Note non-checking of expire time of OpenPGP keys.
added
removed
plugin-runner.c
132
132
}
133
133
new_plugin->argv[0] = copy_name;
134
134
new_plugin->argv[1] = NULL;
135
135
136
136
new_plugin->environ = malloc(sizeof(char *));
137
137
if(new_plugin->environ == NULL){
138
138
free(copy_name);
141
141
return NULL;
142
142
}
143
143
new_plugin->environ[0] = NULL;
144
144
145
145
/* Append the new plugin to the list */
146
146
plugin_list = new_plugin;
147
147
return new_plugin;
179
179
}
180
180
181
181
/* Add to a plugin's environment */
182
static bool add_environment(plugin *p, const char *def){
182
static bool add_environment(plugin *p, const char *def, bool replace){
183
183
if(p == NULL){
184
184
return false;
185
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
}
186
203
return add_to_char_array(def, &(p->environ), &(p->envc));
187
204
}
188
205
327
344
{ .name = "global-options", .key = 'g',
328
345
.arg = "OPTION[,OPTION[,...]]",
329
346
.doc = "Options passed to all plugins" },
330
{ .name = "global-envs", .key = 'e',
347
{ .name = "global-env", .key = 'G',
331
348
.arg = "VAR=value",
332
349
.doc = "Environment variable passed to all plugins" },
333
350
{ .name = "options-for", .key = 'o',
334
351
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
335
352
.doc = "Options passed only to specified plugin" },
336
{ .name = "envs-for", .key = 'f',
353
{ .name = "env-for", .key = 'E',
337
354
.arg = "PLUGIN:ENV=value",
338
355
.doc = "Environment variable passed to specified plugin" },
339
356
{ .name = "disable", .key = 'd',
340
357
.arg = "PLUGIN",
341
358
.doc = "Disable a specific plugin", .group = 1 },
359
{ .name = "enable", .key = 'e',
360
.arg = "PLUGIN",
361
.doc = "Enable a specific plugin", .group = 1 },
342
362
{ .name = "plugin-dir", .key = 128,
343
363
.arg = "DIRECTORY",
344
364
.doc = "Specify a different plugin directory", .group = 2 },
358
378
359
379
error_t parse_opt (int key, char *arg, __attribute__((unused))
360
380
struct argp_state *state) {
361
/* Get the INPUT argument from `argp_parse', which we know is a
362
pointer to our plugin list pointer. */
363
381
switch (key) {
364
382
case 'g': /* --global-options */
365
383
if (arg != NULL){
375
393
}
376
394
}
377
395
break;
378
case 'e': /* --global-envs */
396
case 'G': /* --global-env */
379
397
if(arg == NULL){
380
398
break;
381
399
}
384
402
if(envdef == NULL){
385
403
break;
386
404
}
387
if(not add_environment(getplugin(NULL), envdef)){
405
if(not add_environment(getplugin(NULL), envdef, true)){
388
406
perror("add_environment");
389
407
}
390
408
}
413
431
}
414
432
}
415
433
break;
416
case 'f': /* --envs-for */
434
case 'E': /* --env-for */
417
435
if(arg == NULL){
418
436
break;
419
437
}
427
445
break;
428
446
}
429
447
envdef++;
430
if(not add_environment(getplugin(p_name), envdef)){
448
if(not add_environment(getplugin(p_name), envdef, true)){
431
449
perror("add_environment");
432
450
}
433
451
}
441
459
p->disabled = true;
442
460
}
443
461
break;
462
case 'e': /* --enable */
463
if (arg != NULL){
464
plugin *p = getplugin(arg);
465
if(p == NULL){
466
return ARGP_ERR_UNKNOWN;
467
}
468
p->disabled = false;
469
}
470
break;
444
471
case 128: /* --plugin-dir */
445
472
plugindir = strdup(arg);
446
473
if(plugindir == NULL){
448
475
}
449
476
break;
450
477
case 129: /* --config-file */
451
argfile = strdup(arg);
452
if(argfile == NULL){
453
perror("strdup");
454
}
455
break;
478
/* This is already done by parse_opt_config_file() */
479
break;
456
480
case 130: /* --userid */
457
481
uid = (uid_t)strtol(arg, NULL, 10);
458
482
break;
473
497
return 0;
474
498
}
475
499
476
struct argp argp = { .options = options, .parser = parse_opt,
477
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
500
/* This option parser is the same as parse_opt() above, except it
501
ignores everything but the --config-file option. */
502
error_t parse_opt_config_file (int key, char *arg,
503
__attribute__((unused))
504
struct argp_state *state) {
505
switch (key) {
506
case 'g': /* --global-options */
507
case 'G': /* --global-env */
508
case 'o': /* --options-for */
509
case 'E': /* --env-for */
510
case 'd': /* --disable */
511
case 'e': /* --enable */
512
case 128: /* --plugin-dir */
513
break;
514
case 129: /* --config-file */
515
argfile = strdup(arg);
516
if(argfile == NULL){
517
perror("strdup");
518
}
519
break;
520
case 130: /* --userid */
521
case 131: /* --groupid */
522
case 132: /* --debug */
523
case ARGP_KEY_ARG:
524
case ARGP_KEY_END:
525
break;
526
default:
527
return ARGP_ERR_UNKNOWN;
528
}
529
return 0;
530
}
531
532
struct argp argp = { .options = options,
533
.parser = parse_opt_config_file,
534
.args_doc = "",
478
535
.doc = "Mandos plugin runner -- Run plugins" };
479
536
480
ret = argp_parse (&argp, argc, argv, 0, 0, NULL);
537
/* Parse using the parse_opt_config_file in order to get the custom
538
config file location, if any. */
539
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
481
540
if (ret == ARGP_ERR_UNKNOWN){
482
541
fprintf(stderr, "Unknown error while parsing arguments\n");
483
542
exitstatus = EXIT_FAILURE;
484
543
goto fallback;
485
544
}
486
487
/* Opens the configfile if aviable */
545
546
/* Reset to the normal argument parser */
547
argp.parser = parse_opt;
548
549
/* Open the configfile if available */
488
550
if (argfile == NULL){
489
551
conffp = fopen(AFILE, "r");
490
552
} else {
544
606
}
545
607
}
546
608
free(org_line);
547
} else{
609
} else {
548
610
/* Check for harmful errors and go to fallback. Other errors might
549
611
not affect opening plugins */
550
612
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
556
618
/* If there was any arguments from configuration file,
557
619
pass them to parser as command arguments */
558
620
if(custom_argv != NULL){
559
ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0, NULL);
621
ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
622
0, NULL);
560
623
if (ret == ARGP_ERR_UNKNOWN){
561
624
fprintf(stderr, "Unknown error while parsing arguments\n");
562
625
exitstatus = EXIT_FAILURE;
564
627
}
565
628
}
566
629
630
/* Parse actual command line arguments, to let them override the
631
config file */
632
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
633
if (ret == ARGP_ERR_UNKNOWN){
634
fprintf(stderr, "Unknown error while parsing arguments\n");
635
exitstatus = EXIT_FAILURE;
636
goto fallback;
637
}
638
567
639
if(debug){
568
640
for(plugin *p = plugin_list; p != NULL; p=p->next){
569
641
fprintf(stderr, "Plugin: %s has %d arguments\n",
577
649
}
578
650
}
579
651
}
580
652
581
653
/* Strip permissions down to nobody */
582
654
ret = setuid(uid);
583
655
if (ret == -1){
587
659
if (ret == -1){
588
660
perror("setgid");
589
661
}
590
662
591
663
if (plugindir == NULL){
592
664
dir = opendir(PDIR);
593
665
} else {
614
686
}
615
687
616
688
FD_ZERO(&rfds_all);
617
689
618
690
/* Read and execute any executable in the plugin directory*/
619
691
while(true){
620
692
dirst = readdir(dir);
621
693
622
// All directory entries have been processed
694
/* All directory entries have been processed */
623
695
if(dirst == NULL){
624
696
if (errno == EBADF){
625
697
perror("readdir");
631
703
632
704
d_name_len = strlen(dirst->d_name);
633
705
634
// Ignore dotfiles, backup files and other junk
706
/* Ignore dotfiles, backup files and other junk */
635
707
{
636
708
bool bad_name = false;
637
709
723
795
}
724
796
/* Add global environment variables */
725
797
for(char **e = g->environ; *e != NULL; e++){
726
if(not add_environment(p, *e)){
798
if(not add_environment(p, *e, false)){
727
799
perror("add_environment");
728
800
}
729
801
}
734
806
process, too. */
735
807
if(p->environ[0] != NULL){
736
808
for(char **e = environ; *e != NULL; e++){
737
char *copy = strdup(*e);
738
if(copy == NULL){
739
perror("strdup");
740
continue;
741
}
742
if(not add_environment(p, copy)){
809
if(not add_environment(p, *e, false)){
743
810
perror("add_environment");
744
811
}
745
812
}
772
839
exitstatus = EXIT_FAILURE;
773
840
goto fallback;
774
841
}
775
// Starting a new process to be watched
842
/* Starting a new process to be watched */
776
843
pid_t pid = fork();
777
844
if(pid == -1){
778
845
perror("fork");
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0