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