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