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.89
- compare with another revision
- download diff
- download tarball
- view history from revision 24.1.89
- Committer: Björn Påhlsson
- Date: 2008-09-04 13:42:26 UTC
- mfrom: (156 mandos)
- mto: (237.7.1 mandos) (24.1.154 mandos)
- mto: This revision was merged to the branch mainline in revision 159.
- Revision ID: belorn@braxen-20080904134226-4xvk18os13zz0488
merge
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 },
356
376
{ .name = NULL }
357
377
};
358
378
359
error_t parse_opt (int key, char *arg, __attribute__((unused)) struct argp_state *state) {
360
/* Get the INPUT argument from `argp_parse', which we know is a
361
pointer to our plugin list pointer. */
379
error_t parse_opt (int key, char *arg, __attribute__((unused))
380
struct argp_state *state) {
362
381
switch (key) {
363
382
case 'g': /* --global-options */
364
383
if (arg != NULL){
374
393
}
375
394
}
376
395
break;
377
case 'e': /* --global-envs */
396
case 'G': /* --global-env */
378
397
if(arg == NULL){
379
398
break;
380
399
}
383
402
if(envdef == NULL){
384
403
break;
385
404
}
386
if(not add_environment(getplugin(NULL), envdef)){
405
if(not add_environment(getplugin(NULL), envdef, true)){
387
406
perror("add_environment");
388
407
}
389
408
}
412
431
}
413
432
}
414
433
break;
415
case 'f': /* --envs-for */
434
case 'E': /* --env-for */
416
435
if(arg == NULL){
417
436
break;
418
437
}
426
445
break;
427
446
}
428
447
envdef++;
429
if(not add_environment(getplugin(p_name), envdef)){
448
if(not add_environment(getplugin(p_name), envdef, true)){
430
449
perror("add_environment");
431
450
}
432
451
}
440
459
p->disabled = true;
441
460
}
442
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;
443
471
case 128: /* --plugin-dir */
444
472
plugindir = strdup(arg);
445
473
if(plugindir == NULL){
447
475
}
448
476
break;
449
477
case 129: /* --config-file */
450
argfile = strdup(arg);
451
if(argfile == NULL){
452
perror("strdup");
453
}
454
break;
478
/* This is already done by parse_opt_config_file() */
479
break;
455
480
case 130: /* --userid */
456
481
uid = (uid_t)strtol(arg, NULL, 10);
457
482
break;
472
497
return 0;
473
498
}
474
499
475
struct argp argp = { .options = options, .parser = parse_opt,
476
.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 = "",
477
535
.doc = "Mandos plugin runner -- Run plugins" };
478
536
479
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);
480
540
if (ret == ARGP_ERR_UNKNOWN){
481
541
fprintf(stderr, "Unknown error while parsing arguments\n");
482
542
exitstatus = EXIT_FAILURE;
483
543
goto fallback;
484
544
}
485
486
/* 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 */
487
550
if (argfile == NULL){
488
551
conffp = fopen(AFILE, "r");
489
552
} else {
507
570
custom_argv[0] = argv[0];
508
571
custom_argv[1] = NULL;
509
572
510
/* for each line in the config file, strip whitespace and ignore commented text */
573
/* for each line in the config file, strip whitespace and ignore
574
commented text */
511
575
while(true){
512
576
sret = getline(&org_line, &size, conffp);
513
577
if(sret == -1){
542
606
}
543
607
}
544
608
free(org_line);
545
} else{
609
} else {
546
610
/* Check for harmful errors and go to fallback. Other errors might
547
611
not affect opening plugins */
548
612
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
554
618
/* If there was any arguments from configuration file,
555
619
pass them to parser as command arguments */
556
620
if(custom_argv != NULL){
557
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);
558
623
if (ret == ARGP_ERR_UNKNOWN){
559
624
fprintf(stderr, "Unknown error while parsing arguments\n");
560
625
exitstatus = EXIT_FAILURE;
562
627
}
563
628
}
564
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
565
639
if(debug){
566
640
for(plugin *p = plugin_list; p != NULL; p=p->next){
567
641
fprintf(stderr, "Plugin: %s has %d arguments\n",
575
649
}
576
650
}
577
651
}
578
652
579
653
/* Strip permissions down to nobody */
580
654
ret = setuid(uid);
581
655
if (ret == -1){
585
659
if (ret == -1){
586
660
perror("setgid");
587
661
}
588
662
589
663
if (plugindir == NULL){
590
664
dir = opendir(PDIR);
591
665
} else {
612
686
}
613
687
614
688
FD_ZERO(&rfds_all);
615
689
616
690
/* Read and execute any executable in the plugin directory*/
617
691
while(true){
618
692
dirst = readdir(dir);
619
693
620
// All directory entries have been processed
694
/* All directory entries have been processed */
621
695
if(dirst == NULL){
622
696
if (errno == EBADF){
623
697
perror("readdir");
629
703
630
704
d_name_len = strlen(dirst->d_name);
631
705
632
// Ignore dotfiles, backup files and other junk
706
/* Ignore dotfiles, backup files and other junk */
633
707
{
634
708
bool bad_name = false;
635
709
721
795
}
722
796
/* Add global environment variables */
723
797
for(char **e = g->environ; *e != NULL; e++){
724
if(not add_environment(p, *e)){
798
if(not add_environment(p, *e, false)){
725
799
perror("add_environment");
726
800
}
727
801
}
732
806
process, too. */
733
807
if(p->environ[0] != NULL){
734
808
for(char **e = environ; *e != NULL; e++){
735
char *copy = strdup(*e);
736
if(copy == NULL){
737
perror("strdup");
738
continue;
739
}
740
if(not add_environment(p, copy)){
809
if(not add_environment(p, *e, false)){
741
810
perror("add_environment");
742
811
}
743
812
}
770
839
exitstatus = EXIT_FAILURE;
771
840
goto fallback;
772
841
}
773
// Starting a new process to be watched
842
/* Starting a new process to be watched */
774
843
pid_t pid = fork();
775
844
if(pid == -1){
776
845
perror("fork");
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0