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 394
- compare with another revision
- download diff
- download tarball
- view history from revision 394
- Committer: Teddy Hogeborn
- Date: 2009-10-24 19:17:52 UTC
- Revision ID: teddy@fukt.bsnet.se-20091024191752-7g6xlf6wpp2pdexb
Convert some programs to use the exit codes from <sysexits.h>. Change
all programs using the "argp" parsing functions to use them correctly;
checking return value, using argp_error() to report parse errors etc.
* plugin-runner.c: Use <sysexits.h> exit codes. Always use fallback,
even on option errors, except for "--help", etc.
(getplugin): Make sure "errno" is set correctly on return.
(main): Declare our own "--help", "--usage", and "--version"
options which do not cause the fallback to be invoked.
In all other options, use fallback on any error.
(parse_opt, parse_opt_config_file): Reset errno at start and return
errno. No need to check "arg"
for NULL. New "--help",
"--usage", and "--version"
options.
(parse_opt): Accept empty string as global option. Do not print
errors which will be detected and reported later. Do
"argp_error()" on parse error or empty plugin names.
* plugins.d/mandos-client.c: Use <sysexits.h> exit codes. Do not
return successful exit code on "--help",
etc. since this would give the wrong
message to "plugin-runner".
(main): Declare our own "--help", "--usage", and "--version"
options which do not return a successful exit code.
(parse_opt): Reset errno at start and return errno. Do
"argp_error()" on parse errors. New "--help",
"--usage", and "--version" options.
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
not return successful exit code on
"--help", etc. since this would give
the wrong message to "plugin-runner".
(main): Declare our own "--help", "--usage", and "--version" options
which do not return a successful exit code. Do
close(STDOUT_FILENO) after writing to check its return code.
(parse_opt): Reset errno at start and return errno.
all programs using the "argp" parsing functions to use them correctly;
checking return value, using argp_error() to report parse errors etc.
* plugin-runner.c: Use <sysexits.h> exit codes. Always use fallback,
even on option errors, except for "--help", etc.
(getplugin): Make sure "errno" is set correctly on return.
(main): Declare our own "--help", "--usage", and "--version"
options which do not cause the fallback to be invoked.
In all other options, use fallback on any error.
(parse_opt, parse_opt_config_file): Reset errno at start and return
errno. No need to check "arg"
for NULL. New "--help",
"--usage", and "--version"
options.
(parse_opt): Accept empty string as global option. Do not print
errors which will be detected and reported later. Do
"argp_error()" on parse error or empty plugin names.
* plugins.d/mandos-client.c: Use <sysexits.h> exit codes. Do not
return successful exit code on "--help",
etc. since this would give the wrong
message to "plugin-runner".
(main): Declare our own "--help", "--usage", and "--version"
options which do not return a successful exit code.
(parse_opt): Reset errno at start and return errno. Do
"argp_error()" on parse errors. New "--help",
"--usage", and "--version" options.
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
not return successful exit code on
"--help", etc. since this would give
the wrong message to "plugin-runner".
(main): Declare our own "--help", "--usage", and "--version" options
which do not return a successful exit code. Do
close(STDOUT_FILENO) after writing to check its return code.
(parse_opt): Reset errno at start and return errno.
- files added:
- initramfs-tools-hook-conf
- files removed:
- 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-2018 Teddy Hogeborn
6
* Copyright © 2008-2018 Björn Påhlsson
7
*
8
* This file is part of Mandos.
9
*
10
* Mandos is free software: you can redistribute it and/or modify it
11
* under the terms of the GNU General Public License as published by
12
* the Free Software Foundation, either version 3 of the License, or
13
* (at your option) any later version.
14
*
15
* Mandos is distributed in the hope that it will be useful, but
5
* Copyright © 2008,2009 Teddy Hogeborn
6
* Copyright © 2008,2009 Björn Påhlsson
7
*
8
* This program is free software: you can redistribute it and/or
9
* modify it under the terms of the GNU General Public License as
10
* published by the Free Software Foundation, either version 3 of the
11
* License, or (at your option) any later version.
12
*
13
* This program is distributed in the hope that it will be useful, but
16
14
* WITHOUT ANY WARRANTY; without even the implied warranty of
17
15
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18
16
* General Public License for more details.
19
17
*
20
18
* You should have received a copy of the GNU General Public License
21
* along with Mandos. If not, see <http://www.gnu.org/licenses/>.
19
* along with this program. If not, see
20
* <http://www.gnu.org/licenses/>.
22
21
*
23
* Contact the authors at <mandos@recompile.se>.
22
* Contact the authors at <mandos@fukt.bsnet.se>.
24
23
*/
25
24
26
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
27
O_CLOEXEC, pipe2() */
26
asprintf(), O_CLOEXEC */
28
27
#include <stddef.h> /* size_t, NULL */
29
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
30
realloc() */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
29
EXIT_SUCCESS, realloc() */
31
30
#include <stdbool.h> /* bool, true, false */
32
#include <stdio.h> /* fileno(), fprintf(),
33
stderr, STDOUT_FILENO, fclose() */
34
#include <sys/types.h> /* fstat(), struct stat, waitpid(),
35
WIFEXITED(), WEXITSTATUS(), wait(),
36
pid_t, uid_t, gid_t, getuid(),
37
getgid() */
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() */
38
38
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
39
39
FD_SET(), FD_ISSET(), FD_CLR */
40
40
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
41
WEXITSTATUS(), WTERMSIG() */
42
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
41
WEXITSTATUS(), WTERMSIG(),
42
WCOREDUMP() */
43
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
43
44
#include <iso646.h> /* and, or, not */
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
*/
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() */
52
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
53
FD_CLOEXEC, openat(), scandirat(),
54
pipe2() */
55
#include <string.h> /* strsep, strlen(), strsignal(),
56
strcmp(), strncmp() */
55
FD_CLOEXEC */
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal() */
57
58
#include <errno.h> /* errno */
58
59
#include <argp.h> /* struct argp_option, struct
59
60
argp_state, struct argp,
67
68
*/
68
69
#include <errno.h> /* errno, EBADF */
69
70
#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
#include <sysexits.h> /* EX_OSERR, EX_USAGE */
75
72
76
73
#define BUFFER_SIZE 256
77
74
78
75
#define PDIR "/lib/mandos/plugins.d"
79
#define PHDIR "/lib/mandos/plugin-helpers"
80
76
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
81
77
82
78
const char *argp_program_version = "plugin-runner " VERSION;
83
const char *argp_program_bug_address = "<mandos@recompile.se>";
79
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
84
80
85
81
typedef struct plugin{
86
82
char *name; /* can be NULL or any plugin name */
106
102
107
103
/* Gets an existing plugin based on name,
108
104
or if none is found, creates a new one */
109
__attribute__((warn_unused_result))
110
105
static plugin *getplugin(char *name){
111
106
/* Check for existing plugin with that name */
112
107
for(plugin *p = plugin_list; p != NULL; p = p->next){
173
168
}
174
169
175
170
/* Helper function for add_argument and add_environment */
176
__attribute__((nonnull, warn_unused_result))
177
171
static bool add_to_char_array(const char *new, char ***array,
178
172
int *len){
179
173
/* Resize the pointed-to array to hold one more pointer */
180
char **new_array = NULL;
181
174
do {
182
new_array = realloc(*array, sizeof(char *)
183
* (size_t) ((*len) + 2));
184
} while(new_array == NULL and errno == EINTR);
175
*array = realloc(*array, sizeof(char *)
176
* (size_t) ((*len) + 2));
177
} while(*array == NULL and errno == EINTR);
185
178
/* Malloc check */
186
if(new_array == NULL){
179
if(*array == NULL){
187
180
return false;
188
181
}
189
*array = new_array;
190
182
/* Make a copy of the new string */
191
183
char *copy;
192
184
do {
204
196
}
205
197
206
198
/* Add to a plugin's argument vector */
207
__attribute__((nonnull(2), warn_unused_result))
208
199
static bool add_argument(plugin *p, const char *arg){
209
200
if(p == NULL){
210
201
return false;
213
204
}
214
205
215
206
/* Add to a plugin's environment */
216
__attribute__((nonnull(2), warn_unused_result))
217
207
static bool add_environment(plugin *p, const char *def, bool replace){
218
208
if(p == NULL){
219
209
return false;
221
211
/* namelen = length of name of environment variable */
222
212
size_t namelen = (size_t)(strchrnul(def, '=') - def);
223
213
/* Search for this environment variable */
224
for(char **envdef = p->environ; *envdef != NULL; envdef++){
225
if(strncmp(*envdef, def, namelen + 1) == 0){
214
for(char **e = p->environ; *e != NULL; e++){
215
if(strncmp(*e, def, namelen + 1) == 0){
226
216
/* It already exists */
227
217
if(replace){
228
char *new_envdef;
218
char *new;
229
219
do {
230
new_envdef = realloc(*envdef, strlen(def) + 1);
231
} while(new_envdef == NULL and errno == EINTR);
232
if(new_envdef == NULL){
220
new = realloc(*e, strlen(def) + 1);
221
} while(new == NULL and errno == EINTR);
222
if(new == NULL){
233
223
return false;
234
224
}
235
*envdef = new_envdef;
236
strcpy(*envdef, def);
225
*e = new;
226
strcpy(*e, def);
237
227
}
238
228
return true;
239
229
}
241
231
return add_to_char_array(def, &(p->environ), &(p->envc));
242
232
}
243
233
244
#ifndef O_CLOEXEC
245
234
/*
246
235
* Based on the example in the GNU LibC manual chapter 13.13 "File
247
236
* Descriptor Flags".
248
237
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
249
238
*/
250
__attribute__((warn_unused_result))
251
239
static int set_cloexec_flag(int fd){
252
240
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
253
241
/* If reading the flags failed, return error indication now. */
258
246
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
259
247
ret | FD_CLOEXEC));
260
248
}
261
#endif /* not O_CLOEXEC */
262
249
263
250
264
251
/* Mark processes as completed when they exit, and save their exit
278
265
/* No child processes */
279
266
break;
280
267
}
281
error(0, errno, "waitpid");
268
perror("waitpid");
282
269
}
283
270
284
271
/* A child exited, find it in process_list */
296
283
}
297
284
298
285
/* Prints out a password to stdout */
299
__attribute__((nonnull, warn_unused_result))
300
286
static bool print_out_password(const char *buffer, size_t length){
301
287
ssize_t ret;
302
288
for(size_t written = 0; written < length; written += (size_t)ret){
310
296
}
311
297
312
298
/* Removes and free a plugin from the plugin list */
313
__attribute__((nonnull))
314
299
static void free_plugin(plugin *plugin_node){
315
300
316
301
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
348
333
349
334
int main(int argc, char *argv[]){
350
335
char *plugindir = NULL;
351
char *pluginhelperdir = NULL;
352
336
char *argfile = NULL;
353
337
FILE *conffp;
354
struct dirent **direntries = NULL;
338
size_t d_name_len;
339
DIR *dir = NULL;
340
struct dirent *dirst;
355
341
struct stat st;
356
342
fd_set rfds_all;
357
343
int ret, maxfd = 0;
365
351
.sa_flags = SA_NOCLDSTOP };
366
352
char **custom_argv = NULL;
367
353
int custom_argc = 0;
368
int dir_fd = -1;
369
354
370
355
/* Establish a signal handler */
371
356
sigemptyset(&sigchld_action.sa_mask);
372
357
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
373
358
if(ret == -1){
374
error(0, errno, "sigaddset");
375
exitstatus = EX_OSERR;
359
perror("sigaddset");
360
exitstatus = EXIT_FAILURE;
376
361
goto fallback;
377
362
}
378
363
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
379
364
if(ret == -1){
380
error(0, errno, "sigaction");
381
exitstatus = EX_OSERR;
365
perror("sigaction");
366
exitstatus = EXIT_FAILURE;
382
367
goto fallback;
383
368
}
384
369
416
401
.doc = "Group ID the plugins will run as", .group = 3 },
417
402
{ .name = "debug", .key = 132,
418
403
.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
404
/*
424
405
* These reproduce what we would get without ARGP_NO_HELP
425
406
*/
432
413
{ .name = NULL }
433
414
};
434
415
435
__attribute__((nonnull(3)))
436
416
error_t parse_opt(int key, char *arg, struct argp_state *state){
437
417
errno = 0;
438
418
switch(key){
439
419
char *tmp;
440
intmax_t tmp_id;
420
intmax_t tmpmax;
441
421
case 'g': /* --global-options */
442
422
{
443
423
char *plugin_option;
446
426
break;
447
427
}
448
428
}
449
errno = 0;
450
429
}
451
430
break;
452
431
case 'G': /* --global-env */
453
if(add_environment(getplugin(NULL), arg, true)){
454
errno = 0;
455
}
432
add_environment(getplugin(NULL), arg, true);
456
433
break;
457
434
case 'o': /* --options-for */
458
435
{
475
452
break;
476
453
}
477
454
}
478
errno = 0;
479
455
}
480
456
break;
481
457
case 'E': /* --env-for */
493
469
errno = EINVAL;
494
470
break;
495
471
}
496
if(add_environment(getplugin(arg), envdef, true)){
497
errno = 0;
498
}
472
add_environment(getplugin(arg), envdef, true);
499
473
}
500
474
break;
501
475
case 'd': /* --disable */
503
477
plugin *p = getplugin(arg);
504
478
if(p != NULL){
505
479
p->disabled = true;
506
errno = 0;
507
480
}
508
481
}
509
482
break;
512
485
plugin *p = getplugin(arg);
513
486
if(p != NULL){
514
487
p->disabled = false;
515
errno = 0;
516
488
}
517
489
}
518
490
break;
519
491
case 128: /* --plugin-dir */
520
492
free(plugindir);
521
493
plugindir = strdup(arg);
522
if(plugindir != NULL){
523
errno = 0;
524
}
525
494
break;
526
495
case 129: /* --config-file */
527
496
/* This is already done by parse_opt_config_file() */
528
497
break;
529
498
case 130: /* --userid */
530
tmp_id = strtoimax(arg, &tmp, 10);
499
tmpmax = strtoimax(arg, &tmp, 10);
531
500
if(errno != 0 or tmp == arg or *tmp != '\0'
532
or tmp_id != (uid_t)tmp_id){
501
or tmpmax != (uid_t)tmpmax){
533
502
argp_error(state, "Bad user ID number: \"%s\", using %"
534
503
PRIdMAX, arg, (intmax_t)uid);
535
504
break;
536
505
}
537
uid = (uid_t)tmp_id;
538
errno = 0;
506
uid = (uid_t)tmpmax;
539
507
break;
540
508
case 131: /* --groupid */
541
tmp_id = strtoimax(arg, &tmp, 10);
509
tmpmax = strtoimax(arg, &tmp, 10);
542
510
if(errno != 0 or tmp == arg or *tmp != '\0'
543
or tmp_id != (gid_t)tmp_id){
511
or tmpmax != (gid_t)tmpmax){
544
512
argp_error(state, "Bad group ID number: \"%s\", using %"
545
513
PRIdMAX, arg, (intmax_t)gid);
546
514
break;
547
515
}
548
gid = (gid_t)tmp_id;
549
errno = 0;
516
gid = (gid_t)tmpmax;
550
517
break;
551
518
case 132: /* --debug */
552
519
debug = true;
553
520
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
521
/*
562
522
* These reproduce what we would get without ARGP_NO_HELP
563
523
*/
564
524
case '?': /* --help */
565
525
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
566
526
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
567
__builtin_unreachable();
568
527
case -3: /* --usage */
569
528
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
570
529
argp_state_help(state, state->out_stream,
571
530
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
572
__builtin_unreachable();
573
531
case 'V': /* --version */
574
532
fprintf(state->out_stream, "%s\n", argp_program_version);
575
533
exit(EXIT_SUCCESS);
585
543
if(arg[0] == '\0'){
586
544
break;
587
545
}
588
/* FALLTHROUGH */
589
546
default:
590
547
return ARGP_ERR_UNKNOWN;
591
548
}
610
567
case 129: /* --config-file */
611
568
free(argfile);
612
569
argfile = strdup(arg);
613
if(argfile != NULL){
614
errno = 0;
615
}
616
570
break;
617
571
case 130: /* --userid */
618
572
case 131: /* --groupid */
619
573
case 132: /* --debug */
620
case 133: /* --plugin-helper-dir */
621
574
case '?': /* --help */
622
575
case -3: /* --usage */
623
576
case 'V': /* --version */
645
598
case ENOMEM:
646
599
default:
647
600
errno = ret;
648
error(0, errno, "argp_parse");
601
perror("argp_parse");
649
602
exitstatus = EX_OSERR;
650
603
goto fallback;
651
604
case EINVAL:
672
625
custom_argc = 1;
673
626
custom_argv = malloc(sizeof(char*) * 2);
674
627
if(custom_argv == NULL){
675
error(0, errno, "malloc");
676
exitstatus = EX_OSERR;
628
perror("malloc");
629
exitstatus = EXIT_FAILURE;
677
630
goto fallback;
678
631
}
679
632
custom_argv[0] = argv[0];
695
648
}
696
649
new_arg = strdup(p);
697
650
if(new_arg == NULL){
698
error(0, errno, "strdup");
699
exitstatus = EX_OSERR;
651
perror("strdup");
652
exitstatus = EXIT_FAILURE;
700
653
free(org_line);
701
654
goto fallback;
702
655
}
703
656
704
657
custom_argc += 1;
705
{
706
char **new_argv = realloc(custom_argv, sizeof(char *)
707
* ((size_t)custom_argc + 1));
708
if(new_argv == NULL){
709
error(0, errno, "realloc");
710
exitstatus = EX_OSERR;
711
free(new_arg);
712
free(org_line);
713
goto fallback;
714
} else {
715
custom_argv = new_argv;
716
}
658
custom_argv = realloc(custom_argv, sizeof(char *)
659
* ((unsigned int) custom_argc + 1));
660
if(custom_argv == NULL){
661
perror("realloc");
662
exitstatus = EXIT_FAILURE;
663
free(org_line);
664
goto fallback;
717
665
}
718
666
custom_argv[custom_argc-1] = new_arg;
719
667
custom_argv[custom_argc] = NULL;
723
671
ret = fclose(conffp);
724
672
} while(ret == EOF and errno == EINTR);
725
673
if(ret == EOF){
726
error(0, errno, "fclose");
727
exitstatus = EX_IOERR;
674
perror("fclose");
675
exitstatus = EXIT_FAILURE;
728
676
goto fallback;
729
677
}
730
678
free(org_line);
732
680
/* Check for harmful errors and go to fallback. Other errors might
733
681
not affect opening plugins */
734
682
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
735
error(0, errno, "fopen");
736
exitstatus = EX_OSERR;
683
perror("fopen");
684
exitstatus = EXIT_FAILURE;
737
685
goto fallback;
738
686
}
739
687
}
749
697
case ENOMEM:
750
698
default:
751
699
errno = ret;
752
error(0, errno, "argp_parse");
700
perror("argp_parse");
753
701
exitstatus = EX_OSERR;
754
702
goto fallback;
755
703
case EINVAL:
769
717
case ENOMEM:
770
718
default:
771
719
errno = ret;
772
error(0, errno, "argp_parse");
720
perror("argp_parse");
773
721
exitstatus = EX_OSERR;
774
722
goto fallback;
775
723
case EINVAL:
777
725
goto fallback;
778
726
}
779
727
780
{
781
char *pluginhelperenv;
782
bool bret = true;
783
ret = asprintf(&pluginhelperenv, "MANDOSPLUGINHELPERDIR=%s",
784
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
785
if(ret != -1){
786
bret = add_environment(getplugin(NULL), pluginhelperenv, true);
787
}
788
if(ret == -1 or not bret){
789
error(0, errno, "Failed to set MANDOSPLUGINHELPERDIR"
790
" environment variable to \"%s\" for all plugins\n",
791
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
792
}
793
if(ret != -1){
794
free(pluginhelperenv);
795
}
796
}
797
798
728
if(debug){
799
for(plugin *p = plugin_list; p != NULL; p = p->next){
729
for(plugin *p = plugin_list; p != NULL; p=p->next){
800
730
fprintf(stderr, "Plugin: %s has %d arguments\n",
801
731
p->name ? p->name : "Global", p->argc - 1);
802
732
for(char **a = p->argv; *a != NULL; a++){
809
739
}
810
740
}
811
741
812
if(getuid() == 0){
813
/* Work around Debian bug #633582:
814
<https://bugs.debian.org/633582> */
815
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
816
if(plugindir_fd == -1){
817
if(errno != ENOENT){
818
error(0, errno, "open(\"" PDIR "\")");
819
}
820
} else {
821
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
822
if(ret == -1){
823
error(0, errno, "fstat");
824
} else {
825
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
826
ret = fchown(plugindir_fd, uid, gid);
827
if(ret == -1){
828
error(0, errno, "fchown");
829
}
830
}
831
}
832
close(plugindir_fd);
833
}
834
}
835
836
/* Lower permissions */
837
ret = setgid(gid);
742
/* Strip permissions down to nobody */
743
setgid(gid);
838
744
if(ret == -1){
839
error(0, errno, "setgid");
745
perror("setgid");
840
746
}
841
747
ret = setuid(uid);
842
748
if(ret == -1){
843
error(0, errno, "setuid");
749
perror("setuid");
844
750
}
845
751
846
752
/* Open plugin directory with close_on_exec flag */
847
753
{
848
dir_fd = open(plugindir != NULL ? plugindir : PDIR, O_RDONLY |
849
#ifdef O_CLOEXEC
850
O_CLOEXEC
851
#else /* not O_CLOEXEC */
852
0
853
#endif /* not O_CLOEXEC */
854
);
754
int dir_fd = -1;
755
if(plugindir == NULL){
756
dir_fd = open(PDIR, O_RDONLY |
757
#ifdef O_CLOEXEC
758
O_CLOEXEC
759
#else /* not O_CLOEXEC */
760
0
761
#endif /* not O_CLOEXEC */
762
);
763
} else {
764
dir_fd = open(plugindir, O_RDONLY |
765
#ifdef O_CLOEXEC
766
O_CLOEXEC
767
#else /* not O_CLOEXEC */
768
0
769
#endif /* not O_CLOEXEC */
770
);
771
}
855
772
if(dir_fd == -1){
856
error(0, errno, "Could not open plugin dir");
857
exitstatus = EX_UNAVAILABLE;
773
perror("Could not open plugin dir");
774
exitstatus = EXIT_FAILURE;
858
775
goto fallback;
859
776
}
860
777
862
779
/* Set the FD_CLOEXEC flag on the directory */
863
780
ret = set_cloexec_flag(dir_fd);
864
781
if(ret < 0){
865
error(0, errno, "set_cloexec_flag");
866
exitstatus = EX_OSERR;
782
perror("set_cloexec_flag");
783
TEMP_FAILURE_RETRY(close(dir_fd));
784
exitstatus = EXIT_FAILURE;
867
785
goto fallback;
868
786
}
869
787
#endif /* O_CLOEXEC */
870
}
871
872
int good_name(const struct dirent * const dirent){
873
const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new",
874
"*.dpkg-old", "*.dpkg-bak",
875
"*.dpkg-divert", NULL };
876
#ifdef __GNUC__
877
#pragma GCC diagnostic push
878
#pragma GCC diagnostic ignored "-Wcast-qual"
879
#endif
880
for(const char **pat = (const char **)patterns;
881
*pat != NULL; pat++){
882
#ifdef __GNUC__
883
#pragma GCC diagnostic pop
884
#endif
885
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
886
!= FNM_NOMATCH){
887
if(debug){
888
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
889
" matching pattern %s\n", dirent->d_name, *pat);
890
}
891
return 0;
892
}
788
789
dir = fdopendir(dir_fd);
790
if(dir == NULL){
791
perror("Could not open plugin dir");
792
TEMP_FAILURE_RETRY(close(dir_fd));
793
exitstatus = EXIT_FAILURE;
794
goto fallback;
893
795
}
894
return 1;
895
}
896
897
int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
898
alphasort);
899
if(numplugins == -1){
900
error(0, errno, "Could not scan plugin dir");
901
direntries = NULL;
902
exitstatus = EX_OSERR;
903
goto fallback;
904
796
}
905
797
906
798
FD_ZERO(&rfds_all);
907
799
908
800
/* Read and execute any executable in the plugin directory*/
909
for(int i = 0; i < numplugins; i++){
910
911
int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY);
912
if(plugin_fd == -1){
913
error(0, errno, "Could not open plugin");
914
free(direntries[i]);
801
while(true){
802
do {
803
dirst = readdir(dir);
804
} while(dirst == NULL and errno == EINTR);
805
806
/* All directory entries have been processed */
807
if(dirst == NULL){
808
if(errno == EBADF){
809
perror("readdir");
810
exitstatus = EXIT_FAILURE;
811
goto fallback;
812
}
813
break;
814
}
815
816
d_name_len = strlen(dirst->d_name);
817
818
/* Ignore dotfiles, backup files and other junk */
819
{
820
bool bad_name = false;
821
822
const char const *bad_prefixes[] = { ".", "#", NULL };
823
824
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
825
".dpkg-old",
826
".dpkg-bak",
827
".dpkg-divert", NULL };
828
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
829
size_t pre_len = strlen(*pre);
830
if((d_name_len >= pre_len)
831
and strncmp((dirst->d_name), *pre, pre_len) == 0){
832
if(debug){
833
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
834
" with bad prefix %s\n", dirst->d_name, *pre);
835
}
836
bad_name = true;
837
break;
838
}
839
}
840
if(bad_name){
841
continue;
842
}
843
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
844
size_t suf_len = strlen(*suf);
845
if((d_name_len >= suf_len)
846
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
847
== 0)){
848
if(debug){
849
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
850
" with bad suffix %s\n", dirst->d_name, *suf);
851
}
852
bad_name = true;
853
break;
854
}
855
}
856
857
if(bad_name){
858
continue;
859
}
860
}
861
862
char *filename;
863
if(plugindir == NULL){
864
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
865
dirst->d_name));
866
} else {
867
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
868
plugindir,
869
dirst->d_name));
870
}
871
if(ret < 0){
872
perror("asprintf");
915
873
continue;
916
874
}
917
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
875
876
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
918
877
if(ret == -1){
919
error(0, errno, "stat");
920
close(plugin_fd);
921
free(direntries[i]);
878
perror("stat");
879
free(filename);
922
880
continue;
923
881
}
924
882
925
883
/* Ignore non-executable files */
926
884
if(not S_ISREG(st.st_mode)
927
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
928
X_OK, 0)) != 0)){
885
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
929
886
if(debug){
930
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
931
" with bad type or mode\n",
932
plugindir != NULL ? plugindir : PDIR,
933
direntries[i]->d_name);
887
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
888
" with bad type or mode\n", filename);
934
889
}
935
close(plugin_fd);
936
free(direntries[i]);
890
free(filename);
937
891
continue;
938
892
}
939
893
940
plugin *p = getplugin(direntries[i]->d_name);
894
plugin *p = getplugin(dirst->d_name);
941
895
if(p == NULL){
942
error(0, errno, "getplugin");
943
close(plugin_fd);
944
free(direntries[i]);
896
perror("getplugin");
897
free(filename);
945
898
continue;
946
899
}
947
900
if(p->disabled){
948
901
if(debug){
949
902
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
950
direntries[i]->d_name);
903
dirst->d_name);
951
904
}
952
close(plugin_fd);
953
free(direntries[i]);
905
free(filename);
954
906
continue;
955
907
}
956
908
{
959
911
if(g != NULL){
960
912
for(char **a = g->argv + 1; *a != NULL; a++){
961
913
if(not add_argument(p, *a)){
962
error(0, errno, "add_argument");
914
perror("add_argument");
963
915
}
964
916
}
965
917
/* Add global environment variables */
966
918
for(char **e = g->environ; *e != NULL; e++){
967
919
if(not add_environment(p, *e, false)){
968
error(0, errno, "add_environment");
920
perror("add_environment");
969
921
}
970
922
}
971
923
}
972
924
}
973
/* If this plugin has any environment variables, we need to
974
duplicate the environment from this process, too. */
925
/* If this plugin has any environment variables, we will call
926
using execve and need to duplicate the environment from this
927
process, too. */
975
928
if(p->environ[0] != NULL){
976
929
for(char **e = environ; *e != NULL; e++){
977
930
if(not add_environment(p, *e, false)){
978
error(0, errno, "add_environment");
931
perror("add_environment");
979
932
}
980
933
}
981
934
}
982
935
983
936
int pipefd[2];
984
#ifndef O_CLOEXEC
985
937
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
986
#else /* O_CLOEXEC */
987
ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC));
988
#endif /* O_CLOEXEC */
989
938
if(ret == -1){
990
error(0, errno, "pipe");
991
exitstatus = EX_OSERR;
992
free(direntries[i]);
993
goto fallback;
994
}
995
if(pipefd[0] >= FD_SETSIZE){
996
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
997
FD_SETSIZE);
998
close(pipefd[0]);
999
close(pipefd[1]);
1000
exitstatus = EX_OSERR;
1001
free(direntries[i]);
1002
goto fallback;
1003
}
1004
#ifndef O_CLOEXEC
939
perror("pipe");
940
exitstatus = EXIT_FAILURE;
941
goto fallback;
942
}
1005
943
/* Ask OS to automatic close the pipe on exec */
1006
944
ret = set_cloexec_flag(pipefd[0]);
1007
945
if(ret < 0){
1008
error(0, errno, "set_cloexec_flag");
1009
close(pipefd[0]);
1010
close(pipefd[1]);
1011
exitstatus = EX_OSERR;
1012
free(direntries[i]);
946
perror("set_cloexec_flag");
947
exitstatus = EXIT_FAILURE;
1013
948
goto fallback;
1014
949
}
1015
950
ret = set_cloexec_flag(pipefd[1]);
1016
951
if(ret < 0){
1017
error(0, errno, "set_cloexec_flag");
1018
close(pipefd[0]);
1019
close(pipefd[1]);
1020
exitstatus = EX_OSERR;
1021
free(direntries[i]);
952
perror("set_cloexec_flag");
953
exitstatus = EXIT_FAILURE;
1022
954
goto fallback;
1023
955
}
1024
#endif /* not O_CLOEXEC */
1025
956
/* Block SIGCHLD until process is safely in process list */
1026
957
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1027
958
&sigchld_action.sa_mask,
1028
959
NULL));
1029
960
if(ret < 0){
1030
error(0, errno, "sigprocmask");
1031
exitstatus = EX_OSERR;
1032
free(direntries[i]);
961
perror("sigprocmask");
962
exitstatus = EXIT_FAILURE;
1033
963
goto fallback;
1034
964
}
1035
965
/* Starting a new process to be watched */
1038
968
pid = fork();
1039
969
} while(pid == -1 and errno == EINTR);
1040
970
if(pid == -1){
1041
error(0, errno, "fork");
1042
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1043
&sigchld_action.sa_mask, NULL));
1044
close(pipefd[0]);
1045
close(pipefd[1]);
1046
exitstatus = EX_OSERR;
1047
free(direntries[i]);
971
perror("fork");
972
exitstatus = EXIT_FAILURE;
1048
973
goto fallback;
1049
974
}
1050
975
if(pid == 0){
1051
976
/* this is the child process */
1052
977
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1053
978
if(ret < 0){
1054
error(0, errno, "sigaction");
1055
_exit(EX_OSERR);
979
perror("sigaction");
980
_exit(EXIT_FAILURE);
1056
981
}
1057
982
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1058
983
if(ret < 0){
1059
error(0, errno, "sigprocmask");
1060
_exit(EX_OSERR);
984
perror("sigprocmask");
985
_exit(EXIT_FAILURE);
1061
986
}
1062
987
1063
988
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1064
989
if(ret == -1){
1065
error(0, errno, "dup2");
1066
_exit(EX_OSERR);
990
perror("dup2");
991
_exit(EXIT_FAILURE);
1067
992
}
1068
993
1069
if(fexecve(plugin_fd, p->argv,
1070
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1071
error(0, errno, "fexecve for %s/%s",
1072
plugindir != NULL ? plugindir : PDIR,
1073
direntries[i]->d_name);
1074
_exit(EX_OSERR);
994
if(dirfd(dir) < 0){
995
/* If dir has no file descriptor, we could not set FD_CLOEXEC
996
above and must now close it manually here. */
997
closedir(dir);
998
}
999
if(p->environ[0] == NULL){
1000
if(execv(filename, p->argv) < 0){
1001
perror("execv");
1002
_exit(EXIT_FAILURE);
1003
}
1004
} else {
1005
if(execve(filename, p->argv, p->environ) < 0){
1006
perror("execve");
1007
_exit(EXIT_FAILURE);
1008
}
1075
1009
}
1076
1010
/* no return */
1077
1011
}
1078
1012
/* Parent process */
1079
close(pipefd[1]); /* Close unused write end of pipe */
1080
close(plugin_fd);
1081
plugin *new_plugin = getplugin(direntries[i]->d_name);
1013
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1014
pipe */
1015
free(filename);
1016
plugin *new_plugin = getplugin(dirst->d_name);
1082
1017
if(new_plugin == NULL){
1083
error(0, errno, "getplugin");
1018
perror("getplugin");
1084
1019
ret = (int)(TEMP_FAILURE_RETRY
1085
1020
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1086
1021
NULL)));
1087
1022
if(ret < 0){
1088
error(0, errno, "sigprocmask");
1023
perror("sigprocmask");
1089
1024
}
1090
exitstatus = EX_OSERR;
1091
free(direntries[i]);
1025
exitstatus = EXIT_FAILURE;
1092
1026
goto fallback;
1093
1027
}
1094
free(direntries[i]);
1095
1028
1096
1029
new_plugin->pid = pid;
1097
1030
new_plugin->fd = pipefd[0];
1098
1099
if(debug){
1100
fprintf(stderr, "Plugin %s started (PID %" PRIdMAX ")\n",
1101
new_plugin->name, (intmax_t) (new_plugin->pid));
1102
}
1103
1031
1104
1032
/* Unblock SIGCHLD so signal handler can be run if this process
1105
1033
has already completed */
1106
1034
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1107
1035
&sigchld_action.sa_mask,
1108
1036
NULL));
1109
1037
if(ret < 0){
1110
error(0, errno, "sigprocmask");
1111
exitstatus = EX_OSERR;
1038
perror("sigprocmask");
1039
exitstatus = EXIT_FAILURE;
1112
1040
goto fallback;
1113
1041
}
1114
1042
1115
FD_SET(new_plugin->fd, &rfds_all);
1043
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1044
-Wconversion */
1116
1045
1117
1046
if(maxfd < new_plugin->fd){
1118
1047
maxfd = new_plugin->fd;
1119
1048
}
1120
1049
}
1121
1050
1122
free(direntries);
1123
direntries = NULL;
1124
close(dir_fd);
1125
dir_fd = -1;
1051
TEMP_FAILURE_RETRY(closedir(dir));
1052
dir = NULL;
1126
1053
free_plugin(getplugin(NULL));
1127
1054
1128
1055
for(plugin *p = plugin_list; p != NULL; p = p->next){
1141
1068
fd_set rfds = rfds_all;
1142
1069
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
1143
1070
if(select_ret == -1 and errno != EINTR){
1144
error(0, errno, "select");
1145
exitstatus = EX_OSERR;
1071
perror("select");
1072
exitstatus = EXIT_FAILURE;
1146
1073
goto fallback;
1147
1074
}
1148
1075
/* OK, now either a process completed, or something can be read
1167
1094
(intmax_t) (proc->pid),
1168
1095
WTERMSIG(proc->status),
1169
1096
strsignal(WTERMSIG(proc->status)));
1097
} else if(WCOREDUMP(proc->status)){
1098
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1099
" core\n", proc->name, (intmax_t) (proc->pid));
1170
1100
}
1171
1101
}
1172
1102
1173
1103
/* Remove the plugin */
1174
FD_CLR(proc->fd, &rfds_all);
1104
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1105
-Wconversion */
1175
1106
1176
1107
/* Block signal while modifying process_list */
1177
1108
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1179
1110
&sigchld_action.sa_mask,
1180
1111
NULL));
1181
1112
if(ret < 0){
1182
error(0, errno, "sigprocmask");
1183
exitstatus = EX_OSERR;
1113
perror("sigprocmask");
1114
exitstatus = EXIT_FAILURE;
1184
1115
goto fallback;
1185
1116
}
1186
1117
1193
1124
(sigprocmask(SIG_UNBLOCK,
1194
1125
&sigchld_action.sa_mask, NULL)));
1195
1126
if(ret < 0){
1196
error(0, errno, "sigprocmask");
1197
exitstatus = EX_OSERR;
1127
perror("sigprocmask");
1128
exitstatus = EXIT_FAILURE;
1198
1129
goto fallback;
1199
1130
}
1200
1131
1210
1141
bool bret = print_out_password(proc->buffer,
1211
1142
proc->buffer_length);
1212
1143
if(not bret){
1213
error(0, errno, "print_out_password");
1214
exitstatus = EX_IOERR;
1144
perror("print_out_password");
1145
exitstatus = EXIT_FAILURE;
1215
1146
}
1216
1147
goto fallback;
1217
1148
}
1218
1149
1219
1150
/* This process has not completed. Does it have any output? */
1220
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1151
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1152
warning from
1153
-Wconversion */
1221
1154
/* This process had nothing to say at this time */
1222
1155
proc = proc->next;
1223
1156
continue;
1224
1157
}
1225
1158
/* Before reading, make the process' data buffer large enough */
1226
1159
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1227
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1228
+ (size_t) BUFFER_SIZE);
1229
if(new_buffer == NULL){
1230
error(0, errno, "malloc");
1231
exitstatus = EX_OSERR;
1160
proc->buffer = realloc(proc->buffer, proc->buffer_size
1161
+ (size_t) BUFFER_SIZE);
1162
if(proc->buffer == NULL){
1163
perror("malloc");
1164
exitstatus = EXIT_FAILURE;
1232
1165
goto fallback;
1233
1166
}
1234
proc->buffer = new_buffer;
1235
1167
proc->buffer_size += BUFFER_SIZE;
1236
1168
}
1237
1169
/* Read from the process */
1256
1188
1257
1189
fallback:
1258
1190
1259
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1260
and exitstatus != EX_OK)){
1191
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1261
1192
/* Fallback if all plugins failed, none are found or an error
1262
1193
occured */
1263
1194
bool bret;
1271
1202
}
1272
1203
bret = print_out_password(passwordbuffer, len);
1273
1204
if(not bret){
1274
error(0, errno, "print_out_password");
1275
exitstatus = EX_IOERR;
1205
perror("print_out_password");
1206
exitstatus = EXIT_FAILURE;
1276
1207
}
1277
1208
}
1278
1209
1279
1210
/* Restore old signal handler */
1280
1211
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1281
1212
if(ret == -1){
1282
error(0, errno, "sigaction");
1283
exitstatus = EX_OSERR;
1213
perror("sigaction");
1214
exitstatus = EXIT_FAILURE;
1284
1215
}
1285
1216
1286
1217
if(custom_argv != NULL){
1290
1221
free(custom_argv);
1291
1222
}
1292
1223
1293
free(direntries);
1294
1295
if(dir_fd != -1){
1296
close(dir_fd);
1224
if(dir != NULL){
1225
closedir(dir);
1297
1226
}
1298
1227
1299
1228
/* Kill the processes */
1303
1232
ret = kill(p->pid, SIGTERM);
1304
1233
if(ret == -1 and errno != ESRCH){
1305
1234
/* Set-uid proccesses might not get closed */
1306
error(0, errno, "kill");
1235
perror("kill");
1307
1236
}
1308
1237
}
1309
1238
}
1313
1242
ret = wait(NULL);
1314
1243
} while(ret >= 0);
1315
1244
if(errno != ECHILD){
1316
error(0, errno, "wait");
1245
perror("wait");
1317
1246
}
1318
1247
1319
1248
free_plugin_list();
1320
1249
1321
1250
free(plugindir);
1322
free(pluginhelperdir);
1323
1251
free(argfile);
1324
1252
1325
1253
return exitstatus;
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0