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