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