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