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.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: (24.1.154 mandos) (237.4.3 mandos-release)
- 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:
- network-protocol.txt
- files removed:
- .bzr-builddeb
- debian
- 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> /* strsep, 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,
65
65
#include <errno.h> /* errno, EBADF */
66
66
67
67
#define BUFFER_SIZE 256
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";
68
#define CONFFILE "/conf/conf.d/mandos/client.conf"
69
70
const char *argp_program_version = "mandos-client 1.0";
73
71
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
74
72
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*/
73
struct process;
74
75
typedef struct process{
86
76
pid_t pid;
87
77
int fd;
88
78
char *buffer;
89
79
size_t buffer_size;
90
80
size_t buffer_length;
91
81
bool eof;
92
volatile bool completed;
93
volatile int status;
82
bool completed;
83
int status;
84
struct process *next;
85
} process;
86
87
typedef struct plugin{
88
char *name; /* can be NULL or any plugin name */
89
char **argv;
90
int argc;
91
bool disabled;
94
92
struct plugin *next;
95
93
} plugin;
96
94
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){
95
static plugin *getplugin(char *name, plugin **plugin_list){
96
for (plugin *p = *plugin_list; p != NULL; p = p->next){
104
97
if ((p->name == name)
105
98
or (p->name and name and (strcmp(p->name, name) == 0))){
106
99
return p;
109
102
/* Create a new plugin */
110
103
plugin *new_plugin = malloc(sizeof(plugin));
111
104
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
105
perror("malloc");
106
exit(EXIT_FAILURE);
107
}
108
new_plugin->name = name;
127
109
new_plugin->argv = malloc(sizeof(char *) * 2);
128
110
if (new_plugin->argv == NULL){
129
free(copy_name);
130
free(new_plugin);
131
return NULL;
111
perror("malloc");
112
exit(EXIT_FAILURE);
132
113
}
133
new_plugin->argv[0] = copy_name;
114
new_plugin->argv[0] = name;
134
115
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
116
new_plugin->argc = 1;
117
new_plugin->disabled = false;
118
new_plugin->next = *plugin_list;
145
119
/* Append the new plugin to the list */
146
plugin_list = new_plugin;
120
*plugin_list = new_plugin;
147
121
return new_plugin;
148
122
}
149
123
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));
124
static void addargument(plugin *p, char *arg){
125
p->argv[p->argc] = arg;
126
p->argv = realloc(p->argv, sizeof(char *) * (size_t)(p->argc + 2));
127
if (p->argv == NULL){
128
perror("malloc");
129
exit(EXIT_FAILURE);
130
}
131
p->argc++;
132
p->argv[p->argc] = NULL;
204
133
}
205
134
206
135
/*
219
148
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
220
149
}
221
150
151
process *process_list = NULL;
222
152
223
/* Mark processes as completed when they exit, and save their exit
153
/* Mark a process as completed when it exits, and save its exit
224
154
status. */
225
155
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
}
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;
253
172
}
254
173
255
/* Prints out a password to stdout */
256
174
bool print_out_password(const char *buffer, size_t length){
257
175
ssize_t ret;
176
if(length>0 and buffer[length-1] == '\n'){
177
length--;
178
}
258
179
for(size_t written = 0; written < length; written += (size_t)ret){
259
180
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,
260
181
length - written));
265
186
return true;
266
187
}
267
188
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);
189
char ** addcustomargument(char **argv, int *argc, char *arg){
280
190
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
}
191
if (argv == NULL){
192
*argc = 1;
193
argv = malloc(sizeof(char*) * 2);
194
if(argv == NULL){
195
return NULL;
292
196
}
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
}
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;
302
209
}
303
210
304
211
int main(int argc, char *argv[]){
305
char *plugindir = NULL;
306
char *argfile = NULL;
212
const char *plugindir = "/conf/conf.d/mandos/plugins.d";
213
const char *conffile = CONFFILE;
307
214
FILE *conffp;
308
215
size_t d_name_len;
309
216
DIR *dir = NULL;
324
231
/* Establish a signal handler */
325
232
sigemptyset(&sigchld_action.sa_mask);
326
233
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
327
if(ret == -1){
234
if(ret < 0){
328
235
perror("sigaddset");
329
exitstatus = EXIT_FAILURE;
330
goto fallback;
236
exit(EXIT_FAILURE);
331
237
}
332
238
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
333
if(ret == -1){
239
if(ret < 0){
334
240
perror("sigaction");
335
exitstatus = EXIT_FAILURE;
336
goto fallback;
241
exit(EXIT_FAILURE);
337
242
}
338
243
339
244
/* The options we understand. */
341
246
{ .name = "global-options", .key = 'g',
342
247
.arg = "OPTION[,OPTION[,...]]",
343
248
.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
249
{ .name = "options-for", .key = 'o',
348
250
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
349
251
.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
252
{ .name = "disable", .key = 'd',
354
253
.arg = "PLUGIN",
355
254
.doc = "Disable a specific plugin", .group = 1 },
356
{ .name = "enable", .key = 'e',
357
.arg = "PLUGIN",
358
.doc = "Enable a specific plugin", .group = 1 },
359
255
{ .name = "plugin-dir", .key = 128,
360
256
.arg = "DIRECTORY",
361
257
.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 },
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 },
373
266
{ .name = NULL }
374
267
};
375
268
376
error_t parse_opt (int key, char *arg, __attribute__((unused))
377
struct argp_state *state) {
269
error_t parse_opt (int key, char *arg, struct argp_state *state) {
270
/* Get the INPUT argument from `argp_parse', which we know is a
271
pointer to our plugin list pointer. */
272
plugin **plugins = state->input;
378
273
switch (key) {
379
case 'g': /* --global-options */
274
case 'g':
380
275
if (arg != NULL){
381
276
char *p;
382
277
while((p = strsep(&arg, ",")) != NULL){
383
278
if(p[0] == '\0'){
384
279
continue;
385
280
}
386
if(not add_argument(getplugin(NULL), p)){
387
perror("add_argument");
388
return ARGP_ERR_UNKNOWN;
389
}
281
addargument(getplugin(NULL, plugins), p);
390
282
}
391
283
}
392
284
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 */
285
case 'o':
402
286
if (arg != NULL){
403
char *p_name = strsep(&arg, ":");
404
if(p_name[0] == '\0' or arg == NULL){
287
char *name = strsep(&arg, ":");
288
if(name[0] == '\0'){
405
289
break;
406
290
}
407
291
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 */
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:
467
315
uid = (uid_t)strtol(arg, NULL, 10);
468
316
break;
469
case 131: /* --groupid */
317
case 130:
470
318
gid = (gid_t)strtol(arg, NULL, 10);
471
319
break;
472
case 132: /* --debug */
320
case 131:
473
321
debug = true;
474
322
break;
475
323
case ARGP_KEY_ARG:
476
/* Cryptsetup always passes an argument, which is an empty
477
string if "none" was specified in /etc/crypttab. So if
478
argument was empty, we ignore it silently. */
479
if(arg[0] != '\0'){
480
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
481
}
482
break;
483
case ARGP_KEY_END:
484
break;
485
default:
486
return ARGP_ERR_UNKNOWN;
487
}
488
return 0;
489
}
490
491
/* This option parser is the same as parse_opt() above, except it
492
ignores everything but the --config-file option. */
493
error_t parse_opt_config_file (int key, char *arg,
494
__attribute__((unused))
495
struct argp_state *state) {
496
switch (key) {
497
case 'g': /* --global-options */
498
case 'G': /* --global-env */
499
case 'o': /* --options-for */
500
case 'E': /* --env-for */
501
case 'd': /* --disable */
502
case 'e': /* --enable */
503
case 128: /* --plugin-dir */
504
break;
505
case 129: /* --config-file */
506
free(argfile);
507
argfile = strdup(arg);
508
if(argfile == NULL){
509
perror("strdup");
510
}
511
break;
512
case 130: /* --userid */
513
case 131: /* --groupid */
514
case 132: /* --debug */
515
case ARGP_KEY_ARG:
516
case ARGP_KEY_END:
517
break;
518
default:
519
return ARGP_ERR_UNKNOWN;
520
}
521
return 0;
522
}
523
524
struct argp argp = { .options = options,
525
.parser = parse_opt_config_file,
526
.args_doc = "",
324
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
325
break;
326
case ARGP_KEY_END:
327
break;
328
default:
329
return ARGP_ERR_UNKNOWN;
330
}
331
return 0;
332
}
333
334
plugin *plugin_list = NULL;
335
336
struct argp argp = { .options = options, .parser = parse_opt,
337
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
527
338
.doc = "Mandos plugin runner -- Run plugins" };
528
339
529
/* Parse using the parse_opt_config_file in order to get the custom
530
config file location, if any. */
531
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
340
ret = argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
532
341
if (ret == ARGP_ERR_UNKNOWN){
533
342
fprintf(stderr, "Unknown error while parsing arguments\n");
534
343
exitstatus = EXIT_FAILURE;
535
goto fallback;
344
goto end;
536
345
}
537
538
/* Reset to the normal argument parser */
539
argp.parser = parse_opt;
540
541
/* Open the configfile if available */
542
if (argfile == NULL){
543
conffp = fopen(AFILE, "r");
544
} else {
545
conffp = fopen(argfile, "r");
546
}
346
347
conffp = fopen(conffile, "r");
547
348
if(conffp != NULL){
548
349
char *org_line = NULL;
549
char *p, *arg, *new_arg, *line;
550
350
size_t size = 0;
551
351
ssize_t sret;
352
char *p, *arg, *new_arg, *line;
552
353
const char whitespace_delims[] = " \r\t\f\v\n";
553
354
const char comment_delim[] = "#";
554
355
555
custom_argc = 1;
556
custom_argv = malloc(sizeof(char*) * 2);
557
if(custom_argv == NULL){
558
perror("malloc");
559
exitstatus = EXIT_FAILURE;
560
goto fallback;
561
}
562
custom_argv[0] = argv[0];
563
custom_argv[1] = NULL;
564
565
/* for each line in the config file, strip whitespace and ignore
566
commented text */
567
356
while(true){
568
357
sret = getline(&org_line, &size, conffp);
569
358
if(sret == -1){
577
366
continue;
578
367
}
579
368
new_arg = strdup(p);
580
if(new_arg == NULL){
581
perror("strdup");
582
exitstatus = EXIT_FAILURE;
583
free(org_line);
584
goto fallback;
585
}
586
587
custom_argc += 1;
588
custom_argv = realloc(custom_argv, sizeof(char *)
589
* ((unsigned int) custom_argc + 1));
590
if(custom_argv == NULL){
591
perror("realloc");
592
exitstatus = EXIT_FAILURE;
593
free(org_line);
594
goto fallback;
595
}
596
custom_argv[custom_argc-1] = new_arg;
597
custom_argv[custom_argc] = NULL;
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
}
598
375
}
599
376
}
600
377
free(org_line);
601
} else {
602
/* Check for harmful errors and go to fallback. Other errors might
603
not affect opening plugins */
378
} else{
379
/* check for harmfull errors */
604
380
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
605
381
perror("fopen");
606
382
exitstatus = EXIT_FAILURE;
607
goto fallback;
383
goto end;
608
384
}
609
385
}
610
/* If there was any arguments from configuration file,
611
pass them to parser as command arguments */
386
612
387
if(custom_argv != NULL){
613
ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
614
0, NULL);
388
custom_argv[0] = argv[0];
389
ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0, &plugin_list);
615
390
if (ret == ARGP_ERR_UNKNOWN){
616
391
fprintf(stderr, "Unknown error while parsing arguments\n");
617
392
exitstatus = EXIT_FAILURE;
618
goto fallback;
393
goto end;
619
394
}
620
395
}
621
396
622
/* Parse actual command line arguments, to let them override the
623
config file */
624
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
625
if (ret == ARGP_ERR_UNKNOWN){
626
fprintf(stderr, "Unknown error while parsing arguments\n");
627
exitstatus = EXIT_FAILURE;
628
goto fallback;
629
}
630
631
397
if(debug){
632
398
for(plugin *p = plugin_list; p != NULL; p=p->next){
633
399
fprintf(stderr, "Plugin: %s has %d arguments\n",
635
401
for(char **a = p->argv; *a != NULL; a++){
636
402
fprintf(stderr, "\tArg: %s\n", *a);
637
403
}
638
fprintf(stderr, "...and %u environment variables\n", p->envc);
639
for(char **a = p->environ; *a != NULL; a++){
640
fprintf(stderr, "\t%s\n", *a);
641
}
642
404
}
643
405
}
644
406
645
/* Strip permissions down to nobody */
646
407
ret = setuid(uid);
647
408
if (ret == -1){
648
409
perror("setuid");
649
}
410
}
411
650
412
setgid(gid);
651
413
if (ret == -1){
652
414
perror("setgid");
653
415
}
654
416
655
if (plugindir == NULL){
656
dir = opendir(PDIR);
657
} else {
658
dir = opendir(plugindir);
659
}
660
417
dir = opendir(plugindir);
661
418
if(dir == NULL){
662
419
perror("Could not open plugin dir");
663
420
exitstatus = EXIT_FAILURE;
664
goto fallback;
421
goto end;
665
422
}
666
423
667
424
/* Set the FD_CLOEXEC flag on the directory, if possible */
672
429
if(ret < 0){
673
430
perror("set_cloexec_flag");
674
431
exitstatus = EXIT_FAILURE;
675
goto fallback;
432
goto end;
676
433
}
677
434
}
678
435
}
679
436
680
437
FD_ZERO(&rfds_all);
681
438
682
/* Read and execute any executable in the plugin directory*/
683
439
while(true){
684
440
dirst = readdir(dir);
685
441
686
/* All directory entries have been processed */
442
// All directory entries have been processed
687
443
if(dirst == NULL){
688
444
if (errno == EBADF){
689
445
perror("readdir");
690
446
exitstatus = EXIT_FAILURE;
691
goto fallback;
447
goto end;
692
448
}
693
449
break;
694
450
}
695
451
696
452
d_name_len = strlen(dirst->d_name);
697
453
698
/* Ignore dotfiles, backup files and other junk */
454
// Ignore dotfiles, backup files and other junk
699
455
{
700
456
bool bad_name = false;
701
457
716
472
break;
717
473
}
718
474
}
475
719
476
if(bad_name){
720
477
continue;
721
478
}
479
722
480
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
723
481
size_t suf_len = strlen(*suf);
724
482
if((d_name_len >= suf_len)
737
495
continue;
738
496
}
739
497
}
740
741
char *filename;
742
if(plugindir == NULL){
743
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
744
} else {
745
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
746
}
747
if(ret < 0){
748
perror("asprintf");
498
499
char *filename = malloc(d_name_len + strlen(plugindir) + 2);
500
if (filename == NULL){
501
perror("malloc");
749
502
continue;
750
503
}
504
strcpy(filename, plugindir); /* Spurious warning */
505
strcat(filename, "/"); /* Spurious warning */
506
strcat(filename, dirst->d_name); /* Spurious warning */
751
507
752
508
ret = stat(filename, &st);
753
509
if (ret == -1){
755
511
free(filename);
756
512
continue;
757
513
}
758
759
/* Ignore non-executable files */
514
760
515
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
761
516
if(debug){
762
517
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
765
520
free(filename);
766
521
continue;
767
522
}
768
769
plugin *p = getplugin(dirst->d_name);
770
if(p == NULL){
771
perror("getplugin");
772
free(filename);
773
continue;
774
}
775
if(p->disabled){
523
if(getplugin(dirst->d_name, &plugin_list)->disabled){
776
524
if(debug){
777
525
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
778
526
dirst->d_name);
780
528
free(filename);
781
529
continue;
782
530
}
531
plugin *p = getplugin(dirst->d_name, &plugin_list);
783
532
{
784
533
/* Add global arguments to argument list for this plugin */
785
plugin *g = getplugin(NULL);
786
if(g != NULL){
787
for(char **a = g->argv + 1; *a != NULL; a++){
788
if(not add_argument(p, *a)){
789
perror("add_argument");
790
}
791
}
792
/* Add global environment variables */
793
for(char **e = g->environ; *e != NULL; e++){
794
if(not add_environment(p, *e, false)){
795
perror("add_environment");
796
}
797
}
798
}
799
}
800
/* If this plugin has any environment variables, we will call
801
using execve and need to duplicate the environment from this
802
process, too. */
803
if(p->environ[0] != NULL){
804
for(char **e = environ; *e != NULL; e++){
805
if(not add_environment(p, *e, false)){
806
perror("add_environment");
807
}
808
}
809
}
810
811
int pipefd[2];
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];
812
540
ret = pipe(pipefd);
813
541
if (ret == -1){
814
542
perror("pipe");
815
543
exitstatus = EXIT_FAILURE;
816
goto fallback;
544
goto end;
817
545
}
818
/* Ask OS to automatic close the pipe on exec */
819
546
ret = set_cloexec_flag(pipefd[0]);
820
547
if(ret < 0){
821
548
perror("set_cloexec_flag");
822
549
exitstatus = EXIT_FAILURE;
823
goto fallback;
550
goto end;
824
551
}
825
552
ret = set_cloexec_flag(pipefd[1]);
826
553
if(ret < 0){
827
554
perror("set_cloexec_flag");
828
555
exitstatus = EXIT_FAILURE;
829
goto fallback;
556
goto end;
830
557
}
831
558
/* Block SIGCHLD until process is safely in process list */
832
559
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
833
560
if(ret < 0){
834
561
perror("sigprocmask");
835
562
exitstatus = EXIT_FAILURE;
836
goto fallback;
563
goto end;
837
564
}
838
/* Starting a new process to be watched */
565
// Starting a new process to be watched
839
566
pid_t pid = fork();
840
567
if(pid == -1){
841
568
perror("fork");
842
569
exitstatus = EXIT_FAILURE;
843
goto fallback;
570
goto end;
844
571
}
845
572
if(pid == 0){
846
573
/* this is the child process */
866
593
above and must now close it manually here. */
867
594
closedir(dir);
868
595
}
869
if(p->environ[0] == NULL){
870
if(execv(filename, p->argv) < 0){
871
perror("execv");
872
_exit(EXIT_FAILURE);
873
}
874
} else {
875
if(execve(filename, p->argv, p->environ) < 0){
876
perror("execve");
877
_exit(EXIT_FAILURE);
878
}
596
if(execv(filename, p->argv) < 0){
597
perror("execv");
598
_exit(EXIT_FAILURE);
879
599
}
880
600
/* no return */
881
601
}
882
/* Parent process */
883
close(pipefd[1]); /* Close unused write end of pipe */
602
/* parent process */
884
603
free(filename);
885
plugin *new_plugin = getplugin(dirst->d_name);
886
if (new_plugin == NULL){
887
perror("getplugin");
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");
888
608
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
889
609
if(ret < 0){
890
perror("sigprocmask");
610
perror("sigprocmask");
891
611
}
892
612
exitstatus = EXIT_FAILURE;
893
goto fallback;
613
goto end;
894
614
}
895
615
896
new_plugin->pid = pid;
897
new_plugin->fd = pipefd[0];
898
616
*new_process = (struct process){ .pid = pid,
617
.fd = pipefd[0],
618
.next = process_list };
619
// List handling
620
process_list = new_process;
899
621
/* Unblock SIGCHLD so signal handler can be run if this process
900
622
has already completed */
901
623
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
902
624
if(ret < 0){
903
625
perror("sigprocmask");
904
626
exitstatus = EXIT_FAILURE;
905
goto fallback;
906
}
907
908
FD_SET(new_plugin->fd, &rfds_all);
909
910
if (maxfd < new_plugin->fd){
911
maxfd = new_plugin->fd;
912
}
913
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);
914
643
}
915
644
916
645
closedir(dir);
917
646
dir = NULL;
918
919
for(plugin *p = plugin_list; p != NULL; p = p->next){
920
if(p->pid != 0){
921
break;
922
}
923
if(p->next == NULL){
924
fprintf(stderr, "No plugin processes started. Incorrect plugin"
925
" directory?\n");
926
free_plugin_list();
927
}
647
648
if (process_list == NULL){
649
fprintf(stderr, "No plugin processes started. Incorrect plugin"
650
" directory?\n");
651
process_list = NULL;
928
652
}
929
930
/* Main loop while running plugins exist */
931
while(plugin_list){
653
while(process_list){
932
654
fd_set rfds = rfds_all;
933
655
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
934
656
if (select_ret == -1){
935
657
perror("select");
936
658
exitstatus = EXIT_FAILURE;
937
goto fallback;
659
goto end;
938
660
}
939
661
/* OK, now either a process completed, or something can be read
940
662
from one of them */
941
for(plugin *proc = plugin_list; proc != NULL;){
663
for(process *proc = process_list; proc ; proc = proc->next){
942
664
/* Is this process completely done? */
943
665
if(proc->eof and proc->completed){
944
666
/* Only accept the plugin output if it exited cleanly */
945
667
if(not WIFEXITED(proc->status)
946
668
or WEXITSTATUS(proc->status) != 0){
947
669
/* Bad exit by plugin */
948
949
670
if(debug){
950
671
if(WIFEXITED(proc->status)){
951
672
fprintf(stderr, "Plugin %u exited with status %d\n",
960
681
(unsigned int) (proc->pid));
961
682
}
962
683
}
963
964
684
/* Remove the plugin */
965
685
FD_CLR(proc->fd, &rfds_all);
966
967
686
/* Block signal while modifying process_list */
968
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
687
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
969
688
if(ret < 0){
970
689
perror("sigprocmask");
971
690
exitstatus = EXIT_FAILURE;
972
goto fallback;
973
}
974
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;
703
}
704
}
705
}
975
706
/* We are done modifying process list, so unblock signal */
976
707
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
977
708
NULL);
978
709
if(ret < 0){
979
710
perror("sigprocmask");
980
exitstatus = EXIT_FAILURE;
981
goto fallback;
982
}
983
984
if(plugin_list == NULL){
985
break;
986
}
987
988
plugin *next_plugin = proc->next;
989
free_plugin(proc);
990
proc = next_plugin;
991
continue;
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;
992
718
}
993
994
719
/* This process exited nicely, so print its buffer */
995
720
996
bool bret = print_out_password(proc->buffer,
997
proc->buffer_length);
721
bool bret = print_out_password(proc->buffer, proc->buffer_length);
998
722
if(not bret){
999
723
perror("print_out_password");
1000
724
exitstatus = EXIT_FAILURE;
1001
725
}
1002
goto fallback;
726
goto end;
1003
727
}
1004
1005
728
/* This process has not completed. Does it have any output? */
1006
729
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1007
730
/* This process had nothing to say at this time */
1008
proc = proc->next;
1009
731
continue;
1010
732
}
1011
733
/* Before reading, make the process' data buffer large enough */
1015
737
if (proc->buffer == NULL){
1016
738
perror("malloc");
1017
739
exitstatus = EXIT_FAILURE;
1018
goto fallback;
740
goto end;
1019
741
}
1020
742
proc->buffer_size += BUFFER_SIZE;
1021
743
}
1024
746
BUFFER_SIZE);
1025
747
if(ret < 0){
1026
748
/* Read error from this process; ignore the error */
1027
proc = proc->next;
1028
749
continue;
1029
750
}
1030
751
if(ret == 0){
1037
758
}
1038
759
1039
760
1040
fallback:
761
end:
1041
762
1042
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1043
/* Fallback if all plugins failed, none are found or an error
1044
occured */
763
if(process_list == NULL or exitstatus != EXIT_SUCCESS){
764
/* Fallback if all plugins failed, none are found or an error occured */
1045
765
bool bret;
1046
766
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
1047
767
char *passwordbuffer = getpass("Password: ");
1048
size_t len = strlen(passwordbuffer);
1049
/* Strip trailing newline */
1050
if(len > 0 and passwordbuffer[len-1] == '\n'){
1051
passwordbuffer[len-1] = '\0'; /* not strictly necessary */
1052
len--;
1053
}
1054
bret = print_out_password(passwordbuffer, len);
768
bret = print_out_password(passwordbuffer, strlen(passwordbuffer));
1055
769
if(not bret){
1056
770
perror("print_out_password");
1057
771
exitstatus = EXIT_FAILURE;
772
goto end;
1058
773
}
1059
774
}
1060
775
1061
776
/* Restore old signal handler */
1062
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1063
if(ret == -1){
1064
perror("sigaction");
1065
exitstatus = EXIT_FAILURE;
1066
}
1067
1068
if(custom_argv != NULL){
1069
for(char **arg = custom_argv+1; *arg != NULL; arg++){
1070
free(*arg);
1071
}
1072
free(custom_argv);
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);
1073
786
}
1074
787
1075
788
if(dir != NULL){
1077
790
}
1078
791
1079
792
/* Free the process list and kill the processes */
1080
for(plugin *p = plugin_list; p != NULL; p = p->next){
1081
if(p->pid != 0){
1082
close(p->fd);
1083
ret = kill(p->pid, SIGTERM);
1084
if(ret == -1 and errno != ESRCH){
1085
/* Set-uid proccesses might not get closed */
1086
perror("kill");
1087
}
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");
1088
800
}
801
free(process_list->buffer);
802
free(process_list);
1089
803
}
1090
804
1091
805
/* Wait for any remaining child processes to terminate */
1095
809
if(errno != ECHILD){
1096
810
perror("wait");
1097
811
}
1098
1099
free_plugin_list();
1100
1101
free(plugindir);
1102
free(argfile);
1103
812
1104
813
return exitstatus;
1105
814
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0