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