To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to plugbasedclient.c
- browse files at revision 34
- compare with another revision
- download diff
- download tarball
- view history from revision 34
- Committer: Teddy Hogeborn
- Date: 2008-08-01 20:03:03 UTC
- Revision ID: teddy@fukt.bsnet.se-20080801200303-3xjn9gjewg87365i
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
FD_CLOEXEC on the directory, if possible,
and also on both ends of the pipe. Do not
allocate buffer for process in advance.
Free the plugin list. Bug fix: exit if no
plugins found, not if any found. Set
"exitstatus" in many places. Simplify and
un-indent the loop reading process pipes.
Renamed process list iterator to "proc".
Bug fix: retry password write on EINTR.
Free the process list properly, including
the process structs themselves.
FD_CLOEXEC on the directory, if possible,
and also on both ends of the pipe. Do not
allocate buffer for process in advance.
Free the plugin list. Bug fix: exit if no
plugins found, not if any found. Set
"exitstatus" in many places. Simplify and
un-indent the loop reading process pipes.
Renamed process list iterator to "proc".
Bug fix: retry password write on EINTR.
Free the process list properly, including
the process structs themselves.
- 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, error_t */
60
#include <signal.h> /* struct sigaction, sigemptyset(),
61
sigaddset(), sigaction(),
62
sigprocmask(), SIG_BLOCK, SIGCHLD,
63
SIG_UNBLOCK, kill() */
64
#include <errno.h> /* errno, EBADF */
65
66
#define BUFFER_SIZE 256
67
#define ARGFILE "/conf/conf.d/mandos/plugin-runner.conf"
68
69
const char *argp_program_version = "plugin-runner 1.0";
70
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
49
#include <argp.h> /* struct argp_option,
50
struct argp_state, struct argp,
51
argp_parse() */
71
52
72
53
struct process;
73
54
77
58
char *buffer;
78
59
size_t buffer_size;
79
60
size_t buffer_length;
80
bool eof;
81
bool completed;
82
int status;
83
61
struct process *next;
84
62
} process;
85
63
87
65
char *name; /* can be NULL or any plugin name */
88
66
char **argv;
89
67
int argc;
90
char **environ;
91
int envc;
92
68
bool disabled;
93
69
struct plugin *next;
94
70
} plugin;
95
71
96
static plugin *getplugin(char *name, plugin **plugin_list){
72
plugin *getplugin(char *name, plugin **plugin_list){
97
73
for (plugin *p = *plugin_list; p != NULL; p = p->next){
98
74
if ((p->name == name)
99
75
or (p->name and name and (strcmp(p->name, name) == 0))){
103
79
/* Create a new plugin */
104
80
plugin *new_plugin = malloc(sizeof(plugin));
105
81
if (new_plugin == NULL){
106
return NULL;
107
}
108
char *copy_name = NULL;
109
if(name != NULL){
110
copy_name = strdup(name);
111
if(copy_name == NULL){
112
return NULL;
113
}
114
}
115
116
*new_plugin = (plugin) { .name = copy_name,
117
.argc = 1,
118
.envc = 0,
119
.disabled = false,
120
.next = *plugin_list };
121
82
perror("malloc");
83
exit(EXIT_FAILURE);
84
}
85
new_plugin->name = name;
122
86
new_plugin->argv = malloc(sizeof(char *) * 2);
123
87
if (new_plugin->argv == NULL){
124
free(copy_name);
125
free(new_plugin);
126
return NULL;
88
perror("malloc");
89
exit(EXIT_FAILURE);
127
90
}
128
new_plugin->argv[0] = copy_name;
91
new_plugin->argv[0] = name;
129
92
new_plugin->argv[1] = NULL;
130
131
new_plugin->environ = malloc(sizeof(char *));
132
if(new_plugin->environ == NULL){
133
free(copy_name);
134
free(new_plugin->argv);
135
free(new_plugin);
136
return NULL;
137
}
138
new_plugin->environ[0] = NULL;
93
new_plugin->argc = 1;
94
new_plugin->disabled = false;
95
new_plugin->next = *plugin_list;
139
96
/* Append the new plugin to the list */
140
97
*plugin_list = new_plugin;
141
98
return new_plugin;
142
99
}
143
100
144
/* Helper function for add_argument and add_environment */
145
static bool add_to_char_array(const char *new, char ***array,
146
int *len){
147
/* Resize the pointed-to array to hold one more pointer */
148
*array = realloc(*array, sizeof(char *)
149
* (size_t) ((*len) + 2));
150
/* Malloc check */
151
if(*array == NULL){
152
return false;
153
}
154
/* Make a copy of the new string */
155
char *copy = strdup(new);
156
if(copy == NULL){
157
return false;
158
}
159
/* Insert the copy */
160
(*array)[*len] = copy;
161
(*len)++;
162
/* Add a new terminating NULL pointer to the last element */
163
(*array)[*len] = NULL;
164
return true;
165
}
166
167
/* Add to a plugin's argument vector */
168
static bool add_argument(plugin *p, const char *arg){
169
if(p == NULL){
170
return false;
171
}
172
return add_to_char_array(arg, &(p->argv), &(p->argc));
173
}
174
175
/* Add to a plugin's environment */
176
static bool add_environment(plugin *p, const char *def){
177
if(p == NULL){
178
return false;
179
}
180
return add_to_char_array(def, &(p->environ), &(p->envc));
181
}
182
101
void addargument(plugin *p, char *arg){
102
p->argv[p->argc] = arg;
103
p->argv = realloc(p->argv, sizeof(char *) * (size_t)(p->argc + 2));
104
if (p->argv == NULL){
105
perror("malloc");
106
exit(EXIT_FAILURE);
107
}
108
p->argc++;
109
p->argv[p->argc] = NULL;
110
}
183
111
184
112
/*
185
113
* Based on the example in the GNU LibC manual chapter 13.13 "File
186
114
* Descriptor Flags".
187
115
* *Note File Descriptor Flags:(libc)Descriptor Flags.
188
116
*/
189
static int set_cloexec_flag(int fd)
117
int set_cloexec_flag(int fd)
190
118
{
191
119
int ret = fcntl(fd, F_GETFD, 0);
192
120
/* If reading the flags failed, return error indication now. */
197
125
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
198
126
}
199
127
200
process *process_list = NULL;
201
202
/* Mark a process as completed when it exits, and save its exit
203
status. */
204
void handle_sigchld(__attribute__((unused)) int sig){
205
process *proc = process_list;
206
int status;
207
pid_t pid = wait(&status);
208
if(pid == -1){
209
perror("wait");
210
return;
211
}
212
while(proc != NULL and proc->pid != pid){
213
proc = proc->next;
214
}
215
if(proc == NULL){
216
/* Process not found in process list */
217
return;
218
}
219
proc->status = status;
220
proc->completed = true;
221
}
222
223
bool print_out_password(const char *buffer, size_t length){
224
ssize_t ret;
225
if(length>0 and buffer[length-1] == '\n'){
226
length--;
227
}
228
for(size_t written = 0; written < length; written += (size_t)ret){
229
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,
230
length - written));
231
if(ret < 0){
232
return false;
233
}
234
}
235
return true;
236
}
237
238
char **add_to_argv(char **argv, int *argc, char *arg){
239
if (argv == NULL){
240
*argc = 1;
241
argv = malloc(sizeof(char*) * 2);
242
if(argv == NULL){
243
return NULL;
244
}
245
argv[0] = NULL; /* Will be set to argv[0] in main before parsing */
246
argv[1] = NULL;
247
}
248
*argc += 1;
249
argv = realloc(argv, sizeof(char *)
250
* ((unsigned int) *argc + 1));
251
if(argv == NULL){
252
return NULL;
253
}
254
argv[*argc-1] = arg;
255
argv[*argc] = NULL;
256
return argv;
257
}
258
259
static void free_plugin_list(plugin *plugin_list){
260
for(plugin *next; plugin_list != NULL; plugin_list = next){
261
next = plugin_list->next;
262
for(char **arg = plugin_list->argv; *arg != NULL; arg++){
263
free(*arg);
264
}
265
free(plugin_list->argv);
266
for(char **env = plugin_list->environ; *env != NULL; env++){
267
free(*env);
268
}
269
free(plugin_list->environ);
270
free(plugin_list);
271
}
272
}
128
129
#define BUFFER_SIZE 256
130
131
const char *argp_program_version =
132
"plugbasedclient 0.9";
133
const char *argp_program_bug_address =
134
"<mandos@fukt.bsnet.se>";
273
135
274
136
int main(int argc, char *argv[]){
275
const char *plugindir = "/lib/mandos/plugins.d";
276
const char *argfile = ARGFILE;
277
FILE *conffp;
137
const char *plugindir = "/conf/conf.d/mandos/plugins.d";
278
138
size_t d_name_len;
279
DIR *dir = NULL;
139
DIR *dir;
280
140
struct dirent *dirst;
281
141
struct stat st;
282
142
fd_set rfds_all;
283
143
int ret, maxfd = 0;
284
uid_t uid = 65534;
285
gid_t gid = 65534;
144
process *process_list = NULL;
286
145
bool debug = false;
287
146
int exitstatus = EXIT_SUCCESS;
288
struct sigaction old_sigchld_action;
289
struct sigaction sigchld_action = { .sa_handler = handle_sigchld,
290
.sa_flags = SA_NOCLDSTOP };
291
char **custom_argv = NULL;
292
int custom_argc = 0;
293
294
/* Establish a signal handler */
295
sigemptyset(&sigchld_action.sa_mask);
296
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
297
if(ret == -1){
298
perror("sigaddset");
299
exitstatus = EXIT_FAILURE;
300
goto fallback;
301
}
302
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
303
if(ret == -1){
304
perror("sigaction");
305
exitstatus = EXIT_FAILURE;
306
goto fallback;
307
}
308
147
309
148
/* The options we understand. */
310
149
struct argp_option options[] = {
311
150
{ .name = "global-options", .key = 'g',
312
151
.arg = "OPTION[,OPTION[,...]]",
313
152
.doc = "Options passed to all plugins" },
314
{ .name = "global-envs", .key = 'e',
315
.arg = "VAR=value",
316
.doc = "Environment variable passed to all plugins" },
317
153
{ .name = "options-for", .key = 'o',
318
154
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
319
155
.doc = "Options passed only to specified plugin" },
320
{ .name = "envs-for", .key = 'f',
321
.arg = "PLUGIN:ENV=value",
322
.doc = "Environment variable passed to specified plugin" },
323
156
{ .name = "disable", .key = 'd',
324
157
.arg = "PLUGIN",
325
158
.doc = "Disable a specific plugin", .group = 1 },
326
159
{ .name = "plugin-dir", .key = 128,
327
160
.arg = "DIRECTORY",
328
161
.doc = "Specify a different plugin directory", .group = 2 },
329
{ .name = "userid", .key = 129,
330
.arg = "ID", .flags = 0,
331
.doc = "User ID the plugins will run as", .group = 2 },
332
{ .name = "groupid", .key = 130,
333
.arg = "ID", .flags = 0,
334
.doc = "Group ID the plugins will run as", .group = 2 },
335
{ .name = "debug", .key = 131,
162
{ .name = "debug", .key = 129,
336
163
.doc = "Debug mode", .group = 3 },
337
164
{ .name = NULL }
338
165
};
339
166
340
167
error_t parse_opt (int key, char *arg, struct argp_state *state) {
341
/* Get the INPUT argument from `argp_parse', which we know is a
342
pointer to our plugin list pointer. */
168
/* Get the INPUT argument from `argp_parse', which we
169
know is a pointer to our plugin list pointer. */
343
170
plugin **plugins = state->input;
344
171
switch (key) {
345
172
case 'g':
346
173
if (arg != NULL){
347
char *p;
348
while((p = strsep(&arg, ",")) != NULL){
349
if(p[0] == '\0'){
350
continue;
351
}
352
if(not add_argument(getplugin(NULL, plugins), p)){
353
perror("add_argument");
354
return ARGP_ERR_UNKNOWN;
355
}
356
}
357
}
358
break;
359
case 'e':
360
if(arg == NULL){
361
break;
362
}
363
{
364
char *envdef = strdup(arg);
365
if(envdef == NULL){
366
break;
367
}
368
if(not add_environment(getplugin(NULL, plugins), envdef)){
369
perror("add_environment");
370
}
174
char *p = strtok(arg, ",");
175
do{
176
addargument(getplugin(NULL, plugins), p);
177
p = strtok(NULL, ",");
178
} while (p);
371
179
}
372
180
break;
373
181
case 'o':
374
182
if (arg != NULL){
375
char *p_name = strsep(&arg, ":");
376
if(p_name[0] == '\0'){
377
break;
378
}
379
char *opt = strsep(&arg, ":");
380
if(opt[0] == '\0'){
381
break;
382
}
383
if(opt != NULL){
384
char *p;
385
while((p = strsep(&opt, ",")) != NULL){
386
if(p[0] == '\0'){
387
continue;
388
}
389
if(not add_argument(getplugin(p_name, plugins), p)){
390
perror("add_argument");
391
return ARGP_ERR_UNKNOWN;
392
}
393
}
394
}
395
}
396
break;
397
case 'f':
398
if(arg == NULL){
399
break;
400
}
401
{
402
char *envdef = strchr(arg, ':');
403
if(envdef == NULL){
404
break;
405
}
406
char *p_name = strndup(arg, (size_t) (envdef-arg));
407
if(p_name == NULL){
408
break;
409
}
410
envdef++;
411
if(not add_environment(getplugin(p_name, plugins), envdef)){
412
perror("add_environment");
183
char *name = strtok(arg, ":");
184
char *p = strtok(NULL, ":");
185
if(p){
186
p = strtok(p, ",");
187
do{
188
addargument(getplugin(name, plugins), p);
189
p = strtok(NULL, ",");
190
} while (p);
413
191
}
414
192
}
415
193
break;
416
194
case 'd':
417
195
if (arg != NULL){
418
plugin *p = getplugin(arg, plugins);
419
if(p == NULL){
420
return ARGP_ERR_UNKNOWN;
421
}
422
p->disabled = true;
196
getplugin(arg, plugins)->disabled = true;
423
197
}
424
198
break;
425
199
case 128:
426
200
plugindir = arg;
427
201
break;
428
202
case 129:
429
uid = (uid_t)strtol(arg, NULL, 10);
430
break;
431
case 130:
432
gid = (gid_t)strtol(arg, NULL, 10);
433
break;
434
case 131:
435
203
debug = true;
436
204
break;
437
205
case ARGP_KEY_ARG:
438
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
206
argp_usage (state);
439
207
break;
440
208
case ARGP_KEY_END:
441
209
break;
448
216
plugin *plugin_list = NULL;
449
217
450
218
struct argp argp = { .options = options, .parser = parse_opt,
451
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
219
.args_doc = "",
452
220
.doc = "Mandos plugin runner -- Run plugins" };
453
221
454
ret = argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
455
if (ret == ARGP_ERR_UNKNOWN){
456
fprintf(stderr, "Unknown error while parsing arguments\n");
457
exitstatus = EXIT_FAILURE;
458
goto fallback;
459
}
460
461
conffp = fopen(argfile, "r");
462
if(conffp != NULL){
463
char *org_line = NULL;
464
char *p, *arg, *new_arg, *line;
465
size_t size = 0;
466
ssize_t sret;
467
const char whitespace_delims[] = " \r\t\f\v\n";
468
const char comment_delim[] = "#";
469
470
while(true){
471
sret = getline(&org_line, &size, conffp);
472
if(sret == -1){
473
break;
474
}
475
476
line = org_line;
477
arg = strsep(&line, comment_delim);
478
while((p = strsep(&arg, whitespace_delims)) != NULL){
479
if(p[0] == '\0'){
480
continue;
481
}
482
new_arg = strdup(p);
483
custom_argv = add_to_argv(custom_argv, &custom_argc, new_arg);
484
if (custom_argv == NULL){
485
perror("add_to_argv");
486
exitstatus = EXIT_FAILURE;
487
goto fallback;
488
}
489
}
490
}
491
free(org_line);
492
} else{
493
/* Check for harmful errors and go to fallback. Other errors might
494
not affect opening plugins */
495
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
496
perror("fopen");
497
exitstatus = EXIT_FAILURE;
498
goto fallback;
499
}
500
}
501
502
if(custom_argv != NULL){
503
custom_argv[0] = argv[0];
504
ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0, &plugin_list);
505
if (ret == ARGP_ERR_UNKNOWN){
506
fprintf(stderr, "Unknown error while parsing arguments\n");
507
exitstatus = EXIT_FAILURE;
508
goto fallback;
509
}
510
}
222
argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
511
223
512
224
if(debug){
513
225
for(plugin *p = plugin_list; p != NULL; p=p->next){
516
228
for(char **a = p->argv; *a != NULL; a++){
517
229
fprintf(stderr, "\tArg: %s\n", *a);
518
230
}
519
fprintf(stderr, "...and %u environment variables\n", p->envc);
520
for(char **a = p->environ; *a != NULL; a++){
521
fprintf(stderr, "\t%s\n", *a);
522
}
523
231
}
524
232
}
525
233
526
ret = setuid(uid);
527
if (ret == -1){
528
perror("setuid");
529
}
530
531
setgid(gid);
532
if (ret == -1){
533
perror("setgid");
534
}
535
536
234
dir = opendir(plugindir);
537
235
if(dir == NULL){
538
236
perror("Could not open plugin dir");
539
237
exitstatus = EXIT_FAILURE;
540
goto fallback;
238
goto end;
541
239
}
542
543
240
/* Set the FD_CLOEXEC flag on the directory, if possible */
544
241
{
545
242
int dir_fd = dirfd(dir);
548
245
if(ret < 0){
549
246
perror("set_cloexec_flag");
550
247
exitstatus = EXIT_FAILURE;
551
goto fallback;
248
goto end;
552
249
}
553
250
}
554
251
}
555
252
253
if(dir == NULL){
254
fprintf(stderr, "Can not open directory\n");
255
return EXIT_FAILURE;
256
}
257
556
258
FD_ZERO(&rfds_all);
557
259
558
260
while(true){
560
262
561
263
// All directory entries have been processed
562
264
if(dirst == NULL){
563
if (errno == EBADF){
564
perror("readdir");
565
exitstatus = EXIT_FAILURE;
566
goto fallback;
567
}
568
265
break;
569
266
}
570
267
614
311
continue;
615
312
}
616
313
}
617
618
char *filename;
619
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
620
if(ret < 0){
621
perror("asprintf");
622
continue;
623
}
624
625
ret = stat(filename, &st);
626
if (ret == -1){
627
perror("stat");
628
free(filename);
629
continue;
630
}
631
314
315
char *filename = malloc(d_name_len + strlen(plugindir) + 2);
316
if (filename == NULL){
317
perror("malloc");
318
exitstatus = EXIT_FAILURE;
319
goto end;
320
}
321
strcpy(filename, plugindir);
322
strcat(filename, "/");
323
strcat(filename, dirst->d_name);
324
325
stat(filename, &st);
326
632
327
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
633
328
if(debug){
634
329
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
635
330
" with bad type or mode\n", filename);
636
331
}
637
free(filename);
638
continue;
639
}
640
plugin *p = getplugin(dirst->d_name, &plugin_list);
641
if(p == NULL){
642
perror("getplugin");
643
free(filename);
644
continue;
645
}
646
if(p->disabled){
332
continue;
333
}
334
if(getplugin(dirst->d_name, &plugin_list)->disabled){
647
335
if(debug){
648
336
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
649
337
dirst->d_name);
650
338
}
651
free(filename);
652
339
continue;
653
340
}
341
plugin *p = getplugin(dirst->d_name, &plugin_list);
654
342
{
655
343
/* Add global arguments to argument list for this plugin */
656
344
plugin *g = getplugin(NULL, &plugin_list);
657
if(g != NULL){
658
for(char **a = g->argv + 1; *a != NULL; a++){
659
if(not add_argument(p, *a)){
660
perror("add_argument");
661
}
662
}
663
/* Add global environment variables */
664
for(char **e = g->environ; *e != NULL; e++){
665
if(not add_environment(p, *e)){
666
perror("add_environment");
667
}
668
}
669
}
670
}
671
/* If this plugin has any environment variables, we will call
672
using execve and need to duplicate the environment from this
673
process, too. */
674
if(p->environ[0] != NULL){
675
for(char **e = environ; *e != NULL; e++){
676
char *copy = strdup(*e);
677
if(copy == NULL){
678
perror("strdup");
679
continue;
680
}
681
if(not add_environment(p, copy)){
682
perror("add_environment");
683
}
684
}
685
}
686
687
int pipefd[2];
345
for(char **a = g->argv + 1; *a != NULL; a++){
346
addargument(p, *a);
347
}
348
}
349
int pipefd[2];
688
350
ret = pipe(pipefd);
689
351
if (ret == -1){
690
352
perror("pipe");
691
353
exitstatus = EXIT_FAILURE;
692
goto fallback;
354
goto end;
693
355
}
694
356
ret = set_cloexec_flag(pipefd[0]);
695
357
if(ret < 0){
696
358
perror("set_cloexec_flag");
697
359
exitstatus = EXIT_FAILURE;
698
goto fallback;
360
goto end;
699
361
}
700
362
ret = set_cloexec_flag(pipefd[1]);
701
363
if(ret < 0){
702
364
perror("set_cloexec_flag");
703
365
exitstatus = EXIT_FAILURE;
704
goto fallback;
705
}
706
/* Block SIGCHLD until process is safely in process list */
707
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
708
if(ret < 0){
709
perror("sigprocmask");
710
exitstatus = EXIT_FAILURE;
711
goto fallback;
366
goto end;
712
367
}
713
368
// Starting a new process to be watched
714
369
pid_t pid = fork();
715
if(pid == -1){
716
perror("fork");
717
exitstatus = EXIT_FAILURE;
718
goto fallback;
719
}
720
370
if(pid == 0){
721
371
/* this is the child process */
722
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
723
if(ret < 0){
724
perror("sigaction");
725
_exit(EXIT_FAILURE);
726
}
727
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
728
if(ret < 0){
729
perror("sigprocmask");
730
_exit(EXIT_FAILURE);
731
}
732
733
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
734
if(ret == -1){
735
perror("dup2");
736
_exit(EXIT_FAILURE);
737
}
372
dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
738
373
739
374
if(dirfd(dir) < 0){
740
375
/* If dir has no file descriptor, we could not set FD_CLOEXEC
741
above and must now close it manually here. */
376
and must close it manually */
742
377
closedir(dir);
743
378
}
744
if(p->environ[0] == NULL){
745
if(execv(filename, p->argv) < 0){
746
perror("execv");
747
_exit(EXIT_FAILURE);
748
}
749
} else {
750
if(execve(filename, p->argv, p->environ) < 0){
751
perror("execve");
752
_exit(EXIT_FAILURE);
753
}
379
if(execv(filename, p->argv) < 0){
380
perror("execv");
381
_exit(EXIT_FAILURE);
754
382
}
755
383
/* no return */
756
384
}
757
385
/* parent process */
758
free(filename);
759
386
close(pipefd[1]); /* close unused write end of pipe */
760
387
process *new_process = malloc(sizeof(process));
761
388
if (new_process == NULL){
762
389
perror("malloc");
763
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
764
if(ret < 0){
765
perror("sigprocmask");
766
}
767
390
exitstatus = EXIT_FAILURE;
768
goto fallback;
391
goto end;
769
392
}
770
393
771
394
*new_process = (struct process){ .pid = pid,
772
395
.fd = pipefd[0],
773
396
.next = process_list };
774
// List handling
775
process_list = new_process;
776
/* Unblock SIGCHLD so signal handler can be run if this process
777
has already completed */
778
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
779
if(ret < 0){
780
perror("sigprocmask");
781
exitstatus = EXIT_FAILURE;
782
goto fallback;
783
}
784
785
397
FD_SET(new_process->fd, &rfds_all);
786
398
787
399
if (maxfd < new_process->fd){
788
400
maxfd = new_process->fd;
789
401
}
790
402
403
//List handling
404
process_list = new_process;
791
405
}
792
406
793
free_plugin_list(plugin_list);
794
plugin_list = NULL;
407
/* Free the plugin list */
408
for(plugin *next; plugin_list != NULL; plugin_list = next){
409
next = plugin_list->next;
410
free(plugin_list->argv);
411
free(plugin_list);
412
}
795
413
796
414
closedir(dir);
797
dir = NULL;
798
415
799
416
if (process_list == NULL){
800
fprintf(stderr, "No plugin processes started. Incorrect plugin"
801
" directory?\n");
802
process_list = NULL;
417
fprintf(stderr, "No plugin processes started, exiting\n");
418
return EXIT_FAILURE;
803
419
}
804
while(process_list){
420
while(true){
805
421
fd_set rfds = rfds_all;
806
422
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
807
423
if (select_ret == -1){
808
424
perror("select");
809
425
exitstatus = EXIT_FAILURE;
810
goto fallback;
426
goto end;
811
427
}
812
/* OK, now either a process completed, or something can be read
813
from one of them */
814
428
for(process *proc = process_list; proc ; proc = proc->next){
815
/* Is this process completely done? */
816
if(proc->eof and proc->completed){
817
/* Only accept the plugin output if it exited cleanly */
818
if(not WIFEXITED(proc->status)
819
or WEXITSTATUS(proc->status) != 0){
820
/* Bad exit by plugin */
821
if(debug){
822
if(WIFEXITED(proc->status)){
823
fprintf(stderr, "Plugin %u exited with status %d\n",
824
(unsigned int) (proc->pid),
825
WEXITSTATUS(proc->status));
826
} else if(WIFSIGNALED(proc->status)) {
827
fprintf(stderr, "Plugin %u killed by signal %d\n",
828
(unsigned int) (proc->pid),
829
WTERMSIG(proc->status));
830
} else if(WCOREDUMP(proc->status)){
831
fprintf(stderr, "Plugin %d dumped core\n",
832
(unsigned int) (proc->pid));
833
}
834
}
835
/* Remove the plugin */
836
FD_CLR(proc->fd, &rfds_all);
837
/* Block signal while modifying process_list */
838
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
839
if(ret < 0){
840
perror("sigprocmask");
841
exitstatus = EXIT_FAILURE;
842
goto fallback;
843
}
844
/* Delete this process entry from the list */
845
if(process_list == proc){
846
/* First one - simple */
847
process_list = proc->next;
848
} else {
849
/* Second one or later */
850
for(process *p = process_list; p != NULL; p = p->next){
851
if(p->next == proc){
852
p->next = proc->next;
853
break;
854
}
855
}
856
}
857
/* We are done modifying process list, so unblock signal */
858
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
859
NULL);
860
if(ret < 0){
861
perror("sigprocmask");
862
}
863
free(proc->buffer);
864
free(proc);
865
/* We deleted this process from the list, so we can't go
866
proc->next. Therefore, start over from the beginning of
867
the process list */
868
break;
869
}
870
/* This process exited nicely, so print its buffer */
871
872
bool bret = print_out_password(proc->buffer, proc->buffer_length);
873
if(not bret){
874
perror("print_out_password");
875
exitstatus = EXIT_FAILURE;
876
}
877
goto fallback;
878
}
879
/* This process has not completed. Does it have any output? */
880
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
881
/* This process had nothing to say at this time */
429
if(not FD_ISSET(proc->fd, &rfds)){
882
430
continue;
883
431
}
884
/* Before reading, make the process' data buffer large enough */
885
432
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
886
433
proc->buffer = realloc(proc->buffer, proc->buffer_size
887
434
+ (size_t) BUFFER_SIZE);
888
435
if (proc->buffer == NULL){
889
436
perror("malloc");
890
437
exitstatus = EXIT_FAILURE;
891
goto fallback;
438
goto end;
892
439
}
893
440
proc->buffer_size += BUFFER_SIZE;
894
441
}
895
/* Read from the process */
896
442
ret = read(proc->fd, proc->buffer + proc->buffer_length,
897
443
BUFFER_SIZE);
898
444
if(ret < 0){
899
/* Read error from this process; ignore the error */
445
/* Read error from this process; ignore it */
900
446
continue;
901
447
}
448
proc->buffer_length += (size_t) ret;
902
449
if(ret == 0){
903
450
/* got EOF */
904
proc->eof = true;
905
} else {
906
proc->buffer_length += (size_t) ret;
451
/* wait for process exit */
452
int status;
453
waitpid(proc->pid, &status, 0);
454
if(not WIFEXITED(status) or WEXITSTATUS(status) != 0){
455
FD_CLR(proc->fd, &rfds_all);
456
continue;
457
}
458
for(size_t written = 0;
459
written < proc->buffer_length; written += (size_t)ret){
460
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO,
461
proc->buffer + written,
462
proc->buffer_length
463
- written));
464
if(ret < 0){
465
perror("write");
466
exitstatus = EXIT_FAILURE;
467
goto end;
468
}
469
}
470
goto end;
907
471
}
908
472
}
909
473
}
910
911
912
fallback:
913
914
if(process_list == NULL or exitstatus != EXIT_SUCCESS){
915
/* Fallback if all plugins failed, none are found or an error occured */
916
bool bret;
917
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
918
char *passwordbuffer = getpass("Password: ");
919
bret = print_out_password(passwordbuffer, strlen(passwordbuffer));
920
if(not bret){
921
perror("print_out_password");
922
exitstatus = EXIT_FAILURE;
923
}
924
}
925
926
/* Restore old signal handler */
927
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
928
if(ret == -1){
929
perror("sigaction");
930
exitstatus = EXIT_FAILURE;
931
}
932
933
if(custom_argv != NULL){
934
for(char **arg = custom_argv; *arg != NULL; arg++){
935
free(*arg);
936
}
937
free(custom_argv);
938
}
939
free_plugin_list(plugin_list);
940
941
if(dir != NULL){
942
closedir(dir);
943
}
944
945
/* Free the process list and kill the processes */
474
475
end:
946
476
for(process *next; process_list != NULL; process_list = next){
947
next = process_list->next;
948
477
close(process_list->fd);
949
ret = kill(process_list->pid, SIGTERM);
950
if(ret == -1 and errno != ESRCH){
951
/* set-uid proccesses migth not get closed */
952
perror("kill");
953
}
478
kill(process_list->pid, SIGTERM);
954
479
free(process_list->buffer);
955
480
free(process_list);
956
481
}
957
482
958
/* Wait for any remaining child processes to terminate */
959
do{
960
ret = wait(NULL);
961
} while(ret >= 0);
962
if(errno != ECHILD){
963
perror("wait");
964
}
965
483
while(true){
484
int status;
485
ret = wait(&status);
486
if (ret == -1){
487
if(errno != ECHILD){
488
perror("wait");
489
}
490
break;
491
}
492
}
966
493
return exitstatus;
967
494
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0