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 132
- compare with another revision
- download diff
- download tarball
- view history from revision 132
- Committer: Teddy Hogeborn
- Date: 2008-08-31 16:04:47 UTC
- mfrom: (24.1.77 mandos)
- Revision ID: teddy@fukt.bsnet.se-20080831160447-2xte5k90onspphki
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, bool replace){
182
static bool add_environment(plugin *p, const char *def){
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
}
203
186
return add_to_char_array(def, &(p->environ), &(p->envc));
204
187
}
205
188
344
327
{ .name = "global-options", .key = 'g',
345
328
.arg = "OPTION[,OPTION[,...]]",
346
329
.doc = "Options passed to all plugins" },
347
{ .name = "global-env", .key = 'G',
330
{ .name = "global-envs", .key = 'e',
348
331
.arg = "VAR=value",
349
332
.doc = "Environment variable passed to all plugins" },
350
333
{ .name = "options-for", .key = 'o',
351
334
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
352
335
.doc = "Options passed only to specified plugin" },
353
{ .name = "env-for", .key = 'E',
336
{ .name = "envs-for", .key = 'f',
354
337
.arg = "PLUGIN:ENV=value",
355
338
.doc = "Environment variable passed to specified plugin" },
356
339
{ .name = "disable", .key = 'd',
357
340
.arg = "PLUGIN",
358
341
.doc = "Disable a specific plugin", .group = 1 },
359
{ .name = "enable", .key = 'e',
360
.arg = "PLUGIN",
361
.doc = "Enable a specific plugin", .group = 1 },
362
342
{ .name = "plugin-dir", .key = 128,
363
343
.arg = "DIRECTORY",
364
344
.doc = "Specify a different plugin directory", .group = 2 },
376
356
{ .name = NULL }
377
357
};
378
358
379
error_t parse_opt (int key, char *arg, __attribute__((unused))
380
struct argp_state *state) {
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. */
381
362
switch (key) {
382
363
case 'g': /* --global-options */
383
364
if (arg != NULL){
393
374
}
394
375
}
395
376
break;
396
case 'G': /* --global-env */
377
case 'e': /* --global-envs */
397
378
if(arg == NULL){
398
379
break;
399
380
}
402
383
if(envdef == NULL){
403
384
break;
404
385
}
405
if(not add_environment(getplugin(NULL), envdef, true)){
386
if(not add_environment(getplugin(NULL), envdef)){
406
387
perror("add_environment");
407
388
}
408
389
}
431
412
}
432
413
}
433
414
break;
434
case 'E': /* --env-for */
415
case 'f': /* --envs-for */
435
416
if(arg == NULL){
436
417
break;
437
418
}
445
426
break;
446
427
}
447
428
envdef++;
448
if(not add_environment(getplugin(p_name), envdef, true)){
429
if(not add_environment(getplugin(p_name), envdef)){
449
430
perror("add_environment");
450
431
}
451
432
}
459
440
p->disabled = true;
460
441
}
461
442
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;
471
443
case 128: /* --plugin-dir */
472
444
plugindir = strdup(arg);
473
445
if(plugindir == NULL){
475
447
}
476
448
break;
477
449
case 129: /* --config-file */
478
/* This is already done by parse_opt_config_file() */
479
break;
450
argfile = strdup(arg);
451
if(argfile == NULL){
452
perror("strdup");
453
}
454
break;
480
455
case 130: /* --userid */
481
456
uid = (uid_t)strtol(arg, NULL, 10);
482
457
break;
497
472
return 0;
498
473
}
499
474
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 = "",
475
struct argp argp = { .options = options, .parser = parse_opt,
476
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
535
477
.doc = "Mandos plugin runner -- Run plugins" };
536
478
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);
479
ret = argp_parse (&argp, argc, argv, 0, 0, NULL);
540
480
if (ret == ARGP_ERR_UNKNOWN){
541
481
fprintf(stderr, "Unknown error while parsing arguments\n");
542
482
exitstatus = EXIT_FAILURE;
543
483
goto fallback;
544
484
}
545
546
/* Reset to the normal argument parser */
547
argp.parser = parse_opt;
548
549
/* Open the configfile if available */
485
486
/* Opens the configfile if aviable */
550
487
if (argfile == NULL){
551
488
conffp = fopen(AFILE, "r");
552
489
} else {
570
507
custom_argv[0] = argv[0];
571
508
custom_argv[1] = NULL;
572
509
573
/* for each line in the config file, strip whitespace and ignore
574
commented text */
510
/* for each line in the config file, strip whitespace and ignore commented text */
575
511
while(true){
576
512
sret = getline(&org_line, &size, conffp);
577
513
if(sret == -1){
606
542
}
607
543
}
608
544
free(org_line);
609
} else {
545
} else{
610
546
/* Check for harmful errors and go to fallback. Other errors might
611
547
not affect opening plugins */
612
548
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
618
554
/* If there was any arguments from configuration file,
619
555
pass them to parser as command arguments */
620
556
if(custom_argv != NULL){
621
ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
622
0, NULL);
557
ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0, NULL);
623
558
if (ret == ARGP_ERR_UNKNOWN){
624
559
fprintf(stderr, "Unknown error while parsing arguments\n");
625
560
exitstatus = EXIT_FAILURE;
627
562
}
628
563
}
629
564
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
639
565
if(debug){
640
566
for(plugin *p = plugin_list; p != NULL; p=p->next){
641
567
fprintf(stderr, "Plugin: %s has %d arguments\n",
649
575
}
650
576
}
651
577
}
652
578
653
579
/* Strip permissions down to nobody */
654
580
ret = setuid(uid);
655
581
if (ret == -1){
659
585
if (ret == -1){
660
586
perror("setgid");
661
587
}
662
588
663
589
if (plugindir == NULL){
664
590
dir = opendir(PDIR);
665
591
} else {
686
612
}
687
613
688
614
FD_ZERO(&rfds_all);
689
615
690
616
/* Read and execute any executable in the plugin directory*/
691
617
while(true){
692
618
dirst = readdir(dir);
693
619
694
/* All directory entries have been processed */
620
// All directory entries have been processed
695
621
if(dirst == NULL){
696
622
if (errno == EBADF){
697
623
perror("readdir");
703
629
704
630
d_name_len = strlen(dirst->d_name);
705
631
706
/* Ignore dotfiles, backup files and other junk */
632
// Ignore dotfiles, backup files and other junk
707
633
{
708
634
bool bad_name = false;
709
635
795
721
}
796
722
/* Add global environment variables */
797
723
for(char **e = g->environ; *e != NULL; e++){
798
if(not add_environment(p, *e, false)){
724
if(not add_environment(p, *e)){
799
725
perror("add_environment");
800
726
}
801
727
}
806
732
process, too. */
807
733
if(p->environ[0] != NULL){
808
734
for(char **e = environ; *e != NULL; e++){
809
if(not add_environment(p, *e, false)){
735
char *copy = strdup(*e);
736
if(copy == NULL){
737
perror("strdup");
738
continue;
739
}
740
if(not add_environment(p, copy)){
810
741
perror("add_environment");
811
742
}
812
743
}
839
770
exitstatus = EXIT_FAILURE;
840
771
goto fallback;
841
772
}
842
/* Starting a new process to be watched */
773
// Starting a new process to be watched
843
774
pid_t pid = fork();
844
775
if(pid == -1){
845
776
perror("fork");
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0