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 697
- compare with another revision
- download diff
- download tarball
- view history from revision 697
- Committer: Teddy Hogeborn
- Date: 2014-06-08 03:10:08 UTC
- Revision ID: teddy@recompile.se-20140608031008-mc9bd7b024a3q0y0
Address a very theoretical possible security issue in mandos-client.
If there were to run some sort of "cleaner" process for /run/tmp (or
/tmp), and mandos-client were to run for long enough for that cleaner
process to remove the temporary directory for GPGME, there was a
possibility that another unprivileged process could trick the (also
unprivileged) mandos-client process to remove other files or symlinks
which the unprivileged mandos-client process was allowed to remove.
This is not currently known to have been exploitable, since there are
no known initramfs environments running such cleaner processes.
* plugins.d/mandos-client.c (main): Use O_NOFOLLOW when opening
tempdir for cleaning.
If there were to run some sort of "cleaner" process for /run/tmp (or
/tmp), and mandos-client were to run for long enough for that cleaner
process to remove the temporary directory for GPGME, there was a
possibility that another unprivileged process could trick the (also
unprivileged) mandos-client process to remove other files or symlinks
which the unprivileged mandos-client process was allowed to remove.
This is not currently known to have been exploitable, since there are
no known initramfs environments running such cleaner processes.
* plugins.d/mandos-client.c (main): Use O_NOFOLLOW when opening
tempdir for cleaning.
- files added:
- .bzr-builddeb
- debian
- debian/po
- debian/source
- debian/upstream
- network-hooks.d
- files removed:
- network-protocol.txt
- 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
1
/* -*- coding: utf-8 -*- */
1
/* -*- coding: utf-8; mode: c; mode: orgtbl -*- */
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-2014 Teddy Hogeborn
6
* Copyright © 2008-2014 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
18
19
* along with this program. If not, see
19
20
* <http://www.gnu.org/licenses/>.
20
21
*
21
* Contact the authors at <mandos@fukt.bsnet.se>.
22
* Contact the authors at <mandos@recompile.se>.
22
23
*/
23
24
24
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline() */
25
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
O_CLOEXEC */
26
27
#include <stddef.h> /* size_t, NULL */
27
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
28
EXIT_SUCCESS, realloc() */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
29
realloc() */
29
30
#include <stdbool.h> /* bool, true, false */
30
#include <stdio.h> /* perror, popen(), fileno(),
31
fprintf(), stderr, STDOUT_FILENO */
32
#include <sys/types.h> /* DIR, opendir(), stat(), struct
31
#include <stdio.h> /* fileno(), fprintf(),
32
stderr, STDOUT_FILENO, fclose() */
33
#include <sys/types.h> /* DIR, fdopendir(), fstat(), struct
33
34
stat, waitpid(), WIFEXITED(),
34
35
WEXITSTATUS(), wait(), pid_t,
35
36
uid_t, gid_t, getuid(), getgid(),
37
38
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
38
39
FD_SET(), FD_ISSET(), FD_CLR */
39
40
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
40
WEXITSTATUS() */
41
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
41
WEXITSTATUS(), WTERMSIG(),
42
WCOREDUMP() */
43
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
42
44
#include <iso646.h> /* and, or, not */
43
#include <dirent.h> /* DIR, struct dirent, opendir(),
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
44
46
readdir(), closedir(), dirfd() */
45
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
46
fcntl(), setuid(), setgid(),
47
F_GETFD, F_SETFD, FD_CLOEXEC,
48
access(), pipe(), fork(), close()
49
dup2, STDOUT_FILENO, _exit(),
50
execv(), write(), read(),
51
close() */
47
#include <unistd.h> /* fcntl(), F_GETFD, F_SETFD,
48
FD_CLOEXEC, write(), STDOUT_FILENO,
49
struct stat, fstat(), close(),
50
setgid(), setuid(), S_ISREG(),
51
faccessat() pipe(), fork(),
52
_exit(), dup2(), fexecve(), read()
53
*/
52
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
53
FD_CLOEXEC */
54
#include <string.h> /* strsep, strlen(), strcpy(),
55
strcat() */
55
FD_CLOEXEC, openat() */
56
#include <string.h> /* strsep, strlen(), strsignal(),
57
strcmp(), strncmp() */
56
58
#include <errno.h> /* errno */
57
59
#include <argp.h> /* struct argp_option, struct
58
60
argp_state, struct argp,
59
61
argp_parse(), ARGP_ERR_UNKNOWN,
60
ARGP_KEY_END, ARGP_KEY_ARG, error_t */
62
ARGP_KEY_END, ARGP_KEY_ARG,
63
error_t */
61
64
#include <signal.h> /* struct sigaction, sigemptyset(),
62
65
sigaddset(), sigaction(),
63
66
sigprocmask(), SIG_BLOCK, SIGCHLD,
64
SIG_UNBLOCK, kill() */
67
SIG_UNBLOCK, kill(), sig_atomic_t
68
*/
65
69
#include <errno.h> /* errno, EBADF */
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
71
#include <sysexits.h> /* EX_OSERR, EX_USAGE, EX_IOERR,
72
EX_CONFIG, EX_UNAVAILABLE, EX_OK */
73
#include <errno.h> /* errno */
74
#include <error.h> /* error() */
75
#include <fnmatch.h> /* fnmatch() */
66
76
67
77
#define BUFFER_SIZE 256
68
#define ARGFILE "/conf/conf.d/mandos/plugin-runner.conf"
69
70
const char *argp_program_version = "plugin-runner 1.0";
71
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
72
73
struct process;
74
75
typedef struct process{
78
79
#define PDIR "/lib/mandos/plugins.d"
80
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
81
82
const char *argp_program_version = "plugin-runner " VERSION;
83
const char *argp_program_bug_address = "<mandos@recompile.se>";
84
85
typedef struct plugin{
86
char *name; /* can be NULL or any plugin name */
87
char **argv;
88
int argc;
89
char **environ;
90
int envc;
91
bool disabled;
92
93
/* Variables used for running processes*/
76
94
pid_t pid;
77
95
int fd;
78
96
char *buffer;
79
97
size_t buffer_size;
80
98
size_t buffer_length;
81
99
bool eof;
82
bool completed;
100
volatile sig_atomic_t completed;
83
101
int status;
84
struct process *next;
85
} process;
86
87
typedef struct plugin{
88
char *name; /* can be NULL or any plugin name */
89
char **argv;
90
int argc;
91
bool disabled;
92
102
struct plugin *next;
93
103
} plugin;
94
104
95
static plugin *getplugin(char *name, plugin **plugin_list){
96
for (plugin *p = *plugin_list; p != NULL; p = p->next){
97
if ((p->name == name)
98
or (p->name and name and (strcmp(p->name, name) == 0))){
105
static plugin *plugin_list = NULL;
106
107
/* Gets an existing plugin based on name,
108
or if none is found, creates a new one */
109
__attribute__((warn_unused_result))
110
static plugin *getplugin(char *name){
111
/* Check for existing plugin with that name */
112
for(plugin *p = plugin_list; p != NULL; p = p->next){
113
if((p->name == name)
114
or (p->name and name and (strcmp(p->name, name) == 0))){
99
115
return p;
100
116
}
101
117
}
102
118
/* Create a new plugin */
103
plugin *new_plugin = malloc(sizeof(plugin));
104
if (new_plugin == NULL){
105
perror("malloc");
106
exit(EXIT_FAILURE);
107
}
108
new_plugin->name = name;
109
new_plugin->argv = malloc(sizeof(char *) * 2);
110
if (new_plugin->argv == NULL){
111
perror("malloc");
112
exit(EXIT_FAILURE);
113
}
114
new_plugin->argv[0] = name;
119
plugin *new_plugin = NULL;
120
do {
121
new_plugin = malloc(sizeof(plugin));
122
} while(new_plugin == NULL and errno == EINTR);
123
if(new_plugin == NULL){
124
return NULL;
125
}
126
char *copy_name = NULL;
127
if(name != NULL){
128
do {
129
copy_name = strdup(name);
130
} while(copy_name == NULL and errno == EINTR);
131
if(copy_name == NULL){
132
int e = errno;
133
free(new_plugin);
134
errno = e;
135
return NULL;
136
}
137
}
138
139
*new_plugin = (plugin){ .name = copy_name,
140
.argc = 1,
141
.disabled = false,
142
.next = plugin_list };
143
144
do {
145
new_plugin->argv = malloc(sizeof(char *) * 2);
146
} while(new_plugin->argv == NULL and errno == EINTR);
147
if(new_plugin->argv == NULL){
148
int e = errno;
149
free(copy_name);
150
free(new_plugin);
151
errno = e;
152
return NULL;
153
}
154
new_plugin->argv[0] = copy_name;
115
155
new_plugin->argv[1] = NULL;
116
new_plugin->argc = 1;
117
new_plugin->disabled = false;
118
new_plugin->next = *plugin_list;
156
157
do {
158
new_plugin->environ = malloc(sizeof(char *));
159
} while(new_plugin->environ == NULL and errno == EINTR);
160
if(new_plugin->environ == NULL){
161
int e = errno;
162
free(copy_name);
163
free(new_plugin->argv);
164
free(new_plugin);
165
errno = e;
166
return NULL;
167
}
168
new_plugin->environ[0] = NULL;
169
119
170
/* Append the new plugin to the list */
120
*plugin_list = new_plugin;
171
plugin_list = new_plugin;
121
172
return new_plugin;
122
173
}
123
174
124
static void addargument(plugin *p, char *arg){
125
p->argv[p->argc] = arg;
126
p->argv = realloc(p->argv, sizeof(char *) * (size_t)(p->argc + 2));
127
if (p->argv == NULL){
128
perror("malloc");
129
exit(EXIT_FAILURE);
130
}
131
p->argc++;
132
p->argv[p->argc] = NULL;
175
/* Helper function for add_argument and add_environment */
176
__attribute__((nonnull, warn_unused_result))
177
static bool add_to_char_array(const char *new, char ***array,
178
int *len){
179
/* Resize the pointed-to array to hold one more pointer */
180
char **new_array = NULL;
181
do {
182
new_array = realloc(*array, sizeof(char *)
183
* (size_t) ((*len) + 2));
184
} while(new_array == NULL and errno == EINTR);
185
/* Malloc check */
186
if(new_array == NULL){
187
return false;
188
}
189
*array = new_array;
190
/* Make a copy of the new string */
191
char *copy;
192
do {
193
copy = strdup(new);
194
} while(copy == NULL and errno == EINTR);
195
if(copy == NULL){
196
return false;
197
}
198
/* Insert the copy */
199
(*array)[*len] = copy;
200
(*len)++;
201
/* Add a new terminating NULL pointer to the last element */
202
(*array)[*len] = NULL;
203
return true;
204
}
205
206
/* Add to a plugin's argument vector */
207
__attribute__((nonnull(2), warn_unused_result))
208
static bool add_argument(plugin *p, const char *arg){
209
if(p == NULL){
210
return false;
211
}
212
return add_to_char_array(arg, &(p->argv), &(p->argc));
213
}
214
215
/* Add to a plugin's environment */
216
__attribute__((nonnull(2), warn_unused_result))
217
static bool add_environment(plugin *p, const char *def, bool replace){
218
if(p == NULL){
219
return false;
220
}
221
/* namelen = length of name of environment variable */
222
size_t namelen = (size_t)(strchrnul(def, '=') - def);
223
/* Search for this environment variable */
224
for(char **envdef = p->environ; *envdef != NULL; envdef++){
225
if(strncmp(*envdef, def, namelen + 1) == 0){
226
/* It already exists */
227
if(replace){
228
char *new_envdef;
229
do {
230
new_envdef = realloc(*envdef, strlen(def) + 1);
231
} while(new_envdef == NULL and errno == EINTR);
232
if(new_envdef == NULL){
233
return false;
234
}
235
*envdef = new_envdef;
236
strcpy(*envdef, def);
237
}
238
return true;
239
}
240
}
241
return add_to_char_array(def, &(p->environ), &(p->envc));
133
242
}
134
243
135
244
/*
136
245
* Based on the example in the GNU LibC manual chapter 13.13 "File
137
246
* Descriptor Flags".
138
* *Note File Descriptor Flags:(libc)Descriptor Flags.
247
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
139
248
*/
140
static int set_cloexec_flag(int fd)
141
{
142
int ret = fcntl(fd, F_GETFD, 0);
249
__attribute__((warn_unused_result))
250
static int set_cloexec_flag(int fd){
251
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
143
252
/* If reading the flags failed, return error indication now. */
144
253
if(ret < 0){
145
254
return ret;
146
255
}
147
256
/* Store modified flag word in the descriptor. */
148
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
257
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
258
ret | FD_CLOEXEC));
149
259
}
150
260
151
process *process_list = NULL;
152
261
153
/* Mark a process as completed when it exits, and save its exit
262
/* Mark processes as completed when they exit, and save their exit
154
263
status. */
155
void handle_sigchld(__attribute__((unused)) int sig){
156
process *proc = process_list;
157
int status;
158
pid_t pid = wait(&status);
159
if(pid == -1){
160
perror("wait");
161
return;
162
}
163
while(proc != NULL and proc->pid != pid){
164
proc = proc->next;
165
}
166
if(proc == NULL){
167
/* Process not found in process list */
168
return;
169
}
170
proc->status = status;
171
proc->completed = true;
264
static void handle_sigchld(__attribute__((unused)) int sig){
265
int old_errno = errno;
266
while(true){
267
plugin *proc = plugin_list;
268
int status;
269
pid_t pid = waitpid(-1, &status, WNOHANG);
270
if(pid == 0){
271
/* Only still running child processes */
272
break;
273
}
274
if(pid == -1){
275
if(errno == ECHILD){
276
/* No child processes */
277
break;
278
}
279
error(0, errno, "waitpid");
280
}
281
282
/* A child exited, find it in process_list */
283
while(proc != NULL and proc->pid != pid){
284
proc = proc->next;
285
}
286
if(proc == NULL){
287
/* Process not found in process list */
288
continue;
289
}
290
proc->status = status;
291
proc->completed = 1;
292
}
293
errno = old_errno;
172
294
}
173
295
174
bool print_out_password(const char *buffer, size_t length){
296
/* Prints out a password to stdout */
297
__attribute__((nonnull, warn_unused_result))
298
static bool print_out_password(const char *buffer, size_t length){
175
299
ssize_t ret;
176
if(length>0 and buffer[length-1] == '\n'){
177
length--;
178
}
179
300
for(size_t written = 0; written < length; written += (size_t)ret){
180
301
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,
181
302
length - written));
186
307
return true;
187
308
}
188
309
189
char ** addcustomargument(char **argv, int *argc, char *arg){
190
191
if (argv == NULL){
192
*argc = 1;
193
argv = malloc(sizeof(char*) * 2);
194
if(argv == NULL){
195
return NULL;
310
/* Removes and free a plugin from the plugin list */
311
__attribute__((nonnull))
312
static void free_plugin(plugin *plugin_node){
313
314
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
315
free(*arg);
316
}
317
free(plugin_node->argv);
318
for(char **env = plugin_node->environ; *env != NULL; env++){
319
free(*env);
320
}
321
free(plugin_node->environ);
322
free(plugin_node->buffer);
323
324
/* Removes the plugin from the singly-linked list */
325
if(plugin_node == plugin_list){
326
/* First one - simple */
327
plugin_list = plugin_list->next;
328
} else {
329
/* Second one or later */
330
for(plugin *p = plugin_list; p != NULL; p = p->next){
331
if(p->next == plugin_node){
332
p->next = plugin_node->next;
333
break;
334
}
196
335
}
197
argv[0] = NULL; /* Will be set to argv[0] in main before parsing */
198
argv[1] = NULL;
199
}
200
*argc += 1;
201
argv = realloc(argv, sizeof(char *)
202
* ((unsigned int) *argc + 1));
203
if(argv == NULL){
204
return NULL;
205
}
206
argv[*argc-1] = arg;
207
argv[*argc] = NULL;
208
return argv;
336
}
337
338
free(plugin_node);
339
}
340
341
static void free_plugin_list(void){
342
while(plugin_list != NULL){
343
free_plugin(plugin_list);
344
}
209
345
}
210
346
211
347
int main(int argc, char *argv[]){
212
const char *plugindir = "/lib/mandos/plugins.d";
213
const char *argfile = ARGFILE;
348
char *plugindir = NULL;
349
char *argfile = NULL;
214
350
FILE *conffp;
215
size_t d_name_len;
216
351
DIR *dir = NULL;
217
352
struct dirent *dirst;
218
353
struct stat st;
219
354
fd_set rfds_all;
220
355
int ret, maxfd = 0;
356
ssize_t sret;
221
357
uid_t uid = 65534;
222
358
gid_t gid = 65534;
223
359
bool debug = false;
227
363
.sa_flags = SA_NOCLDSTOP };
228
364
char **custom_argv = NULL;
229
365
int custom_argc = 0;
366
int dir_fd;
230
367
231
368
/* Establish a signal handler */
232
369
sigemptyset(&sigchld_action.sa_mask);
233
370
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
234
if(ret < 0){
235
perror("sigaddset");
236
exit(EXIT_FAILURE);
371
if(ret == -1){
372
error(0, errno, "sigaddset");
373
exitstatus = EX_OSERR;
374
goto fallback;
237
375
}
238
376
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
239
if(ret < 0){
240
perror("sigaction");
241
exit(EXIT_FAILURE);
377
if(ret == -1){
378
error(0, errno, "sigaction");
379
exitstatus = EX_OSERR;
380
goto fallback;
242
381
}
243
382
244
383
/* The options we understand. */
246
385
{ .name = "global-options", .key = 'g',
247
386
.arg = "OPTION[,OPTION[,...]]",
248
387
.doc = "Options passed to all plugins" },
388
{ .name = "global-env", .key = 'G',
389
.arg = "VAR=value",
390
.doc = "Environment variable passed to all plugins" },
249
391
{ .name = "options-for", .key = 'o',
250
392
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
251
393
.doc = "Options passed only to specified plugin" },
394
{ .name = "env-for", .key = 'E',
395
.arg = "PLUGIN:ENV=value",
396
.doc = "Environment variable passed to specified plugin" },
252
397
{ .name = "disable", .key = 'd',
253
398
.arg = "PLUGIN",
254
399
.doc = "Disable a specific plugin", .group = 1 },
400
{ .name = "enable", .key = 'e',
401
.arg = "PLUGIN",
402
.doc = "Enable a specific plugin", .group = 1 },
255
403
{ .name = "plugin-dir", .key = 128,
256
404
.arg = "DIRECTORY",
257
405
.doc = "Specify a different plugin directory", .group = 2 },
258
{ .name = "userid", .key = 129,
259
.arg = "ID", .flags = 0,
260
.doc = "User ID the plugins will run as", .group = 2 },
261
{ .name = "groupid", .key = 130,
262
.arg = "ID", .flags = 0,
263
.doc = "Group ID the plugins will run as", .group = 2 },
264
{ .name = "debug", .key = 131,
265
.doc = "Debug mode", .group = 3 },
406
{ .name = "config-file", .key = 129,
407
.arg = "FILE",
408
.doc = "Specify a different configuration file", .group = 2 },
409
{ .name = "userid", .key = 130,
410
.arg = "ID", .flags = 0,
411
.doc = "User ID the plugins will run as", .group = 3 },
412
{ .name = "groupid", .key = 131,
413
.arg = "ID", .flags = 0,
414
.doc = "Group ID the plugins will run as", .group = 3 },
415
{ .name = "debug", .key = 132,
416
.doc = "Debug mode", .group = 4 },
417
/*
418
* These reproduce what we would get without ARGP_NO_HELP
419
*/
420
{ .name = "help", .key = '?',
421
.doc = "Give this help list", .group = -1 },
422
{ .name = "usage", .key = -3,
423
.doc = "Give a short usage message", .group = -1 },
424
{ .name = "version", .key = 'V',
425
.doc = "Print program version", .group = -1 },
266
426
{ .name = NULL }
267
427
};
268
428
269
error_t parse_opt (int key, char *arg, struct argp_state *state) {
270
/* Get the INPUT argument from `argp_parse', which we know is a
271
pointer to our plugin list pointer. */
272
plugin **plugins = state->input;
273
switch (key) {
274
case 'g':
275
if (arg != NULL){
276
char *p;
277
while((p = strsep(&arg, ",")) != NULL){
278
if(p[0] == '\0'){
279
continue;
280
}
281
addargument(getplugin(NULL, plugins), p);
282
}
283
}
284
break;
285
case 'o':
286
if (arg != NULL){
287
char *name = strsep(&arg, ":");
288
if(name[0] == '\0'){
289
break;
290
}
291
char *opt = strsep(&arg, ":");
292
if(opt[0] == '\0'){
293
break;
294
}
295
if(opt != NULL){
296
char *p;
297
while((p = strsep(&opt, ",")) != NULL){
298
if(p[0] == '\0'){
299
continue;
300
}
301
addargument(getplugin(name, plugins), p);
302
}
303
}
304
}
305
break;
306
case 'd':
307
if (arg != NULL){
308
getplugin(arg, plugins)->disabled = true;
309
}
310
break;
311
case 128:
312
plugindir = arg;
313
break;
314
case 129:
315
uid = (uid_t)strtol(arg, NULL, 10);
316
break;
317
case 130:
318
gid = (gid_t)strtol(arg, NULL, 10);
319
break;
320
case 131:
429
__attribute__((nonnull(3)))
430
error_t parse_opt(int key, char *arg, struct argp_state *state){
431
errno = 0;
432
switch(key){
433
char *tmp;
434
intmax_t tmp_id;
435
case 'g': /* --global-options */
436
{
437
char *plugin_option;
438
while((plugin_option = strsep(&arg, ",")) != NULL){
439
if(not add_argument(getplugin(NULL), plugin_option)){
440
break;
441
}
442
}
443
errno = 0;
444
}
445
break;
446
case 'G': /* --global-env */
447
if(add_environment(getplugin(NULL), arg, true)){
448
errno = 0;
449
}
450
break;
451
case 'o': /* --options-for */
452
{
453
char *option_list = strchr(arg, ':');
454
if(option_list == NULL){
455
argp_error(state, "No colon in \"%s\"", arg);
456
errno = EINVAL;
457
break;
458
}
459
*option_list = '\0';
460
option_list++;
461
if(arg[0] == '\0'){
462
argp_error(state, "Empty plugin name");
463
errno = EINVAL;
464
break;
465
}
466
char *option;
467
while((option = strsep(&option_list, ",")) != NULL){
468
if(not add_argument(getplugin(arg), option)){
469
break;
470
}
471
}
472
errno = 0;
473
}
474
break;
475
case 'E': /* --env-for */
476
{
477
char *envdef = strchr(arg, ':');
478
if(envdef == NULL){
479
argp_error(state, "No colon in \"%s\"", arg);
480
errno = EINVAL;
481
break;
482
}
483
*envdef = '\0';
484
envdef++;
485
if(arg[0] == '\0'){
486
argp_error(state, "Empty plugin name");
487
errno = EINVAL;
488
break;
489
}
490
if(add_environment(getplugin(arg), envdef, true)){
491
errno = 0;
492
}
493
}
494
break;
495
case 'd': /* --disable */
496
{
497
plugin *p = getplugin(arg);
498
if(p != NULL){
499
p->disabled = true;
500
errno = 0;
501
}
502
}
503
break;
504
case 'e': /* --enable */
505
{
506
plugin *p = getplugin(arg);
507
if(p != NULL){
508
p->disabled = false;
509
errno = 0;
510
}
511
}
512
break;
513
case 128: /* --plugin-dir */
514
free(plugindir);
515
plugindir = strdup(arg);
516
if(plugindir != NULL){
517
errno = 0;
518
}
519
break;
520
case 129: /* --config-file */
521
/* This is already done by parse_opt_config_file() */
522
break;
523
case 130: /* --userid */
524
tmp_id = strtoimax(arg, &tmp, 10);
525
if(errno != 0 or tmp == arg or *tmp != '\0'
526
or tmp_id != (uid_t)tmp_id){
527
argp_error(state, "Bad user ID number: \"%s\", using %"
528
PRIdMAX, arg, (intmax_t)uid);
529
break;
530
}
531
uid = (uid_t)tmp_id;
532
errno = 0;
533
break;
534
case 131: /* --groupid */
535
tmp_id = strtoimax(arg, &tmp, 10);
536
if(errno != 0 or tmp == arg or *tmp != '\0'
537
or tmp_id != (gid_t)tmp_id){
538
argp_error(state, "Bad group ID number: \"%s\", using %"
539
PRIdMAX, arg, (intmax_t)gid);
540
break;
541
}
542
gid = (gid_t)tmp_id;
543
errno = 0;
544
break;
545
case 132: /* --debug */
321
546
debug = true;
322
547
break;
323
case ARGP_KEY_ARG:
324
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
325
break;
326
case ARGP_KEY_END:
327
break;
328
default:
329
return ARGP_ERR_UNKNOWN;
330
}
331
return 0;
332
}
333
334
plugin *plugin_list = NULL;
335
336
struct argp argp = { .options = options, .parser = parse_opt,
337
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
548
/*
549
* These reproduce what we would get without ARGP_NO_HELP
550
*/
551
case '?': /* --help */
552
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
553
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
554
case -3: /* --usage */
555
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
556
argp_state_help(state, state->out_stream,
557
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
558
case 'V': /* --version */
559
fprintf(state->out_stream, "%s\n", argp_program_version);
560
exit(EXIT_SUCCESS);
561
break;
562
/*
563
* When adding more options before this line, remember to also add a
564
* "case" to the "parse_opt_config_file" function below.
565
*/
566
case ARGP_KEY_ARG:
567
/* Cryptsetup always passes an argument, which is an empty
568
string if "none" was specified in /etc/crypttab. So if
569
argument was empty, we ignore it silently. */
570
if(arg[0] == '\0'){
571
break;
572
}
573
default:
574
return ARGP_ERR_UNKNOWN;
575
}
576
return errno; /* Set to 0 at start */
577
}
578
579
/* This option parser is the same as parse_opt() above, except it
580
ignores everything but the --config-file option. */
581
error_t parse_opt_config_file(int key, char *arg,
582
__attribute__((unused))
583
struct argp_state *state){
584
errno = 0;
585
switch(key){
586
case 'g': /* --global-options */
587
case 'G': /* --global-env */
588
case 'o': /* --options-for */
589
case 'E': /* --env-for */
590
case 'd': /* --disable */
591
case 'e': /* --enable */
592
case 128: /* --plugin-dir */
593
break;
594
case 129: /* --config-file */
595
free(argfile);
596
argfile = strdup(arg);
597
if(argfile != NULL){
598
errno = 0;
599
}
600
break;
601
case 130: /* --userid */
602
case 131: /* --groupid */
603
case 132: /* --debug */
604
case '?': /* --help */
605
case -3: /* --usage */
606
case 'V': /* --version */
607
case ARGP_KEY_ARG:
608
break;
609
default:
610
return ARGP_ERR_UNKNOWN;
611
}
612
return errno;
613
}
614
615
struct argp argp = { .options = options,
616
.parser = parse_opt_config_file,
617
.args_doc = "",
338
618
.doc = "Mandos plugin runner -- Run plugins" };
339
619
340
ret = argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
341
if (ret == ARGP_ERR_UNKNOWN){
342
fprintf(stderr, "Unknown error while parsing arguments\n");
343
exitstatus = EXIT_FAILURE;
344
goto end;
345
}
346
347
conffp = fopen(argfile, "r");
620
/* Parse using parse_opt_config_file() in order to get the custom
621
config file location, if any. */
622
ret = argp_parse(&argp, argc, argv,
623
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
624
NULL, NULL);
625
switch(ret){
626
case 0:
627
break;
628
case ENOMEM:
629
default:
630
errno = ret;
631
error(0, errno, "argp_parse");
632
exitstatus = EX_OSERR;
633
goto fallback;
634
case EINVAL:
635
exitstatus = EX_USAGE;
636
goto fallback;
637
}
638
639
/* Reset to the normal argument parser */
640
argp.parser = parse_opt;
641
642
/* Open the configfile if available */
643
if(argfile == NULL){
644
conffp = fopen(AFILE, "r");
645
} else {
646
conffp = fopen(argfile, "r");
647
}
348
648
if(conffp != NULL){
349
649
char *org_line = NULL;
650
char *p, *arg, *new_arg, *line;
350
651
size_t size = 0;
351
ssize_t sret;
352
char *p, *arg, *new_arg, *line;
353
652
const char whitespace_delims[] = " \r\t\f\v\n";
354
653
const char comment_delim[] = "#";
355
654
655
custom_argc = 1;
656
custom_argv = malloc(sizeof(char*) * 2);
657
if(custom_argv == NULL){
658
error(0, errno, "malloc");
659
exitstatus = EX_OSERR;
660
goto fallback;
661
}
662
custom_argv[0] = argv[0];
663
custom_argv[1] = NULL;
664
665
/* for each line in the config file, strip whitespace and ignore
666
commented text */
356
667
while(true){
357
668
sret = getline(&org_line, &size, conffp);
358
669
if(sret == -1){
359
670
break;
360
671
}
361
672
362
673
line = org_line;
363
674
arg = strsep(&line, comment_delim);
364
675
while((p = strsep(&arg, whitespace_delims)) != NULL){
366
677
continue;
367
678
}
368
679
new_arg = strdup(p);
369
custom_argv = addcustomargument(custom_argv, &custom_argc, new_arg);
370
if (custom_argv == NULL){
371
perror("addcustomargument");
372
exitstatus = EXIT_FAILURE;
373
goto end;
374
}
680
if(new_arg == NULL){
681
error(0, errno, "strdup");
682
exitstatus = EX_OSERR;
683
free(org_line);
684
goto fallback;
685
}
686
687
custom_argc += 1;
688
{
689
char **new_argv = realloc(custom_argv, sizeof(char *)
690
* ((unsigned int)
691
custom_argc + 1));
692
if(new_argv == NULL){
693
error(0, errno, "realloc");
694
exitstatus = EX_OSERR;
695
free(new_arg);
696
free(org_line);
697
goto fallback;
698
} else {
699
custom_argv = new_argv;
700
}
701
}
702
custom_argv[custom_argc-1] = new_arg;
703
custom_argv[custom_argc] = NULL;
375
704
}
376
705
}
706
do {
707
ret = fclose(conffp);
708
} while(ret == EOF and errno == EINTR);
709
if(ret == EOF){
710
error(0, errno, "fclose");
711
exitstatus = EX_IOERR;
712
goto fallback;
713
}
377
714
free(org_line);
378
} else{
715
} else {
379
716
/* Check for harmful errors and go to fallback. Other errors might
380
717
not affect opening plugins */
381
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
382
perror("fopen");
383
exitstatus = EXIT_FAILURE;
384
goto end;
718
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
719
error(0, errno, "fopen");
720
exitstatus = EX_OSERR;
721
goto fallback;
385
722
}
386
723
}
387
724
/* If there were any arguments from the configuration file, pass
725
them to parser as command line arguments */
388
726
if(custom_argv != NULL){
389
custom_argv[0] = argv[0];
390
ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0, &plugin_list);
391
if (ret == ARGP_ERR_UNKNOWN){
392
fprintf(stderr, "Unknown error while parsing arguments\n");
393
exitstatus = EXIT_FAILURE;
394
goto end;
727
ret = argp_parse(&argp, custom_argc, custom_argv,
728
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
729
NULL, NULL);
730
switch(ret){
731
case 0:
732
break;
733
case ENOMEM:
734
default:
735
errno = ret;
736
error(0, errno, "argp_parse");
737
exitstatus = EX_OSERR;
738
goto fallback;
739
case EINVAL:
740
exitstatus = EX_CONFIG;
741
goto fallback;
395
742
}
396
743
}
397
744
745
/* Parse actual command line arguments, to let them override the
746
config file */
747
ret = argp_parse(&argp, argc, argv,
748
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
749
NULL, NULL);
750
switch(ret){
751
case 0:
752
break;
753
case ENOMEM:
754
default:
755
errno = ret;
756
error(0, errno, "argp_parse");
757
exitstatus = EX_OSERR;
758
goto fallback;
759
case EINVAL:
760
exitstatus = EX_USAGE;
761
goto fallback;
762
}
763
398
764
if(debug){
399
765
for(plugin *p = plugin_list; p != NULL; p=p->next){
400
766
fprintf(stderr, "Plugin: %s has %d arguments\n",
402
768
for(char **a = p->argv; *a != NULL; a++){
403
769
fprintf(stderr, "\tArg: %s\n", *a);
404
770
}
405
}
406
}
407
771
fprintf(stderr, "...and %d environment variables\n", p->envc);
772
for(char **a = p->environ; *a != NULL; a++){
773
fprintf(stderr, "\t%s\n", *a);
774
}
775
}
776
}
777
778
if(getuid() == 0){
779
/* Work around Debian bug #633582:
780
<http://bugs.debian.org/633582> */
781
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
782
if(plugindir_fd == -1){
783
if(errno != ENOENT){
784
error(0, errno, "open(\"" PDIR "\")");
785
}
786
} else {
787
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
788
if(ret == -1){
789
error(0, errno, "fstat");
790
} else {
791
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
792
ret = fchown(plugindir_fd, uid, gid);
793
if(ret == -1){
794
error(0, errno, "fchown");
795
}
796
}
797
}
798
TEMP_FAILURE_RETRY(close(plugindir_fd));
799
}
800
}
801
802
/* Lower permissions */
803
ret = setgid(gid);
804
if(ret == -1){
805
error(0, errno, "setgid");
806
}
408
807
ret = setuid(uid);
409
if (ret == -1){
410
perror("setuid");
411
}
412
413
setgid(gid);
414
if (ret == -1){
415
perror("setgid");
416
}
417
418
dir = opendir(plugindir);
419
if(dir == NULL){
420
perror("Could not open plugin dir");
421
exitstatus = EXIT_FAILURE;
422
goto end;
423
}
424
425
/* Set the FD_CLOEXEC flag on the directory, if possible */
808
if(ret == -1){
809
error(0, errno, "setuid");
810
}
811
812
/* Open plugin directory with close_on_exec flag */
426
813
{
427
int dir_fd = dirfd(dir);
428
if(dir_fd >= 0){
429
ret = set_cloexec_flag(dir_fd);
430
if(ret < 0){
431
perror("set_cloexec_flag");
432
exitstatus = EXIT_FAILURE;
433
goto end;
434
}
814
dir_fd = open(plugindir != NULL ? plugindir : PDIR, O_RDONLY |
815
#ifdef O_CLOEXEC
816
O_CLOEXEC
817
#else /* not O_CLOEXEC */
818
0
819
#endif /* not O_CLOEXEC */
820
);
821
if(dir_fd == -1){
822
error(0, errno, "Could not open plugin dir");
823
exitstatus = EX_UNAVAILABLE;
824
goto fallback;
825
}
826
827
#ifndef O_CLOEXEC
828
/* Set the FD_CLOEXEC flag on the directory */
829
ret = set_cloexec_flag(dir_fd);
830
if(ret < 0){
831
error(0, errno, "set_cloexec_flag");
832
TEMP_FAILURE_RETRY(close(dir_fd));
833
exitstatus = EX_OSERR;
834
goto fallback;
835
}
836
#endif /* O_CLOEXEC */
837
838
dir = fdopendir(dir_fd);
839
if(dir == NULL){
840
error(0, errno, "Could not open plugin dir");
841
TEMP_FAILURE_RETRY(close(dir_fd));
842
exitstatus = EX_OSERR;
843
goto fallback;
435
844
}
436
845
}
437
846
438
847
FD_ZERO(&rfds_all);
439
848
849
/* Read and execute any executable in the plugin directory*/
440
850
while(true){
441
dirst = readdir(dir);
851
do {
852
dirst = readdir(dir);
853
} while(dirst == NULL and errno == EINTR);
442
854
443
// All directory entries have been processed
855
/* All directory entries have been processed */
444
856
if(dirst == NULL){
445
if (errno == EBADF){
446
perror("readdir");
447
exitstatus = EXIT_FAILURE;
448
goto end;
857
if(errno == EBADF){
858
error(0, errno, "readdir");
859
exitstatus = EX_IOERR;
860
goto fallback;
449
861
}
450
862
break;
451
863
}
452
864
453
d_name_len = strlen(dirst->d_name);
454
455
// Ignore dotfiles, backup files and other junk
865
/* Ignore dotfiles, backup files and other junk */
456
866
{
457
867
bool bad_name = false;
458
459
const char const *bad_prefixes[] = { ".", "#", NULL };
460
461
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
462
".dpkg-old",
463
".dpkg-divert", NULL };
464
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
465
size_t pre_len = strlen(*pre);
466
if((d_name_len >= pre_len)
467
and strncmp((dirst->d_name), *pre, pre_len) == 0){
468
if(debug){
469
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
470
" with bad prefix %s\n", dirst->d_name, *pre);
471
}
472
bad_name = true;
473
break;
474
}
475
}
476
477
if(bad_name){
478
continue;
479
}
480
481
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
482
size_t suf_len = strlen(*suf);
483
if((d_name_len >= suf_len)
484
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
485
== 0)){
486
if(debug){
487
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
488
" with bad suffix %s\n", dirst->d_name, *suf);
489
}
490
bad_name = true;
491
break;
492
}
493
}
494
495
if(bad_name){
496
continue;
497
}
498
}
499
500
char *filename = malloc(d_name_len + strlen(plugindir) + 2);
501
if (filename == NULL){
502
perror("malloc");
503
continue;
504
}
505
strcpy(filename, plugindir); /* Spurious warning */
506
strcat(filename, "/"); /* Spurious warning */
507
strcat(filename, dirst->d_name); /* Spurious warning */
508
509
ret = stat(filename, &st);
510
if (ret == -1){
511
perror("stat");
512
free(filename);
513
continue;
514
}
515
516
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
868
const char * const patterns[] = { ".*", "#*#", "*~",
869
"*.dpkg-new", "*.dpkg-old",
870
"*.dpkg-bak", "*.dpkg-divert",
871
NULL };
872
#ifdef __GNUC__
873
#pragma GCC diagnostic push
874
#pragma GCC diagnostic ignored "-Wcast-qual"
875
#endif
876
for(const char **pat = (const char **)patterns;
877
*pat != NULL; pat++){
878
#ifdef __GNUC__
879
#pragma GCC diagnostic pop
880
#endif
881
if(fnmatch(*pat, dirst->d_name,
882
FNM_FILE_NAME | FNM_PERIOD) != FNM_NOMATCH){
883
if(debug){
884
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
885
" matching pattern %s\n", dirst->d_name, *pat);
886
}
887
bad_name = true;
888
break;
889
}
890
}
891
if(bad_name){
892
continue;
893
}
894
}
895
896
int plugin_fd = openat(dir_fd, dirst->d_name, O_RDONLY |
897
#ifdef O_CLOEXEC
898
O_CLOEXEC
899
#else /* not O_CLOEXEC */
900
0
901
#endif /* not O_CLOEXEC */
902
);
903
if(plugin_fd == -1){
904
error(0, errno, "Could not open plugin");
905
continue;
906
}
907
#ifndef O_CLOEXEC
908
/* Set the FD_CLOEXEC flag on the plugin FD */
909
ret = set_cloexec_flag(plugin_fd);
910
if(ret < 0){
911
error(0, errno, "set_cloexec_flag");
912
TEMP_FAILURE_RETRY(close(plugin_fd));
913
continue;
914
}
915
#endif /* O_CLOEXEC */
916
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
917
if(ret == -1){
918
error(0, errno, "stat");
919
TEMP_FAILURE_RETRY(close(plugin_fd));
920
continue;
921
}
922
923
/* Ignore non-executable files */
924
if(not S_ISREG(st.st_mode)
925
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, dirst->d_name, X_OK,
926
0)) != 0)){
517
927
if(debug){
518
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
519
" with bad type or mode\n", filename);
928
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
929
" with bad type or mode\n",
930
plugindir != NULL ? plugindir : PDIR, dirst->d_name);
520
931
}
521
free(filename);
522
continue;
523
}
524
if(getplugin(dirst->d_name, &plugin_list)->disabled){
932
TEMP_FAILURE_RETRY(close(plugin_fd));
933
continue;
934
}
935
936
plugin *p = getplugin(dirst->d_name);
937
if(p == NULL){
938
error(0, errno, "getplugin");
939
TEMP_FAILURE_RETRY(close(plugin_fd));
940
continue;
941
}
942
if(p->disabled){
525
943
if(debug){
526
944
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
527
945
dirst->d_name);
528
946
}
529
free(filename);
947
TEMP_FAILURE_RETRY(close(plugin_fd));
530
948
continue;
531
949
}
532
plugin *p = getplugin(dirst->d_name, &plugin_list);
533
950
{
534
951
/* Add global arguments to argument list for this plugin */
535
plugin *g = getplugin(NULL, &plugin_list);
536
for(char **a = g->argv + 1; *a != NULL; a++){
537
addargument(p, *a);
538
}
539
}
540
int pipefd[2];
541
ret = pipe(pipefd);
542
if (ret == -1){
543
perror("pipe");
544
exitstatus = EXIT_FAILURE;
545
goto end;
546
}
952
plugin *g = getplugin(NULL);
953
if(g != NULL){
954
for(char **a = g->argv + 1; *a != NULL; a++){
955
if(not add_argument(p, *a)){
956
error(0, errno, "add_argument");
957
}
958
}
959
/* Add global environment variables */
960
for(char **e = g->environ; *e != NULL; e++){
961
if(not add_environment(p, *e, false)){
962
error(0, errno, "add_environment");
963
}
964
}
965
}
966
}
967
/* If this plugin has any environment variables, we need to
968
duplicate the environment from this process, too. */
969
if(p->environ[0] != NULL){
970
for(char **e = environ; *e != NULL; e++){
971
if(not add_environment(p, *e, false)){
972
error(0, errno, "add_environment");
973
}
974
}
975
}
976
977
int pipefd[2];
978
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
979
if(ret == -1){
980
error(0, errno, "pipe");
981
exitstatus = EX_OSERR;
982
goto fallback;
983
}
984
/* Ask OS to automatic close the pipe on exec */
547
985
ret = set_cloexec_flag(pipefd[0]);
548
986
if(ret < 0){
549
perror("set_cloexec_flag");
550
exitstatus = EXIT_FAILURE;
551
goto end;
987
error(0, errno, "set_cloexec_flag");
988
exitstatus = EX_OSERR;
989
goto fallback;
552
990
}
553
991
ret = set_cloexec_flag(pipefd[1]);
554
992
if(ret < 0){
555
perror("set_cloexec_flag");
556
exitstatus = EXIT_FAILURE;
557
goto end;
993
error(0, errno, "set_cloexec_flag");
994
exitstatus = EX_OSERR;
995
goto fallback;
558
996
}
559
997
/* Block SIGCHLD until process is safely in process list */
560
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
998
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
999
&sigchld_action.sa_mask,
1000
NULL));
561
1001
if(ret < 0){
562
perror("sigprocmask");
563
exitstatus = EXIT_FAILURE;
564
goto end;
1002
error(0, errno, "sigprocmask");
1003
exitstatus = EX_OSERR;
1004
goto fallback;
565
1005
}
566
// Starting a new process to be watched
567
pid_t pid = fork();
1006
/* Starting a new process to be watched */
1007
pid_t pid;
1008
do {
1009
pid = fork();
1010
} while(pid == -1 and errno == EINTR);
568
1011
if(pid == -1){
569
perror("fork");
570
exitstatus = EXIT_FAILURE;
571
goto end;
1012
error(0, errno, "fork");
1013
exitstatus = EX_OSERR;
1014
goto fallback;
572
1015
}
573
1016
if(pid == 0){
574
1017
/* this is the child process */
575
1018
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
576
1019
if(ret < 0){
577
perror("sigaction");
578
_exit(EXIT_FAILURE);
1020
error(0, errno, "sigaction");
1021
_exit(EX_OSERR);
579
1022
}
580
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1023
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
581
1024
if(ret < 0){
582
perror("sigprocmask");
583
_exit(EXIT_FAILURE);
1025
error(0, errno, "sigprocmask");
1026
_exit(EX_OSERR);
584
1027
}
585
1028
586
1029
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
587
1030
if(ret == -1){
588
perror("dup2");
589
_exit(EXIT_FAILURE);
1031
error(0, errno, "dup2");
1032
_exit(EX_OSERR);
590
1033
}
591
1034
592
1035
if(dirfd(dir) < 0){
594
1037
above and must now close it manually here. */
595
1038
closedir(dir);
596
1039
}
597
if(execv(filename, p->argv) < 0){
598
perror("execv");
599
_exit(EXIT_FAILURE);
1040
if(fexecve(plugin_fd, p->argv,
1041
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1042
error(0, errno, "fexecve for %s/%s",
1043
plugindir != NULL ? plugindir : PDIR, dirst->d_name);
1044
_exit(EX_OSERR);
600
1045
}
601
1046
/* no return */
602
1047
}
603
/* parent process */
604
free(filename);
605
close(pipefd[1]); /* close unused write end of pipe */
606
process *new_process = malloc(sizeof(process));
607
if (new_process == NULL){
608
perror("malloc");
609
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1048
/* Parent process */
1049
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1050
pipe */
1051
TEMP_FAILURE_RETRY(close(plugin_fd));
1052
plugin *new_plugin = getplugin(dirst->d_name);
1053
if(new_plugin == NULL){
1054
error(0, errno, "getplugin");
1055
ret = (int)(TEMP_FAILURE_RETRY
1056
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1057
NULL)));
610
1058
if(ret < 0){
611
perror("sigprocmask");
1059
error(0, errno, "sigprocmask");
612
1060
}
613
exitstatus = EXIT_FAILURE;
614
goto end;
1061
exitstatus = EX_OSERR;
1062
goto fallback;
615
1063
}
616
1064
617
*new_process = (struct process){ .pid = pid,
618
.fd = pipefd[0],
619
.next = process_list };
620
// List handling
621
process_list = new_process;
1065
new_plugin->pid = pid;
1066
new_plugin->fd = pipefd[0];
1067
622
1068
/* Unblock SIGCHLD so signal handler can be run if this process
623
1069
has already completed */
624
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1070
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1071
&sigchld_action.sa_mask,
1072
NULL));
625
1073
if(ret < 0){
626
perror("sigprocmask");
627
exitstatus = EXIT_FAILURE;
628
goto end;
629
}
630
631
FD_SET(new_process->fd, &rfds_all);
632
633
if (maxfd < new_process->fd){
634
maxfd = new_process->fd;
635
}
636
637
}
638
639
/* Free the plugin list */
640
for(plugin *next; plugin_list != NULL; plugin_list = next){
641
next = plugin_list->next;
642
free(plugin_list->argv);
643
free(plugin_list);
644
}
645
646
closedir(dir);
1074
error(0, errno, "sigprocmask");
1075
exitstatus = EX_OSERR;
1076
goto fallback;
1077
}
1078
1079
#if defined (__GNUC__) and defined (__GLIBC__)
1080
#if not __GLIBC_PREREQ(2, 16)
1081
#pragma GCC diagnostic push
1082
#pragma GCC diagnostic ignored "-Wsign-conversion"
1083
#endif
1084
#endif
1085
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1086
-Wconversion in GNU libc
1087
before 2.16 */
1088
#if defined (__GNUC__) and defined (__GLIBC__)
1089
#if not __GLIBC_PREREQ(2, 16)
1090
#pragma GCC diagnostic pop
1091
#endif
1092
#endif
1093
1094
if(maxfd < new_plugin->fd){
1095
maxfd = new_plugin->fd;
1096
}
1097
}
1098
1099
TEMP_FAILURE_RETRY(closedir(dir));
647
1100
dir = NULL;
648
649
if (process_list == NULL){
650
fprintf(stderr, "No plugin processes started. Incorrect plugin"
651
" directory?\n");
652
process_list = NULL;
1101
free_plugin(getplugin(NULL));
1102
1103
for(plugin *p = plugin_list; p != NULL; p = p->next){
1104
if(p->pid != 0){
1105
break;
1106
}
1107
if(p->next == NULL){
1108
fprintf(stderr, "No plugin processes started. Incorrect plugin"
1109
" directory?\n");
1110
free_plugin_list();
1111
}
653
1112
}
654
while(process_list){
1113
1114
/* Main loop while running plugins exist */
1115
while(plugin_list){
655
1116
fd_set rfds = rfds_all;
656
1117
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
657
if (select_ret == -1){
658
perror("select");
659
exitstatus = EXIT_FAILURE;
660
goto end;
1118
if(select_ret == -1 and errno != EINTR){
1119
error(0, errno, "select");
1120
exitstatus = EX_OSERR;
1121
goto fallback;
661
1122
}
662
1123
/* OK, now either a process completed, or something can be read
663
1124
from one of them */
664
for(process *proc = process_list; proc ; proc = proc->next){
1125
for(plugin *proc = plugin_list; proc != NULL;){
665
1126
/* Is this process completely done? */
666
if(proc->eof and proc->completed){
1127
if(proc->completed and proc->eof){
667
1128
/* Only accept the plugin output if it exited cleanly */
668
1129
if(not WIFEXITED(proc->status)
669
1130
or WEXITSTATUS(proc->status) != 0){
670
1131
/* Bad exit by plugin */
1132
671
1133
if(debug){
672
1134
if(WIFEXITED(proc->status)){
673
fprintf(stderr, "Plugin %u exited with status %d\n",
674
(unsigned int) (proc->pid),
1135
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1136
" status %d\n", proc->name,
1137
(intmax_t) (proc->pid),
675
1138
WEXITSTATUS(proc->status));
676
} else if(WIFSIGNALED(proc->status)) {
677
fprintf(stderr, "Plugin %u killed by signal %d\n",
678
(unsigned int) (proc->pid),
679
WTERMSIG(proc->status));
1139
} else if(WIFSIGNALED(proc->status)){
1140
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1141
" signal %d: %s\n", proc->name,
1142
(intmax_t) (proc->pid),
1143
WTERMSIG(proc->status),
1144
strsignal(WTERMSIG(proc->status)));
680
1145
} else if(WCOREDUMP(proc->status)){
681
fprintf(stderr, "Plugin %d dumped core\n",
682
(unsigned int) (proc->pid));
1146
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1147
" core\n", proc->name, (intmax_t) (proc->pid));
683
1148
}
684
1149
}
1150
685
1151
/* Remove the plugin */
686
FD_CLR(proc->fd, &rfds_all);
1152
#if defined (__GNUC__) and defined (__GLIBC__)
1153
#if not __GLIBC_PREREQ(2, 16)
1154
#pragma GCC diagnostic push
1155
#pragma GCC diagnostic ignored "-Wsign-conversion"
1156
#endif
1157
#endif
1158
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1159
-Wconversion in GNU libc
1160
before 2.16 */
1161
#if defined (__GNUC__) and defined (__GLIBC__)
1162
#if not __GLIBC_PREREQ(2, 16)
1163
#pragma GCC diagnostic pop
1164
#endif
1165
#endif
1166
687
1167
/* Block signal while modifying process_list */
688
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1168
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1169
(SIG_BLOCK,
1170
&sigchld_action.sa_mask,
1171
NULL));
689
1172
if(ret < 0){
690
perror("sigprocmask");
691
exitstatus = EXIT_FAILURE;
692
goto end;
693
}
694
/* Delete this process entry from the list */
695
if(process_list == proc){
696
/* First one - simple */
697
process_list = proc->next;
698
} else {
699
/* Second one or later */
700
for(process *p = process_list; p != NULL; p = p->next){
701
if(p->next == proc){
702
p->next = proc->next;
703
break;
704
}
705
}
706
}
1173
error(0, errno, "sigprocmask");
1174
exitstatus = EX_OSERR;
1175
goto fallback;
1176
}
1177
1178
plugin *next_plugin = proc->next;
1179
free_plugin(proc);
1180
proc = next_plugin;
1181
707
1182
/* We are done modifying process list, so unblock signal */
708
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
709
NULL);
1183
ret = (int)(TEMP_FAILURE_RETRY
1184
(sigprocmask(SIG_UNBLOCK,
1185
&sigchld_action.sa_mask, NULL)));
710
1186
if(ret < 0){
711
perror("sigprocmask");
712
}
713
free(proc->buffer);
714
free(proc);
715
/* We deleted this process from the list, so we can't go
716
proc->next. Therefore, start over from the beginning of
717
the process list */
718
break;
1187
error(0, errno, "sigprocmask");
1188
exitstatus = EX_OSERR;
1189
goto fallback;
1190
}
1191
1192
if(plugin_list == NULL){
1193
break;
1194
}
1195
1196
continue;
719
1197
}
1198
720
1199
/* This process exited nicely, so print its buffer */
721
722
bool bret = print_out_password(proc->buffer, proc->buffer_length);
1200
1201
bool bret = print_out_password(proc->buffer,
1202
proc->buffer_length);
723
1203
if(not bret){
724
perror("print_out_password");
725
exitstatus = EXIT_FAILURE;
1204
error(0, errno, "print_out_password");
1205
exitstatus = EX_IOERR;
726
1206
}
727
goto end;
1207
goto fallback;
728
1208
}
1209
729
1210
/* This process has not completed. Does it have any output? */
730
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1211
#if defined (__GNUC__) and defined (__GLIBC__)
1212
#if not __GLIBC_PREREQ(2, 16)
1213
#pragma GCC diagnostic push
1214
#pragma GCC diagnostic ignored "-Wsign-conversion"
1215
#endif
1216
#endif
1217
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1218
warning from
1219
-Wconversion
1220
in GNU libc
1221
before
1222
2.16 */
1223
#if defined (__GNUC__) and defined (__GLIBC__)
1224
#if not __GLIBC_PREREQ(2, 16)
1225
#pragma GCC diagnostic pop
1226
#endif
1227
#endif
731
1228
/* This process had nothing to say at this time */
1229
proc = proc->next;
732
1230
continue;
733
1231
}
734
1232
/* Before reading, make the process' data buffer large enough */
735
1233
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
736
proc->buffer = realloc(proc->buffer, proc->buffer_size
737
+ (size_t) BUFFER_SIZE);
738
if (proc->buffer == NULL){
739
perror("malloc");
740
exitstatus = EXIT_FAILURE;
741
goto end;
1234
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1235
+ (size_t) BUFFER_SIZE);
1236
if(new_buffer == NULL){
1237
error(0, errno, "malloc");
1238
exitstatus = EX_OSERR;
1239
goto fallback;
742
1240
}
1241
proc->buffer = new_buffer;
743
1242
proc->buffer_size += BUFFER_SIZE;
744
1243
}
745
1244
/* Read from the process */
746
ret = read(proc->fd, proc->buffer + proc->buffer_length,
747
BUFFER_SIZE);
748
if(ret < 0){
1245
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1246
proc->buffer
1247
+ proc->buffer_length,
1248
BUFFER_SIZE));
1249
if(sret < 0){
749
1250
/* Read error from this process; ignore the error */
1251
proc = proc->next;
750
1252
continue;
751
1253
}
752
if(ret == 0){
1254
if(sret == 0){
753
1255
/* got EOF */
754
1256
proc->eof = true;
755
1257
} else {
756
proc->buffer_length += (size_t) ret;
1258
proc->buffer_length += (size_t) sret;
757
1259
}
758
1260
}
759
1261
}
760
761
762
end:
763
764
if(process_list == NULL or exitstatus != EXIT_SUCCESS){
765
/* Fallback if all plugins failed, none are found or an error occured */
1262
1263
1264
fallback:
1265
1266
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1267
and exitstatus != EX_OK)){
1268
/* Fallback if all plugins failed, none are found or an error
1269
occured */
766
1270
bool bret;
767
1271
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
768
1272
char *passwordbuffer = getpass("Password: ");
769
bret = print_out_password(passwordbuffer, strlen(passwordbuffer));
1273
size_t len = strlen(passwordbuffer);
1274
/* Strip trailing newline */
1275
if(len > 0 and passwordbuffer[len-1] == '\n'){
1276
passwordbuffer[len-1] = '\0'; /* not strictly necessary */
1277
len--;
1278
}
1279
bret = print_out_password(passwordbuffer, len);
770
1280
if(not bret){
771
perror("print_out_password");
772
exitstatus = EXIT_FAILURE;
773
goto end;
1281
error(0, errno, "print_out_password");
1282
exitstatus = EX_IOERR;
774
1283
}
775
1284
}
776
1285
777
1286
/* Restore old signal handler */
778
sigaction(SIGCHLD, &old_sigchld_action, NULL);
779
780
free(custom_argv);
781
782
/* Free the plugin list */
783
for(plugin *next; plugin_list != NULL; plugin_list = next){
784
next = plugin_list->next;
785
free(plugin_list->argv);
786
free(plugin_list);
1287
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1288
if(ret == -1){
1289
error(0, errno, "sigaction");
1290
exitstatus = EX_OSERR;
1291
}
1292
1293
if(custom_argv != NULL){
1294
for(char **arg = custom_argv+1; *arg != NULL; arg++){
1295
free(*arg);
1296
}
1297
free(custom_argv);
787
1298
}
788
1299
789
1300
if(dir != NULL){
790
1301
closedir(dir);
791
1302
}
792
1303
793
/* Free the process list and kill the processes */
794
for(process *next; process_list != NULL; process_list = next){
795
next = process_list->next;
796
close(process_list->fd);
797
ret = kill(process_list->pid, SIGTERM);
798
if(ret == -1 and errno != ESRCH){
799
/* set-uid proccesses migth not get closed */
800
perror("kill");
1304
/* Kill the processes */
1305
for(plugin *p = plugin_list; p != NULL; p = p->next){
1306
if(p->pid != 0){
1307
close(p->fd);
1308
ret = kill(p->pid, SIGTERM);
1309
if(ret == -1 and errno != ESRCH){
1310
/* Set-uid proccesses might not get closed */
1311
error(0, errno, "kill");
1312
}
801
1313
}
802
free(process_list->buffer);
803
free(process_list);
804
1314
}
805
1315
806
1316
/* Wait for any remaining child processes to terminate */
807
do{
1317
do {
808
1318
ret = wait(NULL);
809
1319
} while(ret >= 0);
810
1320
if(errno != ECHILD){
811
perror("wait");
1321
error(0, errno, "wait");
812
1322
}
813
1323
1324
free_plugin_list();
1325
1326
free(plugindir);
1327
free(argfile);
1328
814
1329
return exitstatus;
815
1330
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0