To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« 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
}
172
173
bool print_out_password(const char *buffer, size_t length){
174
ssize_t ret;
175
if(length>0 and buffer[length-1] == '\n'){
176
length--;
177
}
178
for(size_t written = 0; written < length; written += (size_t)ret){
179
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,
180
length - written));
181
if(ret < 0){
182
return false;
183
}
184
}
185
return true;
186
}
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>";
187
115
188
116
int main(int argc, char *argv[]){
189
117
const char *plugindir = "/conf/conf.d/mandos/plugins.d";
190
118
size_t d_name_len;
191
DIR *dir = NULL;
119
DIR *dir;
192
120
struct dirent *dirst;
193
121
struct stat st;
194
122
fd_set rfds_all;
195
123
int ret, maxfd = 0;
196
uid_t uid = 65534;
197
gid_t gid = 65534;
124
process *process_list = NULL;
198
125
bool debug = false;
199
126
int exitstatus = EXIT_SUCCESS;
200
struct sigaction old_sigchld_action;
201
struct sigaction sigchld_action = { .sa_handler = handle_sigchld,
202
.sa_flags = SA_NOCLDSTOP };
203
char *plus_options = NULL;
204
char **plus_argv = NULL;
205
206
/* Establish a signal handler */
207
sigemptyset(&sigchld_action.sa_mask);
208
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
209
if(ret < 0){
210
perror("sigaddset");
211
exit(EXIT_FAILURE);
212
}
213
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
214
if(ret < 0){
215
perror("sigaction");
216
exit(EXIT_FAILURE);
217
}
218
127
219
128
/* The options we understand. */
220
129
struct argp_option options[] = {
230
139
{ .name = "plugin-dir", .key = 128,
231
140
.arg = "DIRECTORY",
232
141
.doc = "Specify a different plugin directory", .group = 2 },
233
{ .name = "userid", .key = 129,
234
.arg = "ID", .flags = 0,
235
.doc = "User ID the plugins will run as", .group = 2 },
236
{ .name = "groupid", .key = 130,
237
.arg = "ID", .flags = 0,
238
.doc = "Group ID the plugins will run as", .group = 2 },
239
{ .name = "debug", .key = 131,
142
{ .name = "debug", .key = 129,
240
143
.doc = "Debug mode", .group = 3 },
241
144
{ .name = NULL }
242
145
};
243
146
244
147
error_t parse_opt (int key, char *arg, struct argp_state *state) {
245
/* Get the INPUT argument from `argp_parse', which we know is a
246
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. */
247
150
plugin **plugins = state->input;
248
151
switch (key) {
249
152
case 'g':
252
155
do{
253
156
addargument(getplugin(NULL, plugins), p);
254
157
p = strtok(NULL, ",");
255
} while (p != NULL);
158
} while (p);
256
159
}
257
160
break;
258
161
case 'o':
259
162
if (arg != NULL){
260
163
char *name = strtok(arg, ":");
261
164
char *p = strtok(NULL, ":");
262
if(p != NULL){
165
if(p){
263
166
p = strtok(p, ",");
264
167
do{
265
168
addargument(getplugin(name, plugins), p);
266
169
p = strtok(NULL, ",");
267
} while (p != NULL);
170
} while (p);
268
171
}
269
172
}
270
173
break;
277
180
plugindir = arg;
278
181
break;
279
182
case 129:
280
uid = (uid_t)strtol(arg, NULL, 10);
281
break;
282
case 130:
283
gid = (gid_t)strtol(arg, NULL, 10);
284
break;
285
case 131:
286
183
debug = true;
287
184
break;
288
185
case ARGP_KEY_ARG:
289
if(plus_options != NULL or arg == NULL or arg[0] != '+'){
290
argp_usage (state);
291
}
292
plus_options = arg;
186
argp_usage (state);
293
187
break;
294
188
case ARGP_KEY_END:
295
189
break;
302
196
plugin *plugin_list = NULL;
303
197
304
198
struct argp argp = { .options = options, .parser = parse_opt,
305
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
199
.args_doc = "",
306
200
.doc = "Mandos plugin runner -- Run plugins" };
307
201
308
ret = argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
309
if (ret == ARGP_ERR_UNKNOWN){
310
fprintf(stderr, "Unknown error while parsing arguments\n");
311
exitstatus = EXIT_FAILURE;
312
goto end;
313
}
314
315
if(plus_options){
316
/* This is a mangled argument in the form of
317
"+--option+--other-option=parameter+--yet-another-option", etc */
318
/* Make new argc and argv vars, and call argp_parse() again. */
319
plus_options++; /* skip the first '+' character */
320
const char delims[] = "+";
321
char *arg;
322
int new_argc = 1;
323
plus_argv = malloc(sizeof(char*) * 2);
324
if(plus_argv == NULL){
325
perror("malloc");
326
exitstatus = EXIT_FAILURE;
327
goto end;
328
}
329
plus_argv[0] = argv[0];
330
plus_argv[1] = NULL;
331
arg = strtok(plus_options, delims); /* Get first argument */
332
while(arg != NULL){
333
new_argc++;
334
plus_argv = realloc(plus_argv, sizeof(char *)
335
* ((unsigned int) new_argc + 1));
336
if(plus_argv == NULL){
337
perror("realloc");
338
exitstatus = EXIT_FAILURE;
339
goto end;
340
}
341
plus_argv[new_argc-1] = arg;
342
plus_argv[new_argc] = NULL;
343
arg = strtok(NULL, delims); /* Get next argument */
344
}
345
ret = argp_parse (&argp, new_argc, plus_argv, 0, 0, &plugin_list);
346
if (ret == ARGP_ERR_UNKNOWN){
347
fprintf(stderr, "Unknown error while parsing arguments\n");
348
exitstatus = EXIT_FAILURE;
349
goto end;
350
}
351
}
202
argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
352
203
353
204
if(debug){
354
205
for(plugin *p = plugin_list; p != NULL; p=p->next){
355
206
fprintf(stderr, "Plugin: %s has %d arguments\n",
356
p->name ? p->name : "Global", p->argc - 1);
207
p->name ? p->name : "Global", p->argc);
357
208
for(char **a = p->argv; *a != NULL; a++){
358
209
fprintf(stderr, "\tArg: %s\n", *a);
359
210
}
360
211
}
361
212
}
362
213
363
ret = setuid(uid);
364
if (ret == -1){
365
perror("setuid");
366
}
367
368
setgid(gid);
369
if (ret == -1){
370
perror("setgid");
371
}
372
373
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
374
230
if(dir == NULL){
375
perror("Could not open plugin dir");
376
exitstatus = EXIT_FAILURE;
377
goto end;
378
}
379
380
/* Set the FD_CLOEXEC flag on the directory, if possible */
381
{
382
int dir_fd = dirfd(dir);
383
if(dir_fd >= 0){
384
ret = set_cloexec_flag(dir_fd);
385
if(ret < 0){
386
perror("set_cloexec_flag");
387
exitstatus = EXIT_FAILURE;
388
goto end;
389
}
390
}
231
fprintf(stderr, "Can not open directory\n");
232
return EXIT_FAILURE;
391
233
}
392
234
393
235
FD_ZERO(&rfds_all);
397
239
398
240
// All directory entries have been processed
399
241
if(dirst == NULL){
400
if (errno == EBADF){
401
perror("readdir");
402
exitstatus = EXIT_FAILURE;
403
goto end;
404
}
405
242
break;
406
243
}
407
244
421
258
if((d_name_len >= pre_len)
422
259
and strncmp((dirst->d_name), *pre, pre_len) == 0){
423
260
if(debug){
424
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
261
fprintf(stderr, "Ignoring plugin dir entry name \"%s\""
425
262
" with bad prefix %s\n", dirst->d_name, *pre);
426
263
}
427
264
bad_name = true;
439
276
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
440
277
== 0)){
441
278
if(debug){
442
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
279
fprintf(stderr, "Ignoring plugin dir entry name \"%s\""
443
280
" with bad suffix %s\n", dirst->d_name, *suf);
444
281
}
445
282
bad_name = true;
455
292
char *filename = malloc(d_name_len + strlen(plugindir) + 2);
456
293
if (filename == NULL){
457
294
perror("malloc");
458
exitstatus = EXIT_FAILURE;
459
goto end;
460
}
461
strcpy(filename, plugindir); /* Spurious warning */
462
strcat(filename, "/"); /* Spurious warning */
463
strcat(filename, dirst->d_name); /* Spurious warning */
464
465
ret = stat(filename, &st);
466
if (ret == -1){
467
perror("stat");
468
exitstatus = EXIT_FAILURE;
469
goto end;
470
}
471
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
472
304
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
473
305
if(debug){
474
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
306
fprintf(stderr, "Ignoring plugin dir entry name \"%s\""
475
307
" with bad type or mode\n", filename);
476
308
}
477
free(filename);
478
309
continue;
479
310
}
480
311
if(getplugin(dirst->d_name, &plugin_list)->disabled){
481
312
if(debug){
482
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
313
fprintf(stderr, "Ignoring disabled plugin \"%s\"",
483
314
dirst->d_name);
484
315
}
485
free(filename);
486
316
continue;
487
317
}
488
plugin *p = getplugin(dirst->d_name, &plugin_list);
489
{
490
/* Add global arguments to argument list for this plugin */
491
plugin *g = getplugin(NULL, &plugin_list);
492
for(char **a = g->argv + 1; *a != NULL; a++){
493
addargument(p, *a);
494
}
495
}
318
// Starting a new process to be watched
496
319
int pipefd[2];
497
320
ret = pipe(pipefd);
498
321
if (ret == -1){
499
perror("pipe");
500
exitstatus = EXIT_FAILURE;
501
goto end;
502
}
503
ret = set_cloexec_flag(pipefd[0]);
504
if(ret < 0){
505
perror("set_cloexec_flag");
506
exitstatus = EXIT_FAILURE;
507
goto end;
508
}
509
ret = set_cloexec_flag(pipefd[1]);
510
if(ret < 0){
511
perror("set_cloexec_flag");
512
exitstatus = EXIT_FAILURE;
513
goto end;
514
}
515
/* Block SIGCHLD until process is safely in process list */
516
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
517
if(ret < 0){
518
perror("sigprocmask");
519
exitstatus = EXIT_FAILURE;
520
goto end;
521
}
522
// Starting a new process to be watched
322
perror(argv[0]);
323
goto end;
324
}
523
325
pid_t pid = fork();
524
326
if(pid == 0){
525
327
/* this is the child process */
526
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
527
if(ret < 0){
528
perror("sigaction");
529
_exit(EXIT_FAILURE);
530
}
531
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
532
if(ret < 0){
533
perror("sigprocmask");
534
_exit(EXIT_FAILURE);
535
}
536
537
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
538
if(ret == -1){
539
perror("dup2");
540
_exit(EXIT_FAILURE);
541
}
328
closedir(dir);
329
close(pipefd[0]); /* close unused read end of pipe */
330
dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
542
331
543
if(dirfd(dir) < 0){
544
/* If dir has no file descriptor, we could not set FD_CLOEXEC
545
above and must now close it manually here. */
546
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);
547
336
}
548
337
if(execv(filename, p->argv) < 0){
549
perror("execv");
338
perror(argv[0]);
339
close(pipefd[1]);
550
340
_exit(EXIT_FAILURE);
551
341
}
552
342
/* no return */
553
343
}
554
/* parent process */
555
free(filename);
556
344
close(pipefd[1]); /* close unused write end of pipe */
557
345
process *new_process = malloc(sizeof(process));
558
346
if (new_process == NULL){
559
347
perror("malloc");
560
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
561
if(ret < 0){
562
perror("sigprocmask");
563
}
564
exitstatus = EXIT_FAILURE;
565
goto end;
566
}
567
568
*new_process = (struct process){ .pid = pid,
569
.fd = pipefd[0],
570
.next = process_list };
571
// List handling
572
process_list = new_process;
573
/* Unblock SIGCHLD so signal handler can be run if this process
574
has already completed */
575
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
576
if(ret < 0){
577
perror("sigprocmask");
578
exitstatus = EXIT_FAILURE;
579
goto end;
580
}
581
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;
582
361
FD_SET(new_process->fd, &rfds_all);
583
362
584
363
if (maxfd < new_process->fd){
585
364
maxfd = new_process->fd;
586
365
}
587
366
588
}
589
590
/* Free the plugin list */
591
for(plugin *next; plugin_list != NULL; plugin_list = next){
592
next = plugin_list->next;
593
free(plugin_list->argv);
594
free(plugin_list);
367
//List handling
368
new_process->next = process_list;
369
process_list = new_process;
595
370
}
596
371
597
372
closedir(dir);
598
dir = NULL;
599
600
if (process_list == NULL){
601
fprintf(stderr, "No plugin processes started. Incorrect plugin"
602
" directory?\n");
603
process_list = NULL;
604
}
605
while(process_list){
606
fd_set rfds = rfds_all;
607
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
608
if (select_ret == -1){
609
perror("select");
610
exitstatus = EXIT_FAILURE;
611
goto end;
612
}
613
/* OK, now either a process completed, or something can be read
614
from one of them */
615
for(process *proc = process_list; proc ; proc = proc->next){
616
/* Is this process completely done? */
617
if(proc->eof and proc->completed){
618
/* Only accept the plugin output if it exited cleanly */
619
if(not WIFEXITED(proc->status)
620
or WEXITSTATUS(proc->status) != 0){
621
/* Bad exit by plugin */
622
if(debug){
623
if(WIFEXITED(proc->status)){
624
fprintf(stderr, "Plugin %u exited with status %d\n",
625
(unsigned int) (proc->pid),
626
WEXITSTATUS(proc->status));
627
} else if(WIFSIGNALED(proc->status)) {
628
fprintf(stderr, "Plugin %u killed by signal %d\n",
629
(unsigned int) (proc->pid),
630
WTERMSIG(proc->status));
631
} else if(WCOREDUMP(proc->status)){
632
fprintf(stderr, "Plugin %d dumped core\n",
633
(unsigned int) (proc->pid));
634
}
635
}
636
/* Remove the plugin */
637
FD_CLR(proc->fd, &rfds_all);
638
/* Block signal while modifying process_list */
639
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
640
if(ret < 0){
641
perror("sigprocmask");
642
exitstatus = EXIT_FAILURE;
643
goto end;
644
}
645
/* Delete this process entry from the list */
646
if(process_list == proc){
647
/* First one - simple */
648
process_list = proc->next;
649
} else {
650
/* Second one or later */
651
for(process *p = process_list; p != NULL; p = p->next){
652
if(p->next == proc){
653
p->next = proc->next;
654
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);
655
423
}
656
424
}
657
425
}
658
/* We are done modifying process list, so unblock signal */
659
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
660
NULL);
661
if(ret < 0){
662
perror("sigprocmask");
663
}
664
free(proc->buffer);
665
free(proc);
666
/* We deleted this process from the list, so we can't go
667
proc->next. Therefore, start over from the beginning of
668
the process list */
669
break;
670
}
671
/* This process exited nicely, so print its buffer */
672
673
bool bret = print_out_password(proc->buffer, proc->buffer_length);
674
if(not bret){
675
perror("print_out_password");
676
exitstatus = EXIT_FAILURE;
677
}
678
goto end;
679
}
680
/* This process has not completed. Does it have any output? */
681
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
682
/* This process had nothing to say at this time */
683
continue;
684
}
685
/* Before reading, make the process' data buffer large enough */
686
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
687
proc->buffer = realloc(proc->buffer, proc->buffer_size
688
+ (size_t) BUFFER_SIZE);
689
if (proc->buffer == NULL){
690
perror("malloc");
691
exitstatus = EXIT_FAILURE;
692
goto end;
693
}
694
proc->buffer_size += BUFFER_SIZE;
695
}
696
/* Read from the process */
697
ret = read(proc->fd, proc->buffer + proc->buffer_length,
698
BUFFER_SIZE);
699
if(ret < 0){
700
/* Read error from this process; ignore the error */
701
continue;
702
}
703
if(ret == 0){
704
/* got EOF */
705
proc->eof = true;
706
} else {
707
proc->buffer_length += (size_t) ret;
426
}
708
427
}
709
428
}
710
429
}
711
430
712
if(process_list == NULL){
713
bool bret;
714
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
715
char *passwordbuffer = getpass("Password: ");
716
bret = print_out_password(passwordbuffer, strlen(passwordbuffer));
717
if(not bret){
718
perror("print_out_password");
719
exitstatus = EXIT_FAILURE;
720
goto end;
721
}
722
}
723
724
431
end:
725
726
/* Restore old signal handler */
727
sigaction(SIGCHLD, &old_sigchld_action, NULL);
728
729
free(plus_argv);
730
731
/* Free the plugin list */
732
for(plugin *next; plugin_list != NULL; plugin_list = next){
733
next = plugin_list->next;
734
free(plugin_list->argv);
735
free(plugin_list);
736
}
737
738
if(dir != NULL){
739
closedir(dir);
740
}
741
742
/* Free the process list and kill the processes */
743
for(process *next; process_list != NULL; process_list = next){
744
next = process_list->next;
745
close(process_list->fd);
746
ret = kill(process_list->pid, SIGTERM);
747
if(ret == -1 and errno != ESRCH){
748
/* set-uid proccesses migth not get closed */
749
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;
750
447
}
751
free(process_list->buffer);
752
free(process_list);
753
}
754
755
/* Wait for any remaining child processes to terminate */
756
do{
757
ret = wait(NULL);
758
} while(ret >= 0);
759
if(errno != ECHILD){
760
perror("wait");
761
}
762
448
}
763
449
return exitstatus;
764
450
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0