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 369
- compare with another revision
- download diff
- download tarball
- view history from revision 369
- Committer: Teddy Hogeborn
- Date: 2009-09-16 23:28:39 UTC
- Revision ID: teddy@fukt.bsnet.se-20090916232839-3o7i8qmcdcz5j1ya
* init.d-mandos (Required-Start, Required-Stop): Bug fix: Added
"$syslog", thanks to Petter Reinholdtsen
<pere@hungry.com> (Debian bug #546928).
* initramfs-tools-script: Removed erroneous comment.
* plugins.d/askpass-fifo.c: Removed TEMP_FAILURE_RETRY since it is
not needed.
* plugins.d/mandos-client.c (main): Bug fix: Initialize
"old_sigterm_action".
* plugins.d/splashy.c (main): Bug fix: really check return value from
"sigaddset". Fix some warnings on
64-bit systems.
* plugins.d/usplash.c (termination_handler, main): Save received
signal and
re-raise it on
exit.
(usplash_write): Do not close FIFO, instead, take an additional file
descriptor pointer to it and open only when needed
(all callers changed). Abort immediately on EINTR.
Bug fix: Add NUL byte on single-word commands.
Ignore "interrupted_by_signal".
(makeprompt, find_usplash): New; broken out from "main()".
(find_usplash): Bug fix: close /proc/<pid>/cmdline FD on error.
(main): Reorganized to jump to a new "failure" label on any error.
Bug fix: check return values from sigaddset.
New variable "usplash_accessed" to flag if usplash(8) needs
to be killed and restarted. Removed the "an_error_occured"
variable.
"$syslog", thanks to Petter Reinholdtsen
<pere@hungry.com> (Debian bug #546928).
* initramfs-tools-script: Removed erroneous comment.
* plugins.d/askpass-fifo.c: Removed TEMP_FAILURE_RETRY since it is
not needed.
* plugins.d/mandos-client.c (main): Bug fix: Initialize
"old_sigterm_action".
* plugins.d/splashy.c (main): Bug fix: really check return value from
"sigaddset". Fix some warnings on
64-bit systems.
* plugins.d/usplash.c (termination_handler, main): Save received
signal and
re-raise it on
exit.
(usplash_write): Do not close FIFO, instead, take an additional file
descriptor pointer to it and open only when needed
(all callers changed). Abort immediately on EINTR.
Bug fix: Add NUL byte on single-word commands.
Ignore "interrupted_by_signal".
(makeprompt, find_usplash): New; broken out from "main()".
(find_usplash): Bug fix: close /proc/<pid>/cmdline FD on error.
(main): Reorganized to jump to a new "failure" label on any error.
Bug fix: check return values from sigaddset.
New variable "usplash_accessed" to flag if usplash(8) needs
to be killed and restarted. Removed the "an_error_occured"
variable.
- files added:
- .bzr-builddeb
- debian
- debian/po
- 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,2009 Teddy Hogeborn
6
* Copyright © 2008,2009 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
27
28
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
28
29
EXIT_SUCCESS, realloc() */
29
30
#include <stdbool.h> /* bool, true, false */
30
#include <stdio.h> /* perror, popen(), fileno(),
31
fprintf(), stderr, STDOUT_FILENO */
31
#include <stdio.h> /* perror, fileno(), fprintf(),
32
stderr, STDOUT_FILENO */
32
33
#include <sys/types.h> /* DIR, opendir(), stat(), struct
33
34
stat, waitpid(), WIFEXITED(),
34
35
WEXITSTATUS(), wait(), pid_t,
37
38
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
38
39
FD_SET(), FD_ISSET(), FD_CLR */
39
40
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
40
WEXITSTATUS() */
41
WEXITSTATUS(), WTERMSIG(),
42
WCOREDUMP() */
41
43
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
42
44
#include <iso646.h> /* and, or, not */
43
45
#include <dirent.h> /* DIR, struct dirent, opendir(),
46
48
fcntl(), setuid(), setgid(),
47
49
F_GETFD, F_SETFD, FD_CLOEXEC,
48
50
access(), pipe(), fork(), close()
49
dup2, STDOUT_FILENO, _exit(),
51
dup2(), STDOUT_FILENO, _exit(),
50
52
execv(), write(), read(),
51
53
close() */
52
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
53
55
FD_CLOEXEC */
54
#include <string.h> /* strsep, strlen(), asprintf() */
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal() */
55
58
#include <errno.h> /* errno */
56
59
#include <argp.h> /* struct argp_option, struct
57
60
argp_state, struct argp,
61
64
#include <signal.h> /* struct sigaction, sigemptyset(),
62
65
sigaddset(), sigaction(),
63
66
sigprocmask(), SIG_BLOCK, SIGCHLD,
64
SIG_UNBLOCK, kill() */
67
SIG_UNBLOCK, kill(), sig_atomic_t
68
*/
65
69
#include <errno.h> /* errno, EBADF */
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
66
71
67
72
#define BUFFER_SIZE 256
68
73
69
74
#define PDIR "/lib/mandos/plugins.d"
70
75
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
71
76
72
const char *argp_program_version = "plugin-runner 1.0";
77
const char *argp_program_version = "plugin-runner " VERSION;
73
78
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
74
79
75
struct plugin;
76
77
80
typedef struct plugin{
78
81
char *name; /* can be NULL or any plugin name */
79
82
char **argv;
81
84
char **environ;
82
85
int envc;
83
86
bool disabled;
84
87
85
88
/* Variables used for running processes*/
86
89
pid_t pid;
87
90
int fd;
89
92
size_t buffer_size;
90
93
size_t buffer_length;
91
94
bool eof;
92
volatile bool completed;
93
volatile int status;
95
volatile sig_atomic_t completed;
96
int status;
94
97
struct plugin *next;
95
98
} plugin;
96
99
97
100
static plugin *plugin_list = NULL;
98
101
99
/* Gets a existing plugin based on name,
102
/* Gets an existing plugin based on name,
100
103
or if none is found, creates a new one */
101
104
static plugin *getplugin(char *name){
102
105
/* 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))){
106
for(plugin *p = plugin_list; p != NULL; p = p->next){
107
if((p->name == name)
108
or (p->name and name and (strcmp(p->name, name) == 0))){
106
109
return p;
107
110
}
108
111
}
109
112
/* Create a new plugin */
110
plugin *new_plugin = malloc(sizeof(plugin));
111
if (new_plugin == NULL){
113
plugin *new_plugin = NULL;
114
do {
115
new_plugin = malloc(sizeof(plugin));
116
} while(new_plugin == NULL and errno == EINTR);
117
if(new_plugin == NULL){
112
118
return NULL;
113
119
}
114
120
char *copy_name = NULL;
115
121
if(name != NULL){
116
copy_name = strdup(name);
122
do {
123
copy_name = strdup(name);
124
} while(copy_name == NULL and errno == EINTR);
117
125
if(copy_name == NULL){
126
free(new_plugin);
118
127
return NULL;
119
128
}
120
129
}
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){
130
131
*new_plugin = (plugin){ .name = copy_name,
132
.argc = 1,
133
.disabled = false,
134
.next = plugin_list };
135
136
do {
137
new_plugin->argv = malloc(sizeof(char *) * 2);
138
} while(new_plugin->argv == NULL and errno == EINTR);
139
if(new_plugin->argv == NULL){
129
140
free(copy_name);
130
141
free(new_plugin);
131
142
return NULL;
132
143
}
133
144
new_plugin->argv[0] = copy_name;
134
145
new_plugin->argv[1] = NULL;
135
136
new_plugin->environ = malloc(sizeof(char *));
146
147
do {
148
new_plugin->environ = malloc(sizeof(char *));
149
} while(new_plugin->environ == NULL and errno == EINTR);
137
150
if(new_plugin->environ == NULL){
138
151
free(copy_name);
139
152
free(new_plugin->argv);
141
154
return NULL;
142
155
}
143
156
new_plugin->environ[0] = NULL;
144
157
145
158
/* Append the new plugin to the list */
146
159
plugin_list = new_plugin;
147
160
return new_plugin;
151
164
static bool add_to_char_array(const char *new, char ***array,
152
165
int *len){
153
166
/* Resize the pointed-to array to hold one more pointer */
154
*array = realloc(*array, sizeof(char *)
155
* (size_t) ((*len) + 2));
167
do {
168
*array = realloc(*array, sizeof(char *)
169
* (size_t) ((*len) + 2));
170
} while(*array == NULL and errno == EINTR);
156
171
/* Malloc check */
157
172
if(*array == NULL){
158
173
return false;
159
174
}
160
175
/* Make a copy of the new string */
161
char *copy = strdup(new);
176
char *copy;
177
do {
178
copy = strdup(new);
179
} while(copy == NULL and errno == EINTR);
162
180
if(copy == NULL){
163
181
return false;
164
182
}
179
197
}
180
198
181
199
/* Add to a plugin's environment */
182
static bool add_environment(plugin *p, const char *def){
200
static bool add_environment(plugin *p, const char *def, bool replace){
183
201
if(p == NULL){
184
202
return false;
185
203
}
204
/* namelen = length of name of environment variable */
205
size_t namelen = (size_t)(strchrnul(def, '=') - def);
206
/* Search for this environment variable */
207
for(char **e = p->environ; *e != NULL; e++){
208
if(strncmp(*e, def, namelen + 1) == 0){
209
/* It already exists */
210
if(replace){
211
char *new;
212
do {
213
new = realloc(*e, strlen(def) + 1);
214
} while(new == NULL and errno == EINTR);
215
if(new == NULL){
216
return false;
217
}
218
*e = new;
219
strcpy(*e, def);
220
}
221
return true;
222
}
223
}
186
224
return add_to_char_array(def, &(p->environ), &(p->envc));
187
225
}
188
226
189
227
/*
190
228
* Based on the example in the GNU LibC manual chapter 13.13 "File
191
229
* Descriptor Flags".
192
* *Note File Descriptor Flags:(libc)Descriptor Flags.
230
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
193
231
*/
194
static int set_cloexec_flag(int fd)
195
{
196
int ret = fcntl(fd, F_GETFD, 0);
232
static int set_cloexec_flag(int fd){
233
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
197
234
/* If reading the flags failed, return error indication now. */
198
235
if(ret < 0){
199
236
return ret;
200
237
}
201
238
/* Store modified flag word in the descriptor. */
202
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
239
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
240
ret | FD_CLOEXEC));
203
241
}
204
242
205
243
206
244
/* Mark processes as completed when they exit, and save their exit
207
245
status. */
208
void handle_sigchld(__attribute__((unused)) int sig){
246
static void handle_sigchld(__attribute__((unused)) int sig){
247
int old_errno = errno;
209
248
while(true){
210
249
plugin *proc = plugin_list;
211
250
int status;
215
254
break;
216
255
}
217
256
if(pid == -1){
218
if (errno != ECHILD){
219
perror("waitpid");
257
if(errno == ECHILD){
258
/* No child processes */
259
break;
220
260
}
221
/* No child processes */
222
break;
261
perror("waitpid");
223
262
}
224
263
225
264
/* A child exited, find it in process_list */
226
265
while(proc != NULL and proc->pid != pid){
227
266
proc = proc->next;
231
270
continue;
232
271
}
233
272
proc->status = status;
234
proc->completed = true;
273
proc->completed = 1;
235
274
}
275
errno = old_errno;
236
276
}
237
277
238
278
/* Prints out a password to stdout */
239
bool print_out_password(const char *buffer, size_t length){
279
static bool print_out_password(const char *buffer, size_t length){
240
280
ssize_t ret;
241
if(length>0 and buffer[length-1] == '\n'){
242
length--;
243
}
244
281
for(size_t written = 0; written < length; written += (size_t)ret){
245
282
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,
246
283
length - written));
263
300
}
264
301
free(plugin_node->environ);
265
302
free(plugin_node->buffer);
266
303
267
304
/* Removes the plugin from the singly-linked list */
268
305
if(plugin_node == plugin_list){
269
306
/* First one - simple */
297
334
struct stat st;
298
335
fd_set rfds_all;
299
336
int ret, maxfd = 0;
337
ssize_t sret;
300
338
uid_t uid = 65534;
301
339
gid_t gid = 65534;
302
340
bool debug = false;
327
365
{ .name = "global-options", .key = 'g',
328
366
.arg = "OPTION[,OPTION[,...]]",
329
367
.doc = "Options passed to all plugins" },
330
{ .name = "global-envs", .key = 'e',
368
{ .name = "global-env", .key = 'G',
331
369
.arg = "VAR=value",
332
370
.doc = "Environment variable passed to all plugins" },
333
371
{ .name = "options-for", .key = 'o',
334
372
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
335
373
.doc = "Options passed only to specified plugin" },
336
{ .name = "envs-for", .key = 'f',
374
{ .name = "env-for", .key = 'E',
337
375
.arg = "PLUGIN:ENV=value",
338
376
.doc = "Environment variable passed to specified plugin" },
339
377
{ .name = "disable", .key = 'd',
340
378
.arg = "PLUGIN",
341
379
.doc = "Disable a specific plugin", .group = 1 },
380
{ .name = "enable", .key = 'e',
381
.arg = "PLUGIN",
382
.doc = "Enable a specific plugin", .group = 1 },
342
383
{ .name = "plugin-dir", .key = 128,
343
384
.arg = "DIRECTORY",
344
385
.doc = "Specify a different plugin directory", .group = 2 },
356
397
{ .name = NULL }
357
398
};
358
399
359
error_t parse_opt (int key, char *arg, __attribute__((unused))
360
struct argp_state *state) {
361
/* Get the INPUT argument from `argp_parse', which we know is a
362
pointer to our plugin list pointer. */
363
switch (key) {
400
error_t parse_opt(int key, char *arg, __attribute__((unused))
401
struct argp_state *state){
402
switch(key){
403
char *tmp;
404
intmax_t tmpmax;
364
405
case 'g': /* --global-options */
365
if (arg != NULL){
366
char *p;
367
while((p = strsep(&arg, ",")) != NULL){
368
if(p[0] == '\0'){
406
if(arg != NULL){
407
char *plugin_option;
408
while((plugin_option = strsep(&arg, ",")) != NULL){
409
if(plugin_option[0] == '\0'){
369
410
continue;
370
411
}
371
if(not add_argument(getplugin(NULL), p)){
412
if(not add_argument(getplugin(NULL), plugin_option)){
372
413
perror("add_argument");
373
414
return ARGP_ERR_UNKNOWN;
374
415
}
375
416
}
376
417
}
377
418
break;
378
case 'e': /* --global-envs */
419
case 'G': /* --global-env */
379
420
if(arg == NULL){
380
421
break;
381
422
}
382
{
383
char *envdef = strdup(arg);
384
if(envdef == NULL){
385
break;
386
}
387
if(not add_environment(getplugin(NULL), envdef)){
388
perror("add_environment");
389
}
423
if(not add_environment(getplugin(NULL), arg, true)){
424
perror("add_environment");
390
425
}
391
426
break;
392
427
case 'o': /* --options-for */
393
if (arg != NULL){
394
char *p_name = strsep(&arg, ":");
395
if(p_name[0] == '\0'){
396
break;
397
}
398
char *opt = strsep(&arg, ":");
399
if(opt[0] == '\0'){
400
break;
401
}
402
if(opt != NULL){
403
char *p;
404
while((p = strsep(&opt, ",")) != NULL){
405
if(p[0] == '\0'){
406
continue;
407
}
408
if(not add_argument(getplugin(p_name), p)){
409
perror("add_argument");
410
return ARGP_ERR_UNKNOWN;
411
}
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;
412
438
}
413
439
}
414
440
}
415
441
break;
416
case 'f': /* --envs-for */
442
case 'E': /* --env-for */
417
443
if(arg == NULL){
418
444
break;
419
445
}
422
448
if(envdef == NULL){
423
449
break;
424
450
}
425
char *p_name = strndup(arg, (size_t) (envdef-arg));
426
if(p_name == NULL){
427
break;
428
}
429
envdef++;
430
if(not add_environment(getplugin(p_name), envdef)){
451
*envdef = '\0';
452
if(not add_environment(getplugin(arg), envdef+1, true)){
431
453
perror("add_environment");
432
454
}
433
455
}
434
456
break;
435
457
case 'd': /* --disable */
436
if (arg != NULL){
458
if(arg != NULL){
437
459
plugin *p = getplugin(arg);
438
460
if(p == NULL){
439
461
return ARGP_ERR_UNKNOWN;
441
463
p->disabled = true;
442
464
}
443
465
break;
466
case 'e': /* --enable */
467
if(arg != NULL){
468
plugin *p = getplugin(arg);
469
if(p == NULL){
470
return ARGP_ERR_UNKNOWN;
471
}
472
p->disabled = false;
473
}
474
break;
444
475
case 128: /* --plugin-dir */
476
free(plugindir);
445
477
plugindir = strdup(arg);
446
478
if(plugindir == NULL){
447
479
perror("strdup");
448
}
449
break;
450
case 129: /* --config-file */
480
}
481
break;
482
case 129: /* --config-file */
483
/* This is already done by parse_opt_config_file() */
484
break;
485
case 130: /* --userid */
486
errno = 0;
487
tmpmax = strtoimax(arg, &tmp, 10);
488
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;
494
}
495
break;
496
case 131: /* --groupid */
497
errno = 0;
498
tmpmax = strtoimax(arg, &tmp, 10);
499
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;
505
}
506
break;
507
case 132: /* --debug */
508
debug = true;
509
break;
510
/*
511
* When adding more options before this line, remember to also add a
512
* "case" to the "parse_opt_config_file" function below.
513
*/
514
case ARGP_KEY_ARG:
515
/* Cryptsetup always passes an argument, which is an empty
516
string if "none" was specified in /etc/crypttab. So if
517
argument was empty, we ignore it silently. */
518
if(arg[0] != '\0'){
519
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
520
}
521
break;
522
case ARGP_KEY_END:
523
break;
524
default:
525
return ARGP_ERR_UNKNOWN;
526
}
527
return 0;
528
}
529
530
/* This option parser is the same as parse_opt() above, except it
531
ignores everything but the --config-file option. */
532
error_t parse_opt_config_file(int key, char *arg,
533
__attribute__((unused))
534
struct argp_state *state){
535
switch(key){
536
case 'g': /* --global-options */
537
case 'G': /* --global-env */
538
case 'o': /* --options-for */
539
case 'E': /* --env-for */
540
case 'd': /* --disable */
541
case 'e': /* --enable */
542
case 128: /* --plugin-dir */
543
break;
544
case 129: /* --config-file */
545
free(argfile);
451
546
argfile = strdup(arg);
452
547
if(argfile == NULL){
453
548
perror("strdup");
454
549
}
455
break;
550
break;
456
551
case 130: /* --userid */
457
uid = (uid_t)strtol(arg, NULL, 10);
458
break;
459
552
case 131: /* --groupid */
460
gid = (gid_t)strtol(arg, NULL, 10);
461
break;
462
553
case 132: /* --debug */
463
debug = true;
464
break;
465
554
case ARGP_KEY_ARG:
466
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
467
break;
468
555
case ARGP_KEY_END:
469
556
break;
470
557
default:
473
560
return 0;
474
561
}
475
562
476
struct argp argp = { .options = options, .parser = parse_opt,
477
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
563
struct argp argp = { .options = options,
564
.parser = parse_opt_config_file,
565
.args_doc = "",
478
566
.doc = "Mandos plugin runner -- Run plugins" };
479
567
480
ret = argp_parse (&argp, argc, argv, 0, 0, NULL);
481
if (ret == ARGP_ERR_UNKNOWN){
568
/* Parse using parse_opt_config_file() in order to get the custom
569
config file location, if any. */
570
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
571
if(ret == ARGP_ERR_UNKNOWN){
482
572
fprintf(stderr, "Unknown error while parsing arguments\n");
483
573
exitstatus = EXIT_FAILURE;
484
574
goto fallback;
485
575
}
486
487
/* Opens the configfile if aviable */
488
if (argfile == NULL){
576
577
/* Reset to the normal argument parser */
578
argp.parser = parse_opt;
579
580
/* Open the configfile if available */
581
if(argfile == NULL){
489
582
conffp = fopen(AFILE, "r");
490
583
} else {
491
584
conffp = fopen(argfile, "r");
492
}
585
}
493
586
if(conffp != NULL){
494
587
char *org_line = NULL;
495
588
char *p, *arg, *new_arg, *line;
496
589
size_t size = 0;
497
ssize_t sret;
498
590
const char whitespace_delims[] = " \r\t\f\v\n";
499
591
const char comment_delim[] = "#";
500
592
501
593
custom_argc = 1;
502
594
custom_argv = malloc(sizeof(char*) * 2);
503
595
if(custom_argv == NULL){
507
599
}
508
600
custom_argv[0] = argv[0];
509
601
custom_argv[1] = NULL;
510
602
511
603
/* for each line in the config file, strip whitespace and ignore
512
604
commented text */
513
605
while(true){
515
607
if(sret == -1){
516
608
break;
517
609
}
518
610
519
611
line = org_line;
520
612
arg = strsep(&line, comment_delim);
521
613
while((p = strsep(&arg, whitespace_delims)) != NULL){
540
632
goto fallback;
541
633
}
542
634
custom_argv[custom_argc-1] = new_arg;
543
custom_argv[custom_argc] = NULL;
635
custom_argv[custom_argc] = NULL;
544
636
}
545
637
}
638
do {
639
ret = fclose(conffp);
640
} while(ret == EOF and errno == EINTR);
641
if(ret == EOF){
642
perror("fclose");
643
exitstatus = EXIT_FAILURE;
644
goto fallback;
645
}
546
646
free(org_line);
547
} else{
647
} else {
548
648
/* Check for harmful errors and go to fallback. Other errors might
549
649
not affect opening plugins */
550
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
650
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
551
651
perror("fopen");
552
652
exitstatus = EXIT_FAILURE;
553
653
goto fallback;
556
656
/* If there was any arguments from configuration file,
557
657
pass them to parser as command arguments */
558
658
if(custom_argv != NULL){
559
ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0, NULL);
560
if (ret == ARGP_ERR_UNKNOWN){
659
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
660
0, NULL);
661
if(ret == ARGP_ERR_UNKNOWN){
561
662
fprintf(stderr, "Unknown error while parsing arguments\n");
562
663
exitstatus = EXIT_FAILURE;
563
664
goto fallback;
564
665
}
565
666
}
566
667
668
/* Parse actual command line arguments, to let them override the
669
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;
675
}
676
567
677
if(debug){
568
678
for(plugin *p = plugin_list; p != NULL; p=p->next){
569
679
fprintf(stderr, "Plugin: %s has %d arguments\n",
571
681
for(char **a = p->argv; *a != NULL; a++){
572
682
fprintf(stderr, "\tArg: %s\n", *a);
573
683
}
574
fprintf(stderr, "...and %u environment variables\n", p->envc);
684
fprintf(stderr, "...and %d environment variables\n", p->envc);
575
685
for(char **a = p->environ; *a != NULL; a++){
576
686
fprintf(stderr, "\t%s\n", *a);
577
687
}
578
688
}
579
689
}
580
690
581
691
/* Strip permissions down to nobody */
692
setgid(gid);
693
if(ret == -1){
694
perror("setgid");
695
}
582
696
ret = setuid(uid);
583
if (ret == -1){
697
if(ret == -1){
584
698
perror("setuid");
585
}
586
setgid(gid);
587
if (ret == -1){
588
perror("setgid");
589
699
}
590
591
if (plugindir == NULL){
700
701
if(plugindir == NULL){
592
702
dir = opendir(PDIR);
593
703
} else {
594
704
dir = opendir(plugindir);
614
724
}
615
725
616
726
FD_ZERO(&rfds_all);
617
727
618
728
/* Read and execute any executable in the plugin directory*/
619
729
while(true){
620
dirst = readdir(dir);
730
do {
731
dirst = readdir(dir);
732
} while(dirst == NULL and errno == EINTR);
621
733
622
// All directory entries have been processed
734
/* All directory entries have been processed */
623
735
if(dirst == NULL){
624
if (errno == EBADF){
736
if(errno == EBADF){
625
737
perror("readdir");
626
738
exitstatus = EXIT_FAILURE;
627
739
goto fallback;
631
743
632
744
d_name_len = strlen(dirst->d_name);
633
745
634
// Ignore dotfiles, backup files and other junk
746
/* Ignore dotfiles, backup files and other junk */
635
747
{
636
748
bool bad_name = false;
637
749
639
751
640
752
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
641
753
".dpkg-old",
754
".dpkg-bak",
642
755
".dpkg-divert", NULL };
643
756
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
644
757
size_t pre_len = strlen(*pre);
673
786
continue;
674
787
}
675
788
}
676
789
677
790
char *filename;
678
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
791
if(plugindir == NULL){
792
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
793
dirst->d_name));
794
} else {
795
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
796
plugindir,
797
dirst->d_name));
798
}
679
799
if(ret < 0){
680
800
perror("asprintf");
681
801
continue;
682
802
}
683
803
684
ret = stat(filename, &st);
685
if (ret == -1){
804
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
805
if(ret == -1){
686
806
perror("stat");
687
807
free(filename);
688
808
continue;
689
809
}
690
810
691
811
/* Ignore non-executable files */
692
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
812
if(not S_ISREG(st.st_mode)
813
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
693
814
if(debug){
694
815
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
695
816
" with bad type or mode\n", filename);
723
844
}
724
845
/* Add global environment variables */
725
846
for(char **e = g->environ; *e != NULL; e++){
726
if(not add_environment(p, *e)){
847
if(not add_environment(p, *e, false)){
727
848
perror("add_environment");
728
849
}
729
850
}
734
855
process, too. */
735
856
if(p->environ[0] != NULL){
736
857
for(char **e = environ; *e != NULL; e++){
737
char *copy = strdup(*e);
738
if(copy == NULL){
739
perror("strdup");
740
continue;
741
}
742
if(not add_environment(p, copy)){
858
if(not add_environment(p, *e, false)){
743
859
perror("add_environment");
744
860
}
745
861
}
746
862
}
747
863
748
864
int pipefd[2];
749
ret = pipe(pipefd);
750
if (ret == -1){
865
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
866
if(ret == -1){
751
867
perror("pipe");
752
868
exitstatus = EXIT_FAILURE;
753
869
goto fallback;
766
882
goto fallback;
767
883
}
768
884
/* Block SIGCHLD until process is safely in process list */
769
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
885
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
886
&sigchld_action.sa_mask,
887
NULL));
770
888
if(ret < 0){
771
889
perror("sigprocmask");
772
890
exitstatus = EXIT_FAILURE;
773
891
goto fallback;
774
892
}
775
// Starting a new process to be watched
776
pid_t pid = fork();
893
/* Starting a new process to be watched */
894
pid_t pid;
895
do {
896
pid = fork();
897
} while(pid == -1 and errno == EINTR);
777
898
if(pid == -1){
778
899
perror("fork");
779
900
exitstatus = EXIT_FAILURE;
786
907
perror("sigaction");
787
908
_exit(EXIT_FAILURE);
788
909
}
789
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
910
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
790
911
if(ret < 0){
791
912
perror("sigprocmask");
792
913
_exit(EXIT_FAILURE);
793
914
}
794
915
795
916
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
796
917
if(ret == -1){
797
918
perror("dup2");
817
938
/* no return */
818
939
}
819
940
/* Parent process */
820
close(pipefd[1]); /* Close unused write end of pipe */
941
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
942
pipe */
821
943
free(filename);
822
944
plugin *new_plugin = getplugin(dirst->d_name);
823
if (new_plugin == NULL){
945
if(new_plugin == NULL){
824
946
perror("getplugin");
825
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
947
ret = (int)(TEMP_FAILURE_RETRY
948
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
949
NULL)));
826
950
if(ret < 0){
827
951
perror("sigprocmask");
828
952
}
835
959
836
960
/* Unblock SIGCHLD so signal handler can be run if this process
837
961
has already completed */
838
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
962
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
963
&sigchld_action.sa_mask,
964
NULL));
839
965
if(ret < 0){
840
966
perror("sigprocmask");
841
967
exitstatus = EXIT_FAILURE;
844
970
845
971
FD_SET(new_plugin->fd, &rfds_all);
846
972
847
if (maxfd < new_plugin->fd){
973
if(maxfd < new_plugin->fd){
848
974
maxfd = new_plugin->fd;
849
975
}
850
851
976
}
852
977
853
closedir(dir);
978
TEMP_FAILURE_RETRY(closedir(dir));
854
979
dir = NULL;
855
980
free_plugin(getplugin(NULL));
981
856
982
for(plugin *p = plugin_list; p != NULL; p = p->next){
857
983
if(p->pid != 0){
858
984
break;
863
989
free_plugin_list();
864
990
}
865
991
}
866
992
867
993
/* Main loop while running plugins exist */
868
994
while(plugin_list){
869
995
fd_set rfds = rfds_all;
870
996
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
871
if (select_ret == -1){
997
if(select_ret == -1 and errno != EINTR){
872
998
perror("select");
873
999
exitstatus = EXIT_FAILURE;
874
1000
goto fallback;
875
1001
}
876
1002
/* OK, now either a process completed, or something can be read
877
1003
from one of them */
878
for(plugin *proc = plugin_list; proc != NULL; proc = proc->next){
1004
for(plugin *proc = plugin_list; proc != NULL;){
879
1005
/* Is this process completely done? */
880
if(proc->eof and proc->completed){
1006
if(proc->completed and proc->eof){
881
1007
/* Only accept the plugin output if it exited cleanly */
882
1008
if(not WIFEXITED(proc->status)
883
1009
or WEXITSTATUS(proc->status) != 0){
884
1010
/* Bad exit by plugin */
885
1011
886
1012
if(debug){
887
1013
if(WIFEXITED(proc->status)){
888
fprintf(stderr, "Plugin %u exited with status %d\n",
889
(unsigned int) (proc->pid),
1014
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1015
" status %d\n", proc->name,
1016
(intmax_t) (proc->pid),
890
1017
WEXITSTATUS(proc->status));
891
} else if(WIFSIGNALED(proc->status)) {
892
fprintf(stderr, "Plugin %u killed by signal %d\n",
893
(unsigned int) (proc->pid),
894
WTERMSIG(proc->status));
1018
} else if(WIFSIGNALED(proc->status)){
1019
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1020
" signal %d: %s\n", proc->name,
1021
(intmax_t) (proc->pid),
1022
WTERMSIG(proc->status),
1023
strsignal(WTERMSIG(proc->status)));
895
1024
} else if(WCOREDUMP(proc->status)){
896
fprintf(stderr, "Plugin %d dumped core\n",
897
(unsigned int) (proc->pid));
1025
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1026
" core\n", proc->name, (intmax_t) (proc->pid));
898
1027
}
899
1028
}
900
1029
901
1030
/* Remove the plugin */
902
1031
FD_CLR(proc->fd, &rfds_all);
903
1032
904
1033
/* Block signal while modifying process_list */
905
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1034
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1035
(SIG_BLOCK,
1036
&sigchld_action.sa_mask,
1037
NULL));
906
1038
if(ret < 0){
907
1039
perror("sigprocmask");
908
1040
exitstatus = EXIT_FAILURE;
909
1041
goto fallback;
910
1042
}
1043
1044
plugin *next_plugin = proc->next;
911
1045
free_plugin(proc);
1046
proc = next_plugin;
1047
912
1048
/* We are done modifying process list, so unblock signal */
913
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
914
NULL);
1049
ret = (int)(TEMP_FAILURE_RETRY
1050
(sigprocmask(SIG_UNBLOCK,
1051
&sigchld_action.sa_mask, NULL)));
915
1052
if(ret < 0){
916
1053
perror("sigprocmask");
917
1054
exitstatus = EXIT_FAILURE;
921
1058
if(plugin_list == NULL){
922
1059
break;
923
1060
}
1061
924
1062
continue;
925
1063
}
926
1064
927
1065
/* This process exited nicely, so print its buffer */
928
1066
929
1067
bool bret = print_out_password(proc->buffer,
930
1068
proc->buffer_length);
931
1069
if(not bret){
938
1076
/* This process has not completed. Does it have any output? */
939
1077
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
940
1078
/* This process had nothing to say at this time */
1079
proc = proc->next;
941
1080
continue;
942
1081
}
943
1082
/* Before reading, make the process' data buffer large enough */
944
1083
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
945
1084
proc->buffer = realloc(proc->buffer, proc->buffer_size
946
1085
+ (size_t) BUFFER_SIZE);
947
if (proc->buffer == NULL){
1086
if(proc->buffer == NULL){
948
1087
perror("malloc");
949
1088
exitstatus = EXIT_FAILURE;
950
1089
goto fallback;
952
1091
proc->buffer_size += BUFFER_SIZE;
953
1092
}
954
1093
/* Read from the process */
955
ret = read(proc->fd, proc->buffer + proc->buffer_length,
956
BUFFER_SIZE);
957
if(ret < 0){
1094
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1095
proc->buffer
1096
+ proc->buffer_length,
1097
BUFFER_SIZE));
1098
if(sret < 0){
958
1099
/* Read error from this process; ignore the error */
1100
proc = proc->next;
959
1101
continue;
960
1102
}
961
if(ret == 0){
1103
if(sret == 0){
962
1104
/* got EOF */
963
1105
proc->eof = true;
964
1106
} else {
965
proc->buffer_length += (size_t) ret;
1107
proc->buffer_length += (size_t) sret;
966
1108
}
967
1109
}
968
1110
}
969
970
1111
1112
971
1113
fallback:
972
1114
973
1115
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
976
1118
bool bret;
977
1119
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
978
1120
char *passwordbuffer = getpass("Password: ");
979
bret = print_out_password(passwordbuffer, strlen(passwordbuffer));
1121
size_t len = strlen(passwordbuffer);
1122
/* Strip trailing newline */
1123
if(len > 0 and passwordbuffer[len-1] == '\n'){
1124
passwordbuffer[len-1] = '\0'; /* not strictly necessary */
1125
len--;
1126
}
1127
bret = print_out_password(passwordbuffer, len);
980
1128
if(not bret){
981
1129
perror("print_out_password");
982
1130
exitstatus = EXIT_FAILURE;
989
1137
perror("sigaction");
990
1138
exitstatus = EXIT_FAILURE;
991
1139
}
992
1140
993
1141
if(custom_argv != NULL){
994
1142
for(char **arg = custom_argv+1; *arg != NULL; arg++){
995
1143
free(*arg);
1001
1149
closedir(dir);
1002
1150
}
1003
1151
1004
/* Free the process list and kill the processes */
1152
/* Kill the processes */
1005
1153
for(plugin *p = plugin_list; p != NULL; p = p->next){
1006
1154
if(p->pid != 0){
1007
1155
close(p->fd);
1014
1162
}
1015
1163
1016
1164
/* Wait for any remaining child processes to terminate */
1017
do{
1165
do {
1018
1166
ret = wait(NULL);
1019
1167
} while(ret >= 0);
1020
1168
if(errno != ECHILD){
1021
1169
perror("wait");
1022
1170
}
1023
1171
1024
1172
free_plugin_list();
1025
1173
1026
1174
free(plugindir);
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0