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 505.1.25
- compare with another revision
- download diff
- download tarball
- view history from revision 505.1.25
- Committer: Teddy Hogeborn
- Date: 2011-12-23 18:12:16 UTC
- mto: This revision was merged to the branch mainline in revision 528.
- Revision ID: teddy@recompile.se-20111223181216-hejy3ig08wzyngpi
* mandos (main/cleanup): Use O_EXCL when creating saved state file;
abort if file already exists.
abort if file already exists.
- files removed:
- debian/mandos-client.examples
- debian/upstream
- 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-2014 Teddy Hogeborn
6
* Copyright © 2008-2014 Björn Påhlsson
5
* Copyright © 2008-2011 Teddy Hogeborn
6
* Copyright © 2008-2011 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
23
23
*/
24
24
25
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
O_CLOEXEC, pipe2() */
26
asprintf(), O_CLOEXEC */
27
27
#include <stddef.h> /* size_t, NULL */
28
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
29
29
realloc() */
30
30
#include <stdbool.h> /* bool, true, false */
31
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() */
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() */
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
41
WEXITSTATUS(), WTERMSIG(),
41
42
WCOREDUMP() */
42
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
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(), strcmp(), strncmp() */
57
58
#include <errno.h> /* errno */
58
59
#include <argp.h> /* struct argp_option, struct
59
60
argp_state, struct argp,
71
72
EX_CONFIG, EX_UNAVAILABLE, EX_OK */
72
73
#include <errno.h> /* errno */
73
74
#include <error.h> /* error() */
74
#include <fnmatch.h> /* fnmatch() */
75
75
76
76
#define BUFFER_SIZE 256
77
77
78
78
#define PDIR "/lib/mandos/plugins.d"
79
#define PHDIR "/lib/mandos/plugin-helpers"
80
79
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
81
80
82
81
const char *argp_program_version = "plugin-runner " VERSION;
106
105
107
106
/* Gets an existing plugin based on name,
108
107
or if none is found, creates a new one */
109
__attribute__((warn_unused_result))
110
108
static plugin *getplugin(char *name){
111
109
/* Check for existing plugin with that name */
112
110
for(plugin *p = plugin_list; p != NULL; p = p->next){
173
171
}
174
172
175
173
/* Helper function for add_argument and add_environment */
176
__attribute__((nonnull, warn_unused_result))
177
174
static bool add_to_char_array(const char *new, char ***array,
178
175
int *len){
179
176
/* Resize the pointed-to array to hold one more pointer */
180
char **new_array = NULL;
181
177
do {
182
new_array = realloc(*array, sizeof(char *)
183
* (size_t) ((*len) + 2));
184
} while(new_array == NULL and errno == EINTR);
178
*array = realloc(*array, sizeof(char *)
179
* (size_t) ((*len) + 2));
180
} while(*array == NULL and errno == EINTR);
185
181
/* Malloc check */
186
if(new_array == NULL){
182
if(*array == NULL){
187
183
return false;
188
184
}
189
*array = new_array;
190
185
/* Make a copy of the new string */
191
186
char *copy;
192
187
do {
204
199
}
205
200
206
201
/* Add to a plugin's argument vector */
207
__attribute__((nonnull(2), warn_unused_result))
208
202
static bool add_argument(plugin *p, const char *arg){
209
203
if(p == NULL){
210
204
return false;
213
207
}
214
208
215
209
/* Add to a plugin's environment */
216
__attribute__((nonnull(2), warn_unused_result))
217
210
static bool add_environment(plugin *p, const char *def, bool replace){
218
211
if(p == NULL){
219
212
return false;
221
214
/* namelen = length of name of environment variable */
222
215
size_t namelen = (size_t)(strchrnul(def, '=') - def);
223
216
/* Search for this environment variable */
224
for(char **envdef = p->environ; *envdef != NULL; envdef++){
225
if(strncmp(*envdef, def, namelen + 1) == 0){
217
for(char **e = p->environ; *e != NULL; e++){
218
if(strncmp(*e, def, namelen + 1) == 0){
226
219
/* It already exists */
227
220
if(replace){
228
char *new_envdef;
221
char *new;
229
222
do {
230
new_envdef = realloc(*envdef, strlen(def) + 1);
231
} while(new_envdef == NULL and errno == EINTR);
232
if(new_envdef == NULL){
223
new = realloc(*e, strlen(def) + 1);
224
} while(new == NULL and errno == EINTR);
225
if(new == NULL){
233
226
return false;
234
227
}
235
*envdef = new_envdef;
236
strcpy(*envdef, def);
228
*e = new;
229
strcpy(*e, def);
237
230
}
238
231
return true;
239
232
}
241
234
return add_to_char_array(def, &(p->environ), &(p->envc));
242
235
}
243
236
244
#ifndef O_CLOEXEC
245
237
/*
246
238
* Based on the example in the GNU LibC manual chapter 13.13 "File
247
239
* Descriptor Flags".
248
240
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
249
241
*/
250
__attribute__((warn_unused_result))
251
242
static int set_cloexec_flag(int fd){
252
243
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
253
244
/* If reading the flags failed, return error indication now. */
258
249
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
259
250
ret | FD_CLOEXEC));
260
251
}
261
#endif /* not O_CLOEXEC */
262
252
263
253
264
254
/* Mark processes as completed when they exit, and save their exit
296
286
}
297
287
298
288
/* Prints out a password to stdout */
299
__attribute__((nonnull, warn_unused_result))
300
289
static bool print_out_password(const char *buffer, size_t length){
301
290
ssize_t ret;
302
291
for(size_t written = 0; written < length; written += (size_t)ret){
310
299
}
311
300
312
301
/* Removes and free a plugin from the plugin list */
313
__attribute__((nonnull))
314
302
static void free_plugin(plugin *plugin_node){
315
303
316
304
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
348
336
349
337
int main(int argc, char *argv[]){
350
338
char *plugindir = NULL;
351
char *pluginhelperdir = NULL;
352
339
char *argfile = NULL;
353
340
FILE *conffp;
354
struct dirent **direntries = NULL;
341
size_t d_name_len;
342
DIR *dir = NULL;
343
struct dirent *dirst;
355
344
struct stat st;
356
345
fd_set rfds_all;
357
346
int ret, maxfd = 0;
365
354
.sa_flags = SA_NOCLDSTOP };
366
355
char **custom_argv = NULL;
367
356
int custom_argc = 0;
368
int dir_fd = -1;
369
357
370
358
/* Establish a signal handler */
371
359
sigemptyset(&sigchld_action.sa_mask);
416
404
.doc = "Group ID the plugins will run as", .group = 3 },
417
405
{ .name = "debug", .key = 132,
418
406
.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
407
/*
424
408
* These reproduce what we would get without ARGP_NO_HELP
425
409
*/
432
416
{ .name = NULL }
433
417
};
434
418
435
__attribute__((nonnull(3)))
436
419
error_t parse_opt(int key, char *arg, struct argp_state *state){
437
420
errno = 0;
438
421
switch(key){
439
422
char *tmp;
440
intmax_t tmp_id;
423
intmax_t tmpmax;
441
424
case 'g': /* --global-options */
442
425
{
443
426
char *plugin_option;
446
429
break;
447
430
}
448
431
}
449
errno = 0;
450
432
}
451
433
break;
452
434
case 'G': /* --global-env */
453
if(add_environment(getplugin(NULL), arg, true)){
454
errno = 0;
455
}
435
add_environment(getplugin(NULL), arg, true);
456
436
break;
457
437
case 'o': /* --options-for */
458
438
{
475
455
break;
476
456
}
477
457
}
478
errno = 0;
479
458
}
480
459
break;
481
460
case 'E': /* --env-for */
493
472
errno = EINVAL;
494
473
break;
495
474
}
496
if(add_environment(getplugin(arg), envdef, true)){
497
errno = 0;
498
}
475
add_environment(getplugin(arg), envdef, true);
499
476
}
500
477
break;
501
478
case 'd': /* --disable */
503
480
plugin *p = getplugin(arg);
504
481
if(p != NULL){
505
482
p->disabled = true;
506
errno = 0;
507
483
}
508
484
}
509
485
break;
512
488
plugin *p = getplugin(arg);
513
489
if(p != NULL){
514
490
p->disabled = false;
515
errno = 0;
516
491
}
517
492
}
518
493
break;
519
494
case 128: /* --plugin-dir */
520
495
free(plugindir);
521
496
plugindir = strdup(arg);
522
if(plugindir != NULL){
523
errno = 0;
524
}
525
497
break;
526
498
case 129: /* --config-file */
527
499
/* This is already done by parse_opt_config_file() */
528
500
break;
529
501
case 130: /* --userid */
530
tmp_id = strtoimax(arg, &tmp, 10);
502
tmpmax = strtoimax(arg, &tmp, 10);
531
503
if(errno != 0 or tmp == arg or *tmp != '\0'
532
or tmp_id != (uid_t)tmp_id){
504
or tmpmax != (uid_t)tmpmax){
533
505
argp_error(state, "Bad user ID number: \"%s\", using %"
534
506
PRIdMAX, arg, (intmax_t)uid);
535
507
break;
536
508
}
537
uid = (uid_t)tmp_id;
538
errno = 0;
509
uid = (uid_t)tmpmax;
539
510
break;
540
511
case 131: /* --groupid */
541
tmp_id = strtoimax(arg, &tmp, 10);
512
tmpmax = strtoimax(arg, &tmp, 10);
542
513
if(errno != 0 or tmp == arg or *tmp != '\0'
543
or tmp_id != (gid_t)tmp_id){
514
or tmpmax != (gid_t)tmpmax){
544
515
argp_error(state, "Bad group ID number: \"%s\", using %"
545
516
PRIdMAX, arg, (intmax_t)gid);
546
517
break;
547
518
}
548
gid = (gid_t)tmp_id;
549
errno = 0;
519
gid = (gid_t)tmpmax;
550
520
break;
551
521
case 132: /* --debug */
552
522
debug = true;
553
523
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
524
/*
562
525
* These reproduce what we would get without ARGP_NO_HELP
563
526
*/
607
570
case 129: /* --config-file */
608
571
free(argfile);
609
572
argfile = strdup(arg);
610
if(argfile != NULL){
611
errno = 0;
612
}
613
573
break;
614
574
case 130: /* --userid */
615
575
case 131: /* --groupid */
616
576
case 132: /* --debug */
617
case 133: /* --plugin-helper-dir */
618
577
case '?': /* --help */
619
578
case -3: /* --usage */
620
579
case 'V': /* --version */
699
658
}
700
659
701
660
custom_argc += 1;
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
}
661
custom_argv = realloc(custom_argv, sizeof(char *)
662
* ((unsigned int) custom_argc + 1));
663
if(custom_argv == NULL){
664
error(0, errno, "realloc");
665
exitstatus = EX_OSERR;
666
free(org_line);
667
goto fallback;
715
668
}
716
669
custom_argv[custom_argc-1] = new_arg;
717
670
custom_argv[custom_argc] = NULL;
775
728
goto fallback;
776
729
}
777
730
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
}
794
}
795
796
731
if(debug){
797
732
for(plugin *p = plugin_list; p != NULL; p=p->next){
798
733
fprintf(stderr, "Plugin: %s has %d arguments\n",
812
747
<http://bugs.debian.org/633582> */
813
748
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
814
749
if(plugindir_fd == -1){
815
if(errno != ENOENT){
816
error(0, errno, "open(\"" PDIR "\")");
817
}
750
error(0, errno, "open");
818
751
} else {
819
752
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
820
753
if(ret == -1){
832
765
}
833
766
834
767
/* Lower permissions */
835
ret = setgid(gid);
768
setgid(gid);
836
769
if(ret == -1){
837
770
error(0, errno, "setgid");
838
771
}
843
776
844
777
/* Open plugin directory with close_on_exec flag */
845
778
{
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
);
779
int dir_fd = -1;
780
if(plugindir == NULL){
781
dir_fd = open(PDIR, O_RDONLY |
782
#ifdef O_CLOEXEC
783
O_CLOEXEC
784
#else /* not O_CLOEXEC */
785
0
786
#endif /* not O_CLOEXEC */
787
);
788
} else {
789
dir_fd = open(plugindir, O_RDONLY |
790
#ifdef O_CLOEXEC
791
O_CLOEXEC
792
#else /* not O_CLOEXEC */
793
0
794
#endif /* not O_CLOEXEC */
795
);
796
}
853
797
if(dir_fd == -1){
854
798
error(0, errno, "Could not open plugin dir");
855
799
exitstatus = EX_UNAVAILABLE;
861
805
ret = set_cloexec_flag(dir_fd);
862
806
if(ret < 0){
863
807
error(0, errno, "set_cloexec_flag");
808
TEMP_FAILURE_RETRY(close(dir_fd));
864
809
exitstatus = EX_OSERR;
865
810
goto fallback;
866
811
}
867
812
#endif /* O_CLOEXEC */
868
}
869
870
int good_name(const struct dirent * const dirent){
871
const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new",
872
"*.dpkg-old", "*.dpkg-bak",
873
"*.dpkg-divert", NULL };
874
#ifdef __GNUC__
875
#pragma GCC diagnostic push
876
#pragma GCC diagnostic ignored "-Wcast-qual"
877
#endif
878
for(const char **pat = (const char **)patterns;
879
*pat != NULL; pat++){
880
#ifdef __GNUC__
881
#pragma GCC diagnostic pop
882
#endif
883
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
884
!= FNM_NOMATCH){
885
if(debug){
886
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
887
" matching pattern %s\n", dirent->d_name, *pat);
888
}
889
return 0;
890
}
813
814
dir = fdopendir(dir_fd);
815
if(dir == NULL){
816
error(0, errno, "Could not open plugin dir");
817
TEMP_FAILURE_RETRY(close(dir_fd));
818
exitstatus = EX_OSERR;
819
goto fallback;
891
820
}
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;
912
821
}
913
822
914
823
FD_ZERO(&rfds_all);
915
824
916
825
/* Read and execute any executable in the plugin directory*/
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]);
826
while(true){
827
do {
828
dirst = readdir(dir);
829
} while(dirst == NULL and errno == EINTR);
830
831
/* All directory entries have been processed */
832
if(dirst == NULL){
833
if(errno == EBADF){
834
error(0, errno, "readdir");
835
exitstatus = EX_IOERR;
836
goto fallback;
837
}
838
break;
839
}
840
841
d_name_len = strlen(dirst->d_name);
842
843
/* Ignore dotfiles, backup files and other junk */
844
{
845
bool bad_name = false;
846
847
const char const *bad_prefixes[] = { ".", "#", NULL };
848
849
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
850
".dpkg-old",
851
".dpkg-bak",
852
".dpkg-divert", NULL };
853
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
854
size_t pre_len = strlen(*pre);
855
if((d_name_len >= pre_len)
856
and strncmp((dirst->d_name), *pre, pre_len) == 0){
857
if(debug){
858
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
859
" with bad prefix %s\n", dirst->d_name, *pre);
860
}
861
bad_name = true;
862
break;
863
}
864
}
865
if(bad_name){
866
continue;
867
}
868
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
869
size_t suf_len = strlen(*suf);
870
if((d_name_len >= suf_len)
871
and (strcmp((dirst->d_name) + d_name_len-suf_len, *suf)
872
== 0)){
873
if(debug){
874
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
875
" with bad suffix %s\n", dirst->d_name, *suf);
876
}
877
bad_name = true;
878
break;
879
}
880
}
881
882
if(bad_name){
883
continue;
884
}
885
}
886
887
char *filename;
888
if(plugindir == NULL){
889
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
890
dirst->d_name));
891
} else {
892
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
893
plugindir,
894
dirst->d_name));
895
}
896
if(ret < 0){
897
error(0, errno, "asprintf");
923
898
continue;
924
899
}
925
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
900
901
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
926
902
if(ret == -1){
927
903
error(0, errno, "stat");
928
TEMP_FAILURE_RETRY(close(plugin_fd));
929
free(direntries[i]);
904
free(filename);
930
905
continue;
931
906
}
932
907
933
908
/* Ignore non-executable files */
934
909
if(not S_ISREG(st.st_mode)
935
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
936
X_OK, 0)) != 0)){
910
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
937
911
if(debug){
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);
912
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
913
" with bad type or mode\n", filename);
942
914
}
943
TEMP_FAILURE_RETRY(close(plugin_fd));
944
free(direntries[i]);
915
free(filename);
945
916
continue;
946
917
}
947
918
948
plugin *p = getplugin(direntries[i]->d_name);
919
plugin *p = getplugin(dirst->d_name);
949
920
if(p == NULL){
950
921
error(0, errno, "getplugin");
951
TEMP_FAILURE_RETRY(close(plugin_fd));
952
free(direntries[i]);
922
free(filename);
953
923
continue;
954
924
}
955
925
if(p->disabled){
956
926
if(debug){
957
927
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
958
direntries[i]->d_name);
928
dirst->d_name);
959
929
}
960
TEMP_FAILURE_RETRY(close(plugin_fd));
961
free(direntries[i]);
930
free(filename);
962
931
continue;
963
932
}
964
933
{
978
947
}
979
948
}
980
949
}
981
/* If this plugin has any environment variables, we need to
982
duplicate the environment from this process, too. */
950
/* If this plugin has any environment variables, we will call
951
using execve and need to duplicate the environment from this
952
process, too. */
983
953
if(p->environ[0] != NULL){
984
954
for(char **e = environ; *e != NULL; e++){
985
955
if(not add_environment(p, *e, false)){
989
959
}
990
960
991
961
int pipefd[2];
992
#ifndef O_CLOEXEC
993
962
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
994
#else /* O_CLOEXEC */
995
ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC));
996
#endif /* O_CLOEXEC */
997
963
if(ret == -1){
998
964
error(0, errno, "pipe");
999
965
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
TEMP_FAILURE_RETRY(close(pipefd[0]));
1007
TEMP_FAILURE_RETRY(close(pipefd[1]));
1008
exitstatus = EX_OSERR;
1009
free(direntries[i]);
1010
goto fallback;
1011
}
1012
#ifndef O_CLOEXEC
966
goto fallback;
967
}
1013
968
/* Ask OS to automatic close the pipe on exec */
1014
969
ret = set_cloexec_flag(pipefd[0]);
1015
970
if(ret < 0){
1016
971
error(0, errno, "set_cloexec_flag");
1017
TEMP_FAILURE_RETRY(close(pipefd[0]));
1018
TEMP_FAILURE_RETRY(close(pipefd[1]));
1019
972
exitstatus = EX_OSERR;
1020
free(direntries[i]);
1021
973
goto fallback;
1022
974
}
1023
975
ret = set_cloexec_flag(pipefd[1]);
1024
976
if(ret < 0){
1025
977
error(0, errno, "set_cloexec_flag");
1026
TEMP_FAILURE_RETRY(close(pipefd[0]));
1027
TEMP_FAILURE_RETRY(close(pipefd[1]));
1028
978
exitstatus = EX_OSERR;
1029
free(direntries[i]);
1030
979
goto fallback;
1031
980
}
1032
#endif /* not O_CLOEXEC */
1033
981
/* Block SIGCHLD until process is safely in process list */
1034
982
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1035
983
&sigchld_action.sa_mask,
1037
985
if(ret < 0){
1038
986
error(0, errno, "sigprocmask");
1039
987
exitstatus = EX_OSERR;
1040
free(direntries[i]);
1041
988
goto fallback;
1042
989
}
1043
990
/* Starting a new process to be watched */
1047
994
} while(pid == -1 and errno == EINTR);
1048
995
if(pid == -1){
1049
996
error(0, errno, "fork");
1050
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1051
&sigchld_action.sa_mask, NULL));
1052
TEMP_FAILURE_RETRY(close(pipefd[0]));
1053
TEMP_FAILURE_RETRY(close(pipefd[1]));
1054
997
exitstatus = EX_OSERR;
1055
free(direntries[i]);
1056
998
goto fallback;
1057
999
}
1058
1000
if(pid == 0){
1074
1016
_exit(EX_OSERR);
1075
1017
}
1076
1018
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);
1019
if(dirfd(dir) < 0){
1020
/* If dir has no file descriptor, we could not set FD_CLOEXEC
1021
above and must now close it manually here. */
1022
closedir(dir);
1023
}
1024
if(p->environ[0] == NULL){
1025
if(execv(filename, p->argv) < 0){
1026
error(0, errno, "execv for %s", filename);
1027
_exit(EX_OSERR);
1028
}
1029
} else {
1030
if(execve(filename, p->argv, p->environ) < 0){
1031
error(0, errno, "execve for %s", filename);
1032
_exit(EX_OSERR);
1033
}
1083
1034
}
1084
1035
/* no return */
1085
1036
}
1086
1037
/* Parent process */
1087
1038
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1088
1039
pipe */
1089
TEMP_FAILURE_RETRY(close(plugin_fd));
1090
plugin *new_plugin = getplugin(direntries[i]->d_name);
1040
free(filename);
1041
plugin *new_plugin = getplugin(dirst->d_name);
1091
1042
if(new_plugin == NULL){
1092
1043
error(0, errno, "getplugin");
1093
1044
ret = (int)(TEMP_FAILURE_RETRY
1097
1048
error(0, errno, "sigprocmask");
1098
1049
}
1099
1050
exitstatus = EX_OSERR;
1100
free(direntries[i]);
1101
1051
goto fallback;
1102
1052
}
1103
free(direntries[i]);
1104
1053
1105
1054
new_plugin->pid = pid;
1106
1055
new_plugin->fd = pipefd[0];
1116
1065
goto fallback;
1117
1066
}
1118
1067
1119
#if defined (__GNUC__) and defined (__GLIBC__)
1120
#if not __GLIBC_PREREQ(2, 16)
1121
#pragma GCC diagnostic push
1122
#pragma GCC diagnostic ignored "-Wsign-conversion"
1123
#endif
1124
#endif
1125
1068
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1126
-Wconversion in GNU libc
1127
before 2.16 */
1128
#if defined (__GNUC__) and defined (__GLIBC__)
1129
#if not __GLIBC_PREREQ(2, 16)
1130
#pragma GCC diagnostic pop
1131
#endif
1132
#endif
1069
-Wconversion */
1133
1070
1134
1071
if(maxfd < new_plugin->fd){
1135
1072
maxfd = new_plugin->fd;
1136
1073
}
1137
1074
}
1138
1075
1139
free(direntries);
1140
direntries = NULL;
1141
TEMP_FAILURE_RETRY(close(dir_fd));
1142
dir_fd = -1;
1076
TEMP_FAILURE_RETRY(closedir(dir));
1077
dir = NULL;
1143
1078
free_plugin(getplugin(NULL));
1144
1079
1145
1080
for(plugin *p = plugin_list; p != NULL; p = p->next){
1191
1126
}
1192
1127
1193
1128
/* Remove the plugin */
1194
#if defined (__GNUC__) and defined (__GLIBC__)
1195
#if not __GLIBC_PREREQ(2, 16)
1196
#pragma GCC diagnostic push
1197
#pragma GCC diagnostic ignored "-Wsign-conversion"
1198
#endif
1199
#endif
1200
1129
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1201
-Wconversion in GNU libc
1202
before 2.16 */
1203
#if defined (__GNUC__) and defined (__GLIBC__)
1204
#if not __GLIBC_PREREQ(2, 16)
1205
#pragma GCC diagnostic pop
1206
#endif
1207
#endif
1130
-Wconversion */
1208
1131
1209
1132
/* Block signal while modifying process_list */
1210
1133
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1250
1173
}
1251
1174
1252
1175
/* This process has not completed. Does it have any output? */
1253
#if defined (__GNUC__) and defined (__GLIBC__)
1254
#if not __GLIBC_PREREQ(2, 16)
1255
#pragma GCC diagnostic push
1256
#pragma GCC diagnostic ignored "-Wsign-conversion"
1257
#endif
1258
#endif
1259
1176
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1260
1177
warning from
1261
-Wconversion
1262
in GNU libc
1263
before
1264
2.16 */
1265
#if defined (__GNUC__) and defined (__GLIBC__)
1266
#if not __GLIBC_PREREQ(2, 16)
1267
#pragma GCC diagnostic pop
1268
#endif
1269
#endif
1178
-Wconversion */
1270
1179
/* This process had nothing to say at this time */
1271
1180
proc = proc->next;
1272
1181
continue;
1273
1182
}
1274
1183
/* Before reading, make the process' data buffer large enough */
1275
1184
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1276
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1277
+ (size_t) BUFFER_SIZE);
1278
if(new_buffer == NULL){
1185
proc->buffer = realloc(proc->buffer, proc->buffer_size
1186
+ (size_t) BUFFER_SIZE);
1187
if(proc->buffer == NULL){
1279
1188
error(0, errno, "malloc");
1280
1189
exitstatus = EX_OSERR;
1281
1190
goto fallback;
1282
1191
}
1283
proc->buffer = new_buffer;
1284
1192
proc->buffer_size += BUFFER_SIZE;
1285
1193
}
1286
1194
/* Read from the process */
1339
1247
free(custom_argv);
1340
1248
}
1341
1249
1342
free(direntries);
1343
1344
if(dir_fd != -1){
1345
TEMP_FAILURE_RETRY(close(dir_fd));
1250
if(dir != NULL){
1251
closedir(dir);
1346
1252
}
1347
1253
1348
1254
/* Kill the processes */
1368
1274
free_plugin_list();
1369
1275
1370
1276
free(plugindir);
1371
free(pluginhelperdir);
1372
1277
free(argfile);
1373
1278
1374
1279
return exitstatus;
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0