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 24.1.83
- compare with another revision
- download diff
- download tarball
- view history from revision 24.1.83
- Committer: Björn Påhlsson
- Date: 2008-09-03 19:06:25 UTC
- mto: (237.7.1 mandos) (24.1.154 mandos)
- mto: This revision was merged to the branch mainline in revision 149.
- Revision ID: belorn@braxen-20080903190625-6bpg4qqp69swxco5
removed old/unspecified todo's
added
removed
plugin-runner.c
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
}
188
188
/* Search for this environment variable */
189
189
for(char **e = p->environ; *e != NULL; e++){
190
190
if(strncmp(*e, def, namelen+1) == 0){
191
/* Refuse to add an existing variable */
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
}
192
200
return true;
193
201
}
194
202
}
336
344
{ .name = "global-options", .key = 'g',
337
345
.arg = "OPTION[,OPTION[,...]]",
338
346
.doc = "Options passed to all plugins" },
339
{ .name = "global-env", .key = 'e',
347
{ .name = "global-env", .key = 'G',
340
348
.arg = "VAR=value",
341
349
.doc = "Environment variable passed to all plugins" },
342
350
{ .name = "options-for", .key = 'o',
343
351
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
344
352
.doc = "Options passed only to specified plugin" },
345
{ .name = "env-for", .key = 'f',
353
{ .name = "env-for", .key = 'E',
346
354
.arg = "PLUGIN:ENV=value",
347
355
.doc = "Environment variable passed to specified plugin" },
348
356
{ .name = "disable", .key = 'd',
349
357
.arg = "PLUGIN",
350
358
.doc = "Disable a specific plugin", .group = 1 },
359
{ .name = "enable", .key = 'e',
360
.arg = "PLUGIN",
361
.doc = "Enable a specific plugin", .group = 1 },
351
362
{ .name = "plugin-dir", .key = 128,
352
363
.arg = "DIRECTORY",
353
364
.doc = "Specify a different plugin directory", .group = 2 },
367
378
368
379
error_t parse_opt (int key, char *arg, __attribute__((unused))
369
380
struct argp_state *state) {
370
/* Get the INPUT argument from `argp_parse', which we know is a
371
pointer to our plugin list pointer. */
372
381
switch (key) {
373
382
case 'g': /* --global-options */
374
383
if (arg != NULL){
384
393
}
385
394
}
386
395
break;
387
case 'e': /* --global-env */
396
case 'G': /* --global-env */
388
397
if(arg == NULL){
389
398
break;
390
399
}
393
402
if(envdef == NULL){
394
403
break;
395
404
}
396
if(not add_environment(getplugin(NULL), envdef)){
405
if(not add_environment(getplugin(NULL), envdef, true)){
397
406
perror("add_environment");
398
407
}
399
408
}
422
431
}
423
432
}
424
433
break;
425
case 'f': /* --env-for */
434
case 'E': /* --env-for */
426
435
if(arg == NULL){
427
436
break;
428
437
}
436
445
break;
437
446
}
438
447
envdef++;
439
if(not add_environment(getplugin(p_name), envdef)){
448
if(not add_environment(getplugin(p_name), envdef, true)){
440
449
perror("add_environment");
441
450
}
442
451
}
450
459
p->disabled = true;
451
460
}
452
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;
453
471
case 128: /* --plugin-dir */
454
472
plugindir = strdup(arg);
455
473
if(plugindir == NULL){
457
475
}
458
476
break;
459
477
case 129: /* --config-file */
460
argfile = strdup(arg);
461
if(argfile == NULL){
462
perror("strdup");
463
}
464
break;
478
/* This is already done by parse_opt_config_file() */
479
break;
465
480
case 130: /* --userid */
466
481
uid = (uid_t)strtol(arg, NULL, 10);
467
482
break;
482
497
return 0;
483
498
}
484
499
485
struct argp argp = { .options = options, .parser = parse_opt,
486
.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 = "",
487
535
.doc = "Mandos plugin runner -- Run plugins" };
488
536
489
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);
490
540
if (ret == ARGP_ERR_UNKNOWN){
491
541
fprintf(stderr, "Unknown error while parsing arguments\n");
492
542
exitstatus = EXIT_FAILURE;
493
543
goto fallback;
494
544
}
495
496
/* 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 */
497
550
if (argfile == NULL){
498
551
conffp = fopen(AFILE, "r");
499
552
} else {
553
606
}
554
607
}
555
608
free(org_line);
556
} else{
609
} else {
557
610
/* Check for harmful errors and go to fallback. Other errors might
558
611
not affect opening plugins */
559
612
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
565
618
/* If there was any arguments from configuration file,
566
619
pass them to parser as command arguments */
567
620
if(custom_argv != NULL){
568
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);
569
623
if (ret == ARGP_ERR_UNKNOWN){
570
624
fprintf(stderr, "Unknown error while parsing arguments\n");
571
625
exitstatus = EXIT_FAILURE;
573
627
}
574
628
}
575
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
576
639
if(debug){
577
640
for(plugin *p = plugin_list; p != NULL; p=p->next){
578
641
fprintf(stderr, "Plugin: %s has %d arguments\n",
586
649
}
587
650
}
588
651
}
589
652
590
653
/* Strip permissions down to nobody */
591
654
ret = setuid(uid);
592
655
if (ret == -1){
596
659
if (ret == -1){
597
660
perror("setgid");
598
661
}
599
662
600
663
if (plugindir == NULL){
601
664
dir = opendir(PDIR);
602
665
} else {
623
686
}
624
687
625
688
FD_ZERO(&rfds_all);
626
689
627
690
/* Read and execute any executable in the plugin directory*/
628
691
while(true){
629
692
dirst = readdir(dir);
630
693
631
// All directory entries have been processed
694
/* All directory entries have been processed */
632
695
if(dirst == NULL){
633
696
if (errno == EBADF){
634
697
perror("readdir");
640
703
641
704
d_name_len = strlen(dirst->d_name);
642
705
643
// Ignore dotfiles, backup files and other junk
706
/* Ignore dotfiles, backup files and other junk */
644
707
{
645
708
bool bad_name = false;
646
709
732
795
}
733
796
/* Add global environment variables */
734
797
for(char **e = g->environ; *e != NULL; e++){
735
if(not add_environment(p, *e)){
798
if(not add_environment(p, *e, false)){
736
799
perror("add_environment");
737
800
}
738
801
}
743
806
process, too. */
744
807
if(p->environ[0] != NULL){
745
808
for(char **e = environ; *e != NULL; e++){
746
char *copy = strdup(*e);
747
if(copy == NULL){
748
perror("strdup");
749
continue;
750
}
751
if(not add_environment(p, copy)){
809
if(not add_environment(p, *e, false)){
752
810
perror("add_environment");
753
811
}
754
812
}
781
839
exitstatus = EXIT_FAILURE;
782
840
goto fallback;
783
841
}
784
// Starting a new process to be watched
842
/* Starting a new process to be watched */
785
843
pid_t pid = fork();
786
844
if(pid == -1){
787
845
perror("fork");
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0