To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos-client.c
- browse files at revision 24.1.46
- compare with another revision
- download diff
- download tarball
- view history from revision 24.1.46
- Committer: Björn Påhlsson
- Date: 2008-08-12 16:29:05 UTC
- mto: (24.1.154 mandos) (237.4.3 mandos-release)
- mto: This revision was merged to the branch mainline in revision 69.
- Revision ID: belorn@braxen-20080812162905-6zm7vdvj81wkumwb
mandos-client
Better error handling for failing to start plugins
Handle fork errors
password-request
correct exit routine
Better error handling for failing to start plugins
Handle fork errors
password-request
correct exit routine
- files added:
- network-protocol.txt
- files removed:
- .bzrignore
- files renamed:
- plugin-runner.c => mandos-client.c
- plugin-runner.xml => mandos-client.xml
- plugins.d/mandos-client.c => plugins.d/password-request.c
- plugins.d/mandos-client.xml => plugins.d/password-request.xml
- files modified:
- Makefile
added
removed
mandos-client.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() */
24
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY() */
25
26
26
#include <stddef.h> /* size_t, NULL */
27
27
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
28
28
EXIT_SUCCESS, realloc() */
51
51
close() */
52
52
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
53
53
FD_CLOEXEC */
54
#include <string.h> /* strsep, strlen(), asprintf() */
54
#include <string.h> /* strtok, strlen(), strcpy(),
55
strcat() */
55
56
#include <errno.h> /* errno */
56
57
#include <argp.h> /* struct argp_option, struct
57
58
argp_state, struct argp,
58
59
argp_parse(), ARGP_ERR_UNKNOWN,
59
ARGP_KEY_END, ARGP_KEY_ARG,
60
error_t */
60
ARGP_KEY_END, ARGP_KEY_ARG, error_t */
61
61
#include <signal.h> /* struct sigaction, sigemptyset(),
62
62
sigaddset(), sigaction(),
63
63
sigprocmask(), SIG_BLOCK, SIGCHLD,
66
66
67
67
#define BUFFER_SIZE 256
68
68
69
#define PDIR "/lib/mandos/plugins.d"
70
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
71
72
const char *argp_program_version = "plugin-runner 1.0";
69
const char *argp_program_version = "mandos-client 1.0";
73
70
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
74
71
75
struct plugin;
76
77
typedef struct plugin{
78
char *name; /* can be NULL or any plugin name */
79
char **argv;
80
int argc;
81
char **environ;
82
int envc;
83
bool disabled;
84
85
/* Variables used for running processes*/
72
struct process;
73
74
typedef struct process{
86
75
pid_t pid;
87
76
int fd;
88
77
char *buffer;
89
78
size_t buffer_size;
90
79
size_t buffer_length;
91
80
bool eof;
92
volatile bool completed;
93
volatile int status;
81
bool completed;
82
int status;
83
struct process *next;
84
} process;
85
86
typedef struct plugin{
87
char *name; /* can be NULL or any plugin name */
88
char **argv;
89
int argc;
90
bool disabled;
94
91
struct plugin *next;
95
92
} plugin;
96
93
97
static plugin *plugin_list = NULL;
98
99
/* Gets an existing plugin based on name,
100
or if none is found, creates a new one */
101
static plugin *getplugin(char *name){
102
/* Check for exiting plugin with that name */
103
for (plugin *p = plugin_list; p != NULL; p = p->next){
94
static plugin *getplugin(char *name, plugin **plugin_list){
95
for (plugin *p = *plugin_list; p != NULL; p = p->next){
104
96
if ((p->name == name)
105
97
or (p->name and name and (strcmp(p->name, name) == 0))){
106
98
return p;
109
101
/* Create a new plugin */
110
102
plugin *new_plugin = malloc(sizeof(plugin));
111
103
if (new_plugin == NULL){
112
return NULL;
113
}
114
char *copy_name = NULL;
115
if(name != NULL){
116
copy_name = strdup(name);
117
if(copy_name == NULL){
118
return NULL;
119
}
120
}
121
122
*new_plugin = (plugin) { .name = copy_name,
123
.argc = 1,
124
.disabled = false,
125
.next = plugin_list };
126
104
perror("malloc");
105
exit(EXIT_FAILURE);
106
}
107
new_plugin->name = name;
127
108
new_plugin->argv = malloc(sizeof(char *) * 2);
128
109
if (new_plugin->argv == NULL){
129
free(copy_name);
130
free(new_plugin);
131
return NULL;
110
perror("malloc");
111
exit(EXIT_FAILURE);
132
112
}
133
new_plugin->argv[0] = copy_name;
113
new_plugin->argv[0] = name;
134
114
new_plugin->argv[1] = NULL;
135
136
new_plugin->environ = malloc(sizeof(char *));
137
if(new_plugin->environ == NULL){
138
free(copy_name);
139
free(new_plugin->argv);
140
free(new_plugin);
141
return NULL;
142
}
143
new_plugin->environ[0] = NULL;
144
115
new_plugin->argc = 1;
116
new_plugin->disabled = false;
117
new_plugin->next = *plugin_list;
145
118
/* Append the new plugin to the list */
146
plugin_list = new_plugin;
119
*plugin_list = new_plugin;
147
120
return new_plugin;
148
121
}
149
122
150
/* Helper function for add_argument and add_environment */
151
static bool add_to_char_array(const char *new, char ***array,
152
int *len){
153
/* Resize the pointed-to array to hold one more pointer */
154
*array = realloc(*array, sizeof(char *)
155
* (size_t) ((*len) + 2));
156
/* Malloc check */
157
if(*array == NULL){
158
return false;
159
}
160
/* Make a copy of the new string */
161
char *copy = strdup(new);
162
if(copy == NULL){
163
return false;
164
}
165
/* Insert the copy */
166
(*array)[*len] = copy;
167
(*len)++;
168
/* Add a new terminating NULL pointer to the last element */
169
(*array)[*len] = NULL;
170
return true;
171
}
172
173
/* Add to a plugin's argument vector */
174
static bool add_argument(plugin *p, const char *arg){
175
if(p == NULL){
176
return false;
177
}
178
return add_to_char_array(arg, &(p->argv), &(p->argc));
179
}
180
181
/* Add to a plugin's environment */
182
static bool add_environment(plugin *p, const char *def, bool replace){
183
if(p == NULL){
184
return false;
185
}
186
/* namelen = length of name of environment variable */
187
size_t namelen = (size_t)(strchrnul(def, '=') - def);
188
/* Search for this environment variable */
189
for(char **e = p->environ; *e != NULL; e++){
190
if(strncmp(*e, def, namelen + 1) == 0){
191
/* It already exists */
192
if(replace){
193
char *new = realloc(*e, strlen(def) + 1);
194
if(new == NULL){
195
return false;
196
}
197
*e = new;
198
strcpy(*e, def);
199
}
200
return true;
201
}
202
}
203
return add_to_char_array(def, &(p->environ), &(p->envc));
123
static void addargument(plugin *p, char *arg){
124
p->argv[p->argc] = arg;
125
p->argv = realloc(p->argv, sizeof(char *) * (size_t)(p->argc + 2));
126
if (p->argv == NULL){
127
perror("malloc");
128
exit(EXIT_FAILURE);
129
}
130
p->argc++;
131
p->argv[p->argc] = NULL;
204
132
}
205
133
206
134
/*
219
147
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
220
148
}
221
149
150
process *process_list = NULL;
222
151
223
/* Mark processes as completed when they exit, and save their exit
152
/* Mark a process as completed when it exits, and save its exit
224
153
status. */
225
154
void handle_sigchld(__attribute__((unused)) int sig){
226
while(true){
227
plugin *proc = plugin_list;
228
int status;
229
pid_t pid = waitpid(-1, &status, WNOHANG);
230
if(pid == 0){
231
/* Only still running child processes */
232
break;
233
}
234
if(pid == -1){
235
if (errno != ECHILD){
236
perror("waitpid");
237
}
238
/* No child processes */
239
break;
240
}
241
242
/* A child exited, find it in process_list */
243
while(proc != NULL and proc->pid != pid){
244
proc = proc->next;
245
}
246
if(proc == NULL){
247
/* Process not found in process list */
248
continue;
249
}
250
proc->status = status;
251
proc->completed = true;
252
}
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;
253
171
}
254
172
255
/* Prints out a password to stdout */
256
173
bool print_out_password(const char *buffer, size_t length){
257
174
ssize_t ret;
175
if(length>0 and buffer[length-1] == '\n'){
176
length--;
177
}
258
178
for(size_t written = 0; written < length; written += (size_t)ret){
259
179
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,
260
180
length - written));
265
185
return true;
266
186
}
267
187
268
/* Removes and free a plugin from the plugin list */
269
static void free_plugin(plugin *plugin_node){
270
271
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
272
free(*arg);
273
}
274
free(plugin_node->argv);
275
for(char **env = plugin_node->environ; *env != NULL; env++){
276
free(*env);
277
}
278
free(plugin_node->environ);
279
free(plugin_node->buffer);
280
281
/* Removes the plugin from the singly-linked list */
282
if(plugin_node == plugin_list){
283
/* First one - simple */
284
plugin_list = plugin_list->next;
285
} else {
286
/* Second one or later */
287
for(plugin *p = plugin_list; p != NULL; p = p->next){
288
if(p->next == plugin_node){
289
p->next = plugin_node->next;
290
break;
291
}
292
}
293
}
294
295
free(plugin_node);
296
}
297
298
static void free_plugin_list(void){
299
while(plugin_list != NULL){
300
free_plugin(plugin_list);
301
}
302
}
303
304
188
int main(int argc, char *argv[]){
305
char *plugindir = NULL;
306
char *argfile = NULL;
307
FILE *conffp;
189
const char *plugindir = "/conf/conf.d/mandos/plugins.d";
308
190
size_t d_name_len;
309
191
DIR *dir = NULL;
310
192
struct dirent *dirst;
318
200
struct sigaction old_sigchld_action;
319
201
struct sigaction sigchld_action = { .sa_handler = handle_sigchld,
320
202
.sa_flags = SA_NOCLDSTOP };
321
char **custom_argv = NULL;
322
int custom_argc = 0;
203
char *plus_options = NULL;
204
char **plus_argv = NULL;
205
206
errno = 0;
323
207
324
208
/* Establish a signal handler */
325
209
sigemptyset(&sigchld_action.sa_mask);
326
210
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
327
if(ret == -1){
211
if(ret < 0){
328
212
perror("sigaddset");
329
exitstatus = EXIT_FAILURE;
330
goto fallback;
213
exit(EXIT_FAILURE);
331
214
}
332
215
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
333
if(ret == -1){
216
if(ret < 0){
334
217
perror("sigaction");
335
exitstatus = EXIT_FAILURE;
336
goto fallback;
218
exit(EXIT_FAILURE);
337
219
}
338
220
339
221
/* The options we understand. */
341
223
{ .name = "global-options", .key = 'g',
342
224
.arg = "OPTION[,OPTION[,...]]",
343
225
.doc = "Options passed to all plugins" },
344
{ .name = "global-env", .key = 'G',
345
.arg = "VAR=value",
346
.doc = "Environment variable passed to all plugins" },
347
226
{ .name = "options-for", .key = 'o',
348
227
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
349
228
.doc = "Options passed only to specified plugin" },
350
{ .name = "env-for", .key = 'E',
351
.arg = "PLUGIN:ENV=value",
352
.doc = "Environment variable passed to specified plugin" },
353
229
{ .name = "disable", .key = 'd',
354
230
.arg = "PLUGIN",
355
231
.doc = "Disable a specific plugin", .group = 1 },
356
{ .name = "enable", .key = 'e',
357
.arg = "PLUGIN",
358
.doc = "Enable a specific plugin", .group = 1 },
359
232
{ .name = "plugin-dir", .key = 128,
360
233
.arg = "DIRECTORY",
361
234
.doc = "Specify a different plugin directory", .group = 2 },
362
{ .name = "config-file", .key = 129,
363
.arg = "FILE",
364
.doc = "Specify a different configuration file", .group = 2 },
365
{ .name = "userid", .key = 130,
366
.arg = "ID", .flags = 0,
367
.doc = "User ID the plugins will run as", .group = 3 },
368
{ .name = "groupid", .key = 131,
369
.arg = "ID", .flags = 0,
370
.doc = "Group ID the plugins will run as", .group = 3 },
371
{ .name = "debug", .key = 132,
372
.doc = "Debug mode", .group = 4 },
235
{ .name = "userid", .key = 129,
236
.arg = "ID", .flags = 0,
237
.doc = "User ID the plugins will run as", .group = 2 },
238
{ .name = "groupid", .key = 130,
239
.arg = "ID", .flags = 0,
240
.doc = "Group ID the plugins will run as", .group = 2 },
241
{ .name = "debug", .key = 131,
242
.doc = "Debug mode", .group = 3 },
373
243
{ .name = NULL }
374
244
};
375
245
376
error_t parse_opt (int key, char *arg, __attribute__((unused))
377
struct argp_state *state) {
246
error_t parse_opt (int key, char *arg, struct argp_state *state) {
247
/* Get the INPUT argument from `argp_parse', which we know is a
248
pointer to our plugin list pointer. */
249
plugin **plugins = state->input;
378
250
switch (key) {
379
case 'g': /* --global-options */
380
if (arg != NULL){
381
char *p;
382
while((p = strsep(&arg, ",")) != NULL){
383
if(p[0] == '\0'){
384
continue;
385
}
386
if(not add_argument(getplugin(NULL), p)){
387
perror("add_argument");
388
return ARGP_ERR_UNKNOWN;
389
}
390
}
391
}
392
break;
393
case 'G': /* --global-env */
394
if(arg == NULL){
395
break;
396
}
397
if(not add_environment(getplugin(NULL), arg, true)){
398
perror("add_environment");
399
}
400
break;
401
case 'o': /* --options-for */
402
if (arg != NULL){
403
char *p_name = strsep(&arg, ":");
404
if(p_name[0] == '\0' or arg == NULL){
405
break;
406
}
407
char *opt = strsep(&arg, ":");
408
if(opt[0] == '\0' or opt == NULL){
409
break;
410
}
411
char *p;
412
while((p = strsep(&opt, ",")) != NULL){
413
if(p[0] == '\0'){
414
continue;
415
}
416
if(not add_argument(getplugin(p_name), p)){
417
perror("add_argument");
418
return ARGP_ERR_UNKNOWN;
419
}
420
}
421
}
422
break;
423
case 'E': /* --env-for */
424
if(arg == NULL){
425
break;
426
}
427
{
428
char *envdef = strchr(arg, ':');
429
if(envdef == NULL){
430
break;
431
}
432
*envdef = '\0';
433
if(not add_environment(getplugin(arg), envdef+1, true)){
434
perror("add_environment");
435
}
436
}
437
break;
438
case 'd': /* --disable */
439
if (arg != NULL){
440
plugin *p = getplugin(arg);
441
if(p == NULL){
442
return ARGP_ERR_UNKNOWN;
443
}
444
p->disabled = true;
445
}
446
break;
447
case 'e': /* --enable */
448
if (arg != NULL){
449
plugin *p = getplugin(arg);
450
if(p == NULL){
451
return ARGP_ERR_UNKNOWN;
452
}
453
p->disabled = false;
454
}
455
break;
456
case 128: /* --plugin-dir */
457
free(plugindir);
458
plugindir = strdup(arg);
459
if(plugindir == NULL){
460
perror("strdup");
461
}
462
break;
463
case 129: /* --config-file */
464
/* This is already done by parse_opt_config_file() */
465
break;
466
case 130: /* --userid */
251
case 'g':
252
if (arg != NULL){
253
char *p = strtok(arg, ",");
254
do{
255
addargument(getplugin(NULL, plugins), p);
256
p = strtok(NULL, ",");
257
} while (p != NULL);
258
}
259
break;
260
case 'o':
261
if (arg != NULL){
262
char *name = strtok(arg, ":");
263
char *p = strtok(NULL, ":");
264
if(p != NULL){
265
p = strtok(p, ",");
266
do{
267
addargument(getplugin(name, plugins), p);
268
p = strtok(NULL, ",");
269
} while (p != NULL);
270
}
271
}
272
break;
273
case 'd':
274
if (arg != NULL){
275
getplugin(arg, plugins)->disabled = true;
276
}
277
break;
278
case 128:
279
plugindir = arg;
280
break;
281
case 129:
467
282
uid = (uid_t)strtol(arg, NULL, 10);
468
283
break;
469
case 131: /* --groupid */
284
case 130:
470
285
gid = (gid_t)strtol(arg, NULL, 10);
471
286
break;
472
case 132: /* --debug */
287
case 131:
473
288
debug = true;
474
289
break;
475
290
case ARGP_KEY_ARG:
476
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
477
break;
478
case ARGP_KEY_END:
479
break;
480
default:
481
return ARGP_ERR_UNKNOWN;
482
}
483
return 0;
484
}
485
486
/* This option parser is the same as parse_opt() above, except it
487
ignores everything but the --config-file option. */
488
error_t parse_opt_config_file (int key, char *arg,
489
__attribute__((unused))
490
struct argp_state *state) {
491
switch (key) {
492
case 'g': /* --global-options */
493
case 'G': /* --global-env */
494
case 'o': /* --options-for */
495
case 'E': /* --env-for */
496
case 'd': /* --disable */
497
case 'e': /* --enable */
498
case 128: /* --plugin-dir */
499
break;
500
case 129: /* --config-file */
501
free(argfile);
502
argfile = strdup(arg);
503
if(argfile == NULL){
504
perror("strdup");
291
if(plus_options != NULL or arg == NULL or arg[0] != '+'){
292
argp_usage (state);
505
293
}
506
break;
507
case 130: /* --userid */
508
case 131: /* --groupid */
509
case 132: /* --debug */
510
case ARGP_KEY_ARG:
294
plus_options = arg;
295
break;
511
296
case ARGP_KEY_END:
512
297
break;
513
298
default:
516
301
return 0;
517
302
}
518
303
519
struct argp argp = { .options = options,
520
.parser = parse_opt_config_file,
521
.args_doc = "",
304
plugin *plugin_list = NULL;
305
306
struct argp argp = { .options = options, .parser = parse_opt,
307
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
522
308
.doc = "Mandos plugin runner -- Run plugins" };
523
309
524
/* Parse using the parse_opt_config_file in order to get the custom
525
config file location, if any. */
526
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
310
ret = argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
527
311
if (ret == ARGP_ERR_UNKNOWN){
528
312
fprintf(stderr, "Unknown error while parsing arguments\n");
529
313
exitstatus = EXIT_FAILURE;
530
goto fallback;
314
goto end;
531
315
}
532
316
533
/* Reset to the normal argument parser */
534
argp.parser = parse_opt;
535
536
/* Open the configfile if available */
537
if (argfile == NULL){
538
conffp = fopen(AFILE, "r");
539
} else {
540
conffp = fopen(argfile, "r");
541
}
542
if(conffp != NULL){
543
char *org_line = NULL;
544
char *p, *arg, *new_arg, *line;
545
size_t size = 0;
546
ssize_t sret;
547
const char whitespace_delims[] = " \r\t\f\v\n";
548
const char comment_delim[] = "#";
549
550
custom_argc = 1;
551
custom_argv = malloc(sizeof(char*) * 2);
552
if(custom_argv == NULL){
317
if(plus_options){
318
/* This is a mangled argument in the form of
319
"+--option+--other-option=parameter+--yet-another-option", etc */
320
/* Make new argc and argv vars, and call argp_parse() again. */
321
plus_options++; /* skip the first '+' character */
322
const char delims[] = "+";
323
char *arg;
324
int new_argc = 1;
325
plus_argv = malloc(sizeof(char*) * 2);
326
if(plus_argv == NULL){
553
327
perror("malloc");
554
328
exitstatus = EXIT_FAILURE;
555
goto fallback;
556
}
557
custom_argv[0] = argv[0];
558
custom_argv[1] = NULL;
559
560
/* for each line in the config file, strip whitespace and ignore
561
commented text */
562
while(true){
563
sret = getline(&org_line, &size, conffp);
564
if(sret == -1){
565
break;
566
}
567
568
line = org_line;
569
arg = strsep(&line, comment_delim);
570
while((p = strsep(&arg, whitespace_delims)) != NULL){
571
if(p[0] == '\0'){
572
continue;
573
}
574
new_arg = strdup(p);
575
if(new_arg == NULL){
576
perror("strdup");
577
exitstatus = EXIT_FAILURE;
578
free(org_line);
579
goto fallback;
580
}
581
582
custom_argc += 1;
583
custom_argv = realloc(custom_argv, sizeof(char *)
584
* ((unsigned int) custom_argc + 1));
585
if(custom_argv == NULL){
586
perror("realloc");
587
exitstatus = EXIT_FAILURE;
588
free(org_line);
589
goto fallback;
590
}
591
custom_argv[custom_argc-1] = new_arg;
592
custom_argv[custom_argc] = NULL;
593
}
594
}
595
free(org_line);
596
} else {
597
/* Check for harmful errors and go to fallback. Other errors might
598
not affect opening plugins */
599
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
600
perror("fopen");
601
exitstatus = EXIT_FAILURE;
602
goto fallback;
603
}
604
}
605
/* If there was any arguments from configuration file,
606
pass them to parser as command arguments */
607
if(custom_argv != NULL){
608
ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
609
0, NULL);
329
goto end;
330
}
331
plus_argv[0] = argv[0];
332
plus_argv[1] = NULL;
333
arg = strtok(plus_options, delims); /* Get first argument */
334
while(arg != NULL){
335
new_argc++;
336
plus_argv = realloc(plus_argv, sizeof(char *)
337
* ((unsigned int) new_argc + 1));
338
if(plus_argv == NULL){
339
perror("realloc");
340
exitstatus = EXIT_FAILURE;
341
goto end;
342
}
343
plus_argv[new_argc-1] = arg;
344
plus_argv[new_argc] = NULL;
345
arg = strtok(NULL, delims); /* Get next argument */
346
}
347
ret = argp_parse (&argp, new_argc, plus_argv, 0, 0, &plugin_list);
610
348
if (ret == ARGP_ERR_UNKNOWN){
611
349
fprintf(stderr, "Unknown error while parsing arguments\n");
612
350
exitstatus = EXIT_FAILURE;
613
goto fallback;
351
goto end;
614
352
}
615
353
}
616
354
617
/* Parse actual command line arguments, to let them override the
618
config file */
619
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
620
if (ret == ARGP_ERR_UNKNOWN){
621
fprintf(stderr, "Unknown error while parsing arguments\n");
622
exitstatus = EXIT_FAILURE;
623
goto fallback;
624
}
625
626
355
if(debug){
627
356
for(plugin *p = plugin_list; p != NULL; p=p->next){
628
357
fprintf(stderr, "Plugin: %s has %d arguments\n",
630
359
for(char **a = p->argv; *a != NULL; a++){
631
360
fprintf(stderr, "\tArg: %s\n", *a);
632
361
}
633
fprintf(stderr, "...and %u environment variables\n", p->envc);
634
for(char **a = p->environ; *a != NULL; a++){
635
fprintf(stderr, "\t%s\n", *a);
636
}
637
362
}
638
363
}
639
364
640
/* Strip permissions down to nobody */
641
365
ret = setuid(uid);
642
366
if (ret == -1){
643
367
perror("setuid");
644
}
368
}
369
645
370
setgid(gid);
646
371
if (ret == -1){
647
372
perror("setgid");
648
373
}
649
374
650
if (plugindir == NULL){
651
dir = opendir(PDIR);
652
} else {
653
dir = opendir(plugindir);
654
}
655
375
dir = opendir(plugindir);
656
376
if(dir == NULL){
657
377
perror("Could not open plugin dir");
658
378
exitstatus = EXIT_FAILURE;
659
goto fallback;
379
goto end;
660
380
}
661
381
662
382
/* Set the FD_CLOEXEC flag on the directory, if possible */
667
387
if(ret < 0){
668
388
perror("set_cloexec_flag");
669
389
exitstatus = EXIT_FAILURE;
670
goto fallback;
390
goto end;
671
391
}
672
392
}
673
393
}
674
394
675
395
FD_ZERO(&rfds_all);
676
396
677
/* Read and execute any executable in the plugin directory*/
678
397
while(true){
679
398
dirst = readdir(dir);
680
399
681
/* All directory entries have been processed */
400
// All directory entries have been processed
682
401
if(dirst == NULL){
683
402
if (errno == EBADF){
684
403
perror("readdir");
685
404
exitstatus = EXIT_FAILURE;
686
goto fallback;
405
goto end;
687
406
}
688
407
break;
689
408
}
690
409
691
410
d_name_len = strlen(dirst->d_name);
692
411
693
/* Ignore dotfiles, backup files and other junk */
412
// Ignore dotfiles, backup files and other junk
694
413
{
695
414
bool bad_name = false;
696
415
711
430
break;
712
431
}
713
432
}
433
714
434
if(bad_name){
715
435
continue;
716
436
}
437
717
438
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
718
439
size_t suf_len = strlen(*suf);
719
440
if((d_name_len >= suf_len)
732
453
continue;
733
454
}
734
455
}
735
736
char *filename;
737
if(plugindir == NULL){
738
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
739
} else {
740
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
741
}
742
if(ret < 0){
743
perror("asprintf");
456
457
char *filename = malloc(d_name_len + strlen(plugindir) + 2);
458
if (filename == NULL){
459
perror("malloc");
744
460
continue;
745
461
}
462
strcpy(filename, plugindir); /* Spurious warning */
463
strcat(filename, "/"); /* Spurious warning */
464
strcat(filename, dirst->d_name); /* Spurious warning */
746
465
747
466
ret = stat(filename, &st);
748
467
if (ret == -1){
750
469
free(filename);
751
470
continue;
752
471
}
753
754
/* Ignore non-executable files */
472
755
473
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
756
474
if(debug){
757
475
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
760
478
free(filename);
761
479
continue;
762
480
}
763
764
plugin *p = getplugin(dirst->d_name);
765
if(p == NULL){
766
perror("getplugin");
767
free(filename);
768
continue;
769
}
770
if(p->disabled){
481
if(getplugin(dirst->d_name, &plugin_list)->disabled){
771
482
if(debug){
772
483
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
773
484
dirst->d_name);
775
486
free(filename);
776
487
continue;
777
488
}
489
plugin *p = getplugin(dirst->d_name, &plugin_list);
778
490
{
779
491
/* Add global arguments to argument list for this plugin */
780
plugin *g = getplugin(NULL);
781
if(g != NULL){
782
for(char **a = g->argv + 1; *a != NULL; a++){
783
if(not add_argument(p, *a)){
784
perror("add_argument");
785
}
786
}
787
/* Add global environment variables */
788
for(char **e = g->environ; *e != NULL; e++){
789
if(not add_environment(p, *e, false)){
790
perror("add_environment");
791
}
792
}
793
}
794
}
795
/* If this plugin has any environment variables, we will call
796
using execve and need to duplicate the environment from this
797
process, too. */
798
if(p->environ[0] != NULL){
799
for(char **e = environ; *e != NULL; e++){
800
if(not add_environment(p, *e, false)){
801
perror("add_environment");
802
}
803
}
804
}
805
806
int pipefd[2];
492
plugin *g = getplugin(NULL, &plugin_list);
493
for(char **a = g->argv + 1; *a != NULL; a++){
494
addargument(p, *a);
495
}
496
}
497
int pipefd[2];
807
498
ret = pipe(pipefd);
808
499
if (ret == -1){
809
500
perror("pipe");
810
501
exitstatus = EXIT_FAILURE;
811
goto fallback;
502
goto end;
812
503
}
813
/* Ask OS to automatic close the pipe on exec */
814
504
ret = set_cloexec_flag(pipefd[0]);
815
505
if(ret < 0){
816
506
perror("set_cloexec_flag");
817
507
exitstatus = EXIT_FAILURE;
818
goto fallback;
508
goto end;
819
509
}
820
510
ret = set_cloexec_flag(pipefd[1]);
821
511
if(ret < 0){
822
512
perror("set_cloexec_flag");
823
513
exitstatus = EXIT_FAILURE;
824
goto fallback;
514
goto end;
825
515
}
826
516
/* Block SIGCHLD until process is safely in process list */
827
517
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
828
518
if(ret < 0){
829
519
perror("sigprocmask");
830
520
exitstatus = EXIT_FAILURE;
831
goto fallback;
521
goto end;
832
522
}
833
/* Starting a new process to be watched */
523
// Starting a new process to be watched
834
524
pid_t pid = fork();
835
525
if(pid == -1){
836
526
perror("fork");
837
527
exitstatus = EXIT_FAILURE;
838
goto fallback;
528
goto end;
839
529
}
840
530
if(pid == 0){
841
531
/* this is the child process */
861
551
above and must now close it manually here. */
862
552
closedir(dir);
863
553
}
864
if(p->environ[0] == NULL){
865
if(execv(filename, p->argv) < 0){
866
perror("execv");
867
_exit(EXIT_FAILURE);
868
}
869
} else {
870
if(execve(filename, p->argv, p->environ) < 0){
871
perror("execve");
872
_exit(EXIT_FAILURE);
873
}
554
if(execv(filename, p->argv) < 0){
555
perror("execv");
556
_exit(EXIT_FAILURE);
874
557
}
875
558
/* no return */
876
559
}
877
/* Parent process */
878
close(pipefd[1]); /* Close unused write end of pipe */
560
/* parent process */
879
561
free(filename);
880
plugin *new_plugin = getplugin(dirst->d_name);
881
if (new_plugin == NULL){
882
perror("getplugin");
562
close(pipefd[1]); /* close unused write end of pipe */
563
process *new_process = malloc(sizeof(process));
564
if (new_process == NULL){
565
perror("malloc");
883
566
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
884
567
if(ret < 0){
885
perror("sigprocmask");
568
perror("sigprocmask");
886
569
}
887
570
exitstatus = EXIT_FAILURE;
888
goto fallback;
571
goto end;
889
572
}
890
573
891
new_plugin->pid = pid;
892
new_plugin->fd = pipefd[0];
893
574
*new_process = (struct process){ .pid = pid,
575
.fd = pipefd[0],
576
.next = process_list };
577
// List handling
578
process_list = new_process;
894
579
/* Unblock SIGCHLD so signal handler can be run if this process
895
580
has already completed */
896
581
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
897
582
if(ret < 0){
898
583
perror("sigprocmask");
899
584
exitstatus = EXIT_FAILURE;
900
goto fallback;
901
}
902
903
FD_SET(new_plugin->fd, &rfds_all);
904
905
if (maxfd < new_plugin->fd){
906
maxfd = new_plugin->fd;
907
}
908
585
goto end;
586
}
587
588
FD_SET(new_process->fd, &rfds_all);
589
590
if (maxfd < new_process->fd){
591
maxfd = new_process->fd;
592
}
593
594
}
595
596
/* Free the plugin list */
597
for(plugin *next; plugin_list != NULL; plugin_list = next){
598
next = plugin_list->next;
599
free(plugin_list->argv);
600
free(plugin_list);
909
601
}
910
602
911
603
closedir(dir);
912
604
dir = NULL;
913
914
for(plugin *p = plugin_list; p != NULL; p = p->next){
915
if(p->pid != 0){
916
break;
917
}
918
if(p->next == NULL){
919
fprintf(stderr, "No plugin processes started. Incorrect plugin"
920
" directory?\n");
921
free_plugin_list();
922
}
605
606
if (process_list == NULL){
607
fprintf(stderr, "No plugin processes started. Incorrect plugin"
608
" directory?\n");
609
process_list = NULL;
923
610
}
924
925
/* Main loop while running plugins exist */
926
while(plugin_list){
611
while(process_list){
927
612
fd_set rfds = rfds_all;
928
613
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
929
614
if (select_ret == -1){
930
615
perror("select");
931
616
exitstatus = EXIT_FAILURE;
932
goto fallback;
617
goto end;
933
618
}
934
619
/* OK, now either a process completed, or something can be read
935
620
from one of them */
936
for(plugin *proc = plugin_list; proc != NULL;){
621
for(process *proc = process_list; proc ; proc = proc->next){
937
622
/* Is this process completely done? */
938
623
if(proc->eof and proc->completed){
939
624
/* Only accept the plugin output if it exited cleanly */
940
625
if(not WIFEXITED(proc->status)
941
626
or WEXITSTATUS(proc->status) != 0){
942
627
/* Bad exit by plugin */
943
944
628
if(debug){
945
629
if(WIFEXITED(proc->status)){
946
630
fprintf(stderr, "Plugin %u exited with status %d\n",
955
639
(unsigned int) (proc->pid));
956
640
}
957
641
}
958
959
642
/* Remove the plugin */
960
643
FD_CLR(proc->fd, &rfds_all);
961
962
644
/* Block signal while modifying process_list */
963
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
645
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
964
646
if(ret < 0){
965
647
perror("sigprocmask");
966
648
exitstatus = EXIT_FAILURE;
967
goto fallback;
968
}
969
649
goto end;
650
}
651
/* Delete this process entry from the list */
652
if(process_list == proc){
653
/* First one - simple */
654
process_list = proc->next;
655
} else {
656
/* Second one or later */
657
for(process *p = process_list; p != NULL; p = p->next){
658
if(p->next == proc){
659
p->next = proc->next;
660
break;
661
}
662
}
663
}
970
664
/* We are done modifying process list, so unblock signal */
971
665
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
972
666
NULL);
973
667
if(ret < 0){
974
668
perror("sigprocmask");
975
exitstatus = EXIT_FAILURE;
976
goto fallback;
977
}
978
979
if(plugin_list == NULL){
980
break;
981
}
982
983
plugin *next_plugin = proc->next;
984
free_plugin(proc);
985
proc = next_plugin;
986
continue;
669
}
670
free(proc->buffer);
671
free(proc);
672
/* We deleted this process from the list, so we can't go
673
proc->next. Therefore, start over from the beginning of
674
the process list */
675
break;
987
676
}
988
989
677
/* This process exited nicely, so print its buffer */
990
678
991
bool bret = print_out_password(proc->buffer,
992
proc->buffer_length);
679
bool bret = print_out_password(proc->buffer, proc->buffer_length);
993
680
if(not bret){
994
681
perror("print_out_password");
995
682
exitstatus = EXIT_FAILURE;
996
683
}
997
goto fallback;
684
goto end;
998
685
}
999
1000
686
/* This process has not completed. Does it have any output? */
1001
687
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1002
688
/* This process had nothing to say at this time */
1003
proc = proc->next;
1004
689
continue;
1005
690
}
1006
691
/* Before reading, make the process' data buffer large enough */
1010
695
if (proc->buffer == NULL){
1011
696
perror("malloc");
1012
697
exitstatus = EXIT_FAILURE;
1013
goto fallback;
698
goto end;
1014
699
}
1015
700
proc->buffer_size += BUFFER_SIZE;
1016
701
}
1019
704
BUFFER_SIZE);
1020
705
if(ret < 0){
1021
706
/* Read error from this process; ignore the error */
1022
proc = proc->next;
1023
707
continue;
1024
708
}
1025
709
if(ret == 0){
1032
716
}
1033
717
1034
718
1035
fallback:
719
end:
1036
720
1037
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1038
/* Fallback if all plugins failed, none are found or an error
1039
occured */
721
if(process_list == NULL or exitstatus != EXIT_SUCCESS){
722
/* Fallback if all plugins failed, none are found or an error occured */
1040
723
bool bret;
1041
724
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
1042
725
char *passwordbuffer = getpass("Password: ");
1043
size_t len = strlen(passwordbuffer);
1044
/* Strip trailing newline */
1045
if(len > 0 and passwordbuffer[len-1] == '\n'){
1046
passwordbuffer[len-1] = '\0'; /* not strictly necessary */
1047
len--;
1048
}
1049
bret = print_out_password(passwordbuffer, len);
726
bret = print_out_password(passwordbuffer, strlen(passwordbuffer));
1050
727
if(not bret){
1051
728
perror("print_out_password");
1052
729
exitstatus = EXIT_FAILURE;
730
goto end;
1053
731
}
1054
732
}
1055
733
1056
734
/* Restore old signal handler */
1057
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1058
if(ret == -1){
1059
perror("sigaction");
1060
exitstatus = EXIT_FAILURE;
1061
}
1062
1063
if(custom_argv != NULL){
1064
for(char **arg = custom_argv+1; *arg != NULL; arg++){
1065
free(*arg);
1066
}
1067
free(custom_argv);
735
sigaction(SIGCHLD, &old_sigchld_action, NULL);
736
737
free(plus_argv);
738
739
/* Free the plugin list */
740
for(plugin *next; plugin_list != NULL; plugin_list = next){
741
next = plugin_list->next;
742
free(plugin_list->argv);
743
free(plugin_list);
1068
744
}
1069
745
1070
746
if(dir != NULL){
1072
748
}
1073
749
1074
750
/* Free the process list and kill the processes */
1075
for(plugin *p = plugin_list; p != NULL; p = p->next){
1076
if(p->pid != 0){
1077
close(p->fd);
1078
ret = kill(p->pid, SIGTERM);
1079
if(ret == -1 and errno != ESRCH){
1080
/* Set-uid proccesses might not get closed */
1081
perror("kill");
1082
}
751
for(process *next; process_list != NULL; process_list = next){
752
next = process_list->next;
753
close(process_list->fd);
754
ret = kill(process_list->pid, SIGTERM);
755
if(ret == -1 and errno != ESRCH){
756
/* set-uid proccesses migth not get closed */
757
perror("kill");
1083
758
}
759
free(process_list->buffer);
760
free(process_list);
1084
761
}
1085
762
1086
763
/* Wait for any remaining child processes to terminate */
1090
767
if(errno != ECHILD){
1091
768
perror("wait");
1092
769
}
1093
1094
free_plugin_list();
1095
1096
free(plugindir);
1097
free(argfile);
1098
770
1099
771
return exitstatus;
1100
772
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0