To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos-client.c
- browse files at revision 61
- compare with another revision
- download diff
- download tarball
- view history from revision 61
- Committer: Teddy Hogeborn
- Date: 2008-08-10 16:13:23 UTC
- Revision ID: teddy@fukt.bsnet.se-20080810161323-wrh1rbpdrq0otuhf
* mandos (console): Define handler globally.
(main): If in debug mode, also reduce consol log level. Remove
console log handler before daemonizing.
(main): If in debug mode, also reduce consol log level. Remove
console log handler before daemonizing.
- files added:
- mandos-client.xml
- files removed:
- ca.pem
- files renamed:
- server.py => mandos
- plugbasedclient.c => mandos-client.c
- server.conf => mandos.conf
- plugins.d/passprompt.c => plugins.d/password-prompt.c
- plugins.d/mandosclient.c => plugins.d/password-request.c
- files modified:
- Makefile
added
removed
mandos-client.c
21
21
* Contact the authors at <mandos@fukt.bsnet.se>.
22
22
*/
23
23
24
#include <stdio.h> /* popen(), fileno(), fprintf(),
25
stderr, STDOUT_FILENO */
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() */
26
42
#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() */
31
43
#include <dirent.h> /* DIR, struct dirent, opendir(),
32
readdir(), closedir() */
33
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
44
readdir(), closedir(), dirfd() */
34
45
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
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() */
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() */
45
56
#include <errno.h> /* errno */
46
#include <argp.h> /* struct argp_option,
47
struct argp_state, struct argp,
48
argp_parse() */
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>";
49
71
50
72
struct process;
51
73
55
77
char *buffer;
56
78
size_t buffer_size;
57
79
size_t buffer_length;
80
bool eof;
81
bool completed;
82
int status;
58
83
struct process *next;
59
84
} process;
60
85
66
91
struct plugin *next;
67
92
} plugin;
68
93
69
plugin *getplugin(char *name, plugin **plugin_list){
94
static plugin *getplugin(char *name, plugin **plugin_list){
70
95
for (plugin *p = *plugin_list; p != NULL; p = p->next){
71
96
if ((p->name == name)
72
97
or (p->name and name and (strcmp(p->name, name) == 0))){
95
120
return new_plugin;
96
121
}
97
122
98
void addargument(plugin *p, char *arg){
123
static void addargument(plugin *p, char *arg){
99
124
p->argv[p->argc] = arg;
100
125
p->argv = realloc(p->argv, sizeof(char *) * (size_t)(p->argc + 2));
101
126
if (p->argv == NULL){
111
136
* Descriptor Flags".
112
137
* *Note File Descriptor Flags:(libc)Descriptor Flags.
113
138
*/
114
int set_cloexec_flag(int fd)
139
static int set_cloexec_flag(int fd)
115
140
{
116
141
int ret = fcntl(fd, F_GETFD, 0);
117
142
/* If reading the flags failed, return error indication now. */
122
147
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
123
148
}
124
149
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>";
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
}
132
172
133
173
int main(int argc, char *argv[]){
134
174
const char *plugindir = "/conf/conf.d/mandos/plugins.d";
135
175
size_t d_name_len;
136
DIR *dir;
176
DIR *dir = NULL;
137
177
struct dirent *dirst;
138
178
struct stat st;
139
179
fd_set rfds_all;
140
180
int ret, maxfd = 0;
141
process *process_list = NULL;
181
uid_t uid = 65534;
182
gid_t gid = 65534;
142
183
bool debug = false;
143
184
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
}
144
203
145
204
/* The options we understand. */
146
205
struct argp_option options[] = {
156
215
{ .name = "plugin-dir", .key = 128,
157
216
.arg = "DIRECTORY",
158
217
.doc = "Specify a different plugin directory", .group = 2 },
159
{ .name = "debug", .key = 129,
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,
160
225
.doc = "Debug mode", .group = 3 },
161
226
{ .name = NULL }
162
227
};
163
228
164
229
error_t parse_opt (int key, char *arg, struct argp_state *state) {
165
/* Get the INPUT argument from `argp_parse', which we
166
know is a pointer to our plugin list pointer. */
230
/* Get the INPUT argument from `argp_parse', which we know is a
231
pointer to our plugin list pointer. */
167
232
plugin **plugins = state->input;
168
233
switch (key) {
169
234
case 'g':
172
237
do{
173
238
addargument(getplugin(NULL, plugins), p);
174
239
p = strtok(NULL, ",");
175
} while (p);
240
} while (p != NULL);
176
241
}
177
242
break;
178
243
case 'o':
179
244
if (arg != NULL){
180
245
char *name = strtok(arg, ":");
181
246
char *p = strtok(NULL, ":");
182
if(p){
247
if(p != NULL){
183
248
p = strtok(p, ",");
184
249
do{
185
250
addargument(getplugin(name, plugins), p);
186
251
p = strtok(NULL, ",");
187
} while (p);
252
} while (p != NULL);
188
253
}
189
254
}
190
255
break;
197
262
plugindir = arg;
198
263
break;
199
264
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:
200
271
debug = true;
201
272
break;
202
273
case ARGP_KEY_ARG:
203
argp_usage (state);
274
if(plus_options != NULL or arg == NULL or arg[0] != '+'){
275
argp_usage (state);
276
}
277
plus_options = arg;
204
278
break;
205
279
case ARGP_KEY_END:
206
280
break;
213
287
plugin *plugin_list = NULL;
214
288
215
289
struct argp argp = { .options = options, .parser = parse_opt,
216
.args_doc = "",
290
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
217
291
.doc = "Mandos plugin runner -- Run plugins" };
218
292
219
argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
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
}
220
337
221
338
if(debug){
222
339
for(plugin *p = plugin_list; p != NULL; p=p->next){
228
345
}
229
346
}
230
347
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
231
358
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
239
359
if(dir == NULL){
240
fprintf(stderr, "Can not open directory\n");
241
return EXIT_FAILURE;
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
}
242
376
}
243
377
244
378
FD_ZERO(&rfds_all);
248
382
249
383
// All directory entries have been processed
250
384
if(dirst == NULL){
385
if (errno == EBADF){
386
perror("readdir");
387
exitstatus = EXIT_FAILURE;
388
goto end;
389
}
251
390
break;
252
391
}
253
392
267
406
if((d_name_len >= pre_len)
268
407
and strncmp((dirst->d_name), *pre, pre_len) == 0){
269
408
if(debug){
270
fprintf(stderr, "Ignoring plugin dir entry name \"%s\""
409
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
271
410
" with bad prefix %s\n", dirst->d_name, *pre);
272
411
}
273
412
bad_name = true;
285
424
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
286
425
== 0)){
287
426
if(debug){
288
fprintf(stderr, "Ignoring plugin dir entry name \"%s\""
427
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
289
428
" with bad suffix %s\n", dirst->d_name, *suf);
290
429
}
291
430
bad_name = true;
301
440
char *filename = malloc(d_name_len + strlen(plugindir) + 2);
302
441
if (filename == NULL){
303
442
perror("malloc");
304
exitstatus =EXIT_FAILURE;
305
goto end;
306
}
307
strcpy(filename, plugindir);
308
strcat(filename, "/");
309
strcat(filename, dirst->d_name);
310
311
stat(filename, &st);
312
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
313
457
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
314
458
if(debug){
315
fprintf(stderr, "Ignoring plugin dir entry name \"%s\""
459
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
316
460
" with bad type or mode\n", filename);
317
461
}
462
free(filename);
318
463
continue;
319
464
}
320
465
if(getplugin(dirst->d_name, &plugin_list)->disabled){
321
466
if(debug){
322
fprintf(stderr, "Ignoring disabled plugin \"%s\"",
467
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
323
468
dirst->d_name);
324
469
}
470
free(filename);
325
471
continue;
326
472
}
327
// Starting a new process to be watched
328
int pipefd[2];
329
ret = pipe(pipefd);
330
if (ret == -1){
331
perror(argv[0]);
332
goto end;
333
}
334
473
plugin *p = getplugin(dirst->d_name, &plugin_list);
335
474
{
336
475
/* Add global arguments to argument list for this plugin */
339
478
addargument(p, *a);
340
479
}
341
480
}
481
int pipefd[2];
482
ret = pipe(pipefd);
483
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
342
508
pid_t pid = fork();
343
509
if(pid == 0){
344
510
/* this is the child process */
345
closedir(dir);
346
close(pipefd[0]); /* close unused read end of pipe */
347
dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
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
}
348
527
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);
532
}
349
533
if(execv(filename, p->argv) < 0){
350
perror(argv[0]);
351
close(pipefd[1]);
534
perror("execv");
352
535
_exit(EXIT_FAILURE);
353
536
}
354
537
/* no return */
355
538
}
539
/* parent process */
540
free(filename);
356
541
close(pipefd[1]); /* close unused write end of pipe */
357
542
process *new_process = malloc(sizeof(process));
358
543
if (new_process == NULL){
359
544
perror("malloc");
360
exitstatus = EXIT_FAILURE;
361
goto end;
362
}
363
364
new_process->fd = pipefd[0];
365
new_process->buffer = malloc(BUFFER_SIZE);
366
if (new_process->buffer == NULL){
367
perror("malloc");
368
exitstatus = EXIT_FAILURE;
369
goto end;
370
}
371
new_process->buffer_size = BUFFER_SIZE;
372
new_process->buffer_length = 0;
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
373
567
FD_SET(new_process->fd, &rfds_all);
374
568
375
569
if (maxfd < new_process->fd){
376
570
maxfd = new_process->fd;
377
571
}
378
572
379
//List handling
380
new_process->next = process_list;
381
process_list = new_process;
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);
382
580
}
383
581
384
582
closedir(dir);
385
386
if (process_list != NULL){
387
while(true){
388
fd_set rfds = rfds_all;
389
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
390
if (select_ret == -1){
391
perror(argv[0]);
392
goto end;
393
}else{
394
for(process *process_itr = process_list; process_itr != NULL;
395
process_itr = process_itr->next){
396
if(FD_ISSET(process_itr->fd, &rfds)){
397
if(process_itr->buffer_length + BUFFER_SIZE
398
> process_itr->buffer_size){
399
process_itr->buffer = realloc(process_itr->buffer,
400
process_itr->buffer_size
401
+ (size_t) BUFFER_SIZE);
402
if (process_itr->buffer == NULL){
403
perror(argv[0]);
404
goto end;
405
}
406
process_itr->buffer_size += BUFFER_SIZE;
407
}
408
ret = read(process_itr->fd, process_itr->buffer
409
+ process_itr->buffer_length, BUFFER_SIZE);
410
if(ret < 0){
411
/* Read error from this process; ignore it */
412
continue;
413
}
414
process_itr->buffer_length += (size_t) ret;
415
if(ret == 0){
416
/* got EOF */
417
/* wait for process exit */
418
int status;
419
waitpid(process_itr->pid, &status, 0);
420
if(WIFEXITED(status) and WEXITSTATUS(status) == 0){
421
for(size_t written = 0;
422
written < process_itr->buffer_length;){
423
ret = write(STDOUT_FILENO,
424
process_itr->buffer + written,
425
process_itr->buffer_length - written);
426
if(ret < 0){
427
perror(argv[0]);
428
goto end;
429
}
430
written += (size_t)ret;
431
}
432
goto end;
433
} else {
434
FD_CLR(process_itr->fd, &rfds_all);
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 %u exited with status %d\n",
610
(unsigned int) (proc->pid),
611
WEXITSTATUS(proc->status));
612
} else if(WIFSIGNALED(proc->status)) {
613
fprintf(stderr, "Plugin %u killed by signal %d\n",
614
(unsigned int) (proc->pid),
615
WTERMSIG(proc->status));
616
} else if(WCOREDUMP(proc->status)){
617
fprintf(stderr, "Plugin %d dumped core\n",
618
(unsigned int) (proc->pid));
619
}
620
}
621
/* Remove the plugin */
622
FD_CLR(proc->fd, &rfds_all);
623
/* Block signal while modifying process_list */
624
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
625
if(ret < 0){
626
perror("sigprocmask");
627
exitstatus = EXIT_FAILURE;
628
goto end;
629
}
630
/* Delete this process entry from the list */
631
if(process_list == proc){
632
/* First one - simple */
633
process_list = proc->next;
634
} else {
635
/* Second one or later */
636
for(process *p = process_list; p != NULL; p = p->next){
637
if(p->next == proc){
638
p->next = proc->next;
639
break;
435
640
}
436
641
}
437
642
}
438
}
643
/* We are done modifying process list, so unblock signal */
644
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
645
NULL);
646
if(ret < 0){
647
perror("sigprocmask");
648
}
649
free(proc->buffer);
650
free(proc);
651
/* We deleted this process from the list, so we can't go
652
proc->next. Therefore, start over from the beginning of
653
the process list */
654
break;
655
}
656
/* This process exited nicely, so print its buffer */
657
for(size_t written = 0; written < proc->buffer_length;
658
written += (size_t)ret){
659
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO,
660
proc->buffer + written,
661
proc->buffer_length
662
- written));
663
if(ret < 0){
664
perror("write");
665
exitstatus = EXIT_FAILURE;
666
goto end;
667
}
668
}
669
goto end;
670
}
671
/* This process has not completed. Does it have any output? */
672
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
673
/* This process had nothing to say at this time */
674
continue;
675
}
676
/* Before reading, make the process' data buffer large enough */
677
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
678
proc->buffer = realloc(proc->buffer, proc->buffer_size
679
+ (size_t) BUFFER_SIZE);
680
if (proc->buffer == NULL){
681
perror("malloc");
682
exitstatus = EXIT_FAILURE;
683
goto end;
684
}
685
proc->buffer_size += BUFFER_SIZE;
686
}
687
/* Read from the process */
688
ret = read(proc->fd, proc->buffer + proc->buffer_length,
689
BUFFER_SIZE);
690
if(ret < 0){
691
/* Read error from this process; ignore the error */
692
continue;
693
}
694
if(ret == 0){
695
/* got EOF */
696
proc->eof = true;
697
} else {
698
proc->buffer_length += (size_t) ret;
439
699
}
440
700
}
441
701
}
702
if(process_list == NULL){
703
fprintf(stderr, "All plugin processes failed, exiting\n");
704
exitstatus = EXIT_FAILURE;
705
}
442
706
443
707
end:
444
for(process *process_itr = process_list; process_itr != NULL;
445
process_itr = process_itr->next){
446
close(process_itr->fd);
447
kill(process_itr->pid, SIGTERM);
448
free(process_itr->buffer);
449
}
450
451
while(true){
452
int status;
453
ret = wait(&status);
454
if (ret == -1){
455
if(errno != ECHILD){
456
perror("wait");
457
}
458
break;
708
/* Restore old signal handler */
709
sigaction(SIGCHLD, &old_sigchld_action, NULL);
710
711
free(plus_argv);
712
713
/* Free the plugin list */
714
for(plugin *next; plugin_list != NULL; plugin_list = next){
715
next = plugin_list->next;
716
free(plugin_list->argv);
717
free(plugin_list);
718
}
719
720
if(dir != NULL){
721
closedir(dir);
722
}
723
724
/* Free the process list and kill the processes */
725
for(process *next; process_list != NULL; process_list = next){
726
next = process_list->next;
727
close(process_list->fd);
728
ret = kill(process_list->pid, SIGTERM);
729
if(ret == -1 and errno != ESRCH){
730
/* set-uid proccesses migth not get closed */
731
perror("kill");
459
732
}
460
}
733
free(process_list->buffer);
734
free(process_list);
735
}
736
737
/* Wait for any remaining child processes to terminate */
738
do{
739
ret = wait(NULL);
740
} while(ret >= 0);
741
if(errno != ECHILD){
742
perror("wait");
743
}
744
461
745
return exitstatus;
462
746
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0