To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to plugbasedclient.c
- browse files at revision 35
- compare with another revision
- download diff
- download tarball
- view history from revision 35
- Committer: Teddy Hogeborn
- Date: 2008-08-02 10:48:24 UTC
- Revision ID: teddy@fukt.bsnet.se-20080802104824-fx0miwp9o4g9r31e
* plugbasedclient.c (struct process): New fields "eof", "completed",
and "status".
(handle_sigchld): New function.
(main): Initialize "dir" to NULL to only closedir() it if necessary.
Move "process_list" to be a global variable to be accessible
by "handle_sigchld". Make "handle_sigchld" handle SIGCHLD.
Remove redundant check for NULL "dir". Free "filename" when
no longer used. Block SIGCHLD around fork()/exec().
Restore normal signals in child. Only loop while running
processes exist. Print process buffer when the process is
done and it has emitted EOF, not when it only emits EOF.
Remove processes from list which exit non-cleanly. In
cleaning up, closedir() if necessary. Bug fix: set next
pointer correctly when freeing process list.
* plugins.d/passprompt.c (main): Do not ignore SIGQUIT.
and "status".
(handle_sigchld): New function.
(main): Initialize "dir" to NULL to only closedir() it if necessary.
Move "process_list" to be a global variable to be accessible
by "handle_sigchld". Make "handle_sigchld" handle SIGCHLD.
Remove redundant check for NULL "dir". Free "filename" when
no longer used. Block SIGCHLD around fork()/exec().
Restore normal signals in child. Only loop while running
processes exist. Print process buffer when the process is
done and it has emitted EOF, not when it only emits EOF.
Remove processes from list which exit non-cleanly. In
cleaning up, closedir() if necessary. Bug fix: set next
pointer correctly when freeing process list.
* plugins.d/passprompt.c (main): Do not ignore SIGQUIT.
- files added:
- ca.pem
- files removed:
- .bzr-builddeb
- debian
- debian/po
- files renamed:
- plugin-runner.c => plugbasedclient.c
- plugins.d/mandos-client.c => plugins.d/mandosclient.c
- plugins.d/password-prompt.c => plugins.d/passprompt.c
- mandos.conf => server.conf
- mandos => server.py
- files modified:
- Makefile
added
removed
plugbasedclient.c
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() */
27
#include <stddef.h> /* size_t, NULL */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
29
EXIT_SUCCESS, realloc() */
30
#include <stdbool.h> /* bool, true, false */
31
#include <stdio.h> /* perror, fileno(), fprintf(),
24
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY() */
25
26
#include <stdio.h> /* popen(), fileno(), fprintf(),
32
27
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, opendir(), stat(), struct
34
stat, waitpid(), WIFEXITED(),
35
WEXITSTATUS(), wait(), pid_t,
36
uid_t, gid_t, getuid(), getgid(),
37
dirfd() */
38
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
39
FD_SET(), FD_ISSET(), FD_CLR */
40
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
41
WEXITSTATUS() */
42
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
43
28
#include <iso646.h> /* and, or, not */
29
#include <sys/types.h> /* DIR, opendir(), stat(),
30
struct stat, waitpid(),
31
WIFEXITED(), WEXITSTATUS(),
32
wait() */
33
#include <sys/wait.h> /* wait() */
44
34
#include <dirent.h> /* DIR, struct dirent, opendir(),
45
readdir(), closedir(), dirfd() */
35
readdir(), closedir() */
36
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
46
37
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
47
fcntl(), setuid(), setgid(),
48
F_GETFD, F_SETFD, FD_CLOEXEC,
49
access(), pipe(), fork(), close()
50
dup2(), STDOUT_FILENO, _exit(),
51
execv(), write(), read(),
52
close() */
53
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
54
FD_CLOEXEC */
55
#include <string.h> /* strsep, strlen(), asprintf() */
38
fcntl() */
39
#include <fcntl.h> /* fcntl() */
40
#include <stddef.h> /* NULL */
41
#include <stdlib.h> /* EXIT_FAILURE */
42
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
43
FD_SET(), FD_ISSET() */
44
#include <string.h> /* strlen(), strcpy(), strcat() */
45
#include <stdbool.h> /* true */
46
#include <sys/wait.h> /* waitpid(), WIFEXITED(),
47
WEXITSTATUS() */
56
48
#include <errno.h> /* errno */
57
#include <argp.h> /* struct argp_option, struct
58
argp_state, struct argp,
59
argp_parse(), ARGP_ERR_UNKNOWN,
60
ARGP_KEY_END, ARGP_KEY_ARG,
61
error_t */
62
#include <signal.h> /* struct sigaction, sigemptyset(),
63
sigaddset(), sigaction(),
64
sigprocmask(), SIG_BLOCK, SIGCHLD,
65
SIG_UNBLOCK, kill(), sig_atomic_t
66
*/
67
#include <errno.h> /* errno, EBADF */
68
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
69
70
#define BUFFER_SIZE 256
71
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;
76
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
77
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*/
49
#include <argp.h> /* struct argp_option,
50
struct argp_state, struct argp,
51
argp_parse() */
52
53
struct process;
54
55
typedef struct process{
87
56
pid_t pid;
88
57
int fd;
89
58
char *buffer;
90
59
size_t buffer_size;
91
60
size_t buffer_length;
92
61
bool eof;
93
volatile sig_atomic_t completed;
62
bool completed;
94
63
int status;
64
struct process *next;
65
} process;
66
67
typedef struct plugin{
68
char *name; /* can be NULL or any plugin name */
69
char **argv;
70
int argc;
71
bool disabled;
95
72
struct plugin *next;
96
73
} plugin;
97
74
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))){
75
plugin *getplugin(char *name, plugin **plugin_list){
76
for (plugin *p = *plugin_list; p != NULL; p = p->next){
77
if ((p->name == name)
78
or (p->name and name and (strcmp(p->name, name) == 0))){
107
79
return p;
108
80
}
109
81
}
110
82
/* Create a new plugin */
111
83
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
84
if (new_plugin == NULL){
85
perror("malloc");
86
exit(EXIT_FAILURE);
87
}
88
new_plugin->name = name;
129
89
new_plugin->argv = malloc(sizeof(char *) * 2);
130
if(new_plugin->argv == NULL){
131
free(copy_name);
132
free(new_plugin);
133
return NULL;
90
if (new_plugin->argv == NULL){
91
perror("malloc");
92
exit(EXIT_FAILURE);
134
93
}
135
new_plugin->argv[0] = copy_name;
94
new_plugin->argv[0] = name;
136
95
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
96
new_plugin->argc = 1;
97
new_plugin->disabled = false;
98
new_plugin->next = *plugin_list;
147
99
/* Append the new plugin to the list */
148
plugin_list = new_plugin;
100
*plugin_list = new_plugin;
149
101
return new_plugin;
150
102
}
151
103
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));
104
void addargument(plugin *p, char *arg){
105
p->argv[p->argc] = arg;
106
p->argv = realloc(p->argv, sizeof(char *) * (size_t)(p->argc + 2));
107
if (p->argv == NULL){
108
perror("malloc");
109
exit(EXIT_FAILURE);
110
}
111
p->argc++;
112
p->argv[p->argc] = NULL;
206
113
}
207
114
208
115
/*
210
117
* Descriptor Flags".
211
118
* *Note File Descriptor Flags:(libc)Descriptor Flags.
212
119
*/
213
static int set_cloexec_flag(int fd){
120
int set_cloexec_flag(int fd)
121
{
214
122
int ret = fcntl(fd, F_GETFD, 0);
215
123
/* If reading the flags failed, return error indication now. */
216
124
if(ret < 0){
220
128
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
221
129
}
222
130
223
224
/* Mark processes as completed when they exit, and save their exit
131
#define BUFFER_SIZE 256
132
133
const char *argp_program_version = "plugbasedclient 0.9";
134
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
135
136
process *process_list = NULL;
137
138
/* Mark a process as completed when it exits, and save its exit
225
139
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;
256
}
257
258
/* Prints out a password to stdout */
259
static bool print_out_password(const char *buffer, size_t length){
260
ssize_t ret;
261
for(size_t written = 0; written < length; written += (size_t)ret){
262
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,
263
length - written));
264
if(ret < 0){
265
return false;
266
}
267
}
268
return true;
269
}
270
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
}
140
void handle_sigchld(__attribute__((unused)) int sig){
141
process *proc = process_list;
142
int status;
143
pid_t pid = wait(&status);
144
while(proc != NULL and proc->pid != pid){
145
proc = proc->next;
146
}
147
if(proc == NULL){
148
/* Process not found in process list */
149
return;
150
}
151
proc->status = status;
152
proc->completed = true;
305
153
}
306
154
307
155
int main(int argc, char *argv[]){
308
char *plugindir = NULL;
309
char *argfile = NULL;
310
FILE *conffp;
156
const char *plugindir = "/conf/conf.d/mandos/plugins.d";
311
157
size_t d_name_len;
312
158
DIR *dir = NULL;
313
159
struct dirent *dirst;
314
160
struct stat st;
315
161
fd_set rfds_all;
316
162
int ret, maxfd = 0;
317
ssize_t sret;
318
intmax_t tmpmax;
319
uid_t uid = 65534;
320
gid_t gid = 65534;
321
163
bool debug = false;
322
164
int exitstatus = EXIT_SUCCESS;
323
struct sigaction old_sigchld_action;
324
struct sigaction sigchld_action = { .sa_handler = handle_sigchld,
325
.sa_flags = SA_NOCLDSTOP };
326
char **custom_argv = NULL;
327
int custom_argc = 0;
328
165
329
166
/* Establish a signal handler */
167
struct sigaction old_sigchld_action,
168
sigchld_action = { .sa_handler = handle_sigchld,
169
.sa_flags = SA_NOCLDSTOP };
330
170
sigemptyset(&sigchld_action.sa_mask);
331
171
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
332
if(ret == -1){
172
if(ret < 0){
333
173
perror("sigaddset");
334
exitstatus = EXIT_FAILURE;
335
goto fallback;
174
exit(EXIT_FAILURE);
336
175
}
337
176
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
338
if(ret == -1){
177
if(ret < 0){
339
178
perror("sigaction");
340
exitstatus = EXIT_FAILURE;
341
goto fallback;
179
exit(EXIT_FAILURE);
342
180
}
343
181
344
182
/* The options we understand. */
346
184
{ .name = "global-options", .key = 'g',
347
185
.arg = "OPTION[,OPTION[,...]]",
348
186
.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
187
{ .name = "options-for", .key = 'o',
353
188
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
354
189
.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
190
{ .name = "disable", .key = 'd',
359
191
.arg = "PLUGIN",
360
192
.doc = "Disable a specific plugin", .group = 1 },
361
{ .name = "enable", .key = 'e',
362
.arg = "PLUGIN",
363
.doc = "Enable a specific plugin", .group = 1 },
364
193
{ .name = "plugin-dir", .key = 128,
365
194
.arg = "DIRECTORY",
366
195
.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 },
196
{ .name = "debug", .key = 129,
197
.doc = "Debug mode", .group = 3 },
378
198
{ .name = NULL }
379
199
};
380
200
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 */
201
error_t parse_opt (int key, char *arg, struct argp_state *state) {
202
/* Get the INPUT argument from `argp_parse', which we know is a
203
pointer to our plugin list pointer. */
204
plugin **plugins = state->input;
205
switch (key) {
206
case 'g':
207
if (arg != NULL){
208
char *p = strtok(arg, ",");
209
do{
210
addargument(getplugin(NULL, plugins), p);
211
p = strtok(NULL, ",");
212
} while (p);
213
}
214
break;
215
case 'o':
216
if (arg != NULL){
217
char *name = strtok(arg, ":");
218
char *p = strtok(NULL, ":");
219
if(p){
220
p = strtok(p, ",");
221
do{
222
addargument(getplugin(name, plugins), p);
223
p = strtok(NULL, ",");
224
} while (p);
225
}
226
}
227
break;
228
case 'd':
229
if (arg != NULL){
230
getplugin(arg, plugins)->disabled = true;
231
}
232
break;
233
case 128:
234
plugindir = arg;
235
break;
236
case 129:
488
237
debug = true;
489
238
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,
239
case ARGP_KEY_ARG:
240
argp_usage (state);
241
break;
242
case ARGP_KEY_END:
243
break;
244
default:
245
return ARGP_ERR_UNKNOWN;
246
}
247
return 0;
248
}
249
250
plugin *plugin_list = NULL;
251
252
struct argp argp = { .options = options, .parser = parse_opt,
545
253
.args_doc = "",
546
254
.doc = "Mandos plugin runner -- Run plugins" };
547
255
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){
552
fprintf(stderr, "Unknown error while parsing arguments\n");
553
exitstatus = EXIT_FAILURE;
554
goto fallback;
555
}
556
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){
576
perror("malloc");
577
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){
634
fprintf(stderr, "Unknown error while parsing arguments\n");
635
exitstatus = EXIT_FAILURE;
636
goto fallback;
637
}
638
}
639
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
}
256
argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
648
257
649
258
if(debug){
650
259
for(plugin *p = plugin_list; p != NULL; p=p->next){
653
262
for(char **a = p->argv; *a != NULL; a++){
654
263
fprintf(stderr, "\tArg: %s\n", *a);
655
264
}
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
265
}
661
266
}
662
267
663
/* Strip permissions down to nobody */
664
setgid(gid);
665
if(ret == -1){
666
perror("setgid");
667
}
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
268
dir = opendir(plugindir);
679
269
if(dir == NULL){
680
270
perror("Could not open plugin dir");
681
271
exitstatus = EXIT_FAILURE;
682
goto fallback;
272
goto end;
683
273
}
684
274
685
275
/* Set the FD_CLOEXEC flag on the directory, if possible */
690
280
if(ret < 0){
691
281
perror("set_cloexec_flag");
692
282
exitstatus = EXIT_FAILURE;
693
goto fallback;
283
goto end;
694
284
}
695
285
}
696
286
}
697
287
698
288
FD_ZERO(&rfds_all);
699
289
700
/* Read and execute any executable in the plugin directory*/
701
290
while(true){
702
291
dirst = readdir(dir);
703
292
704
/* All directory entries have been processed */
293
// All directory entries have been processed
705
294
if(dirst == NULL){
706
if(errno == EBADF){
707
perror("readdir");
708
exitstatus = EXIT_FAILURE;
709
goto fallback;
710
}
711
295
break;
712
296
}
713
297
714
298
d_name_len = strlen(dirst->d_name);
715
299
716
/* Ignore dotfiles, backup files and other junk */
300
// Ignore dotfiles, backup files and other junk
717
301
{
718
302
bool bad_name = false;
719
303
721
305
722
306
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
723
307
".dpkg-old",
724
".dpkg-bak",
725
308
".dpkg-divert", NULL };
726
309
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
727
310
size_t pre_len = strlen(*pre);
735
318
break;
736
319
}
737
320
}
321
738
322
if(bad_name){
739
323
continue;
740
324
}
325
741
326
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
742
327
size_t suf_len = strlen(*suf);
743
328
if((d_name_len >= suf_len)
757
342
}
758
343
}
759
344
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");
768
continue;
769
}
770
771
ret = stat(filename, &st);
772
if(ret == -1){
773
perror("stat");
774
free(filename);
775
continue;
776
}
777
778
/* Ignore non-executable files */
779
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
345
char *filename = malloc(d_name_len + strlen(plugindir) + 2);
346
if (filename == NULL){
347
perror("malloc");
348
exitstatus = EXIT_FAILURE;
349
goto end;
350
}
351
strcpy(filename, plugindir); /* Spurious warning */
352
strcat(filename, "/"); /* Spurious warning */
353
strcat(filename, dirst->d_name); /* Spurious warning */
354
355
stat(filename, &st);
356
357
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
780
358
if(debug){
781
359
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
782
360
" with bad type or mode\n", filename);
784
362
free(filename);
785
363
continue;
786
364
}
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){
365
if(getplugin(dirst->d_name, &plugin_list)->disabled){
795
366
if(debug){
796
367
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
797
368
dirst->d_name);
799
370
free(filename);
800
371
continue;
801
372
}
373
plugin *p = getplugin(dirst->d_name, &plugin_list);
802
374
{
803
375
/* 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];
376
plugin *g = getplugin(NULL, &plugin_list);
377
for(char **a = g->argv + 1; *a != NULL; a++){
378
addargument(p, *a);
379
}
380
}
381
int pipefd[2];
831
382
ret = pipe(pipefd);
832
if(ret == -1){
383
if (ret == -1){
833
384
perror("pipe");
834
385
exitstatus = EXIT_FAILURE;
835
goto fallback;
386
goto end;
836
387
}
837
/* Ask OS to automatic close the pipe on exec */
838
388
ret = set_cloexec_flag(pipefd[0]);
839
389
if(ret < 0){
840
390
perror("set_cloexec_flag");
841
391
exitstatus = EXIT_FAILURE;
842
goto fallback;
392
goto end;
843
393
}
844
394
ret = set_cloexec_flag(pipefd[1]);
845
395
if(ret < 0){
846
396
perror("set_cloexec_flag");
847
397
exitstatus = EXIT_FAILURE;
848
goto fallback;
398
goto end;
849
399
}
850
400
/* Block SIGCHLD until process is safely in process list */
851
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
401
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
852
402
if(ret < 0){
853
403
perror("sigprocmask");
854
404
exitstatus = EXIT_FAILURE;
855
goto fallback;
405
goto end;
856
406
}
857
/* Starting a new process to be watched */
407
// Starting a new process to be watched
858
408
pid_t pid = fork();
859
if(pid == -1){
860
perror("fork");
861
exitstatus = EXIT_FAILURE;
862
goto fallback;
863
}
864
409
if(pid == 0){
865
410
/* this is the child process */
866
411
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
868
413
perror("sigaction");
869
414
_exit(EXIT_FAILURE);
870
415
}
871
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
416
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
872
417
if(ret < 0){
873
418
perror("sigprocmask");
874
419
_exit(EXIT_FAILURE);
875
420
}
876
877
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
878
if(ret == -1){
879
perror("dup2");
880
_exit(EXIT_FAILURE);
881
}
421
dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
882
422
883
423
if(dirfd(dir) < 0){
884
424
/* If dir has no file descriptor, we could not set FD_CLOEXEC
885
425
above and must now close it manually here. */
886
426
closedir(dir);
887
427
}
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
}
428
if(execv(filename, p->argv) < 0){
429
perror("execv");
430
_exit(EXIT_FAILURE);
898
431
}
899
432
/* no return */
900
433
}
901
/* Parent process */
902
close(pipefd[1]); /* Close unused write end of pipe */
434
/* parent process */
903
435
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);
436
close(pipefd[1]); /* close unused write end of pipe */
437
process *new_process = malloc(sizeof(process));
438
if (new_process == NULL){
439
perror("malloc");
440
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
908
441
if(ret < 0){
909
perror("sigprocmask");
442
perror("sigprocmask");
910
443
}
911
444
exitstatus = EXIT_FAILURE;
912
goto fallback;
445
goto end;
913
446
}
914
447
915
new_plugin->pid = pid;
916
new_plugin->fd = pipefd[0];
917
448
*new_process = (struct process){ .pid = pid,
449
.fd = pipefd[0],
450
.next = process_list };
451
// List handling
452
process_list = new_process;
918
453
/* Unblock SIGCHLD so signal handler can be run if this process
919
454
has already completed */
920
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
455
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
921
456
if(ret < 0){
922
457
perror("sigprocmask");
923
458
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
}
459
goto end;
460
}
461
462
FD_SET(new_process->fd, &rfds_all);
463
464
if (maxfd < new_process->fd){
465
maxfd = new_process->fd;
466
}
467
468
}
469
470
/* Free the plugin list */
471
for(plugin *next; plugin_list != NULL; plugin_list = next){
472
next = plugin_list->next;
473
free(plugin_list->argv);
474
free(plugin_list);
932
475
}
933
476
934
477
closedir(dir);
935
478
dir = NULL;
936
free_plugin(getplugin(NULL));
937
479
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
}
480
if (process_list == NULL){
481
fprintf(stderr, "No plugin processes started, exiting\n");
482
exitstatus = EXIT_FAILURE;
483
goto end;
947
484
}
948
949
/* Main loop while running plugins exist */
950
while(plugin_list){
485
while(process_list){
951
486
fd_set rfds = rfds_all;
952
487
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
953
if(select_ret == -1){
488
if (select_ret == -1){
954
489
perror("select");
955
490
exitstatus = EXIT_FAILURE;
956
goto fallback;
491
goto end;
957
492
}
958
493
/* OK, now either a process completed, or something can be read
959
494
from one of them */
960
for(plugin *proc = plugin_list; proc != NULL;){
495
for(process *proc = process_list; proc ; proc = proc->next){
961
496
/* Is this process completely done? */
962
if(proc->completed and proc->eof){
497
if(proc->eof and proc->completed){
963
498
/* Only accept the plugin output if it exited cleanly */
964
499
if(not WIFEXITED(proc->status)
965
500
or WEXITSTATUS(proc->status) != 0){
966
501
/* Bad exit by plugin */
967
968
502
if(debug){
969
503
if(WIFEXITED(proc->status)){
970
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
971
" status %d\n", proc->name,
972
(intmax_t) (proc->pid),
973
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),
978
WTERMSIG(proc->status));
504
fprintf(stderr, "Plugin %d exited with status %d\n",
505
proc->pid, WEXITSTATUS(proc->status));
506
} else if(WIFSIGNALED(proc->status)) {
507
fprintf(stderr, "Plugin %d killed by signal %d\n",
508
proc->pid, WTERMSIG(proc->status));
979
509
} else if(WCOREDUMP(proc->status)){
980
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
981
" core\n", proc->name, (intmax_t) (proc->pid));
510
fprintf(stderr, "Plugin %d dumped core\n", proc->pid);
982
511
}
983
512
}
984
985
513
/* Remove the plugin */
986
514
FD_CLR(proc->fd, &rfds_all);
987
988
515
/* Block signal while modifying process_list */
989
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
516
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
990
517
if(ret < 0){
991
518
perror("sigprocmask");
992
519
exitstatus = EXIT_FAILURE;
993
goto fallback;
994
}
995
996
plugin *next_plugin = proc->next;
997
free_plugin(proc);
998
proc = next_plugin;
999
520
goto end;
521
}
522
/* Delete this process entry from the list */
523
if(process_list == proc){
524
/* First one - simple */
525
process_list = proc->next;
526
} else {
527
/* Second one or later */
528
for(process *p = process_list; p != NULL; p = p->next){
529
if(p->next == proc){
530
p->next = proc->next;
531
break;
532
}
533
}
534
}
1000
535
/* We are done modifying process list, so unblock signal */
1001
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1002
NULL);
536
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
537
NULL);
1003
538
if(ret < 0){
1004
539
perror("sigprocmask");
1005
exitstatus = EXIT_FAILURE;
1006
goto fallback;
1007
}
1008
1009
if(plugin_list == NULL){
1010
break;
1011
}
1012
1013
continue;
540
}
541
free(proc->buffer);
542
free(proc);
543
/* We deleted this process from the list, so we can't go
544
proc->next. Therefore, start over from the beginning of
545
the process list */
546
break;
1014
547
}
1015
1016
548
/* This process exited nicely, so print its buffer */
1017
1018
bool bret = print_out_password(proc->buffer,
1019
proc->buffer_length);
1020
if(not bret){
1021
perror("print_out_password");
1022
exitstatus = EXIT_FAILURE;
549
for(size_t written = 0; written < proc->buffer_length;
550
written += (size_t)ret){
551
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO,
552
proc->buffer + written,
553
proc->buffer_length
554
- written));
555
if(ret < 0){
556
perror("write");
557
exitstatus = EXIT_FAILURE;
558
goto end;
559
}
1023
560
}
1024
goto fallback;
561
goto end;
1025
562
}
1026
1027
563
/* This process has not completed. Does it have any output? */
1028
564
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1029
565
/* This process had nothing to say at this time */
1030
proc = proc->next;
1031
566
continue;
1032
567
}
1033
568
/* Before reading, make the process' data buffer large enough */
1034
569
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1035
570
proc->buffer = realloc(proc->buffer, proc->buffer_size
1036
571
+ (size_t) BUFFER_SIZE);
1037
if(proc->buffer == NULL){
572
if (proc->buffer == NULL){
1038
573
perror("malloc");
1039
574
exitstatus = EXIT_FAILURE;
1040
goto fallback;
575
goto end;
1041
576
}
1042
577
proc->buffer_size += BUFFER_SIZE;
1043
578
}
1044
579
/* Read from the process */
1045
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1046
BUFFER_SIZE);
1047
if(sret < 0){
580
ret = read(proc->fd, proc->buffer + proc->buffer_length,
581
BUFFER_SIZE);
582
if(ret < 0){
1048
583
/* Read error from this process; ignore the error */
1049
proc = proc->next;
1050
584
continue;
1051
585
}
1052
if(sret == 0){
586
if(ret == 0){
1053
587
/* got EOF */
1054
588
proc->eof = true;
1055
589
} else {
1056
proc->buffer_length += (size_t) sret;
590
proc->buffer_length += (size_t) ret;
1057
591
}
1058
592
}
1059
593
}
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 */
1067
bool bret;
1068
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
1069
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);
1077
if(not bret){
1078
perror("print_out_password");
1079
exitstatus = EXIT_FAILURE;
1080
}
594
if(process_list == NULL){
595
fprintf(stderr, "All plugin processes failed, exiting\n");
596
exitstatus = EXIT_FAILURE;
1081
597
}
1082
598
599
end:
1083
600
/* Restore old signal handler */
1084
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1085
if(ret == -1){
1086
perror("sigaction");
1087
exitstatus = EXIT_FAILURE;
1088
}
601
sigaction(SIGCHLD, &old_sigchld_action, NULL);
1089
602
1090
if(custom_argv != NULL){
1091
for(char **arg = custom_argv+1; *arg != NULL; arg++){
1092
free(*arg);
1093
}
1094
free(custom_argv);
603
/* Free the plugin list */
604
for(plugin *next; plugin_list != NULL; plugin_list = next){
605
next = plugin_list->next;
606
free(plugin_list->argv);
607
free(plugin_list);
1095
608
}
1096
609
1097
610
if(dir != NULL){
1098
611
closedir(dir);
1099
612
}
1100
613
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
}
1110
}
614
/* Free the process list and kill the processes */
615
for(process *next; process_list != NULL; process_list = next){
616
next = process_list->next;
617
close(process_list->fd);
618
kill(process_list->pid, SIGTERM);
619
free(process_list->buffer);
620
free(process_list);
1111
621
}
1112
622
1113
623
/* Wait for any remaining child processes to terminate */
1118
628
perror("wait");
1119
629
}
1120
630
1121
free_plugin_list();
1122
1123
free(plugindir);
1124
free(argfile);
1125
1126
631
return exitstatus;
1127
632
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0