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 40
- compare with another revision
- download diff
- download tarball
- view history from revision 40
- Committer: Teddy Hogeborn
- Date: 2008-08-03 16:05:52 UTC
- Revision ID: teddy@fukt.bsnet.se-20080803160552-mvqy5klry3wn57x1
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
own code block.
(start_mandos_communication): Moved call to "initgnutls" to
beginning. Renamed label "exit" to
"mandos_end". Bug fix: set return
code if failure to realloc buffer.
Close TLS session as early as
possible.
(resolve_callback): Also print interface number when debugging.
(main): Moved "debug_int" and "config" into their own respective
code blocks.
own code block.
(start_mandos_communication): Moved call to "initgnutls" to
beginning. Renamed label "exit" to
"mandos_end". Bug fix: set return
code if failure to realloc buffer.
Close TLS session as early as
possible.
(resolve_callback): Also print interface number when debugging.
(main): Moved "debug_int" and "config" into their own respective
code blocks.
- files added:
- ca.pem
- files removed:
- COPYING
- files renamed:
- plugin-runner.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(), getline(),
25
asprintf() */
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
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY() */
25
26
#include <stdio.h> /* popen(), fileno(), fprintf(),
27
stderr, STDOUT_FILENO */
42
28
#include <iso646.h> /* and, or, not */
29
#include <sys/types.h> /* DIR, opendir(), stat(),
30
struct stat, waitpid(),
31
WIFEXITED(), WEXITSTATUS(),
32
wait() */
33
#include <sys/wait.h> /* wait() */
43
34
#include <dirent.h> /* DIR, struct dirent, opendir(),
44
readdir(), closedir(), dirfd() */
35
readdir(), closedir() */
36
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
45
37
#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> /* strsep, strlen(), asprintf() */
38
fcntl() */
39
#include <fcntl.h> /* fcntl() */
40
#include <stddef.h> /* NULL */
41
#include <stdlib.h> /* EXIT_FAILURE */
42
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
43
FD_SET(), FD_ISSET() */
44
#include <string.h> /* strlen(), strcpy(), strcat() */
45
#include <stdbool.h> /* true */
46
#include <sys/wait.h> /* waitpid(), WIFEXITED(),
47
WEXITSTATUS() */
55
48
#include <errno.h> /* errno */
56
#include <argp.h> /* struct argp_option, struct
57
argp_state, struct argp,
58
argp_parse(), ARGP_ERR_UNKNOWN,
59
ARGP_KEY_END, ARGP_KEY_ARG,
60
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 */
49
#include <argp.h> /* struct argp_option,
50
struct argp_state, struct argp,
51
argp_parse() */
66
52
67
53
#define BUFFER_SIZE 256
68
#define ARGFILE "/conf/conf.d/mandos/plugin-runner.conf"
69
70
const char *argp_program_version = "plugin-runner 1.0";
71
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
72
54
73
55
struct process;
74
56
79
61
size_t buffer_size;
80
62
size_t buffer_length;
81
63
bool eof;
82
volatile bool completed;
83
volatile int status;
64
bool completed;
65
int status;
84
66
struct process *next;
85
67
} process;
86
68
88
70
char *name; /* can be NULL or any plugin name */
89
71
char **argv;
90
72
int argc;
91
char **environ;
92
int envc;
93
73
bool disabled;
94
74
struct plugin *next;
95
75
} plugin;
104
84
/* Create a new plugin */
105
85
plugin *new_plugin = malloc(sizeof(plugin));
106
86
if (new_plugin == NULL){
107
return NULL;
108
}
109
char *copy_name = NULL;
110
if(name != NULL){
111
copy_name = strdup(name);
112
if(copy_name == NULL){
113
return NULL;
114
}
115
}
116
117
*new_plugin = (plugin) { .name = copy_name,
118
.argc = 1,
119
.envc = 0,
120
.disabled = false,
121
.next = *plugin_list };
122
87
perror("malloc");
88
exit(EXIT_FAILURE);
89
}
90
new_plugin->name = name;
123
91
new_plugin->argv = malloc(sizeof(char *) * 2);
124
92
if (new_plugin->argv == NULL){
125
free(copy_name);
126
free(new_plugin);
127
return NULL;
93
perror("malloc");
94
exit(EXIT_FAILURE);
128
95
}
129
new_plugin->argv[0] = copy_name;
96
new_plugin->argv[0] = name;
130
97
new_plugin->argv[1] = NULL;
131
132
new_plugin->environ = malloc(sizeof(char *));
133
if(new_plugin->environ == NULL){
134
free(copy_name);
135
free(new_plugin->argv);
136
free(new_plugin);
137
return NULL;
138
}
139
new_plugin->environ[0] = NULL;
98
new_plugin->argc = 1;
99
new_plugin->disabled = false;
100
new_plugin->next = *plugin_list;
140
101
/* Append the new plugin to the list */
141
102
*plugin_list = new_plugin;
142
103
return new_plugin;
143
104
}
144
105
145
/* Helper function for add_argument and add_environment */
146
static bool add_to_char_array(const char *new, char ***array,
147
int *len){
148
/* Resize the pointed-to array to hold one more pointer */
149
*array = realloc(*array, sizeof(char *)
150
* (size_t) ((*len) + 2));
151
/* Malloc check */
152
if(*array == NULL){
153
return false;
154
}
155
/* Make a copy of the new string */
156
char *copy = strdup(new);
157
if(copy == NULL){
158
return false;
159
}
160
/* Insert the copy */
161
(*array)[*len] = copy;
162
(*len)++;
163
/* Add a new terminating NULL pointer to the last element */
164
(*array)[*len] = NULL;
165
return true;
166
}
167
168
/* Add to a plugin's argument vector */
169
static bool add_argument(plugin *p, const char *arg){
170
if(p == NULL){
171
return false;
172
}
173
return add_to_char_array(arg, &(p->argv), &(p->argc));
174
}
175
176
/* Add to a plugin's environment */
177
static bool add_environment(plugin *p, const char *def){
178
if(p == NULL){
179
return false;
180
}
181
return add_to_char_array(def, &(p->environ), &(p->envc));
182
}
183
106
static void addargument(plugin *p, char *arg){
107
p->argv[p->argc] = arg;
108
p->argv = realloc(p->argv, sizeof(char *) * (size_t)(p->argc + 2));
109
if (p->argv == NULL){
110
perror("malloc");
111
exit(EXIT_FAILURE);
112
}
113
p->argc++;
114
p->argv[p->argc] = NULL;
115
}
184
116
185
117
/*
186
118
* Based on the example in the GNU LibC manual chapter 13.13 "File
198
130
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
199
131
}
200
132
133
const char *argp_program_version = "plugbasedclient 0.9";
134
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
135
201
136
process *process_list = NULL;
202
137
203
/* Mark processes as completed when they exit, and save their exit
138
/* Mark a process as completed when it exits, and save its exit
204
139
status. */
205
140
void handle_sigchld(__attribute__((unused)) int sig){
206
while(true){
207
process *proc = process_list;
208
int status;
209
pid_t pid = waitpid(-1, &status, WNOHANG);
210
if(pid == 0){
211
/* Only still running child processes */
212
break;
213
}
214
if(pid == -1){
215
if (errno != ECHILD){
216
perror("waitpid");
217
}
218
/* No child processes */
219
break;
220
}
221
222
/* A child exited, find it in process_list */
223
while(proc != NULL and proc->pid != pid){
224
proc = proc->next;
225
}
226
if(proc == NULL){
227
/* Process not found in process list */
228
continue;
229
}
230
proc->status = status;
231
proc->completed = true;
232
}
233
}
234
235
bool print_out_password(const char *buffer, size_t length){
236
ssize_t ret;
237
if(length>0 and buffer[length-1] == '\n'){
238
length--;
239
}
240
for(size_t written = 0; written < length; written += (size_t)ret){
241
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,
242
length - written));
243
if(ret < 0){
244
return false;
245
}
246
}
247
return true;
248
}
249
250
char **add_to_argv(char **argv, int *argc, char *arg){
251
if (argv == NULL){
252
*argc = 1;
253
argv = malloc(sizeof(char*) * 2);
254
if(argv == NULL){
255
return NULL;
256
}
257
argv[0] = NULL; /* Will be set to argv[0] in main before
258
parsing */
259
argv[1] = NULL;
260
}
261
*argc += 1;
262
argv = realloc(argv, sizeof(char *)
263
* ((unsigned int) *argc + 1));
264
if(argv == NULL){
265
return NULL;
266
}
267
argv[*argc-1] = arg;
268
argv[*argc] = NULL;
269
return argv;
270
}
271
272
static void free_plugin_list(plugin *plugin_list){
273
for(plugin *next; plugin_list != NULL; plugin_list = next){
274
next = plugin_list->next;
275
for(char **arg = plugin_list->argv; *arg != NULL; arg++){
276
free(*arg);
277
}
278
free(plugin_list->argv);
279
for(char **env = plugin_list->environ; *env != NULL; env++){
280
free(*env);
281
}
282
free(plugin_list->environ);
283
free(plugin_list);
284
}
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;
285
153
}
286
154
287
155
int main(int argc, char *argv[]){
288
const char *plugindir = "/lib/mandos/plugins.d";
289
const char *argfile = ARGFILE;
290
FILE *conffp;
156
const char *plugindir = "/conf/conf.d/mandos/plugins.d";
291
157
size_t d_name_len;
292
158
DIR *dir = NULL;
293
159
struct dirent *dirst;
301
167
struct sigaction old_sigchld_action;
302
168
struct sigaction sigchld_action = { .sa_handler = handle_sigchld,
303
169
.sa_flags = SA_NOCLDSTOP };
304
char **custom_argv = NULL;
305
int custom_argc = 0;
170
char *plus_options = NULL;
171
char **plus_argv = NULL;
306
172
307
173
/* Establish a signal handler */
308
174
sigemptyset(&sigchld_action.sa_mask);
309
175
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
310
if(ret == -1){
176
if(ret < 0){
311
177
perror("sigaddset");
312
exitstatus = EXIT_FAILURE;
313
goto fallback;
178
exit(EXIT_FAILURE);
314
179
}
315
180
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
316
if(ret == -1){
181
if(ret < 0){
317
182
perror("sigaction");
318
exitstatus = EXIT_FAILURE;
319
goto fallback;
183
exit(EXIT_FAILURE);
320
184
}
321
185
322
186
/* The options we understand. */
324
188
{ .name = "global-options", .key = 'g',
325
189
.arg = "OPTION[,OPTION[,...]]",
326
190
.doc = "Options passed to all plugins" },
327
{ .name = "global-envs", .key = 'e',
328
.arg = "VAR=value",
329
.doc = "Environment variable passed to all plugins" },
330
191
{ .name = "options-for", .key = 'o',
331
192
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
332
193
.doc = "Options passed only to specified plugin" },
333
{ .name = "envs-for", .key = 'f',
334
.arg = "PLUGIN:ENV=value",
335
.doc = "Environment variable passed to specified plugin" },
336
194
{ .name = "disable", .key = 'd',
337
195
.arg = "PLUGIN",
338
196
.doc = "Disable a specific plugin", .group = 1 },
357
215
switch (key) {
358
216
case 'g':
359
217
if (arg != NULL){
360
char *p;
361
while((p = strsep(&arg, ",")) != NULL){
362
if(p[0] == '\0'){
363
continue;
364
}
365
if(not add_argument(getplugin(NULL, plugins), p)){
366
perror("add_argument");
367
return ARGP_ERR_UNKNOWN;
368
}
369
}
370
}
371
break;
372
case 'e':
373
if(arg == NULL){
374
break;
375
}
376
{
377
char *envdef = strdup(arg);
378
if(envdef == NULL){
379
break;
380
}
381
if(not add_environment(getplugin(NULL, plugins), envdef)){
382
perror("add_environment");
383
}
218
char *p = strtok(arg, ",");
219
do{
220
addargument(getplugin(NULL, plugins), p);
221
p = strtok(NULL, ",");
222
} while (p != NULL);
384
223
}
385
224
break;
386
225
case 'o':
387
226
if (arg != NULL){
388
char *p_name = strsep(&arg, ":");
389
if(p_name[0] == '\0'){
390
break;
391
}
392
char *opt = strsep(&arg, ":");
393
if(opt[0] == '\0'){
394
break;
395
}
396
if(opt != NULL){
397
char *p;
398
while((p = strsep(&opt, ",")) != NULL){
399
if(p[0] == '\0'){
400
continue;
401
}
402
if(not add_argument(getplugin(p_name, plugins), p)){
403
perror("add_argument");
404
return ARGP_ERR_UNKNOWN;
405
}
406
}
407
}
408
}
409
break;
410
case 'f':
411
if(arg == NULL){
412
break;
413
}
414
{
415
char *envdef = strchr(arg, ':');
416
if(envdef == NULL){
417
break;
418
}
419
char *p_name = strndup(arg, (size_t) (envdef-arg));
420
if(p_name == NULL){
421
break;
422
}
423
envdef++;
424
if(not add_environment(getplugin(p_name, plugins), envdef)){
425
perror("add_environment");
227
char *name = strtok(arg, ":");
228
char *p = strtok(NULL, ":");
229
if(p != NULL){
230
p = strtok(p, ",");
231
do{
232
addargument(getplugin(name, plugins), p);
233
p = strtok(NULL, ",");
234
} while (p != NULL);
426
235
}
427
236
}
428
237
break;
429
238
case 'd':
430
239
if (arg != NULL){
431
plugin *p = getplugin(arg, plugins);
432
if(p == NULL){
433
return ARGP_ERR_UNKNOWN;
434
}
435
p->disabled = true;
240
getplugin(arg, plugins)->disabled = true;
436
241
}
437
242
break;
438
243
case 128:
448
253
debug = true;
449
254
break;
450
255
case ARGP_KEY_ARG:
451
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
256
if(plus_options != NULL or arg == NULL or arg[0] != '+'){
257
argp_usage (state);
258
}
259
plus_options = arg;
452
260
break;
453
261
case ARGP_KEY_END:
454
262
break;
464
272
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
465
273
.doc = "Mandos plugin runner -- Run plugins" };
466
274
467
ret = argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
468
if (ret == ARGP_ERR_UNKNOWN){
469
fprintf(stderr, "Unknown error while parsing arguments\n");
470
exitstatus = EXIT_FAILURE;
471
goto fallback;
472
}
473
474
conffp = fopen(argfile, "r");
475
if(conffp != NULL){
476
char *org_line = NULL;
477
char *p, *arg, *new_arg, *line;
478
size_t size = 0;
479
ssize_t sret;
480
const char whitespace_delims[] = " \r\t\f\v\n";
481
const char comment_delim[] = "#";
482
483
while(true){
484
sret = getline(&org_line, &size, conffp);
485
if(sret == -1){
486
break;
487
}
488
489
line = org_line;
490
arg = strsep(&line, comment_delim);
491
while((p = strsep(&arg, whitespace_delims)) != NULL){
492
if(p[0] == '\0'){
493
continue;
494
}
495
new_arg = strdup(p);
496
custom_argv = add_to_argv(custom_argv, &custom_argc, new_arg);
497
if (custom_argv == NULL){
498
perror("add_to_argv");
499
exitstatus = EXIT_FAILURE;
500
goto fallback;
501
}
502
}
503
}
504
free(org_line);
505
} else{
506
/* Check for harmful errors and go to fallback. Other errors might
507
not affect opening plugins */
508
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
509
perror("fopen");
510
exitstatus = EXIT_FAILURE;
511
goto fallback;
512
}
513
}
514
515
if(custom_argv != NULL){
516
custom_argv[0] = argv[0];
517
ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0,
518
&plugin_list);
519
if (ret == ARGP_ERR_UNKNOWN){
520
fprintf(stderr, "Unknown error while parsing arguments\n");
521
exitstatus = EXIT_FAILURE;
522
goto fallback;
523
}
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);
524
308
}
525
309
526
310
if(debug){
530
314
for(char **a = p->argv; *a != NULL; a++){
531
315
fprintf(stderr, "\tArg: %s\n", *a);
532
316
}
533
fprintf(stderr, "...and %u environment variables\n", p->envc);
534
for(char **a = p->environ; *a != NULL; a++){
535
fprintf(stderr, "\t%s\n", *a);
536
}
537
317
}
538
318
}
539
319
551
331
if(dir == NULL){
552
332
perror("Could not open plugin dir");
553
333
exitstatus = EXIT_FAILURE;
554
goto fallback;
334
goto end;
555
335
}
556
336
557
337
/* Set the FD_CLOEXEC flag on the directory, if possible */
562
342
if(ret < 0){
563
343
perror("set_cloexec_flag");
564
344
exitstatus = EXIT_FAILURE;
565
goto fallback;
345
goto end;
566
346
}
567
347
}
568
348
}
574
354
575
355
// All directory entries have been processed
576
356
if(dirst == NULL){
577
if (errno == EBADF){
578
perror("readdir");
579
exitstatus = EXIT_FAILURE;
580
goto fallback;
581
}
582
357
break;
583
358
}
584
359
628
403
continue;
629
404
}
630
405
}
631
632
char *filename;
633
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
634
if(ret < 0){
635
perror("asprintf");
636
continue;
637
}
638
639
ret = stat(filename, &st);
640
if (ret == -1){
641
perror("stat");
642
free(filename);
643
continue;
644
}
406
407
char *filename = malloc(d_name_len + strlen(plugindir) + 2);
408
if (filename == NULL){
409
perror("malloc");
410
exitstatus = EXIT_FAILURE;
411
goto end;
412
}
413
strcpy(filename, plugindir); /* Spurious warning */
414
strcat(filename, "/"); /* Spurious warning */
415
strcat(filename, dirst->d_name); /* Spurious warning */
416
417
stat(filename, &st);
645
418
646
419
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
647
420
if(debug){
651
424
free(filename);
652
425
continue;
653
426
}
654
plugin *p = getplugin(dirst->d_name, &plugin_list);
655
if(p == NULL){
656
perror("getplugin");
657
free(filename);
658
continue;
659
}
660
if(p->disabled){
427
if(getplugin(dirst->d_name, &plugin_list)->disabled){
661
428
if(debug){
662
429
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
663
430
dirst->d_name);
665
432
free(filename);
666
433
continue;
667
434
}
435
plugin *p = getplugin(dirst->d_name, &plugin_list);
668
436
{
669
437
/* Add global arguments to argument list for this plugin */
670
438
plugin *g = getplugin(NULL, &plugin_list);
671
if(g != NULL){
672
for(char **a = g->argv + 1; *a != NULL; a++){
673
if(not add_argument(p, *a)){
674
perror("add_argument");
675
}
676
}
677
/* Add global environment variables */
678
for(char **e = g->environ; *e != NULL; e++){
679
if(not add_environment(p, *e)){
680
perror("add_environment");
681
}
682
}
683
}
684
}
685
/* If this plugin has any environment variables, we will call
686
using execve and need to duplicate the environment from this
687
process, too. */
688
if(p->environ[0] != NULL){
689
for(char **e = environ; *e != NULL; e++){
690
char *copy = strdup(*e);
691
if(copy == NULL){
692
perror("strdup");
693
continue;
694
}
695
if(not add_environment(p, copy)){
696
perror("add_environment");
697
}
698
}
699
}
700
701
int pipefd[2];
439
for(char **a = g->argv + 1; *a != NULL; a++){
440
addargument(p, *a);
441
}
442
}
443
int pipefd[2];
702
444
ret = pipe(pipefd);
703
445
if (ret == -1){
704
446
perror("pipe");
705
447
exitstatus = EXIT_FAILURE;
706
goto fallback;
448
goto end;
707
449
}
708
450
ret = set_cloexec_flag(pipefd[0]);
709
451
if(ret < 0){
710
452
perror("set_cloexec_flag");
711
453
exitstatus = EXIT_FAILURE;
712
goto fallback;
454
goto end;
713
455
}
714
456
ret = set_cloexec_flag(pipefd[1]);
715
457
if(ret < 0){
716
458
perror("set_cloexec_flag");
717
459
exitstatus = EXIT_FAILURE;
718
goto fallback;
460
goto end;
719
461
}
720
462
/* Block SIGCHLD until process is safely in process list */
721
463
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
722
464
if(ret < 0){
723
465
perror("sigprocmask");
724
466
exitstatus = EXIT_FAILURE;
725
goto fallback;
467
goto end;
726
468
}
727
469
// Starting a new process to be watched
728
470
pid_t pid = fork();
729
if(pid == -1){
730
perror("fork");
731
exitstatus = EXIT_FAILURE;
732
goto fallback;
733
}
734
471
if(pid == 0){
735
472
/* this is the child process */
736
473
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
743
480
perror("sigprocmask");
744
481
_exit(EXIT_FAILURE);
745
482
}
746
747
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
748
if(ret == -1){
749
perror("dup2");
750
_exit(EXIT_FAILURE);
751
}
483
dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
752
484
753
485
if(dirfd(dir) < 0){
754
486
/* If dir has no file descriptor, we could not set FD_CLOEXEC
755
487
above and must now close it manually here. */
756
488
closedir(dir);
757
489
}
758
if(p->environ[0] == NULL){
759
if(execv(filename, p->argv) < 0){
760
perror("execv");
761
_exit(EXIT_FAILURE);
762
}
763
} else {
764
if(execve(filename, p->argv, p->environ) < 0){
765
perror("execve");
766
_exit(EXIT_FAILURE);
767
}
490
if(execv(filename, p->argv) < 0){
491
perror("execv");
492
_exit(EXIT_FAILURE);
768
493
}
769
494
/* no return */
770
495
}
779
504
perror("sigprocmask");
780
505
}
781
506
exitstatus = EXIT_FAILURE;
782
goto fallback;
507
goto end;
783
508
}
784
509
785
510
*new_process = (struct process){ .pid = pid,
793
518
if(ret < 0){
794
519
perror("sigprocmask");
795
520
exitstatus = EXIT_FAILURE;
796
goto fallback;
521
goto end;
797
522
}
798
523
799
524
FD_SET(new_process->fd, &rfds_all);
804
529
805
530
}
806
531
807
free_plugin_list(plugin_list);
808
plugin_list = NULL;
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);
537
}
809
538
810
539
closedir(dir);
811
540
dir = NULL;
812
541
813
542
if (process_list == NULL){
814
fprintf(stderr, "No plugin processes started. Incorrect plugin"
815
" directory?\n");
816
process_list = NULL;
543
fprintf(stderr, "No plugin processes started, exiting\n");
544
exitstatus = EXIT_FAILURE;
545
goto end;
817
546
}
818
547
while(process_list){
819
548
fd_set rfds = rfds_all;
821
550
if (select_ret == -1){
822
551
perror("select");
823
552
exitstatus = EXIT_FAILURE;
824
goto fallback;
553
goto end;
825
554
}
826
555
/* OK, now either a process completed, or something can be read
827
556
from one of them */
834
563
/* Bad exit by plugin */
835
564
if(debug){
836
565
if(WIFEXITED(proc->status)){
837
fprintf(stderr, "Plugin %u exited with status %d\n",
838
(unsigned int) (proc->pid),
839
WEXITSTATUS(proc->status));
566
fprintf(stderr, "Plugin %d exited with status %d\n",
567
proc->pid, WEXITSTATUS(proc->status));
840
568
} else if(WIFSIGNALED(proc->status)) {
841
fprintf(stderr, "Plugin %u killed by signal %d\n",
842
(unsigned int) (proc->pid),
843
WTERMSIG(proc->status));
569
fprintf(stderr, "Plugin %d killed by signal %d\n",
570
proc->pid, WTERMSIG(proc->status));
844
571
} else if(WCOREDUMP(proc->status)){
845
fprintf(stderr, "Plugin %d dumped core\n",
846
(unsigned int) (proc->pid));
572
fprintf(stderr, "Plugin %d dumped core\n", proc->pid);
847
573
}
848
574
}
849
575
/* Remove the plugin */
850
576
FD_CLR(proc->fd, &rfds_all);
851
577
/* Block signal while modifying process_list */
852
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
578
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
853
579
if(ret < 0){
854
580
perror("sigprocmask");
855
581
exitstatus = EXIT_FAILURE;
856
goto fallback;
582
goto end;
857
583
}
858
584
/* Delete this process entry from the list */
859
585
if(process_list == proc){
882
608
break;
883
609
}
884
610
/* This process exited nicely, so print its buffer */
885
886
bool bret = print_out_password(proc->buffer,
887
proc->buffer_length);
888
if(not bret){
889
perror("print_out_password");
890
exitstatus = EXIT_FAILURE;
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
}
891
622
}
892
goto fallback;
623
goto end;
893
624
}
894
625
/* This process has not completed. Does it have any output? */
895
626
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
903
634
if (proc->buffer == NULL){
904
635
perror("malloc");
905
636
exitstatus = EXIT_FAILURE;
906
goto fallback;
637
goto end;
907
638
}
908
639
proc->buffer_size += BUFFER_SIZE;
909
640
}
922
653
}
923
654
}
924
655
}
925
926
927
fallback:
928
929
if(process_list == NULL or exitstatus != EXIT_SUCCESS){
930
/* Fallback if all plugins failed, none are found or an error
931
occured */
932
bool bret;
933
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
934
char *passwordbuffer = getpass("Password: ");
935
bret = print_out_password(passwordbuffer, strlen(passwordbuffer));
936
if(not bret){
937
perror("print_out_password");
938
exitstatus = EXIT_FAILURE;
939
}
656
if(process_list == NULL){
657
fprintf(stderr, "All plugin processes failed, exiting\n");
658
exitstatus = EXIT_FAILURE;
940
659
}
941
660
661
end:
942
662
/* Restore old signal handler */
943
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
944
if(ret == -1){
945
perror("sigaction");
946
exitstatus = EXIT_FAILURE;
947
}
948
949
if(custom_argv != NULL){
950
for(char **arg = custom_argv; *arg != NULL; arg++){
951
free(*arg);
952
}
953
free(custom_argv);
954
}
955
free_plugin_list(plugin_list);
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
}
956
673
957
674
if(dir != NULL){
958
675
closedir(dir);
962
679
for(process *next; process_list != NULL; process_list = next){
963
680
next = process_list->next;
964
681
close(process_list->fd);
965
ret = kill(process_list->pid, SIGTERM);
966
if(ret == -1 and errno != ESRCH){
967
/* set-uid proccesses migth not get closed */
968
perror("kill");
969
}
682
kill(process_list->pid, SIGTERM);
970
683
free(process_list->buffer);
971
684
free(process_list);
972
685
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0