To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to plugin-runner.c
- browse files at revision 237.7.333
- compare with another revision
- download diff
- download tarball
- view history from revision 237.7.333
- Committer: Teddy Hogeborn
- Date: 2015-08-10 09:00:23 UTC
- mto: (237.7.594 trunk)
- mto: This revision was merged to the branch mainline in revision 325.
- 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:
- DBUS-API
- debian/source
- debian/upstream
- network-hooks.d
- plugin-helpers
- files modified:
- .bzrignore
added
removed
plugin-runner.c
2
2
/*
3
3
* Mandos plugin runner - Run Mandos plugins
4
4
*
5
* Copyright © 2008,2009 Teddy Hogeborn
6
* Copyright © 2008,2009 Björn Påhlsson
5
* Copyright © 2008-2015 Teddy Hogeborn
6
* Copyright © 2008-2015 Björn Påhlsson
7
7
*
8
8
* This program is free software: you can redistribute it and/or
9
9
* modify it under the terms of the GNU General Public License as
19
19
* along with this program. If not, see
20
20
* <http://www.gnu.org/licenses/>.
21
21
*
22
* Contact the authors at <mandos@fukt.bsnet.se>.
22
* Contact the authors at <mandos@recompile.se>.
23
23
*/
24
24
25
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
asprintf(), O_CLOEXEC */
26
O_CLOEXEC, pipe2() */
27
27
#include <stddef.h> /* size_t, NULL */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
29
EXIT_SUCCESS, realloc() */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
29
realloc() */
30
30
#include <stdbool.h> /* bool, true, false */
31
#include <stdio.h> /* perror, fileno(), fprintf(),
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, fdopendir(), stat(), struct
34
stat, waitpid(), WIFEXITED(),
35
WEXITSTATUS(), wait(), pid_t,
36
uid_t, gid_t, getuid(), getgid(),
37
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() */
38
37
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
39
38
FD_SET(), FD_ISSET(), FD_CLR */
40
39
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
41
40
WEXITSTATUS(), WTERMSIG(),
42
41
WCOREDUMP() */
43
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
42
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
44
43
#include <iso646.h> /* and, or, not */
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
46
readdir(), closedir(), dirfd() */
47
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
48
fcntl(), setuid(), setgid(),
49
F_GETFD, F_SETFD, FD_CLOEXEC,
50
access(), pipe(), fork(), close()
51
dup2(), STDOUT_FILENO, _exit(),
52
execv(), write(), read(),
53
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
*/
54
52
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
55
FD_CLOEXEC */
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal() */
53
FD_CLOEXEC, openat(), scandirat(),
54
pipe2() */
55
#include <string.h> /* strsep, strlen(), strsignal(),
56
strcmp(), strncmp() */
58
57
#include <errno.h> /* errno */
59
58
#include <argp.h> /* struct argp_option, struct
60
59
argp_state, struct argp,
68
67
*/
69
68
#include <errno.h> /* errno, EBADF */
70
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() */
71
75
72
76
#define BUFFER_SIZE 256
73
77
74
78
#define PDIR "/lib/mandos/plugins.d"
79
#define PHDIR "/lib/mandos/plugin-helpers"
75
80
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
76
81
77
82
const char *argp_program_version = "plugin-runner " VERSION;
78
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
83
const char *argp_program_bug_address = "<mandos@recompile.se>";
79
84
80
85
typedef struct plugin{
81
86
char *name; /* can be NULL or any plugin name */
101
106
102
107
/* Gets an existing plugin based on name,
103
108
or if none is found, creates a new one */
109
__attribute__((warn_unused_result))
104
110
static plugin *getplugin(char *name){
105
/* Check for exiting plugin with that name */
111
/* Check for existing plugin with that name */
106
112
for(plugin *p = plugin_list; p != NULL; p = p->next){
107
113
if((p->name == name)
108
114
or (p->name and name and (strcmp(p->name, name) == 0))){
123
129
copy_name = strdup(name);
124
130
} while(copy_name == NULL and errno == EINTR);
125
131
if(copy_name == NULL){
132
int e = errno;
126
133
free(new_plugin);
134
errno = e;
127
135
return NULL;
128
136
}
129
137
}
137
145
new_plugin->argv = malloc(sizeof(char *) * 2);
138
146
} while(new_plugin->argv == NULL and errno == EINTR);
139
147
if(new_plugin->argv == NULL){
148
int e = errno;
140
149
free(copy_name);
141
150
free(new_plugin);
151
errno = e;
142
152
return NULL;
143
153
}
144
154
new_plugin->argv[0] = copy_name;
148
158
new_plugin->environ = malloc(sizeof(char *));
149
159
} while(new_plugin->environ == NULL and errno == EINTR);
150
160
if(new_plugin->environ == NULL){
161
int e = errno;
151
162
free(copy_name);
152
163
free(new_plugin->argv);
153
164
free(new_plugin);
165
errno = e;
154
166
return NULL;
155
167
}
156
168
new_plugin->environ[0] = NULL;
161
173
}
162
174
163
175
/* Helper function for add_argument and add_environment */
176
__attribute__((nonnull, warn_unused_result))
164
177
static bool add_to_char_array(const char *new, char ***array,
165
178
int *len){
166
179
/* Resize the pointed-to array to hold one more pointer */
180
char **new_array = NULL;
167
181
do {
168
*array = realloc(*array, sizeof(char *)
169
* (size_t) ((*len) + 2));
170
} while(*array == NULL and errno == EINTR);
182
new_array = realloc(*array, sizeof(char *)
183
* (size_t) ((*len) + 2));
184
} while(new_array == NULL and errno == EINTR);
171
185
/* Malloc check */
172
if(*array == NULL){
186
if(new_array == NULL){
173
187
return false;
174
188
}
189
*array = new_array;
175
190
/* Make a copy of the new string */
176
191
char *copy;
177
192
do {
189
204
}
190
205
191
206
/* Add to a plugin's argument vector */
207
__attribute__((nonnull(2), warn_unused_result))
192
208
static bool add_argument(plugin *p, const char *arg){
193
209
if(p == NULL){
194
210
return false;
197
213
}
198
214
199
215
/* Add to a plugin's environment */
216
__attribute__((nonnull(2), warn_unused_result))
200
217
static bool add_environment(plugin *p, const char *def, bool replace){
201
218
if(p == NULL){
202
219
return false;
204
221
/* namelen = length of name of environment variable */
205
222
size_t namelen = (size_t)(strchrnul(def, '=') - def);
206
223
/* Search for this environment variable */
207
for(char **e = p->environ; *e != NULL; e++){
208
if(strncmp(*e, def, namelen + 1) == 0){
224
for(char **envdef = p->environ; *envdef != NULL; envdef++){
225
if(strncmp(*envdef, def, namelen + 1) == 0){
209
226
/* It already exists */
210
227
if(replace){
211
char *new;
228
char *new_envdef;
212
229
do {
213
new = realloc(*e, strlen(def) + 1);
214
} while(new == NULL and errno == EINTR);
215
if(new == NULL){
230
new_envdef = realloc(*envdef, strlen(def) + 1);
231
} while(new_envdef == NULL and errno == EINTR);
232
if(new_envdef == NULL){
216
233
return false;
217
234
}
218
*e = new;
219
strcpy(*e, def);
235
*envdef = new_envdef;
236
strcpy(*envdef, def);
220
237
}
221
238
return true;
222
239
}
224
241
return add_to_char_array(def, &(p->environ), &(p->envc));
225
242
}
226
243
244
#ifndef O_CLOEXEC
227
245
/*
228
246
* Based on the example in the GNU LibC manual chapter 13.13 "File
229
247
* Descriptor Flags".
230
248
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
231
249
*/
250
__attribute__((warn_unused_result))
232
251
static int set_cloexec_flag(int fd){
233
252
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
234
253
/* If reading the flags failed, return error indication now. */
239
258
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
240
259
ret | FD_CLOEXEC));
241
260
}
261
#endif /* not O_CLOEXEC */
242
262
243
263
244
264
/* Mark processes as completed when they exit, and save their exit
258
278
/* No child processes */
259
279
break;
260
280
}
261
perror("waitpid");
281
error(0, errno, "waitpid");
262
282
}
263
283
264
284
/* A child exited, find it in process_list */
276
296
}
277
297
278
298
/* Prints out a password to stdout */
299
__attribute__((nonnull, warn_unused_result))
279
300
static bool print_out_password(const char *buffer, size_t length){
280
301
ssize_t ret;
281
302
for(size_t written = 0; written < length; written += (size_t)ret){
289
310
}
290
311
291
312
/* Removes and free a plugin from the plugin list */
313
__attribute__((nonnull))
292
314
static void free_plugin(plugin *plugin_node){
293
315
294
316
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
326
348
327
349
int main(int argc, char *argv[]){
328
350
char *plugindir = NULL;
351
char *pluginhelperdir = NULL;
329
352
char *argfile = NULL;
330
353
FILE *conffp;
331
size_t d_name_len;
332
DIR *dir = NULL;
333
struct dirent *dirst;
354
struct dirent **direntries = NULL;
334
355
struct stat st;
335
356
fd_set rfds_all;
336
357
int ret, maxfd = 0;
344
365
.sa_flags = SA_NOCLDSTOP };
345
366
char **custom_argv = NULL;
346
367
int custom_argc = 0;
368
int dir_fd = -1;
347
369
348
370
/* Establish a signal handler */
349
371
sigemptyset(&sigchld_action.sa_mask);
350
372
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
351
373
if(ret == -1){
352
perror("sigaddset");
353
exitstatus = EXIT_FAILURE;
374
error(0, errno, "sigaddset");
375
exitstatus = EX_OSERR;
354
376
goto fallback;
355
377
}
356
378
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
357
379
if(ret == -1){
358
perror("sigaction");
359
exitstatus = EXIT_FAILURE;
380
error(0, errno, "sigaction");
381
exitstatus = EX_OSERR;
360
382
goto fallback;
361
383
}
362
384
394
416
.doc = "Group ID the plugins will run as", .group = 3 },
395
417
{ .name = "debug", .key = 132,
396
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 },
397
432
{ .name = NULL }
398
433
};
399
434
400
error_t parse_opt(int key, char *arg, __attribute__((unused))
401
struct argp_state *state){
435
__attribute__((nonnull(3)))
436
error_t parse_opt(int key, char *arg, struct argp_state *state){
437
errno = 0;
402
438
switch(key){
403
439
char *tmp;
404
intmax_t tmpmax;
440
intmax_t tmp_id;
405
441
case 'g': /* --global-options */
406
if(arg != NULL){
442
{
407
443
char *plugin_option;
408
444
while((plugin_option = strsep(&arg, ",")) != NULL){
409
if(plugin_option[0] == '\0'){
410
continue;
411
}
412
445
if(not add_argument(getplugin(NULL), plugin_option)){
413
perror("add_argument");
414
return ARGP_ERR_UNKNOWN;
446
break;
415
447
}
416
448
}
449
errno = 0;
417
450
}
418
451
break;
419
452
case 'G': /* --global-env */
420
if(arg == NULL){
421
break;
422
}
423
if(not add_environment(getplugin(NULL), arg, true)){
424
perror("add_environment");
453
if(add_environment(getplugin(NULL), arg, true)){
454
errno = 0;
425
455
}
426
456
break;
427
457
case 'o': /* --options-for */
428
if(arg != NULL){
429
char *plugin_name = strsep(&arg, ":");
430
if(plugin_name[0] == '\0'){
431
break;
432
}
433
char *plugin_option;
434
while((plugin_option = strsep(&arg, ",")) != NULL){
435
if(not add_argument(getplugin(plugin_name), plugin_option)){
436
perror("add_argument");
437
return ARGP_ERR_UNKNOWN;
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;
438
476
}
439
477
}
478
errno = 0;
440
479
}
441
480
break;
442
481
case 'E': /* --env-for */
443
if(arg == NULL){
444
break;
445
}
446
482
{
447
483
char *envdef = strchr(arg, ':');
448
484
if(envdef == NULL){
485
argp_error(state, "No colon in \"%s\"", arg);
486
errno = EINVAL;
449
487
break;
450
488
}
451
489
*envdef = '\0';
452
if(not add_environment(getplugin(arg), envdef+1, true)){
453
perror("add_environment");
490
envdef++;
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;
454
498
}
455
499
}
456
500
break;
457
501
case 'd': /* --disable */
458
if(arg != NULL){
502
{
459
503
plugin *p = getplugin(arg);
460
if(p == NULL){
461
return ARGP_ERR_UNKNOWN;
504
if(p != NULL){
505
p->disabled = true;
506
errno = 0;
462
507
}
463
p->disabled = true;
464
508
}
465
509
break;
466
510
case 'e': /* --enable */
467
if(arg != NULL){
511
{
468
512
plugin *p = getplugin(arg);
469
if(p == NULL){
470
return ARGP_ERR_UNKNOWN;
513
if(p != NULL){
514
p->disabled = false;
515
errno = 0;
471
516
}
472
p->disabled = false;
473
517
}
474
518
break;
475
519
case 128: /* --plugin-dir */
476
520
free(plugindir);
477
521
plugindir = strdup(arg);
478
if(plugindir == NULL){
479
perror("strdup");
522
if(plugindir != NULL){
523
errno = 0;
480
524
}
481
525
break;
482
526
case 129: /* --config-file */
483
527
/* This is already done by parse_opt_config_file() */
484
528
break;
485
529
case 130: /* --userid */
486
errno = 0;
487
tmpmax = strtoimax(arg, &tmp, 10);
530
tmp_id = strtoimax(arg, &tmp, 10);
488
531
if(errno != 0 or tmp == arg or *tmp != '\0'
489
or tmpmax != (uid_t)tmpmax){
490
fprintf(stderr, "Bad user ID number: \"%s\", using %"
491
PRIdMAX "\n", arg, (intmax_t)uid);
492
} else {
493
uid = (uid_t)tmpmax;
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;
494
536
}
537
uid = (uid_t)tmp_id;
538
errno = 0;
495
539
break;
496
540
case 131: /* --groupid */
497
errno = 0;
498
tmpmax = strtoimax(arg, &tmp, 10);
541
tmp_id = strtoimax(arg, &tmp, 10);
499
542
if(errno != 0 or tmp == arg or *tmp != '\0'
500
or tmpmax != (gid_t)tmpmax){
501
fprintf(stderr, "Bad group ID number: \"%s\", using %"
502
PRIdMAX "\n", arg, (intmax_t)gid);
503
} else {
504
gid = (gid_t)tmpmax;
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;
505
547
}
548
gid = (gid_t)tmp_id;
549
errno = 0;
506
550
break;
507
551
case 132: /* --debug */
508
552
debug = true;
509
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;
510
575
/*
511
576
* When adding more options before this line, remember to also add a
512
577
* "case" to the "parse_opt_config_file" function below.
515
580
/* Cryptsetup always passes an argument, which is an empty
516
581
string if "none" was specified in /etc/crypttab. So if
517
582
argument was empty, we ignore it silently. */
518
if(arg[0] != '\0'){
519
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
583
if(arg[0] == '\0'){
584
break;
520
585
}
521
break;
522
case ARGP_KEY_END:
523
break;
524
586
default:
525
587
return ARGP_ERR_UNKNOWN;
526
588
}
527
return 0;
589
return errno; /* Set to 0 at start */
528
590
}
529
591
530
592
/* This option parser is the same as parse_opt() above, except it
532
594
error_t parse_opt_config_file(int key, char *arg,
533
595
__attribute__((unused))
534
596
struct argp_state *state){
597
errno = 0;
535
598
switch(key){
536
599
case 'g': /* --global-options */
537
600
case 'G': /* --global-env */
544
607
case 129: /* --config-file */
545
608
free(argfile);
546
609
argfile = strdup(arg);
547
if(argfile == NULL){
548
perror("strdup");
610
if(argfile != NULL){
611
errno = 0;
549
612
}
550
613
break;
551
614
case 130: /* --userid */
552
615
case 131: /* --groupid */
553
616
case 132: /* --debug */
617
case 133: /* --plugin-helper-dir */
618
case '?': /* --help */
619
case -3: /* --usage */
620
case 'V': /* --version */
554
621
case ARGP_KEY_ARG:
555
case ARGP_KEY_END:
556
622
break;
557
623
default:
558
624
return ARGP_ERR_UNKNOWN;
559
625
}
560
return 0;
626
return errno;
561
627
}
562
628
563
629
struct argp argp = { .options = options,
567
633
568
634
/* Parse using parse_opt_config_file() in order to get the custom
569
635
config file location, if any. */
570
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
571
if(ret == ARGP_ERR_UNKNOWN){
572
fprintf(stderr, "Unknown error while parsing arguments\n");
573
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;
574
650
goto fallback;
575
651
}
576
652
593
669
custom_argc = 1;
594
670
custom_argv = malloc(sizeof(char*) * 2);
595
671
if(custom_argv == NULL){
596
perror("malloc");
597
exitstatus = EXIT_FAILURE;
672
error(0, errno, "malloc");
673
exitstatus = EX_OSERR;
598
674
goto fallback;
599
675
}
600
676
custom_argv[0] = argv[0];
616
692
}
617
693
new_arg = strdup(p);
618
694
if(new_arg == NULL){
619
perror("strdup");
620
exitstatus = EXIT_FAILURE;
695
error(0, errno, "strdup");
696
exitstatus = EX_OSERR;
621
697
free(org_line);
622
698
goto fallback;
623
699
}
624
700
625
701
custom_argc += 1;
626
custom_argv = realloc(custom_argv, sizeof(char *)
627
* ((unsigned int) custom_argc + 1));
628
if(custom_argv == NULL){
629
perror("realloc");
630
exitstatus = EXIT_FAILURE;
631
free(org_line);
632
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
}
633
715
}
634
716
custom_argv[custom_argc-1] = new_arg;
635
717
custom_argv[custom_argc] = NULL;
639
721
ret = fclose(conffp);
640
722
} while(ret == EOF and errno == EINTR);
641
723
if(ret == EOF){
642
perror("fclose");
643
exitstatus = EXIT_FAILURE;
724
error(0, errno, "fclose");
725
exitstatus = EX_IOERR;
644
726
goto fallback;
645
727
}
646
728
free(org_line);
648
730
/* Check for harmful errors and go to fallback. Other errors might
649
731
not affect opening plugins */
650
732
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
651
perror("fopen");
652
exitstatus = EXIT_FAILURE;
733
error(0, errno, "fopen");
734
exitstatus = EX_OSERR;
653
735
goto fallback;
654
736
}
655
737
}
656
/* If there was any arguments from configuration file,
657
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 */
658
740
if(custom_argv != NULL){
659
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
660
0, NULL);
661
if(ret == ARGP_ERR_UNKNOWN){
662
fprintf(stderr, "Unknown error while parsing arguments\n");
663
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;
664
755
goto fallback;
665
756
}
666
757
}
667
758
668
759
/* Parse actual command line arguments, to let them override the
669
760
config file */
670
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
671
if(ret == ARGP_ERR_UNKNOWN){
672
fprintf(stderr, "Unknown error while parsing arguments\n");
673
exitstatus = EXIT_FAILURE;
674
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
}
675
794
}
676
795
677
796
if(debug){
688
807
}
689
808
}
690
809
691
/* Strip permissions down to nobody */
692
setgid(gid);
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);
693
836
if(ret == -1){
694
perror("setgid");
837
error(0, errno, "setgid");
695
838
}
696
839
ret = setuid(uid);
697
840
if(ret == -1){
698
perror("setuid");
841
error(0, errno, "setuid");
699
842
}
700
843
701
844
/* Open plugin directory with close_on_exec flag */
702
845
{
703
int dir_fd = -1;
704
if(plugindir == NULL){
705
dir_fd = open(PDIR, O_RDONLY |
706
#ifdef O_CLOEXEC
707
O_CLOEXEC
708
#else /* not O_CLOEXEC */
709
0
710
#endif /* not O_CLOEXEC */
711
);
712
} else {
713
dir_fd = open(plugindir, O_RDONLY |
714
#ifdef O_CLOEXEC
715
O_CLOEXEC
716
#else /* not O_CLOEXEC */
717
0
718
#endif /* not O_CLOEXEC */
719
);
720
}
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
);
721
853
if(dir_fd == -1){
722
perror("Could not open plugin dir");
723
exitstatus = EXIT_FAILURE;
854
error(0, errno, "Could not open plugin dir");
855
exitstatus = EX_UNAVAILABLE;
724
856
goto fallback;
725
857
}
726
858
728
860
/* Set the FD_CLOEXEC flag on the directory */
729
861
ret = set_cloexec_flag(dir_fd);
730
862
if(ret < 0){
731
perror("set_cloexec_flag");
732
TEMP_FAILURE_RETRY(close(dir_fd));
733
exitstatus = EXIT_FAILURE;
863
error(0, errno, "set_cloexec_flag");
864
exitstatus = EX_OSERR;
734
865
goto fallback;
735
866
}
736
867
#endif /* O_CLOEXEC */
737
738
dir = fdopendir(dir_fd);
739
if(dir == NULL){
740
perror("Could not open plugin dir");
741
TEMP_FAILURE_RETRY(close(dir_fd));
742
exitstatus = EXIT_FAILURE;
743
goto fallback;
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;
890
}
744
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;
745
912
}
746
913
747
914
FD_ZERO(&rfds_all);
748
915
749
916
/* Read and execute any executable in the plugin directory*/
750
while(true){
751
do {
752
dirst = readdir(dir);
753
} while(dirst == NULL and errno == EINTR);
754
755
/* All directory entries have been processed */
756
if(dirst == NULL){
757
if(errno == EBADF){
758
perror("readdir");
759
exitstatus = EXIT_FAILURE;
760
goto fallback;
761
}
762
break;
763
}
764
765
d_name_len = strlen(dirst->d_name);
766
767
/* Ignore dotfiles, backup files and other junk */
768
{
769
bool bad_name = false;
770
771
const char const *bad_prefixes[] = { ".", "#", NULL };
772
773
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
774
".dpkg-old",
775
".dpkg-bak",
776
".dpkg-divert", NULL };
777
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
778
size_t pre_len = strlen(*pre);
779
if((d_name_len >= pre_len)
780
and strncmp((dirst->d_name), *pre, pre_len) == 0){
781
if(debug){
782
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
783
" with bad prefix %s\n", dirst->d_name, *pre);
784
}
785
bad_name = true;
786
break;
787
}
788
}
789
if(bad_name){
790
continue;
791
}
792
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
793
size_t suf_len = strlen(*suf);
794
if((d_name_len >= suf_len)
795
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
796
== 0)){
797
if(debug){
798
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
799
" with bad suffix %s\n", dirst->d_name, *suf);
800
}
801
bad_name = true;
802
break;
803
}
804
}
805
806
if(bad_name){
807
continue;
808
}
809
}
810
811
char *filename;
812
if(plugindir == NULL){
813
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
814
dirst->d_name));
815
} else {
816
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
817
plugindir,
818
dirst->d_name));
819
}
820
if(ret < 0){
821
perror("asprintf");
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]);
822
923
continue;
823
924
}
824
825
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
925
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
826
926
if(ret == -1){
827
perror("stat");
828
free(filename);
927
error(0, errno, "stat");
928
close(plugin_fd);
929
free(direntries[i]);
829
930
continue;
830
931
}
831
932
832
933
/* Ignore non-executable files */
833
934
if(not S_ISREG(st.st_mode)
834
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
935
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
936
X_OK, 0)) != 0)){
835
937
if(debug){
836
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
837
" 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);
838
942
}
839
free(filename);
943
close(plugin_fd);
944
free(direntries[i]);
840
945
continue;
841
946
}
842
947
843
plugin *p = getplugin(dirst->d_name);
948
plugin *p = getplugin(direntries[i]->d_name);
844
949
if(p == NULL){
845
perror("getplugin");
846
free(filename);
950
error(0, errno, "getplugin");
951
close(plugin_fd);
952
free(direntries[i]);
847
953
continue;
848
954
}
849
955
if(p->disabled){
850
956
if(debug){
851
957
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
852
dirst->d_name);
958
direntries[i]->d_name);
853
959
}
854
free(filename);
960
close(plugin_fd);
961
free(direntries[i]);
855
962
continue;
856
963
}
857
964
{
860
967
if(g != NULL){
861
968
for(char **a = g->argv + 1; *a != NULL; a++){
862
969
if(not add_argument(p, *a)){
863
perror("add_argument");
970
error(0, errno, "add_argument");
864
971
}
865
972
}
866
973
/* Add global environment variables */
867
974
for(char **e = g->environ; *e != NULL; e++){
868
975
if(not add_environment(p, *e, false)){
869
perror("add_environment");
976
error(0, errno, "add_environment");
870
977
}
871
978
}
872
979
}
873
980
}
874
/* If this plugin has any environment variables, we will call
875
using execve and need to duplicate the environment from this
876
process, too. */
981
/* If this plugin has any environment variables, we need to
982
duplicate the environment from this process, too. */
877
983
if(p->environ[0] != NULL){
878
984
for(char **e = environ; *e != NULL; e++){
879
985
if(not add_environment(p, *e, false)){
880
perror("add_environment");
986
error(0, errno, "add_environment");
881
987
}
882
988
}
883
989
}
884
990
885
991
int pipefd[2];
992
#ifndef O_CLOEXEC
886
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 */
887
997
if(ret == -1){
888
perror("pipe");
889
exitstatus = EXIT_FAILURE;
890
goto fallback;
891
}
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
892
1013
/* Ask OS to automatic close the pipe on exec */
893
1014
ret = set_cloexec_flag(pipefd[0]);
894
1015
if(ret < 0){
895
perror("set_cloexec_flag");
896
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]);
897
1021
goto fallback;
898
1022
}
899
1023
ret = set_cloexec_flag(pipefd[1]);
900
1024
if(ret < 0){
901
perror("set_cloexec_flag");
902
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]);
903
1030
goto fallback;
904
1031
}
1032
#endif /* not O_CLOEXEC */
905
1033
/* Block SIGCHLD until process is safely in process list */
906
1034
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
907
1035
&sigchld_action.sa_mask,
908
1036
NULL));
909
1037
if(ret < 0){
910
perror("sigprocmask");
911
exitstatus = EXIT_FAILURE;
1038
error(0, errno, "sigprocmask");
1039
exitstatus = EX_OSERR;
1040
free(direntries[i]);
912
1041
goto fallback;
913
1042
}
914
1043
/* Starting a new process to be watched */
917
1046
pid = fork();
918
1047
} while(pid == -1 and errno == EINTR);
919
1048
if(pid == -1){
920
perror("fork");
921
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]);
922
1056
goto fallback;
923
1057
}
924
1058
if(pid == 0){
925
1059
/* this is the child process */
926
1060
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
927
1061
if(ret < 0){
928
perror("sigaction");
929
_exit(EXIT_FAILURE);
1062
error(0, errno, "sigaction");
1063
_exit(EX_OSERR);
930
1064
}
931
1065
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
932
1066
if(ret < 0){
933
perror("sigprocmask");
934
_exit(EXIT_FAILURE);
1067
error(0, errno, "sigprocmask");
1068
_exit(EX_OSERR);
935
1069
}
936
1070
937
1071
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
938
1072
if(ret == -1){
939
perror("dup2");
940
_exit(EXIT_FAILURE);
1073
error(0, errno, "dup2");
1074
_exit(EX_OSERR);
941
1075
}
942
1076
943
if(dirfd(dir) < 0){
944
/* If dir has no file descriptor, we could not set FD_CLOEXEC
945
above and must now close it manually here. */
946
closedir(dir);
947
}
948
if(p->environ[0] == NULL){
949
if(execv(filename, p->argv) < 0){
950
perror("execv");
951
_exit(EXIT_FAILURE);
952
}
953
} else {
954
if(execve(filename, p->argv, p->environ) < 0){
955
perror("execve");
956
_exit(EXIT_FAILURE);
957
}
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);
958
1083
}
959
1084
/* no return */
960
1085
}
961
1086
/* Parent process */
962
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
963
pipe */
964
free(filename);
965
plugin *new_plugin = getplugin(dirst->d_name);
1087
close(pipefd[1]); /* Close unused write end of pipe */
1088
close(plugin_fd);
1089
plugin *new_plugin = getplugin(direntries[i]->d_name);
966
1090
if(new_plugin == NULL){
967
perror("getplugin");
1091
error(0, errno, "getplugin");
968
1092
ret = (int)(TEMP_FAILURE_RETRY
969
1093
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
970
1094
NULL)));
971
1095
if(ret < 0){
972
perror("sigprocmask");
1096
error(0, errno, "sigprocmask");
973
1097
}
974
exitstatus = EXIT_FAILURE;
1098
exitstatus = EX_OSERR;
1099
free(direntries[i]);
975
1100
goto fallback;
976
1101
}
1102
free(direntries[i]);
977
1103
978
1104
new_plugin->pid = pid;
979
1105
new_plugin->fd = pipefd[0];
984
1110
&sigchld_action.sa_mask,
985
1111
NULL));
986
1112
if(ret < 0){
987
perror("sigprocmask");
988
exitstatus = EXIT_FAILURE;
1113
error(0, errno, "sigprocmask");
1114
exitstatus = EX_OSERR;
989
1115
goto fallback;
990
1116
}
991
1117
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
992
1124
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
993
-Wconversion */
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
994
1132
995
1133
if(maxfd < new_plugin->fd){
996
1134
maxfd = new_plugin->fd;
997
1135
}
998
1136
}
999
1137
1000
TEMP_FAILURE_RETRY(closedir(dir));
1001
dir = NULL;
1138
free(direntries);
1139
direntries = NULL;
1140
close(dir_fd);
1141
dir_fd = -1;
1002
1142
free_plugin(getplugin(NULL));
1003
1143
1004
1144
for(plugin *p = plugin_list; p != NULL; p = p->next){
1017
1157
fd_set rfds = rfds_all;
1018
1158
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
1019
1159
if(select_ret == -1 and errno != EINTR){
1020
perror("select");
1021
exitstatus = EXIT_FAILURE;
1160
error(0, errno, "select");
1161
exitstatus = EX_OSERR;
1022
1162
goto fallback;
1023
1163
}
1024
1164
/* OK, now either a process completed, or something can be read
1050
1190
}
1051
1191
1052
1192
/* Remove the plugin */
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
1053
1199
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1054
-Wconversion */
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
1055
1207
1056
1208
/* Block signal while modifying process_list */
1057
1209
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1059
1211
&sigchld_action.sa_mask,
1060
1212
NULL));
1061
1213
if(ret < 0){
1062
perror("sigprocmask");
1063
exitstatus = EXIT_FAILURE;
1214
error(0, errno, "sigprocmask");
1215
exitstatus = EX_OSERR;
1064
1216
goto fallback;
1065
1217
}
1066
1218
1073
1225
(sigprocmask(SIG_UNBLOCK,
1074
1226
&sigchld_action.sa_mask, NULL)));
1075
1227
if(ret < 0){
1076
perror("sigprocmask");
1077
exitstatus = EXIT_FAILURE;
1228
error(0, errno, "sigprocmask");
1229
exitstatus = EX_OSERR;
1078
1230
goto fallback;
1079
1231
}
1080
1232
1090
1242
bool bret = print_out_password(proc->buffer,
1091
1243
proc->buffer_length);
1092
1244
if(not bret){
1093
perror("print_out_password");
1094
exitstatus = EXIT_FAILURE;
1245
error(0, errno, "print_out_password");
1246
exitstatus = EX_IOERR;
1095
1247
}
1096
1248
goto fallback;
1097
1249
}
1098
1250
1099
1251
/* This process has not completed. Does it have any output? */
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
1100
1258
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1101
1259
warning from
1102
-Wconversion */
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
1103
1269
/* This process had nothing to say at this time */
1104
1270
proc = proc->next;
1105
1271
continue;
1106
1272
}
1107
1273
/* Before reading, make the process' data buffer large enough */
1108
1274
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1109
proc->buffer = realloc(proc->buffer, proc->buffer_size
1110
+ (size_t) BUFFER_SIZE);
1111
if(proc->buffer == NULL){
1112
perror("malloc");
1113
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;
1114
1280
goto fallback;
1115
1281
}
1282
proc->buffer = new_buffer;
1116
1283
proc->buffer_size += BUFFER_SIZE;
1117
1284
}
1118
1285
/* Read from the process */
1137
1304
1138
1305
fallback:
1139
1306
1140
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1307
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1308
and exitstatus != EX_OK)){
1141
1309
/* Fallback if all plugins failed, none are found or an error
1142
1310
occured */
1143
1311
bool bret;
1151
1319
}
1152
1320
bret = print_out_password(passwordbuffer, len);
1153
1321
if(not bret){
1154
perror("print_out_password");
1155
exitstatus = EXIT_FAILURE;
1322
error(0, errno, "print_out_password");
1323
exitstatus = EX_IOERR;
1156
1324
}
1157
1325
}
1158
1326
1159
1327
/* Restore old signal handler */
1160
1328
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1161
1329
if(ret == -1){
1162
perror("sigaction");
1163
exitstatus = EXIT_FAILURE;
1330
error(0, errno, "sigaction");
1331
exitstatus = EX_OSERR;
1164
1332
}
1165
1333
1166
1334
if(custom_argv != NULL){
1170
1338
free(custom_argv);
1171
1339
}
1172
1340
1173
if(dir != NULL){
1174
closedir(dir);
1341
free(direntries);
1342
1343
if(dir_fd != -1){
1344
close(dir_fd);
1175
1345
}
1176
1346
1177
1347
/* Kill the processes */
1181
1351
ret = kill(p->pid, SIGTERM);
1182
1352
if(ret == -1 and errno != ESRCH){
1183
1353
/* Set-uid proccesses might not get closed */
1184
perror("kill");
1354
error(0, errno, "kill");
1185
1355
}
1186
1356
}
1187
1357
}
1191
1361
ret = wait(NULL);
1192
1362
} while(ret >= 0);
1193
1363
if(errno != ECHILD){
1194
perror("wait");
1364
error(0, errno, "wait");
1195
1365
}
1196
1366
1197
1367
free_plugin_list();
1198
1368
1199
1369
free(plugindir);
1370
free(pluginhelperdir);
1200
1371
free(argfile);
1201
1372
1202
1373
return exitstatus;
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0