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