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