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