To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to plugbasedclient.c
- browse files at revision 33
- compare with another revision
- download diff
- download tarball
- view history from revision 33
- Committer: Teddy Hogeborn
- Date: 2008-08-01 07:04:32 UTC
- Revision ID: teddy@fukt.bsnet.se-20080801070432-5t1q0ds0bjxojyoz
* plugins.d/plugbasedclient.c (main): Close the pipe fd after dup2:ing
it onto stdout.
it onto stdout.
added
removed
plugbasedclient.c
21
21
* Contact the authors at <mandos@fukt.bsnet.se>.
22
22
*/
23
23
24
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY() */
25
26
24
#include <stdio.h> /* popen(), fileno(), fprintf(),
27
25
stderr, STDOUT_FILENO */
28
26
#include <iso646.h> /* and, or, not */
29
#include <sys/types.h> /* DIR, opendir(), stat(),
30
struct stat, waitpid(),
31
WIFEXITED(), WEXITSTATUS(),
32
wait() */
27
#include <sys/types.h> /* DIR, opendir(), stat(), struct stat,
28
waitpid(), WIFEXITED(),
29
WEXITSTATUS(), wait() */
33
30
#include <sys/wait.h> /* wait() */
34
31
#include <dirent.h> /* DIR, struct dirent, opendir(),
35
32
readdir(), closedir() */
50
47
struct argp_state, struct argp,
51
48
argp_parse() */
52
49
53
#define BUFFER_SIZE 256
54
55
50
struct process;
56
51
57
52
typedef struct process{
60
55
char *buffer;
61
56
size_t buffer_size;
62
57
size_t buffer_length;
63
bool eof;
64
bool completed;
65
int status;
66
58
struct process *next;
67
59
} process;
68
60
74
66
struct plugin *next;
75
67
} plugin;
76
68
77
static plugin *getplugin(char *name, plugin **plugin_list){
69
plugin *getplugin(char *name, plugin **plugin_list){
78
70
for (plugin *p = *plugin_list; p != NULL; p = p->next){
79
71
if ((p->name == name)
80
72
or (p->name and name and (strcmp(p->name, name) == 0))){
103
95
return new_plugin;
104
96
}
105
97
106
static void addargument(plugin *p, char *arg){
98
void addargument(plugin *p, char *arg){
107
99
p->argv[p->argc] = arg;
108
100
p->argv = realloc(p->argv, sizeof(char *) * (size_t)(p->argc + 2));
109
101
if (p->argv == NULL){
119
111
* Descriptor Flags".
120
112
* *Note File Descriptor Flags:(libc)Descriptor Flags.
121
113
*/
122
static int set_cloexec_flag(int fd)
114
int set_cloexec_flag(int fd)
123
115
{
124
116
int ret = fcntl(fd, F_GETFD, 0);
125
117
/* If reading the flags failed, return error indication now. */
130
122
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
131
123
}
132
124
133
const char *argp_program_version = "plugbasedclient 0.9";
134
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
135
136
process *process_list = NULL;
137
138
/* Mark a process as completed when it exits, and save its exit
139
status. */
140
void handle_sigchld(__attribute__((unused)) int sig){
141
process *proc = process_list;
142
int status;
143
pid_t pid = wait(&status);
144
while(proc != NULL and proc->pid != pid){
145
proc = proc->next;
146
}
147
if(proc == NULL){
148
/* Process not found in process list */
149
return;
150
}
151
proc->status = status;
152
proc->completed = true;
153
}
125
126
#define BUFFER_SIZE 256
127
128
const char *argp_program_version =
129
"plugbasedclient 0.9";
130
const char *argp_program_bug_address =
131
"<mandos@fukt.bsnet.se>";
154
132
155
133
int main(int argc, char *argv[]){
156
134
const char *plugindir = "/conf/conf.d/mandos/plugins.d";
157
135
size_t d_name_len;
158
DIR *dir = NULL;
136
DIR *dir;
159
137
struct dirent *dirst;
160
138
struct stat st;
161
139
fd_set rfds_all;
162
140
int ret, maxfd = 0;
163
uid_t uid = 65534;
164
gid_t gid = 65534;
141
process *process_list = NULL;
165
142
bool debug = false;
166
143
int exitstatus = EXIT_SUCCESS;
167
struct sigaction old_sigchld_action;
168
struct sigaction sigchld_action = { .sa_handler = handle_sigchld,
169
.sa_flags = SA_NOCLDSTOP };
170
char *plus_options = NULL;
171
char **plus_argv = NULL;
172
173
/* Establish a signal handler */
174
sigemptyset(&sigchld_action.sa_mask);
175
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
176
if(ret < 0){
177
perror("sigaddset");
178
exit(EXIT_FAILURE);
179
}
180
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
181
if(ret < 0){
182
perror("sigaction");
183
exit(EXIT_FAILURE);
184
}
185
144
186
145
/* The options we understand. */
187
146
struct argp_option options[] = {
197
156
{ .name = "plugin-dir", .key = 128,
198
157
.arg = "DIRECTORY",
199
158
.doc = "Specify a different plugin directory", .group = 2 },
200
{ .name = "userid", .key = 129,
201
.arg = "ID", .flags = 0,
202
.doc = "User ID the plugins will run as", .group = 2 },
203
{ .name = "groupid", .key = 130,
204
.arg = "ID", .flags = 0,
205
.doc = "Group ID the plugins will run as", .group = 2 },
206
{ .name = "debug", .key = 131,
159
{ .name = "debug", .key = 129,
207
160
.doc = "Debug mode", .group = 3 },
208
161
{ .name = NULL }
209
162
};
210
163
211
164
error_t parse_opt (int key, char *arg, struct argp_state *state) {
212
/* Get the INPUT argument from `argp_parse', which we know is a
213
pointer to our plugin list pointer. */
165
/* Get the INPUT argument from `argp_parse', which we
166
know is a pointer to our plugin list pointer. */
214
167
plugin **plugins = state->input;
215
168
switch (key) {
216
169
case 'g':
219
172
do{
220
173
addargument(getplugin(NULL, plugins), p);
221
174
p = strtok(NULL, ",");
222
} while (p != NULL);
175
} while (p);
223
176
}
224
177
break;
225
178
case 'o':
226
179
if (arg != NULL){
227
180
char *name = strtok(arg, ":");
228
181
char *p = strtok(NULL, ":");
229
if(p != NULL){
182
if(p){
230
183
p = strtok(p, ",");
231
184
do{
232
185
addargument(getplugin(name, plugins), p);
233
186
p = strtok(NULL, ",");
234
} while (p != NULL);
187
} while (p);
235
188
}
236
189
}
237
190
break;
244
197
plugindir = arg;
245
198
break;
246
199
case 129:
247
uid = (uid_t)strtol(arg, NULL, 10);
248
break;
249
case 130:
250
gid = (gid_t)strtol(arg, NULL, 10);
251
break;
252
case 131:
253
200
debug = true;
254
201
break;
255
202
case ARGP_KEY_ARG:
256
if(plus_options != NULL or arg == NULL or arg[0] != '+'){
257
argp_usage (state);
258
}
259
plus_options = arg;
203
argp_usage (state);
260
204
break;
261
205
case ARGP_KEY_END:
262
206
break;
269
213
plugin *plugin_list = NULL;
270
214
271
215
struct argp argp = { .options = options, .parser = parse_opt,
272
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
216
.args_doc = "",
273
217
.doc = "Mandos plugin runner -- Run plugins" };
274
218
275
argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
276
277
if(plus_options){
278
/* This is a mangled argument in the form of
279
"+--option+--other-option=parameter+--yet-another-option", etc */
280
/* Make new argc and argv vars, and call argp_parse() again. */
281
plus_options++; /* skip the first '+' character */
282
const char delims[] = "+";
283
char *arg;
284
int new_argc = 1;
285
plus_argv = malloc(sizeof(char*) * 2);
286
if(plus_argv == NULL){
287
perror("malloc");
288
exitstatus = EXIT_FAILURE;
289
goto end;
290
}
291
plus_argv[0] = argv[0];
292
plus_argv[1] = NULL;
293
arg = strtok(plus_options, delims); /* Get first argument */
294
while(arg != NULL){
295
new_argc++;
296
plus_argv = realloc(plus_argv, sizeof(char *)
297
* ((unsigned int) new_argc + 1));
298
if(plus_argv == NULL){
299
perror("malloc");
300
exitstatus = EXIT_FAILURE;
301
goto end;
302
}
303
plus_argv[new_argc-1] = arg;
304
plus_argv[new_argc] = NULL;
305
arg = strtok(NULL, delims); /* Get next argument */
306
}
307
argp_parse (&argp, new_argc, plus_argv, 0, 0, &plugin_list);
308
}
219
argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
309
220
310
221
if(debug){
311
222
for(plugin *p = plugin_list; p != NULL; p=p->next){
317
228
}
318
229
}
319
230
320
ret = setuid(uid);
321
if (ret == -1){
322
perror("setuid");
323
}
324
325
setgid(gid);
326
if (ret == -1){
327
perror("setgid");
328
}
329
330
231
dir = opendir(plugindir);
232
/* Set the FD_CLOEXEC flag on the directory */
233
ret = set_cloexec_flag(dirfd(dir));
234
if(ret < 0){
235
perror("set_cloexec_flag");
236
goto end;
237
}
238
331
239
if(dir == NULL){
332
perror("Could not open plugin dir");
333
exitstatus = EXIT_FAILURE;
334
goto end;
335
}
336
337
/* Set the FD_CLOEXEC flag on the directory, if possible */
338
{
339
int dir_fd = dirfd(dir);
340
if(dir_fd >= 0){
341
ret = set_cloexec_flag(dir_fd);
342
if(ret < 0){
343
perror("set_cloexec_flag");
344
exitstatus = EXIT_FAILURE;
345
goto end;
346
}
347
}
240
fprintf(stderr, "Can not open directory\n");
241
return EXIT_FAILURE;
348
242
}
349
243
350
244
FD_ZERO(&rfds_all);
373
267
if((d_name_len >= pre_len)
374
268
and strncmp((dirst->d_name), *pre, pre_len) == 0){
375
269
if(debug){
376
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
270
fprintf(stderr, "Ignoring plugin dir entry name \"%s\""
377
271
" with bad prefix %s\n", dirst->d_name, *pre);
378
272
}
379
273
bad_name = true;
391
285
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
392
286
== 0)){
393
287
if(debug){
394
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
288
fprintf(stderr, "Ignoring plugin dir entry name \"%s\""
395
289
" with bad suffix %s\n", dirst->d_name, *suf);
396
290
}
397
291
bad_name = true;
407
301
char *filename = malloc(d_name_len + strlen(plugindir) + 2);
408
302
if (filename == NULL){
409
303
perror("malloc");
410
exitstatus = EXIT_FAILURE;
304
exitstatus =EXIT_FAILURE;
411
305
goto end;
412
306
}
413
strcpy(filename, plugindir); /* Spurious warning */
414
strcat(filename, "/"); /* Spurious warning */
415
strcat(filename, dirst->d_name); /* Spurious warning */
416
307
strcpy(filename, plugindir);
308
strcat(filename, "/");
309
strcat(filename, dirst->d_name);
310
417
311
stat(filename, &st);
418
312
419
313
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
420
314
if(debug){
421
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
315
fprintf(stderr, "Ignoring plugin dir entry name \"%s\""
422
316
" with bad type or mode\n", filename);
423
317
}
424
free(filename);
425
318
continue;
426
319
}
427
320
if(getplugin(dirst->d_name, &plugin_list)->disabled){
428
321
if(debug){
429
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
322
fprintf(stderr, "Ignoring disabled plugin \"%s\"",
430
323
dirst->d_name);
431
324
}
432
free(filename);
433
325
continue;
434
326
}
327
// Starting a new process to be watched
328
int pipefd[2];
329
ret = pipe(pipefd);
330
if (ret == -1){
331
perror("pipe");
332
goto end;
333
}
435
334
plugin *p = getplugin(dirst->d_name, &plugin_list);
436
335
{
437
336
/* Add global arguments to argument list for this plugin */
440
339
addargument(p, *a);
441
340
}
442
341
}
443
int pipefd[2];
444
ret = pipe(pipefd);
445
if (ret == -1){
446
perror("pipe");
447
exitstatus = EXIT_FAILURE;
448
goto end;
449
}
450
ret = set_cloexec_flag(pipefd[0]);
451
if(ret < 0){
452
perror("set_cloexec_flag");
453
exitstatus = EXIT_FAILURE;
454
goto end;
455
}
456
ret = set_cloexec_flag(pipefd[1]);
457
if(ret < 0){
458
perror("set_cloexec_flag");
459
exitstatus = EXIT_FAILURE;
460
goto end;
461
}
462
/* Block SIGCHLD until process is safely in process list */
463
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
464
if(ret < 0){
465
perror("sigprocmask");
466
exitstatus = EXIT_FAILURE;
467
goto end;
468
}
469
// Starting a new process to be watched
470
342
pid_t pid = fork();
471
343
if(pid == 0){
472
344
/* this is the child process */
473
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
474
if(ret < 0){
475
perror("sigaction");
476
_exit(EXIT_FAILURE);
477
}
478
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
479
if(ret < 0){
480
perror("sigprocmask");
481
_exit(EXIT_FAILURE);
482
}
345
closedir(dir);
346
close(pipefd[0]); /* close unused read end of pipe */
483
347
dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
348
if(pipefd[1] > 2){
349
close(pipefd[1]);
350
}
484
351
485
if(dirfd(dir) < 0){
486
/* If dir has no file descriptor, we could not set FD_CLOEXEC
487
above and must now close it manually here. */
488
closedir(dir);
489
}
490
352
if(execv(filename, p->argv) < 0){
491
perror("execv");
353
perror(argv[0]);
354
close(pipefd[1]);
492
355
_exit(EXIT_FAILURE);
493
356
}
494
357
/* no return */
495
358
}
496
/* parent process */
497
free(filename);
498
359
close(pipefd[1]); /* close unused write end of pipe */
499
360
process *new_process = malloc(sizeof(process));
500
361
if (new_process == NULL){
501
362
perror("malloc");
502
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
503
if(ret < 0){
504
perror("sigprocmask");
505
}
506
exitstatus = EXIT_FAILURE;
507
goto end;
508
}
509
510
*new_process = (struct process){ .pid = pid,
511
.fd = pipefd[0],
512
.next = process_list };
513
// List handling
514
process_list = new_process;
515
/* Unblock SIGCHLD so signal handler can be run if this process
516
has already completed */
517
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
518
if(ret < 0){
519
perror("sigprocmask");
520
exitstatus = EXIT_FAILURE;
521
goto end;
522
}
523
363
exitstatus = EXIT_FAILURE;
364
goto end;
365
}
366
367
new_process->fd = pipefd[0];
368
new_process->buffer = malloc(BUFFER_SIZE);
369
if (new_process->buffer == NULL){
370
perror("malloc");
371
exitstatus = EXIT_FAILURE;
372
goto end;
373
}
374
new_process->buffer_size = BUFFER_SIZE;
375
new_process->buffer_length = 0;
524
376
FD_SET(new_process->fd, &rfds_all);
525
377
526
378
if (maxfd < new_process->fd){
527
379
maxfd = new_process->fd;
528
380
}
529
381
530
}
531
532
/* Free the plugin list */
533
for(plugin *next; plugin_list != NULL; plugin_list = next){
534
next = plugin_list->next;
535
free(plugin_list->argv);
536
free(plugin_list);
382
//List handling
383
new_process->next = process_list;
384
process_list = new_process;
537
385
}
538
386
539
387
closedir(dir);
540
dir = NULL;
541
388
542
if (process_list == NULL){
543
fprintf(stderr, "No plugin processes started, exiting\n");
544
exitstatus = EXIT_FAILURE;
545
goto end;
546
}
547
while(process_list){
548
fd_set rfds = rfds_all;
549
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
550
if (select_ret == -1){
551
perror("select");
552
exitstatus = EXIT_FAILURE;
553
goto end;
554
}
555
/* OK, now either a process completed, or something can be read
556
from one of them */
557
for(process *proc = process_list; proc ; proc = proc->next){
558
/* Is this process completely done? */
559
if(proc->eof and proc->completed){
560
/* Only accept the plugin output if it exited cleanly */
561
if(not WIFEXITED(proc->status)
562
or WEXITSTATUS(proc->status) != 0){
563
/* Bad exit by plugin */
564
if(debug){
565
if(WIFEXITED(proc->status)){
566
fprintf(stderr, "Plugin %d exited with status %d\n",
567
proc->pid, WEXITSTATUS(proc->status));
568
} else if(WIFSIGNALED(proc->status)) {
569
fprintf(stderr, "Plugin %d killed by signal %d\n",
570
proc->pid, WTERMSIG(proc->status));
571
} else if(WCOREDUMP(proc->status)){
572
fprintf(stderr, "Plugin %d dumped core\n", proc->pid);
573
}
574
}
575
/* Remove the plugin */
576
FD_CLR(proc->fd, &rfds_all);
577
/* Block signal while modifying process_list */
578
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
579
if(ret < 0){
580
perror("sigprocmask");
581
exitstatus = EXIT_FAILURE;
582
goto end;
583
}
584
/* Delete this process entry from the list */
585
if(process_list == proc){
586
/* First one - simple */
587
process_list = proc->next;
588
} else {
589
/* Second one or later */
590
for(process *p = process_list; p != NULL; p = p->next){
591
if(p->next == proc){
592
p->next = proc->next;
593
break;
389
if (process_list != NULL){
390
while(true){
391
fd_set rfds = rfds_all;
392
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
393
if (select_ret == -1){
394
perror(argv[0]);
395
goto end;
396
}else{
397
for(process *process_itr = process_list; process_itr != NULL;
398
process_itr = process_itr->next){
399
if(FD_ISSET(process_itr->fd, &rfds)){
400
if(process_itr->buffer_length + BUFFER_SIZE
401
> process_itr->buffer_size){
402
process_itr->buffer = realloc(process_itr->buffer,
403
process_itr->buffer_size
404
+ (size_t) BUFFER_SIZE);
405
if (process_itr->buffer == NULL){
406
perror(argv[0]);
407
goto end;
408
}
409
process_itr->buffer_size += BUFFER_SIZE;
410
}
411
ret = read(process_itr->fd, process_itr->buffer
412
+ process_itr->buffer_length, BUFFER_SIZE);
413
if(ret < 0){
414
/* Read error from this process; ignore it */
415
continue;
416
}
417
process_itr->buffer_length += (size_t) ret;
418
if(ret == 0){
419
/* got EOF */
420
/* wait for process exit */
421
int status;
422
waitpid(process_itr->pid, &status, 0);
423
if(WIFEXITED(status) and WEXITSTATUS(status) == 0){
424
for(size_t written = 0;
425
written < process_itr->buffer_length;){
426
ret = write(STDOUT_FILENO,
427
process_itr->buffer + written,
428
process_itr->buffer_length - written);
429
if(ret < 0){
430
perror(argv[0]);
431
goto end;
432
}
433
written += (size_t)ret;
434
}
435
goto end;
436
} else {
437
FD_CLR(process_itr->fd, &rfds_all);
594
438
}
595
439
}
596
440
}
597
/* We are done modifying process list, so unblock signal */
598
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
599
NULL);
600
if(ret < 0){
601
perror("sigprocmask");
602
}
603
free(proc->buffer);
604
free(proc);
605
/* We deleted this process from the list, so we can't go
606
proc->next. Therefore, start over from the beginning of
607
the process list */
608
break;
609
}
610
/* This process exited nicely, so print its buffer */
611
for(size_t written = 0; written < proc->buffer_length;
612
written += (size_t)ret){
613
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO,
614
proc->buffer + written,
615
proc->buffer_length
616
- written));
617
if(ret < 0){
618
perror("write");
619
exitstatus = EXIT_FAILURE;
620
goto end;
621
}
622
}
623
goto end;
624
}
625
/* This process has not completed. Does it have any output? */
626
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
627
/* This process had nothing to say at this time */
628
continue;
629
}
630
/* Before reading, make the process' data buffer large enough */
631
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
632
proc->buffer = realloc(proc->buffer, proc->buffer_size
633
+ (size_t) BUFFER_SIZE);
634
if (proc->buffer == NULL){
635
perror("malloc");
636
exitstatus = EXIT_FAILURE;
637
goto end;
638
}
639
proc->buffer_size += BUFFER_SIZE;
640
}
641
/* Read from the process */
642
ret = read(proc->fd, proc->buffer + proc->buffer_length,
643
BUFFER_SIZE);
644
if(ret < 0){
645
/* Read error from this process; ignore the error */
646
continue;
647
}
648
if(ret == 0){
649
/* got EOF */
650
proc->eof = true;
651
} else {
652
proc->buffer_length += (size_t) ret;
441
}
653
442
}
654
443
}
655
444
}
656
if(process_list == NULL){
657
fprintf(stderr, "All plugin processes failed, exiting\n");
658
exitstatus = EXIT_FAILURE;
659
}
660
445
661
446
end:
662
/* Restore old signal handler */
663
sigaction(SIGCHLD, &old_sigchld_action, NULL);
664
665
free(plus_argv);
666
667
/* Free the plugin list */
668
for(plugin *next; plugin_list != NULL; plugin_list = next){
669
next = plugin_list->next;
670
free(plugin_list->argv);
671
free(plugin_list);
672
}
673
674
if(dir != NULL){
675
closedir(dir);
676
}
677
678
/* Free the process list and kill the processes */
679
for(process *next; process_list != NULL; process_list = next){
680
next = process_list->next;
681
close(process_list->fd);
682
kill(process_list->pid, SIGTERM);
683
free(process_list->buffer);
684
free(process_list);
685
}
686
687
/* Wait for any remaining child processes to terminate */
688
do{
689
ret = wait(NULL);
690
} while(ret >= 0);
691
if(errno != ECHILD){
692
perror("wait");
693
}
694
447
for(process *process_itr = process_list; process_itr != NULL;
448
process_itr = process_itr->next){
449
close(process_itr->fd);
450
kill(process_itr->pid, SIGTERM);
451
free(process_itr->buffer);
452
}
453
454
while(true){
455
int status;
456
ret = wait(&status);
457
if (ret == -1){
458
if(errno != ECHILD){
459
perror("wait");
460
}
461
break;
462
}
463
}
695
464
return exitstatus;
696
465
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0