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