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 94
- compare with another revision
- download diff
- download tarball
- view history from revision 94
- Committer: Teddy Hogeborn
- Date: 2008-08-22 00:16:20 UTC
- mfrom: (24.1.57 mandos)
- Revision ID: teddy@fukt.bsnet.se-20080822001620-vxpn1evy0t0kyvj0
* clients.conf ([DEFAULT]/checker): Update to new default value.
* mandos (Client.start_checker): Bug fix: OSError, not
subprocess.OSError.
(main): Use "fping -q -- %(host)s" instead of "fping -q --
%%(host)s" as default value for "checker". Always redirect
stdin to be from /dev/null, even if in debug mode.
* mandos-clients.conf.xml (DESCRIPTION): Improved wording and refer to
the EXPANSION section.
(OPTIONS): Added synopsis and improved wording for "checker",
"fingerprint", and "secret". Refer to the RUNTIME
EXPANSION section for the "checker" option.
(EXAMPLE): Update to new default value for "checker".
* mandos-keygen (trap): Split lines and add "set +e".
* mandos (Client.start_checker): Bug fix: OSError, not
subprocess.OSError.
(main): Use "fping -q -- %(host)s" instead of "fping -q --
%%(host)s" as default value for "checker". Always redirect
stdin to be from /dev/null, even if in debug mode.
* mandos-clients.conf.xml (DESCRIPTION): Improved wording and refer to
the EXPANSION section.
(OPTIONS): Added synopsis and improved wording for "checker",
"fingerprint", and "secret". Refer to the RUNTIME
EXPANSION section for the "checker" option.
(EXAMPLE): Update to new default value for "checker".
* mandos-keygen (trap): Split lines and add "set +e".
- files removed:
- .bzrignore
- files modified:
- Makefile
added
removed
plugin-runner.c
56
56
#include <argp.h> /* struct argp_option, struct
57
57
argp_state, struct argp,
58
58
argp_parse(), ARGP_ERR_UNKNOWN,
59
ARGP_KEY_END, ARGP_KEY_ARG,
60
error_t */
59
ARGP_KEY_END, ARGP_KEY_ARG, error_t */
61
60
#include <signal.h> /* struct sigaction, sigemptyset(),
62
61
sigaddset(), sigaction(),
63
62
sigprocmask(), SIG_BLOCK, SIGCHLD,
65
64
#include <errno.h> /* errno, EBADF */
66
65
67
66
#define BUFFER_SIZE 256
68
69
#define PDIR "/lib/mandos/plugins.d"
70
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
67
#define ARGFILE "/conf/conf.d/mandos/plugin-runner.conf"
71
68
72
69
const char *argp_program_version = "plugin-runner 1.0";
73
70
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
74
71
75
struct plugin;
72
struct process;
73
74
typedef struct process{
75
pid_t pid;
76
int fd;
77
char *buffer;
78
size_t buffer_size;
79
size_t buffer_length;
80
bool eof;
81
bool completed;
82
int status;
83
struct process *next;
84
} process;
76
85
77
86
typedef struct plugin{
78
87
char *name; /* can be NULL or any plugin name */
81
90
char **environ;
82
91
int envc;
83
92
bool disabled;
84
85
/* Variables used for running processes*/
86
pid_t pid;
87
int fd;
88
char *buffer;
89
size_t buffer_size;
90
size_t buffer_length;
91
bool eof;
92
volatile bool completed;
93
volatile int status;
94
93
struct plugin *next;
95
94
} plugin;
96
95
97
static plugin *plugin_list = NULL;
98
99
/* Gets a existing plugin based on name,
100
or if none is found, creates a new one */
101
static plugin *getplugin(char *name){
102
/* Check for exiting plugin with that name */
103
for (plugin *p = plugin_list; p != NULL; p = p->next){
96
static plugin *getplugin(char *name, plugin **plugin_list){
97
for (plugin *p = *plugin_list; p != NULL; p = p->next){
104
98
if ((p->name == name)
105
99
or (p->name and name and (strcmp(p->name, name) == 0))){
106
100
return p;
111
105
if (new_plugin == NULL){
112
106
return NULL;
113
107
}
114
char *copy_name = NULL;
115
if(name != NULL){
116
copy_name = strdup(name);
117
if(copy_name == NULL){
118
return NULL;
119
}
108
char *copy_name = strdup(name);
109
if(copy_name == NULL){
110
return NULL;
120
111
}
121
112
122
113
*new_plugin = (plugin) { .name = copy_name,
123
114
.argc = 1,
115
.envc = 0,
124
116
.disabled = false,
125
.next = plugin_list };
117
.next = *plugin_list };
126
118
127
119
new_plugin->argv = malloc(sizeof(char *) * 2);
128
120
if (new_plugin->argv == NULL){
129
free(copy_name);
130
121
free(new_plugin);
131
122
return NULL;
132
123
}
133
124
new_plugin->argv[0] = copy_name;
134
125
new_plugin->argv[1] = NULL;
135
126
136
127
new_plugin->environ = malloc(sizeof(char *));
137
128
if(new_plugin->environ == NULL){
138
free(copy_name);
139
129
free(new_plugin->argv);
140
130
free(new_plugin);
141
131
return NULL;
142
132
}
143
133
new_plugin->environ[0] = NULL;
144
145
134
/* Append the new plugin to the list */
146
plugin_list = new_plugin;
135
*plugin_list = new_plugin;
147
136
return new_plugin;
148
137
}
149
138
179
168
}
180
169
181
170
/* Add to a plugin's environment */
182
static bool add_environment(plugin *p, const char *def, bool replace){
171
static bool add_environment(plugin *p, const char *def){
183
172
if(p == NULL){
184
173
return false;
185
174
}
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
175
return add_to_char_array(def, &(p->environ), &(p->envc));
204
176
}
205
177
178
206
179
/*
207
180
* Based on the example in the GNU LibC manual chapter 13.13 "File
208
181
* Descriptor Flags".
219
192
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
220
193
}
221
194
195
process *process_list = NULL;
222
196
223
/* Mark processes as completed when they exit, and save their exit
197
/* Mark a process as completed when it exits, and save its exit
224
198
status. */
225
199
void handle_sigchld(__attribute__((unused)) int sig){
226
while(true){
227
plugin *proc = plugin_list;
228
int status;
229
pid_t pid = waitpid(-1, &status, WNOHANG);
230
if(pid == 0){
231
/* Only still running child processes */
232
break;
233
}
234
if(pid == -1){
235
if (errno != ECHILD){
236
perror("waitpid");
237
}
238
/* No child processes */
239
break;
240
}
241
242
/* A child exited, find it in process_list */
243
while(proc != NULL and proc->pid != pid){
244
proc = proc->next;
245
}
246
if(proc == NULL){
247
/* Process not found in process list */
248
continue;
249
}
250
proc->status = status;
251
proc->completed = true;
252
}
200
process *proc = process_list;
201
int status;
202
pid_t pid = wait(&status);
203
if(pid == -1){
204
perror("wait");
205
return;
206
}
207
while(proc != NULL and proc->pid != pid){
208
proc = proc->next;
209
}
210
if(proc == NULL){
211
/* Process not found in process list */
212
return;
213
}
214
proc->status = status;
215
proc->completed = true;
253
216
}
254
217
255
/* Prints out a password to stdout */
256
218
bool print_out_password(const char *buffer, size_t length){
257
219
ssize_t ret;
258
220
if(length>0 and buffer[length-1] == '\n'){
268
230
return true;
269
231
}
270
232
271
/* Removes and free a plugin from the plugin list */
272
static void free_plugin(plugin *plugin_node){
273
274
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
275
free(*arg);
276
}
277
free(plugin_node->argv);
278
for(char **env = plugin_node->environ; *env != NULL; env++){
279
free(*env);
280
}
281
free(plugin_node->environ);
282
free(plugin_node->buffer);
283
284
/* Removes the plugin from the singly-linked list */
285
if(plugin_node == plugin_list){
286
/* First one - simple */
287
plugin_list = plugin_list->next;
288
} else {
289
/* Second one or later */
290
for(plugin *p = plugin_list; p != NULL; p = p->next){
291
if(p->next == plugin_node){
292
p->next = plugin_node->next;
293
break;
294
}
233
char **add_to_argv(char **argv, int *argc, char *arg){
234
if (argv == NULL){
235
*argc = 1;
236
argv = malloc(sizeof(char*) * 2);
237
if(argv == NULL){
238
return NULL;
295
239
}
296
}
297
298
free(plugin_node);
240
argv[0] = NULL; /* Will be set to argv[0] in main before parsing */
241
argv[1] = NULL;
242
}
243
*argc += 1;
244
argv = realloc(argv, sizeof(char *)
245
* ((unsigned int) *argc + 1));
246
if(argv == NULL){
247
return NULL;
248
}
249
argv[*argc-1] = arg;
250
argv[*argc] = NULL;
251
return argv;
299
252
}
300
253
301
static void free_plugin_list(void){
302
while(plugin_list != NULL){
303
free_plugin(plugin_list);
304
}
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
}
305
268
}
306
269
307
270
int main(int argc, char *argv[]){
308
char *plugindir = NULL;
309
char *argfile = NULL;
271
const char *plugindir = "/lib/mandos/plugins.d";
272
const char *argfile = ARGFILE;
310
273
FILE *conffp;
311
274
size_t d_name_len;
312
275
DIR *dir = NULL;
335
298
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
336
299
if(ret == -1){
337
300
perror("sigaction");
338
exitstatus = EXIT_FAILURE;
301
exitstatus = EXIT_FAILURE;
339
302
goto fallback;
340
303
}
341
304
344
307
{ .name = "global-options", .key = 'g',
345
308
.arg = "OPTION[,OPTION[,...]]",
346
309
.doc = "Options passed to all plugins" },
347
{ .name = "global-env", .key = 'G',
310
{ .name = "global-envs", .key = 'e',
348
311
.arg = "VAR=value",
349
312
.doc = "Environment variable passed to all plugins" },
350
313
{ .name = "options-for", .key = 'o',
351
314
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
352
315
.doc = "Options passed only to specified plugin" },
353
{ .name = "env-for", .key = 'E',
316
{ .name = "envs-for", .key = 'f',
354
317
.arg = "PLUGIN:ENV=value",
355
318
.doc = "Environment variable passed to specified plugin" },
356
319
{ .name = "disable", .key = 'd',
357
320
.arg = "PLUGIN",
358
321
.doc = "Disable a specific plugin", .group = 1 },
359
{ .name = "enable", .key = 'e',
360
.arg = "PLUGIN",
361
.doc = "Enable a specific plugin", .group = 1 },
362
322
{ .name = "plugin-dir", .key = 128,
363
323
.arg = "DIRECTORY",
364
324
.doc = "Specify a different plugin directory", .group = 2 },
365
{ .name = "config-file", .key = 129,
366
.arg = "FILE",
367
.doc = "Specify a different configuration file", .group = 2 },
368
{ .name = "userid", .key = 130,
369
.arg = "ID", .flags = 0,
370
.doc = "User ID the plugins will run as", .group = 3 },
371
{ .name = "groupid", .key = 131,
372
.arg = "ID", .flags = 0,
373
.doc = "Group ID the plugins will run as", .group = 3 },
374
{ .name = "debug", .key = 132,
375
.doc = "Debug mode", .group = 4 },
325
{ .name = "userid", .key = 129,
326
.arg = "ID", .flags = 0,
327
.doc = "User ID the plugins will run as", .group = 2 },
328
{ .name = "groupid", .key = 130,
329
.arg = "ID", .flags = 0,
330
.doc = "Group ID the plugins will run as", .group = 2 },
331
{ .name = "debug", .key = 131,
332
.doc = "Debug mode", .group = 3 },
376
333
{ .name = NULL }
377
334
};
378
335
379
error_t parse_opt (int key, char *arg, __attribute__((unused))
380
struct argp_state *state) {
336
error_t parse_opt (int key, char *arg, struct argp_state *state) {
337
/* Get the INPUT argument from `argp_parse', which we know is a
338
pointer to our plugin list pointer. */
339
plugin **plugins = state->input;
381
340
switch (key) {
382
case 'g': /* --global-options */
341
case 'g':
383
342
if (arg != NULL){
384
343
char *p;
385
344
while((p = strsep(&arg, ",")) != NULL){
386
345
if(p[0] == '\0'){
387
346
continue;
388
347
}
389
if(not add_argument(getplugin(NULL), p)){
348
if(not add_argument(getplugin(NULL, plugins), p)){
390
349
perror("add_argument");
391
350
return ARGP_ERR_UNKNOWN;
392
351
}
393
352
}
394
353
}
395
354
break;
396
case 'G': /* --global-env */
355
case 'e':
397
356
if(arg == NULL){
398
357
break;
399
358
}
402
361
if(envdef == NULL){
403
362
break;
404
363
}
405
if(not add_environment(getplugin(NULL), envdef, true)){
364
if(not add_environment(getplugin(NULL, plugins), envdef)){
406
365
perror("add_environment");
407
366
}
408
367
}
409
368
break;
410
case 'o': /* --options-for */
369
case 'o':
411
370
if (arg != NULL){
412
371
char *p_name = strsep(&arg, ":");
413
372
if(p_name[0] == '\0'){
423
382
if(p[0] == '\0'){
424
383
continue;
425
384
}
426
if(not add_argument(getplugin(p_name), p)){
385
if(not add_argument(getplugin(p_name, plugins), p)){
427
386
perror("add_argument");
428
387
return ARGP_ERR_UNKNOWN;
429
388
}
431
390
}
432
391
}
433
392
break;
434
case 'E': /* --env-for */
393
case 'f':
435
394
if(arg == NULL){
436
395
break;
437
396
}
445
404
break;
446
405
}
447
406
envdef++;
448
if(not add_environment(getplugin(p_name), envdef, true)){
407
if(not add_environment(getplugin(p_name, plugins), envdef)){
449
408
perror("add_environment");
450
409
}
451
410
}
452
411
break;
453
case 'd': /* --disable */
412
case 'd':
454
413
if (arg != NULL){
455
plugin *p = getplugin(arg);
414
plugin *p = getplugin(arg, plugins);
456
415
if(p == NULL){
457
416
return ARGP_ERR_UNKNOWN;
458
417
}
459
418
p->disabled = true;
460
419
}
461
420
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
case 128: /* --plugin-dir */
472
plugindir = strdup(arg);
473
if(plugindir == NULL){
474
perror("strdup");
475
}
476
break;
477
case 129: /* --config-file */
478
/* This is already done by parse_opt_config_file() */
479
break;
480
case 130: /* --userid */
421
case 128:
422
plugindir = arg;
423
break;
424
case 129:
481
425
uid = (uid_t)strtol(arg, NULL, 10);
482
426
break;
483
case 131: /* --groupid */
427
case 130:
484
428
gid = (gid_t)strtol(arg, NULL, 10);
485
429
break;
486
case 132: /* --debug */
430
case 131:
487
431
debug = true;
488
432
break;
489
433
case ARGP_KEY_ARG:
497
441
return 0;
498
442
}
499
443
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
}
444
plugin *plugin_list = NULL;
531
445
532
struct argp argp = { .options = options,
533
.parser = parse_opt_config_file,
534
.args_doc = "",
446
struct argp argp = { .options = options, .parser = parse_opt,
447
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
535
448
.doc = "Mandos plugin runner -- Run plugins" };
536
449
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);
450
ret = argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
540
451
if (ret == ARGP_ERR_UNKNOWN){
541
452
fprintf(stderr, "Unknown error while parsing arguments\n");
542
453
exitstatus = EXIT_FAILURE;
543
454
goto fallback;
544
455
}
545
546
/* Reset to the normal argument parser */
547
argp.parser = parse_opt;
548
549
/* Open the configfile if available */
550
if (argfile == NULL){
551
conffp = fopen(AFILE, "r");
552
} else {
553
conffp = fopen(argfile, "r");
554
}
456
457
conffp = fopen(argfile, "r");
555
458
if(conffp != NULL){
556
459
char *org_line = NULL;
557
460
char *p, *arg, *new_arg, *line;
560
463
const char whitespace_delims[] = " \r\t\f\v\n";
561
464
const char comment_delim[] = "#";
562
465
563
custom_argc = 1;
564
custom_argv = malloc(sizeof(char*) * 2);
565
if(custom_argv == NULL){
566
perror("malloc");
567
exitstatus = EXIT_FAILURE;
568
goto fallback;
569
}
570
custom_argv[0] = argv[0];
571
custom_argv[1] = NULL;
572
573
/* for each line in the config file, strip whitespace and ignore
574
commented text */
575
466
while(true){
576
467
sret = getline(&org_line, &size, conffp);
577
468
if(sret == -1){
585
476
continue;
586
477
}
587
478
new_arg = strdup(p);
588
if(new_arg == NULL){
589
perror("strdup");
590
exitstatus = EXIT_FAILURE;
591
free(org_line);
592
goto fallback;
593
}
594
595
custom_argc += 1;
596
custom_argv = realloc(custom_argv, sizeof(char *)
597
* ((unsigned int) custom_argc + 1));
598
if(custom_argv == NULL){
599
perror("realloc");
600
exitstatus = EXIT_FAILURE;
601
free(org_line);
602
goto fallback;
603
}
604
custom_argv[custom_argc-1] = new_arg;
605
custom_argv[custom_argc] = NULL;
479
custom_argv = add_to_argv(custom_argv, &custom_argc, new_arg);
480
if (custom_argv == NULL){
481
perror("add_to_argv");
482
exitstatus = EXIT_FAILURE;
483
goto fallback;
484
}
606
485
}
607
486
}
608
487
free(org_line);
609
} else {
488
} else{
610
489
/* Check for harmful errors and go to fallback. Other errors might
611
490
not affect opening plugins */
612
491
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
615
494
goto fallback;
616
495
}
617
496
}
618
/* If there was any arguments from configuration file,
619
pass them to parser as command arguments */
497
620
498
if(custom_argv != NULL){
621
ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
622
0, NULL);
499
custom_argv[0] = argv[0];
500
ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0, &plugin_list);
623
501
if (ret == ARGP_ERR_UNKNOWN){
624
502
fprintf(stderr, "Unknown error while parsing arguments\n");
625
503
exitstatus = EXIT_FAILURE;
627
505
}
628
506
}
629
507
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
508
if(debug){
640
509
for(plugin *p = plugin_list; p != NULL; p=p->next){
641
510
fprintf(stderr, "Plugin: %s has %d arguments\n",
650
519
}
651
520
}
652
521
653
/* Strip permissions down to nobody */
654
522
ret = setuid(uid);
655
523
if (ret == -1){
656
524
perror("setuid");
657
}
525
}
526
658
527
setgid(gid);
659
528
if (ret == -1){
660
529
perror("setgid");
661
530
}
662
531
663
if (plugindir == NULL){
664
dir = opendir(PDIR);
665
} else {
666
dir = opendir(plugindir);
667
}
668
532
dir = opendir(plugindir);
669
533
if(dir == NULL){
670
534
perror("Could not open plugin dir");
671
535
exitstatus = EXIT_FAILURE;
687
551
688
552
FD_ZERO(&rfds_all);
689
553
690
/* Read and execute any executable in the plugin directory*/
691
554
while(true){
692
555
dirst = readdir(dir);
693
556
694
/* All directory entries have been processed */
557
// All directory entries have been processed
695
558
if(dirst == NULL){
696
559
if (errno == EBADF){
697
560
perror("readdir");
703
566
704
567
d_name_len = strlen(dirst->d_name);
705
568
706
/* Ignore dotfiles, backup files and other junk */
569
// Ignore dotfiles, backup files and other junk
707
570
{
708
571
bool bad_name = false;
709
572
724
587
break;
725
588
}
726
589
}
590
727
591
if(bad_name){
728
592
continue;
729
593
}
594
730
595
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
731
596
size_t suf_len = strlen(*suf);
732
597
if((d_name_len >= suf_len)
759
624
free(filename);
760
625
continue;
761
626
}
762
763
/* Ignore non-executable files */
627
764
628
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
765
629
if(debug){
766
630
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
769
633
free(filename);
770
634
continue;
771
635
}
772
773
plugin *p = getplugin(dirst->d_name);
636
plugin *p = getplugin(dirst->d_name, &plugin_list);
774
637
if(p == NULL){
775
638
perror("getplugin");
776
639
free(filename);
786
649
}
787
650
{
788
651
/* Add global arguments to argument list for this plugin */
789
plugin *g = getplugin(NULL);
652
plugin *g = getplugin(NULL, &plugin_list);
790
653
if(g != NULL){
791
654
for(char **a = g->argv + 1; *a != NULL; a++){
792
655
if(not add_argument(p, *a)){
795
658
}
796
659
/* Add global environment variables */
797
660
for(char **e = g->environ; *e != NULL; e++){
798
if(not add_environment(p, *e, false)){
661
if(not add_environment(p, *e)){
799
662
perror("add_environment");
800
663
}
801
664
}
806
669
process, too. */
807
670
if(p->environ[0] != NULL){
808
671
for(char **e = environ; *e != NULL; e++){
809
if(not add_environment(p, *e, false)){
672
char *copy = strdup(*e);
673
if(copy == NULL){
674
perror("strdup");
675
continue;
676
}
677
if(not add_environment(p, copy)){
810
678
perror("add_environment");
811
679
}
812
680
}
813
681
}
814
682
815
int pipefd[2];
683
int pipefd[2];
816
684
ret = pipe(pipefd);
817
685
if (ret == -1){
818
686
perror("pipe");
819
687
exitstatus = EXIT_FAILURE;
820
688
goto fallback;
821
689
}
822
/* Ask OS to automatic close the pipe on exec */
823
690
ret = set_cloexec_flag(pipefd[0]);
824
691
if(ret < 0){
825
692
perror("set_cloexec_flag");
839
706
exitstatus = EXIT_FAILURE;
840
707
goto fallback;
841
708
}
842
/* Starting a new process to be watched */
709
// Starting a new process to be watched
843
710
pid_t pid = fork();
844
711
if(pid == -1){
845
712
perror("fork");
883
750
}
884
751
/* no return */
885
752
}
886
/* Parent process */
887
close(pipefd[1]); /* Close unused write end of pipe */
753
/* parent process */
888
754
free(filename);
889
plugin *new_plugin = getplugin(dirst->d_name);
890
if (new_plugin == NULL){
891
perror("getplugin");
755
close(pipefd[1]); /* close unused write end of pipe */
756
process *new_process = malloc(sizeof(process));
757
if (new_process == NULL){
758
perror("malloc");
892
759
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
893
760
if(ret < 0){
894
perror("sigprocmask");
761
perror("sigprocmask");
895
762
}
896
763
exitstatus = EXIT_FAILURE;
897
764
goto fallback;
898
765
}
899
766
900
new_plugin->pid = pid;
901
new_plugin->fd = pipefd[0];
902
767
*new_process = (struct process){ .pid = pid,
768
.fd = pipefd[0],
769
.next = process_list };
770
// List handling
771
process_list = new_process;
903
772
/* Unblock SIGCHLD so signal handler can be run if this process
904
773
has already completed */
905
774
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
909
778
goto fallback;
910
779
}
911
780
912
FD_SET(new_plugin->fd, &rfds_all);
781
FD_SET(new_process->fd, &rfds_all);
913
782
914
if (maxfd < new_plugin->fd){
915
maxfd = new_plugin->fd;
783
if (maxfd < new_process->fd){
784
maxfd = new_process->fd;
916
785
}
917
786
918
787
}
919
788
789
free_plugin_list(plugin_list);
790
920
791
closedir(dir);
921
792
dir = NULL;
922
923
for(plugin *p = plugin_list; p != NULL; p = p->next){
924
if(p->pid != 0){
925
break;
926
}
927
if(p->next == NULL){
928
fprintf(stderr, "No plugin processes started. Incorrect plugin"
929
" directory?\n");
930
free_plugin_list();
931
}
793
794
if (process_list == NULL){
795
fprintf(stderr, "No plugin processes started. Incorrect plugin"
796
" directory?\n");
797
process_list = NULL;
932
798
}
933
934
/* Main loop while running plugins exist */
935
while(plugin_list){
799
while(process_list){
936
800
fd_set rfds = rfds_all;
937
801
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
938
802
if (select_ret == -1){
942
806
}
943
807
/* OK, now either a process completed, or something can be read
944
808
from one of them */
945
for(plugin *proc = plugin_list; proc != NULL; proc = proc->next){
809
for(process *proc = process_list; proc ; proc = proc->next){
946
810
/* Is this process completely done? */
947
811
if(proc->eof and proc->completed){
948
812
/* Only accept the plugin output if it exited cleanly */
949
813
if(not WIFEXITED(proc->status)
950
814
or WEXITSTATUS(proc->status) != 0){
951
815
/* Bad exit by plugin */
952
953
816
if(debug){
954
817
if(WIFEXITED(proc->status)){
955
818
fprintf(stderr, "Plugin %u exited with status %d\n",
964
827
(unsigned int) (proc->pid));
965
828
}
966
829
}
967
968
830
/* Remove the plugin */
969
831
FD_CLR(proc->fd, &rfds_all);
970
971
832
/* Block signal while modifying process_list */
972
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
833
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
973
834
if(ret < 0){
974
835
perror("sigprocmask");
975
836
exitstatus = EXIT_FAILURE;
976
837
goto fallback;
977
838
}
978
free_plugin(proc);
839
/* Delete this process entry from the list */
840
if(process_list == proc){
841
/* First one - simple */
842
process_list = proc->next;
843
} else {
844
/* Second one or later */
845
for(process *p = process_list; p != NULL; p = p->next){
846
if(p->next == proc){
847
p->next = proc->next;
848
break;
849
}
850
}
851
}
979
852
/* We are done modifying process list, so unblock signal */
980
853
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
981
854
NULL);
982
855
if(ret < 0){
983
856
perror("sigprocmask");
984
exitstatus = EXIT_FAILURE;
985
goto fallback;
986
}
987
988
if(plugin_list == NULL){
989
break;
990
}
991
continue;
857
}
858
free(proc->buffer);
859
free(proc);
860
/* We deleted this process from the list, so we can't go
861
proc->next. Therefore, start over from the beginning of
862
the process list */
863
break;
992
864
}
993
994
865
/* This process exited nicely, so print its buffer */
995
866
996
bool bret = print_out_password(proc->buffer,
997
proc->buffer_length);
867
bool bret = print_out_password(proc->buffer, proc->buffer_length);
998
868
if(not bret){
999
869
perror("print_out_password");
1000
870
exitstatus = EXIT_FAILURE;
1001
871
}
1002
872
goto fallback;
1003
873
}
1004
1005
874
/* This process has not completed. Does it have any output? */
1006
875
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1007
876
/* This process had nothing to say at this time */
1037
906
1038
907
fallback:
1039
908
1040
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1041
/* Fallback if all plugins failed, none are found or an error
1042
occured */
909
if(process_list == NULL or exitstatus != EXIT_SUCCESS){
910
/* Fallback if all plugins failed, none are found or an error occured */
1043
911
bool bret;
1044
912
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
1045
913
char *passwordbuffer = getpass("Password: ");
1058
926
}
1059
927
1060
928
if(custom_argv != NULL){
1061
for(char **arg = custom_argv+1; *arg != NULL; arg++){
929
for(char **arg = custom_argv; *arg != NULL; arg++){
1062
930
free(*arg);
1063
931
}
1064
932
free(custom_argv);
1065
933
}
934
free_plugin_list(plugin_list);
1066
935
1067
936
if(dir != NULL){
1068
937
closedir(dir);
1069
938
}
1070
939
1071
940
/* Free the process list and kill the processes */
1072
for(plugin *p = plugin_list; p != NULL; p = p->next){
1073
if(p->pid != 0){
1074
close(p->fd);
1075
ret = kill(p->pid, SIGTERM);
1076
if(ret == -1 and errno != ESRCH){
1077
/* Set-uid proccesses might not get closed */
1078
perror("kill");
1079
}
941
for(process *next; process_list != NULL; process_list = next){
942
next = process_list->next;
943
close(process_list->fd);
944
ret = kill(process_list->pid, SIGTERM);
945
if(ret == -1 and errno != ESRCH){
946
/* set-uid proccesses migth not get closed */
947
perror("kill");
1080
948
}
949
free(process_list->buffer);
950
free(process_list);
1081
951
}
1082
952
1083
953
/* Wait for any remaining child processes to terminate */
1087
957
if(errno != ECHILD){
1088
958
perror("wait");
1089
959
}
1090
1091
free_plugin_list();
1092
1093
free(plugindir);
1094
free(argfile);
1095
960
1096
961
return exitstatus;
1097
962
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0