To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to plugin-runner.c
- browse files at revision 237.2.67
- compare with another revision
- download diff
- download tarball
- view history from revision 237.2.67
- Committer: Teddy Hogeborn
- Date: 2009-02-09 02:01:13 UTC
- mto: (24.1.133 mandos) (237.4.2 mandos-pipe-ipc) (299.1.1 release) (300.1.1 release) (301.1.1 release)
- mto: This revision was merged to the branch mainline in revision 250.
- 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
114
char *copy_name = NULL;
109
115
if(name != NULL){
110
116
copy_name = strdup(name);
111
}
112
if(copy_name == NULL){
113
return NULL;
117
if(copy_name == NULL){
118
free(new_plugin);
119
return NULL;
120
}
114
121
}
115
122
116
*new_plugin = (plugin) { .name = copy_name,
117
.argc = 1,
118
.envc = 0,
119
.disabled = false,
120
.next = *plugin_list };
123
*new_plugin = (plugin){ .name = copy_name,
124
.argc = 1,
125
.disabled = false,
126
.next = plugin_list };
121
127
122
128
new_plugin->argv = malloc(sizeof(char *) * 2);
123
if (new_plugin->argv == NULL){
129
if(new_plugin->argv == NULL){
124
130
free(copy_name);
125
131
free(new_plugin);
126
132
return NULL;
127
133
}
128
134
new_plugin->argv[0] = copy_name;
129
135
new_plugin->argv[1] = NULL;
130
136
131
137
new_plugin->environ = malloc(sizeof(char *));
132
138
if(new_plugin->environ == NULL){
133
139
free(copy_name);
136
142
return NULL;
137
143
}
138
144
new_plugin->environ[0] = NULL;
145
139
146
/* Append the new plugin to the list */
140
*plugin_list = new_plugin;
147
plugin_list = new_plugin;
141
148
return new_plugin;
142
149
}
143
150
173
180
}
174
181
175
182
/* Add to a plugin's environment */
176
static bool add_environment(plugin *p, const char *def){
183
static bool add_environment(plugin *p, const char *def, bool replace){
177
184
if(p == NULL){
178
185
return false;
179
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
}
180
204
return add_to_char_array(def, &(p->environ), &(p->envc));
181
205
}
182
206
183
184
207
/*
185
208
* Based on the example in the GNU LibC manual chapter 13.13 "File
186
209
* Descriptor Flags".
187
210
* *Note File Descriptor Flags:(libc)Descriptor Flags.
188
211
*/
189
static int set_cloexec_flag(int fd)
190
{
212
static int set_cloexec_flag(int fd){
191
213
int ret = fcntl(fd, F_GETFD, 0);
192
214
/* If reading the flags failed, return error indication now. */
193
215
if(ret < 0){
197
219
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
198
220
}
199
221
200
process *process_list = NULL;
201
222
202
/* Mark a process as completed when it exits, and save its exit
223
/* Mark processes as completed when they exit, and save their exit
203
224
status. */
204
void handle_sigchld(__attribute__((unused)) int sig){
205
process *proc = process_list;
206
int status;
207
pid_t pid = wait(&status);
208
if(pid == -1){
209
perror("wait");
210
return;
211
}
212
while(proc != NULL and proc->pid != pid){
213
proc = proc->next;
214
}
215
if(proc == NULL){
216
/* Process not found in process list */
217
return;
218
}
219
proc->status = status;
220
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;
221
255
}
222
256
223
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){
224
259
ssize_t ret;
225
if(length>0 and buffer[length-1] == '\n'){
226
length--;
227
}
228
260
for(size_t written = 0; written < length; written += (size_t)ret){
229
261
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,
230
262
length - written));
235
267
return true;
236
268
}
237
269
238
char **add_to_argv(char **argv, int *argc, char *arg){
239
if (argv == NULL){
240
*argc = 1;
241
argv = malloc(sizeof(char*) * 2);
242
if(argv == NULL){
243
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
}
244
294
}
245
argv[0] = NULL; /* Will be set to argv[0] in main before parsing */
246
argv[1] = NULL;
247
}
248
*argc += 1;
249
argv = realloc(argv, sizeof(char *)
250
* ((unsigned int) *argc + 1));
251
if(argv == NULL){
252
return NULL;
253
}
254
argv[*argc-1] = arg;
255
argv[*argc] = NULL;
256
return argv;
295
}
296
297
free(plugin_node);
257
298
}
258
299
259
static void free_plugin_list(plugin *plugin_list){
260
for(plugin *next = plugin_list; plugin_list != NULL; plugin_list = next){
261
next = plugin_list->next;
262
free(plugin_list->name);
263
for(char **arg = plugin_list->argv; *arg != NULL; arg++){
264
free(*arg);
265
}
266
free(plugin_list->argv);
267
for(char **env = plugin_list->environ; *env != NULL; env++){
268
free(*env);
269
}
270
free(plugin_list->environ);
271
free(plugin_list);
272
}
300
static void free_plugin_list(void){
301
while(plugin_list != NULL){
302
free_plugin(plugin_list);
303
}
273
304
}
274
305
275
306
int main(int argc, char *argv[]){
276
const char *plugindir = "/lib/mandos/plugins.d";
277
const char *argfile = ARGFILE;
307
char *plugindir = NULL;
308
char *argfile = NULL;
278
309
FILE *conffp;
279
310
size_t d_name_len;
280
311
DIR *dir = NULL;
281
312
struct dirent *dirst;
282
313
struct stat st;
283
314
fd_set rfds_all;
284
int ret, maxfd = 0;
315
int ret, numchars, maxfd = 0;
316
ssize_t sret;
317
intmax_t tmpmax;
285
318
uid_t uid = 65534;
286
319
gid_t gid = 65534;
287
320
bool debug = false;
303
336
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
304
337
if(ret == -1){
305
338
perror("sigaction");
306
exitstatus = EXIT_FAILURE;
339
exitstatus = EXIT_FAILURE;
307
340
goto fallback;
308
341
}
309
342
312
345
{ .name = "global-options", .key = 'g',
313
346
.arg = "OPTION[,OPTION[,...]]",
314
347
.doc = "Options passed to all plugins" },
315
{ .name = "global-envs", .key = 'e',
348
{ .name = "global-env", .key = 'G',
316
349
.arg = "VAR=value",
317
350
.doc = "Environment variable passed to all plugins" },
318
351
{ .name = "options-for", .key = 'o',
319
352
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
320
353
.doc = "Options passed only to specified plugin" },
321
{ .name = "envs-for", .key = 'f',
354
{ .name = "env-for", .key = 'E',
322
355
.arg = "PLUGIN:ENV=value",
323
356
.doc = "Environment variable passed to specified plugin" },
324
357
{ .name = "disable", .key = 'd',
325
358
.arg = "PLUGIN",
326
359
.doc = "Disable a specific plugin", .group = 1 },
360
{ .name = "enable", .key = 'e',
361
.arg = "PLUGIN",
362
.doc = "Enable a specific plugin", .group = 1 },
327
363
{ .name = "plugin-dir", .key = 128,
328
364
.arg = "DIRECTORY",
329
365
.doc = "Specify a different plugin directory", .group = 2 },
330
{ .name = "userid", .key = 129,
331
.arg = "ID", .flags = 0,
332
.doc = "User ID the plugins will run as", .group = 2 },
333
{ .name = "groupid", .key = 130,
334
.arg = "ID", .flags = 0,
335
.doc = "Group ID the plugins will run as", .group = 2 },
336
{ .name = "debug", .key = 131,
337
.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 },
338
377
{ .name = NULL }
339
378
};
340
379
341
error_t parse_opt (int key, char *arg, struct argp_state *state) {
342
/* Get the INPUT argument from `argp_parse', which we know is a
343
pointer to our plugin list pointer. */
344
plugin **plugins = state->input;
345
switch (key) {
346
case 'g':
347
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){
348
385
char *p;
349
386
while((p = strsep(&arg, ",")) != NULL){
350
387
if(p[0] == '\0'){
351
388
continue;
352
389
}
353
if(not add_argument(getplugin(NULL, plugins), p)){
390
if(not add_argument(getplugin(NULL), p)){
354
391
perror("add_argument");
355
392
return ARGP_ERR_UNKNOWN;
356
393
}
357
394
}
358
395
}
359
396
break;
360
case 'e':
397
case 'G': /* --global-env */
361
398
if(arg == NULL){
362
399
break;
363
400
}
364
{
365
char *envdef = strdup(arg);
366
if(envdef == NULL){
367
break;
368
}
369
if(not add_environment(getplugin(NULL, plugins), envdef)){
370
perror("add_environment");
371
}
401
if(not add_environment(getplugin(NULL), arg, true)){
402
perror("add_environment");
372
403
}
373
404
break;
374
case 'o':
375
if (arg != NULL){
405
case 'o': /* --options-for */
406
if(arg != NULL){
376
407
char *p_name = strsep(&arg, ":");
377
if(p_name[0] == '\0'){
408
if(p_name[0] == '\0' or arg == NULL){
378
409
break;
379
410
}
380
411
char *opt = strsep(&arg, ":");
381
if(opt[0] == '\0'){
412
if(opt[0] == '\0' or opt == NULL){
382
413
break;
383
414
}
384
if(opt != NULL){
385
char *p;
386
while((p = strsep(&opt, ",")) != NULL){
387
if(p[0] == '\0'){
388
continue;
389
}
390
if(not add_argument(getplugin(p_name, plugins), p)){
391
perror("add_argument");
392
return ARGP_ERR_UNKNOWN;
393
}
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;
394
423
}
395
424
}
396
425
}
397
426
break;
398
case 'f':
427
case 'E': /* --env-for */
399
428
if(arg == NULL){
400
429
break;
401
430
}
404
433
if(envdef == NULL){
405
434
break;
406
435
}
407
char *p_name = strndup(arg, (size_t) (envdef-arg));
408
if(p_name == NULL){
409
break;
410
}
411
envdef++;
412
if(not add_environment(getplugin(p_name, plugins), envdef)){
436
*envdef = '\0';
437
if(not add_environment(getplugin(arg), envdef+1, true)){
413
438
perror("add_environment");
414
439
}
415
440
}
416
441
break;
417
case 'd':
418
if (arg != NULL){
419
plugin *p = getplugin(arg, plugins);
442
case 'd': /* --disable */
443
if(arg != NULL){
444
plugin *p = getplugin(arg);
420
445
if(p == NULL){
421
446
return ARGP_ERR_UNKNOWN;
422
447
}
423
448
p->disabled = true;
424
449
}
425
450
break;
426
case 128:
427
plugindir = arg;
428
break;
429
case 129:
430
uid = (uid_t)strtol(arg, NULL, 10);
431
break;
432
case 130:
433
gid = (gid_t)strtol(arg, NULL, 10);
434
break;
435
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 */
436
491
debug = true;
437
492
break;
438
case ARGP_KEY_ARG:
439
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
440
break;
441
case ARGP_KEY_END:
442
break;
443
default:
444
return ARGP_ERR_UNKNOWN;
445
}
446
return 0;
447
}
448
449
plugin *plugin_list = NULL;
450
451
struct argp argp = { .options = options, .parser = parse_opt,
452
.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 = "",
453
549
.doc = "Mandos plugin runner -- Run plugins" };
454
550
455
ret = argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
456
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){
457
555
fprintf(stderr, "Unknown error while parsing arguments\n");
458
556
exitstatus = EXIT_FAILURE;
459
557
goto fallback;
460
558
}
461
462
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
}
463
569
if(conffp != NULL){
464
570
char *org_line = NULL;
465
571
char *p, *arg, *new_arg, *line;
466
572
size_t size = 0;
467
ssize_t sret;
468
573
const char whitespace_delims[] = " \r\t\f\v\n";
469
574
const char comment_delim[] = "#";
470
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 */
471
588
while(true){
472
589
sret = getline(&org_line, &size, conffp);
473
590
if(sret == -1){
481
598
continue;
482
599
}
483
600
new_arg = strdup(p);
484
custom_argv = add_to_argv(custom_argv, &custom_argc, new_arg);
485
if (custom_argv == NULL){
486
perror("add_to_argv");
487
exitstatus = EXIT_FAILURE;
488
goto fallback;
489
}
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;
490
619
}
491
620
}
492
621
free(org_line);
493
} else{
622
} else {
494
623
/* Check for harmful errors and go to fallback. Other errors might
495
624
not affect opening plugins */
496
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
625
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
497
626
perror("fopen");
498
627
exitstatus = EXIT_FAILURE;
499
628
goto fallback;
500
629
}
501
630
}
502
631
/* If there was any arguments from configuration file,
632
pass them to parser as command arguments */
503
633
if(custom_argv != NULL){
504
custom_argv[0] = argv[0];
505
ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0, &plugin_list);
506
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){
507
637
fprintf(stderr, "Unknown error while parsing arguments\n");
508
638
exitstatus = EXIT_FAILURE;
509
639
goto fallback;
510
640
}
511
641
}
512
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
513
652
if(debug){
514
653
for(plugin *p = plugin_list; p != NULL; p=p->next){
515
654
fprintf(stderr, "Plugin: %s has %d arguments\n",
517
656
for(char **a = p->argv; *a != NULL; a++){
518
657
fprintf(stderr, "\tArg: %s\n", *a);
519
658
}
520
fprintf(stderr, "...and %u environment variables\n", p->envc);
659
fprintf(stderr, "...and %d environment variables\n", p->envc);
521
660
for(char **a = p->environ; *a != NULL; a++){
522
661
fprintf(stderr, "\t%s\n", *a);
523
662
}
524
663
}
525
664
}
526
665
666
/* Strip permissions down to nobody */
667
setgid(gid);
668
if(ret == -1){
669
perror("setgid");
670
}
527
671
ret = setuid(uid);
528
if (ret == -1){
672
if(ret == -1){
529
673
perror("setuid");
530
674
}
531
675
532
setgid(gid);
533
if (ret == -1){
534
perror("setgid");
676
if(plugindir == NULL){
677
dir = opendir(PDIR);
678
} else {
679
dir = opendir(plugindir);
535
680
}
536
681
537
dir = opendir(plugindir);
538
682
if(dir == NULL){
539
683
perror("Could not open plugin dir");
540
684
exitstatus = EXIT_FAILURE;
556
700
557
701
FD_ZERO(&rfds_all);
558
702
703
/* Read and execute any executable in the plugin directory*/
559
704
while(true){
560
705
dirst = readdir(dir);
561
706
562
// All directory entries have been processed
707
/* All directory entries have been processed */
563
708
if(dirst == NULL){
564
if (errno == EBADF){
709
if(errno == EBADF){
565
710
perror("readdir");
566
711
exitstatus = EXIT_FAILURE;
567
712
goto fallback;
571
716
572
717
d_name_len = strlen(dirst->d_name);
573
718
574
// Ignore dotfiles, backup files and other junk
719
/* Ignore dotfiles, backup files and other junk */
575
720
{
576
721
bool bad_name = false;
577
722
579
724
580
725
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
581
726
".dpkg-old",
727
".dpkg-bak",
582
728
".dpkg-divert", NULL };
583
729
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
584
730
size_t pre_len = strlen(*pre);
592
738
break;
593
739
}
594
740
}
595
596
741
if(bad_name){
597
742
continue;
598
743
}
599
600
744
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
601
745
size_t suf_len = strlen(*suf);
602
746
if((d_name_len >= suf_len)
617
761
}
618
762
619
763
char *filename;
620
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
}
621
769
if(ret < 0){
622
770
perror("asprintf");
623
771
continue;
624
772
}
625
773
626
774
ret = stat(filename, &st);
627
if (ret == -1){
775
if(ret == -1){
628
776
perror("stat");
629
777
free(filename);
630
778
continue;
631
779
}
632
633
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)){
634
783
if(debug){
635
784
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
636
785
" with bad type or mode\n", filename);
638
787
free(filename);
639
788
continue;
640
789
}
641
plugin *p = getplugin(dirst->d_name, &plugin_list);
790
791
plugin *p = getplugin(dirst->d_name);
642
792
if(p == NULL){
643
793
perror("getplugin");
644
794
free(filename);
654
804
}
655
805
{
656
806
/* Add global arguments to argument list for this plugin */
657
plugin *g = getplugin(NULL, &plugin_list);
807
plugin *g = getplugin(NULL);
658
808
if(g != NULL){
659
809
for(char **a = g->argv + 1; *a != NULL; a++){
660
810
if(not add_argument(p, *a)){
663
813
}
664
814
/* Add global environment variables */
665
815
for(char **e = g->environ; *e != NULL; e++){
666
if(not add_environment(p, *e)){
816
if(not add_environment(p, *e, false)){
667
817
perror("add_environment");
668
818
}
669
819
}
674
824
process, too. */
675
825
if(p->environ[0] != NULL){
676
826
for(char **e = environ; *e != NULL; e++){
677
char *copy = strdup(*e);
678
if(copy == NULL){
679
perror("strdup");
680
continue;
681
}
682
if(not add_environment(p, copy)){
827
if(not add_environment(p, *e, false)){
683
828
perror("add_environment");
684
829
}
685
830
}
686
831
}
687
832
688
int pipefd[2];
833
int pipefd[2];
689
834
ret = pipe(pipefd);
690
if (ret == -1){
835
if(ret == -1){
691
836
perror("pipe");
692
837
exitstatus = EXIT_FAILURE;
693
838
goto fallback;
694
839
}
840
/* Ask OS to automatic close the pipe on exec */
695
841
ret = set_cloexec_flag(pipefd[0]);
696
842
if(ret < 0){
697
843
perror("set_cloexec_flag");
705
851
goto fallback;
706
852
}
707
853
/* Block SIGCHLD until process is safely in process list */
708
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
854
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
709
855
if(ret < 0){
710
856
perror("sigprocmask");
711
857
exitstatus = EXIT_FAILURE;
712
858
goto fallback;
713
859
}
714
// Starting a new process to be watched
860
/* Starting a new process to be watched */
715
861
pid_t pid = fork();
716
862
if(pid == -1){
717
863
perror("fork");
725
871
perror("sigaction");
726
872
_exit(EXIT_FAILURE);
727
873
}
728
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
874
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
729
875
if(ret < 0){
730
876
perror("sigprocmask");
731
877
_exit(EXIT_FAILURE);
732
878
}
733
879
734
880
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
735
881
if(ret == -1){
736
882
perror("dup2");
755
901
}
756
902
/* no return */
757
903
}
758
/* parent process */
904
/* Parent process */
905
close(pipefd[1]); /* Close unused write end of pipe */
759
906
free(filename);
760
close(pipefd[1]); /* close unused write end of pipe */
761
process *new_process = malloc(sizeof(process));
762
if (new_process == NULL){
763
perror("malloc");
764
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);
765
911
if(ret < 0){
766
perror("sigprocmask");
912
perror("sigprocmask");
767
913
}
768
914
exitstatus = EXIT_FAILURE;
769
915
goto fallback;
770
916
}
771
917
772
*new_process = (struct process){ .pid = pid,
773
.fd = pipefd[0],
774
.next = process_list };
775
// List handling
776
process_list = new_process;
918
new_plugin->pid = pid;
919
new_plugin->fd = pipefd[0];
920
777
921
/* Unblock SIGCHLD so signal handler can be run if this process
778
922
has already completed */
779
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
923
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
780
924
if(ret < 0){
781
925
perror("sigprocmask");
782
926
exitstatus = EXIT_FAILURE;
783
927
goto fallback;
784
928
}
785
929
786
FD_SET(new_process->fd, &rfds_all);
930
FD_SET(new_plugin->fd, &rfds_all);
787
931
788
if (maxfd < new_process->fd){
789
maxfd = new_process->fd;
932
if(maxfd < new_plugin->fd){
933
maxfd = new_plugin->fd;
790
934
}
791
792
935
}
793
936
794
free_plugin_list(plugin_list);
795
796
937
closedir(dir);
797
938
dir = NULL;
798
799
if (process_list == NULL){
800
fprintf(stderr, "No plugin processes started. Incorrect plugin"
801
" directory?\n");
802
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
}
803
949
}
804
while(process_list){
950
951
/* Main loop while running plugins exist */
952
while(plugin_list){
805
953
fd_set rfds = rfds_all;
806
954
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
807
if (select_ret == -1){
955
if(select_ret == -1){
808
956
perror("select");
809
957
exitstatus = EXIT_FAILURE;
810
958
goto fallback;
811
959
}
812
960
/* OK, now either a process completed, or something can be read
813
961
from one of them */
814
for(process *proc = process_list; proc ; proc = proc->next){
962
for(plugin *proc = plugin_list; proc != NULL;){
815
963
/* Is this process completely done? */
816
if(proc->eof and proc->completed){
964
if(proc->completed and proc->eof){
817
965
/* Only accept the plugin output if it exited cleanly */
818
966
if(not WIFEXITED(proc->status)
819
967
or WEXITSTATUS(proc->status) != 0){
820
968
/* Bad exit by plugin */
969
821
970
if(debug){
822
971
if(WIFEXITED(proc->status)){
823
fprintf(stderr, "Plugin %u exited with status %d\n",
824
(unsigned int) (proc->pid),
972
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
973
" status %d\n", proc->name,
974
(intmax_t) (proc->pid),
825
975
WEXITSTATUS(proc->status));
826
} else if(WIFSIGNALED(proc->status)) {
827
fprintf(stderr, "Plugin %u killed by signal %d\n",
828
(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),
829
980
WTERMSIG(proc->status));
830
981
} else if(WCOREDUMP(proc->status)){
831
fprintf(stderr, "Plugin %d dumped core\n",
832
(unsigned int) (proc->pid));
982
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
983
" core\n", proc->name, (intmax_t) (proc->pid));
833
984
}
834
985
}
986
835
987
/* Remove the plugin */
836
988
FD_CLR(proc->fd, &rfds_all);
989
837
990
/* Block signal while modifying process_list */
838
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
991
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
839
992
if(ret < 0){
840
993
perror("sigprocmask");
841
994
exitstatus = EXIT_FAILURE;
842
995
goto fallback;
843
996
}
844
/* Delete this process entry from the list */
845
if(process_list == proc){
846
/* First one - simple */
847
process_list = proc->next;
848
} else {
849
/* Second one or later */
850
for(process *p = process_list; p != NULL; p = p->next){
851
if(p->next == proc){
852
p->next = proc->next;
853
break;
854
}
855
}
856
}
997
998
plugin *next_plugin = proc->next;
999
free_plugin(proc);
1000
proc = next_plugin;
1001
857
1002
/* We are done modifying process list, so unblock signal */
858
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
859
NULL);
1003
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1004
NULL);
860
1005
if(ret < 0){
861
1006
perror("sigprocmask");
862
}
863
free(proc->buffer);
864
free(proc);
865
/* We deleted this process from the list, so we can't go
866
proc->next. Therefore, start over from the beginning of
867
the process list */
868
break;
1007
exitstatus = EXIT_FAILURE;
1008
goto fallback;
1009
}
1010
1011
if(plugin_list == NULL){
1012
break;
1013
}
1014
1015
continue;
869
1016
}
1017
870
1018
/* This process exited nicely, so print its buffer */
871
872
bool bret = print_out_password(proc->buffer, proc->buffer_length);
1019
1020
bool bret = print_out_password(proc->buffer,
1021
proc->buffer_length);
873
1022
if(not bret){
874
1023
perror("print_out_password");
875
1024
exitstatus = EXIT_FAILURE;
876
1025
}
877
1026
goto fallback;
878
1027
}
1028
879
1029
/* This process has not completed. Does it have any output? */
880
1030
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
881
1031
/* This process had nothing to say at this time */
1032
proc = proc->next;
882
1033
continue;
883
1034
}
884
1035
/* Before reading, make the process' data buffer large enough */
885
1036
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
886
1037
proc->buffer = realloc(proc->buffer, proc->buffer_size
887
1038
+ (size_t) BUFFER_SIZE);
888
if (proc->buffer == NULL){
1039
if(proc->buffer == NULL){
889
1040
perror("malloc");
890
1041
exitstatus = EXIT_FAILURE;
891
1042
goto fallback;
893
1044
proc->buffer_size += BUFFER_SIZE;
894
1045
}
895
1046
/* Read from the process */
896
ret = read(proc->fd, proc->buffer + proc->buffer_length,
897
BUFFER_SIZE);
898
if(ret < 0){
1047
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1048
BUFFER_SIZE);
1049
if(sret < 0){
899
1050
/* Read error from this process; ignore the error */
1051
proc = proc->next;
900
1052
continue;
901
1053
}
902
if(ret == 0){
1054
if(sret == 0){
903
1055
/* got EOF */
904
1056
proc->eof = true;
905
1057
} else {
906
proc->buffer_length += (size_t) ret;
1058
proc->buffer_length += (size_t) sret;
907
1059
}
908
1060
}
909
1061
}
911
1063
912
1064
fallback:
913
1065
914
if(process_list == NULL or exitstatus != EXIT_SUCCESS){
915
/* 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 */
916
1069
bool bret;
917
1070
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
918
1071
char *passwordbuffer = getpass("Password: ");
919
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);
920
1079
if(not bret){
921
1080
perror("print_out_password");
922
1081
exitstatus = EXIT_FAILURE;
929
1088
perror("sigaction");
930
1089
exitstatus = EXIT_FAILURE;
931
1090
}
932
1091
933
1092
if(custom_argv != NULL){
934
for(char **arg = custom_argv; *arg != NULL; arg++){
1093
for(char **arg = custom_argv+1; *arg != NULL; arg++){
935
1094
free(*arg);
936
1095
}
937
1096
free(custom_argv);
938
1097
}
939
free_plugin_list(plugin_list);
940
1098
941
1099
if(dir != NULL){
942
1100
closedir(dir);
943
1101
}
944
1102
945
/* Free the process list and kill the processes */
946
for(process *next; process_list != NULL; process_list = next){
947
next = process_list->next;
948
close(process_list->fd);
949
ret = kill(process_list->pid, SIGTERM);
950
if(ret == -1 and errno != ESRCH){
951
/* set-uid proccesses migth not get closed */
952
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
}
953
1112
}
954
free(process_list->buffer);
955
free(process_list);
956
1113
}
957
1114
958
1115
/* Wait for any remaining child processes to terminate */
963
1120
perror("wait");
964
1121
}
965
1122
1123
free_plugin_list();
1124
1125
free(plugindir);
1126
free(argfile);
1127
966
1128
return exitstatus;
967
1129
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0