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