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 846
- compare with another revision
- download diff
- download tarball
- view history from revision 846
- Committer: Teddy Hogeborn
- Date: 2016-06-03 16:42:05 UTC
- Revision ID: teddy@recompile.se-20160603164205-0ekfa0r4pmqccd1w
debian/control: Update Standards-Version to 3.9.8
* debian/control (Standards-Version): Update to 3.9.8
* debian/control (Standards-Version): Update to 3.9.8
added
removed
plugin-runner.c
2
2
/*
3
3
* Mandos plugin runner - Run Mandos plugins
4
4
*
5
* Copyright © 2008-2013 Teddy Hogeborn
6
* Copyright © 2008-2013 Björn Påhlsson
5
* Copyright © 2008-2016 Teddy Hogeborn
6
* Copyright © 2008-2016 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
asprintf(), O_CLOEXEC */
26
O_CLOEXEC, pipe2() */
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 */
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() */
32
stderr, STDOUT_FILENO, fclose() */
33
#include <sys/types.h> /* fstat(), struct stat, waitpid(),
34
WIFEXITED(), WEXITSTATUS(), wait(),
35
pid_t, uid_t, gid_t, getuid(),
36
getgid() */
38
37
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
39
38
FD_SET(), FD_ISSET(), FD_CLR */
40
39
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
41
WEXITSTATUS(), WTERMSIG(),
42
WCOREDUMP() */
43
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
40
WEXITSTATUS(), WTERMSIG() */
41
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
44
42
#include <iso646.h> /* and, or, not */
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
46
readdir(), closedir(), dirfd() */
47
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
48
fcntl(), setuid(), setgid(),
49
F_GETFD, F_SETFD, FD_CLOEXEC,
50
access(), pipe(), fork(), close()
51
dup2(), STDOUT_FILENO, _exit(),
52
execv(), write(), read(),
53
close() */
43
#include <dirent.h> /* struct dirent, scandirat() */
44
#include <unistd.h> /* fcntl(), F_GETFD, F_SETFD,
45
FD_CLOEXEC, write(), STDOUT_FILENO,
46
struct stat, fstat(), close(),
47
setgid(), setuid(), S_ISREG(),
48
faccessat() pipe2(), fork(),
49
_exit(), dup2(), fexecve(), read()
50
*/
54
51
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
55
FD_CLOEXEC */
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal(), strcmp(), strncmp() */
52
FD_CLOEXEC, openat(), scandirat(),
53
pipe2() */
54
#include <string.h> /* strsep, strlen(), strsignal(),
55
strcmp(), strncmp() */
58
56
#include <errno.h> /* errno */
59
57
#include <argp.h> /* struct argp_option, struct
60
58
argp_state, struct argp,
72
70
EX_CONFIG, EX_UNAVAILABLE, EX_OK */
73
71
#include <errno.h> /* errno */
74
72
#include <error.h> /* error() */
73
#include <fnmatch.h> /* fnmatch() */
75
74
76
75
#define BUFFER_SIZE 256
77
76
78
77
#define PDIR "/lib/mandos/plugins.d"
78
#define PHDIR "/lib/mandos/plugin-helpers"
79
79
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
80
80
81
81
const char *argp_program_version = "plugin-runner " VERSION;
105
105
106
106
/* Gets an existing plugin based on name,
107
107
or if none is found, creates a new one */
108
__attribute__((warn_unused_result))
108
109
static plugin *getplugin(char *name){
109
110
/* Check for existing plugin with that name */
110
111
for(plugin *p = plugin_list; p != NULL; p = p->next){
171
172
}
172
173
173
174
/* Helper function for add_argument and add_environment */
174
__attribute__((nonnull))
175
__attribute__((nonnull, warn_unused_result))
175
176
static bool add_to_char_array(const char *new, char ***array,
176
177
int *len){
177
178
/* Resize the pointed-to array to hold one more pointer */
179
char **new_array = NULL;
178
180
do {
179
*array = realloc(*array, sizeof(char *)
180
* (size_t) ((*len) + 2));
181
} while(*array == NULL and errno == EINTR);
181
new_array = realloc(*array, sizeof(char *)
182
* (size_t) ((*len) + 2));
183
} while(new_array == NULL and errno == EINTR);
182
184
/* Malloc check */
183
if(*array == NULL){
185
if(new_array == NULL){
184
186
return false;
185
187
}
188
*array = new_array;
186
189
/* Make a copy of the new string */
187
190
char *copy;
188
191
do {
200
203
}
201
204
202
205
/* Add to a plugin's argument vector */
203
__attribute__((nonnull(2)))
206
__attribute__((nonnull(2), warn_unused_result))
204
207
static bool add_argument(plugin *p, const char *arg){
205
208
if(p == NULL){
206
209
return false;
209
212
}
210
213
211
214
/* Add to a plugin's environment */
212
__attribute__((nonnull(2)))
215
__attribute__((nonnull(2), warn_unused_result))
213
216
static bool add_environment(plugin *p, const char *def, bool replace){
214
217
if(p == NULL){
215
218
return false;
217
220
/* namelen = length of name of environment variable */
218
221
size_t namelen = (size_t)(strchrnul(def, '=') - def);
219
222
/* Search for this environment variable */
220
for(char **e = p->environ; *e != NULL; e++){
221
if(strncmp(*e, def, namelen + 1) == 0){
223
for(char **envdef = p->environ; *envdef != NULL; envdef++){
224
if(strncmp(*envdef, def, namelen + 1) == 0){
222
225
/* It already exists */
223
226
if(replace){
224
char *new;
227
char *new_envdef;
225
228
do {
226
new = realloc(*e, strlen(def) + 1);
227
} while(new == NULL and errno == EINTR);
228
if(new == NULL){
229
new_envdef = realloc(*envdef, strlen(def) + 1);
230
} while(new_envdef == NULL and errno == EINTR);
231
if(new_envdef == NULL){
229
232
return false;
230
233
}
231
*e = new;
232
strcpy(*e, def);
234
*envdef = new_envdef;
235
strcpy(*envdef, def);
233
236
}
234
237
return true;
235
238
}
237
240
return add_to_char_array(def, &(p->environ), &(p->envc));
238
241
}
239
242
243
#ifndef O_CLOEXEC
240
244
/*
241
245
* Based on the example in the GNU LibC manual chapter 13.13 "File
242
246
* Descriptor Flags".
243
247
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
244
248
*/
249
__attribute__((warn_unused_result))
245
250
static int set_cloexec_flag(int fd){
246
251
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
247
252
/* If reading the flags failed, return error indication now. */
252
257
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
253
258
ret | FD_CLOEXEC));
254
259
}
260
#endif /* not O_CLOEXEC */
255
261
256
262
257
263
/* Mark processes as completed when they exit, and save their exit
289
295
}
290
296
291
297
/* Prints out a password to stdout */
292
__attribute__((nonnull))
298
__attribute__((nonnull, warn_unused_result))
293
299
static bool print_out_password(const char *buffer, size_t length){
294
300
ssize_t ret;
295
301
for(size_t written = 0; written < length; written += (size_t)ret){
341
347
342
348
int main(int argc, char *argv[]){
343
349
char *plugindir = NULL;
350
char *pluginhelperdir = NULL;
344
351
char *argfile = NULL;
345
352
FILE *conffp;
346
size_t d_name_len;
347
DIR *dir = NULL;
348
struct dirent *dirst;
353
struct dirent **direntries = NULL;
349
354
struct stat st;
350
355
fd_set rfds_all;
351
356
int ret, maxfd = 0;
359
364
.sa_flags = SA_NOCLDSTOP };
360
365
char **custom_argv = NULL;
361
366
int custom_argc = 0;
367
int dir_fd = -1;
362
368
363
369
/* Establish a signal handler */
364
370
sigemptyset(&sigchld_action.sa_mask);
409
415
.doc = "Group ID the plugins will run as", .group = 3 },
410
416
{ .name = "debug", .key = 132,
411
417
.doc = "Debug mode", .group = 4 },
418
{ .name = "plugin-helper-dir", .key = 133,
419
.arg = "DIRECTORY",
420
.doc = "Specify a different plugin helper directory",
421
.group = 2 },
412
422
/*
413
423
* These reproduce what we would get without ARGP_NO_HELP
414
424
*/
435
445
break;
436
446
}
437
447
}
448
errno = 0;
438
449
}
439
450
break;
440
451
case 'G': /* --global-env */
441
add_environment(getplugin(NULL), arg, true);
452
if(add_environment(getplugin(NULL), arg, true)){
453
errno = 0;
454
}
442
455
break;
443
456
case 'o': /* --options-for */
444
457
{
461
474
break;
462
475
}
463
476
}
477
errno = 0;
464
478
}
465
479
break;
466
480
case 'E': /* --env-for */
478
492
errno = EINVAL;
479
493
break;
480
494
}
481
add_environment(getplugin(arg), envdef, true);
495
if(add_environment(getplugin(arg), envdef, true)){
496
errno = 0;
497
}
482
498
}
483
499
break;
484
500
case 'd': /* --disable */
486
502
plugin *p = getplugin(arg);
487
503
if(p != NULL){
488
504
p->disabled = true;
505
errno = 0;
489
506
}
490
507
}
491
508
break;
494
511
plugin *p = getplugin(arg);
495
512
if(p != NULL){
496
513
p->disabled = false;
514
errno = 0;
497
515
}
498
516
}
499
517
break;
500
518
case 128: /* --plugin-dir */
501
519
free(plugindir);
502
520
plugindir = strdup(arg);
521
if(plugindir != NULL){
522
errno = 0;
523
}
503
524
break;
504
525
case 129: /* --config-file */
505
526
/* This is already done by parse_opt_config_file() */
513
534
break;
514
535
}
515
536
uid = (uid_t)tmp_id;
537
errno = 0;
516
538
break;
517
539
case 131: /* --groupid */
518
540
tmp_id = strtoimax(arg, &tmp, 10);
523
545
break;
524
546
}
525
547
gid = (gid_t)tmp_id;
548
errno = 0;
526
549
break;
527
550
case 132: /* --debug */
528
551
debug = true;
529
552
break;
553
case 133: /* --plugin-helper-dir */
554
free(pluginhelperdir);
555
pluginhelperdir = strdup(arg);
556
if(pluginhelperdir != NULL){
557
errno = 0;
558
}
559
break;
530
560
/*
531
561
* These reproduce what we would get without ARGP_NO_HELP
532
562
*/
576
606
case 129: /* --config-file */
577
607
free(argfile);
578
608
argfile = strdup(arg);
609
if(argfile != NULL){
610
errno = 0;
611
}
579
612
break;
580
613
case 130: /* --userid */
581
614
case 131: /* --groupid */
582
615
case 132: /* --debug */
616
case 133: /* --plugin-helper-dir */
583
617
case '?': /* --help */
584
618
case -3: /* --usage */
585
619
case 'V': /* --version */
664
698
}
665
699
666
700
custom_argc += 1;
667
custom_argv = realloc(custom_argv, sizeof(char *)
668
* ((unsigned int) custom_argc + 1));
669
if(custom_argv == NULL){
670
error(0, errno, "realloc");
671
exitstatus = EX_OSERR;
672
free(org_line);
673
goto fallback;
701
{
702
char **new_argv = realloc(custom_argv, sizeof(char *)
703
* ((size_t)custom_argc + 1));
704
if(new_argv == NULL){
705
error(0, errno, "realloc");
706
exitstatus = EX_OSERR;
707
free(new_arg);
708
free(org_line);
709
goto fallback;
710
} else {
711
custom_argv = new_argv;
712
}
674
713
}
675
714
custom_argv[custom_argc-1] = new_arg;
676
715
custom_argv[custom_argc] = NULL;
734
773
goto fallback;
735
774
}
736
775
776
{
777
char *pluginhelperenv;
778
bool bret = true;
779
ret = asprintf(&pluginhelperenv, "MANDOSPLUGINHELPERDIR=%s",
780
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
781
if(ret != -1){
782
bret = add_environment(getplugin(NULL), pluginhelperenv, true);
783
}
784
if(ret == -1 or not bret){
785
error(0, errno, "Failed to set MANDOSPLUGINHELPERDIR"
786
" environment variable to \"%s\" for all plugins\n",
787
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
788
}
789
if(ret != -1){
790
free(pluginhelperenv);
791
}
792
}
793
737
794
if(debug){
738
795
for(plugin *p = plugin_list; p != NULL; p=p->next){
739
796
fprintf(stderr, "Plugin: %s has %d arguments\n",
753
810
<http://bugs.debian.org/633582> */
754
811
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
755
812
if(plugindir_fd == -1){
756
error(0, errno, "open");
813
if(errno != ENOENT){
814
error(0, errno, "open(\"" PDIR "\")");
815
}
757
816
} else {
758
817
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
759
818
if(ret == -1){
766
825
}
767
826
}
768
827
}
769
TEMP_FAILURE_RETRY(close(plugindir_fd));
828
close(plugindir_fd);
770
829
}
771
830
}
772
831
782
841
783
842
/* Open plugin directory with close_on_exec flag */
784
843
{
785
int dir_fd = -1;
786
if(plugindir == NULL){
787
dir_fd = open(PDIR, O_RDONLY |
788
#ifdef O_CLOEXEC
789
O_CLOEXEC
790
#else /* not O_CLOEXEC */
791
0
792
#endif /* not O_CLOEXEC */
793
);
794
} else {
795
dir_fd = open(plugindir, O_RDONLY |
796
#ifdef O_CLOEXEC
797
O_CLOEXEC
798
#else /* not O_CLOEXEC */
799
0
800
#endif /* not O_CLOEXEC */
801
);
802
}
844
dir_fd = open(plugindir != NULL ? plugindir : PDIR, O_RDONLY |
845
#ifdef O_CLOEXEC
846
O_CLOEXEC
847
#else /* not O_CLOEXEC */
848
0
849
#endif /* not O_CLOEXEC */
850
);
803
851
if(dir_fd == -1){
804
852
error(0, errno, "Could not open plugin dir");
805
853
exitstatus = EX_UNAVAILABLE;
811
859
ret = set_cloexec_flag(dir_fd);
812
860
if(ret < 0){
813
861
error(0, errno, "set_cloexec_flag");
814
TEMP_FAILURE_RETRY(close(dir_fd));
815
862
exitstatus = EX_OSERR;
816
863
goto fallback;
817
864
}
818
865
#endif /* O_CLOEXEC */
819
820
dir = fdopendir(dir_fd);
821
if(dir == NULL){
822
error(0, errno, "Could not open plugin dir");
823
TEMP_FAILURE_RETRY(close(dir_fd));
824
exitstatus = EX_OSERR;
825
goto fallback;
866
}
867
868
int good_name(const struct dirent * const dirent){
869
const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new",
870
"*.dpkg-old", "*.dpkg-bak",
871
"*.dpkg-divert", NULL };
872
#ifdef __GNUC__
873
#pragma GCC diagnostic push
874
#pragma GCC diagnostic ignored "-Wcast-qual"
875
#endif
876
for(const char **pat = (const char **)patterns;
877
*pat != NULL; pat++){
878
#ifdef __GNUC__
879
#pragma GCC diagnostic pop
880
#endif
881
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
882
!= FNM_NOMATCH){
883
if(debug){
884
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
885
" matching pattern %s\n", dirent->d_name, *pat);
886
}
887
return 0;
888
}
826
889
}
890
return 1;
891
}
892
893
int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
894
alphasort);
895
if(numplugins == -1){
896
error(0, errno, "Could not scan plugin dir");
897
direntries = NULL;
898
exitstatus = EX_OSERR;
899
goto fallback;
827
900
}
828
901
829
902
FD_ZERO(&rfds_all);
830
903
831
904
/* Read and execute any executable in the plugin directory*/
832
while(true){
833
do {
834
dirst = readdir(dir);
835
} while(dirst == NULL and errno == EINTR);
836
837
/* All directory entries have been processed */
838
if(dirst == NULL){
839
if(errno == EBADF){
840
error(0, errno, "readdir");
841
exitstatus = EX_IOERR;
842
goto fallback;
843
}
844
break;
845
}
846
847
d_name_len = strlen(dirst->d_name);
848
849
/* Ignore dotfiles, backup files and other junk */
850
{
851
bool bad_name = false;
852
853
const char const *bad_prefixes[] = { ".", "#", NULL };
854
855
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
856
".dpkg-old",
857
".dpkg-bak",
858
".dpkg-divert", NULL };
859
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
860
size_t pre_len = strlen(*pre);
861
if((d_name_len >= pre_len)
862
and strncmp((dirst->d_name), *pre, pre_len) == 0){
863
if(debug){
864
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
865
" with bad prefix %s\n", dirst->d_name, *pre);
866
}
867
bad_name = true;
868
break;
869
}
870
}
871
if(bad_name){
872
continue;
873
}
874
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
875
size_t suf_len = strlen(*suf);
876
if((d_name_len >= suf_len)
877
and (strcmp((dirst->d_name) + d_name_len-suf_len, *suf)
878
== 0)){
879
if(debug){
880
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
881
" with bad suffix %s\n", dirst->d_name, *suf);
882
}
883
bad_name = true;
884
break;
885
}
886
}
887
888
if(bad_name){
889
continue;
890
}
891
}
892
893
char *filename;
894
if(plugindir == NULL){
895
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
896
dirst->d_name));
897
} else {
898
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
899
plugindir,
900
dirst->d_name));
901
}
902
if(ret < 0){
903
error(0, errno, "asprintf");
905
for(int i = 0; i < numplugins; i++){
906
907
int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY);
908
if(plugin_fd == -1){
909
error(0, errno, "Could not open plugin");
910
free(direntries[i]);
904
911
continue;
905
912
}
906
907
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
913
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
908
914
if(ret == -1){
909
915
error(0, errno, "stat");
910
free(filename);
916
close(plugin_fd);
917
free(direntries[i]);
911
918
continue;
912
919
}
913
920
914
921
/* Ignore non-executable files */
915
922
if(not S_ISREG(st.st_mode)
916
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
923
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
924
X_OK, 0)) != 0)){
917
925
if(debug){
918
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
919
" with bad type or mode\n", filename);
926
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
927
" with bad type or mode\n",
928
plugindir != NULL ? plugindir : PDIR,
929
direntries[i]->d_name);
920
930
}
921
free(filename);
931
close(plugin_fd);
932
free(direntries[i]);
922
933
continue;
923
934
}
924
935
925
plugin *p = getplugin(dirst->d_name);
936
plugin *p = getplugin(direntries[i]->d_name);
926
937
if(p == NULL){
927
938
error(0, errno, "getplugin");
928
free(filename);
939
close(plugin_fd);
940
free(direntries[i]);
929
941
continue;
930
942
}
931
943
if(p->disabled){
932
944
if(debug){
933
945
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
934
dirst->d_name);
946
direntries[i]->d_name);
935
947
}
936
free(filename);
948
close(plugin_fd);
949
free(direntries[i]);
937
950
continue;
938
951
}
939
952
{
953
966
}
954
967
}
955
968
}
956
/* If this plugin has any environment variables, we will call
957
using execve and need to duplicate the environment from this
958
process, too. */
969
/* If this plugin has any environment variables, we need to
970
duplicate the environment from this process, too. */
959
971
if(p->environ[0] != NULL){
960
972
for(char **e = environ; *e != NULL; e++){
961
973
if(not add_environment(p, *e, false)){
965
977
}
966
978
967
979
int pipefd[2];
980
#ifndef O_CLOEXEC
968
981
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
982
#else /* O_CLOEXEC */
983
ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC));
984
#endif /* O_CLOEXEC */
969
985
if(ret == -1){
970
986
error(0, errno, "pipe");
971
987
exitstatus = EX_OSERR;
972
goto fallback;
973
}
988
free(direntries[i]);
989
goto fallback;
990
}
991
if(pipefd[0] >= FD_SETSIZE){
992
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
993
FD_SETSIZE);
994
close(pipefd[0]);
995
close(pipefd[1]);
996
exitstatus = EX_OSERR;
997
free(direntries[i]);
998
goto fallback;
999
}
1000
#ifndef O_CLOEXEC
974
1001
/* Ask OS to automatic close the pipe on exec */
975
1002
ret = set_cloexec_flag(pipefd[0]);
976
1003
if(ret < 0){
977
1004
error(0, errno, "set_cloexec_flag");
1005
close(pipefd[0]);
1006
close(pipefd[1]);
978
1007
exitstatus = EX_OSERR;
1008
free(direntries[i]);
979
1009
goto fallback;
980
1010
}
981
1011
ret = set_cloexec_flag(pipefd[1]);
982
1012
if(ret < 0){
983
1013
error(0, errno, "set_cloexec_flag");
1014
close(pipefd[0]);
1015
close(pipefd[1]);
984
1016
exitstatus = EX_OSERR;
1017
free(direntries[i]);
985
1018
goto fallback;
986
1019
}
1020
#endif /* not O_CLOEXEC */
987
1021
/* Block SIGCHLD until process is safely in process list */
988
1022
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
989
1023
&sigchld_action.sa_mask,
991
1025
if(ret < 0){
992
1026
error(0, errno, "sigprocmask");
993
1027
exitstatus = EX_OSERR;
1028
free(direntries[i]);
994
1029
goto fallback;
995
1030
}
996
1031
/* Starting a new process to be watched */
1000
1035
} while(pid == -1 and errno == EINTR);
1001
1036
if(pid == -1){
1002
1037
error(0, errno, "fork");
1038
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1039
&sigchld_action.sa_mask, NULL));
1040
close(pipefd[0]);
1041
close(pipefd[1]);
1003
1042
exitstatus = EX_OSERR;
1043
free(direntries[i]);
1004
1044
goto fallback;
1005
1045
}
1006
1046
if(pid == 0){
1022
1062
_exit(EX_OSERR);
1023
1063
}
1024
1064
1025
if(dirfd(dir) < 0){
1026
/* If dir has no file descriptor, we could not set FD_CLOEXEC
1027
above and must now close it manually here. */
1028
closedir(dir);
1029
}
1030
if(p->environ[0] == NULL){
1031
if(execv(filename, p->argv) < 0){
1032
error(0, errno, "execv for %s", filename);
1033
_exit(EX_OSERR);
1034
}
1035
} else {
1036
if(execve(filename, p->argv, p->environ) < 0){
1037
error(0, errno, "execve for %s", filename);
1038
_exit(EX_OSERR);
1039
}
1065
if(fexecve(plugin_fd, p->argv,
1066
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1067
error(0, errno, "fexecve for %s/%s",
1068
plugindir != NULL ? plugindir : PDIR,
1069
direntries[i]->d_name);
1070
_exit(EX_OSERR);
1040
1071
}
1041
1072
/* no return */
1042
1073
}
1043
1074
/* Parent process */
1044
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1045
pipe */
1046
free(filename);
1047
plugin *new_plugin = getplugin(dirst->d_name);
1075
close(pipefd[1]); /* Close unused write end of pipe */
1076
close(plugin_fd);
1077
plugin *new_plugin = getplugin(direntries[i]->d_name);
1048
1078
if(new_plugin == NULL){
1049
1079
error(0, errno, "getplugin");
1050
1080
ret = (int)(TEMP_FAILURE_RETRY
1054
1084
error(0, errno, "sigprocmask");
1055
1085
}
1056
1086
exitstatus = EX_OSERR;
1087
free(direntries[i]);
1057
1088
goto fallback;
1058
1089
}
1090
free(direntries[i]);
1059
1091
1060
1092
new_plugin->pid = pid;
1061
1093
new_plugin->fd = pipefd[0];
1071
1103
goto fallback;
1072
1104
}
1073
1105
1074
#if defined (__GNUC__) and defined (__GLIBC__)
1075
#if not __GLIBC_PREREQ(2, 16)
1076
#pragma GCC diagnostic push
1077
#pragma GCC diagnostic ignored "-Wsign-conversion"
1078
#endif
1079
#endif
1080
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1081
-Wconversion in GNU libc
1082
before 2.16 */
1083
#if defined (__GNUC__) and defined (__GLIBC__)
1084
#if not __GLIBC_PREREQ(2, 16)
1085
#pragma GCC diagnostic pop
1086
#endif
1087
#endif
1106
FD_SET(new_plugin->fd, &rfds_all);
1088
1107
1089
1108
if(maxfd < new_plugin->fd){
1090
1109
maxfd = new_plugin->fd;
1091
1110
}
1092
1111
}
1093
1112
1094
TEMP_FAILURE_RETRY(closedir(dir));
1095
dir = NULL;
1113
free(direntries);
1114
direntries = NULL;
1115
close(dir_fd);
1116
dir_fd = -1;
1096
1117
free_plugin(getplugin(NULL));
1097
1118
1098
1119
for(plugin *p = plugin_list; p != NULL; p = p->next){
1137
1158
(intmax_t) (proc->pid),
1138
1159
WTERMSIG(proc->status),
1139
1160
strsignal(WTERMSIG(proc->status)));
1140
} else if(WCOREDUMP(proc->status)){
1141
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1142
" core\n", proc->name, (intmax_t) (proc->pid));
1143
1161
}
1144
1162
}
1145
1163
1146
1164
/* Remove the plugin */
1147
#if defined (__GNUC__) and defined (__GLIBC__)
1148
#if not __GLIBC_PREREQ(2, 16)
1149
#pragma GCC diagnostic push
1150
#pragma GCC diagnostic ignored "-Wsign-conversion"
1151
#endif
1152
#endif
1153
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1154
-Wconversion in GNU libc
1155
before 2.16 */
1156
#if defined (__GNUC__) and defined (__GLIBC__)
1157
#if not __GLIBC_PREREQ(2, 16)
1158
#pragma GCC diagnostic pop
1159
#endif
1160
#endif
1165
FD_CLR(proc->fd, &rfds_all);
1161
1166
1162
1167
/* Block signal while modifying process_list */
1163
1168
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1203
1208
}
1204
1209
1205
1210
/* This process has not completed. Does it have any output? */
1206
#if defined (__GNUC__) and defined (__GLIBC__)
1207
#if not __GLIBC_PREREQ(2, 16)
1208
#pragma GCC diagnostic push
1209
#pragma GCC diagnostic ignored "-Wsign-conversion"
1210
#endif
1211
#endif
1212
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1213
warning from
1214
-Wconversion
1215
in GNU libc
1216
before
1217
2.16 */
1218
#if defined (__GNUC__) and defined (__GLIBC__)
1219
#if not __GLIBC_PREREQ(2, 16)
1220
#pragma GCC diagnostic pop
1221
#endif
1222
#endif
1211
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1223
1212
/* This process had nothing to say at this time */
1224
1213
proc = proc->next;
1225
1214
continue;
1226
1215
}
1227
1216
/* Before reading, make the process' data buffer large enough */
1228
1217
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1229
proc->buffer = realloc(proc->buffer, proc->buffer_size
1230
+ (size_t) BUFFER_SIZE);
1231
if(proc->buffer == NULL){
1218
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1219
+ (size_t) BUFFER_SIZE);
1220
if(new_buffer == NULL){
1232
1221
error(0, errno, "malloc");
1233
1222
exitstatus = EX_OSERR;
1234
1223
goto fallback;
1235
1224
}
1225
proc->buffer = new_buffer;
1236
1226
proc->buffer_size += BUFFER_SIZE;
1237
1227
}
1238
1228
/* Read from the process */
1291
1281
free(custom_argv);
1292
1282
}
1293
1283
1294
if(dir != NULL){
1295
closedir(dir);
1284
free(direntries);
1285
1286
if(dir_fd != -1){
1287
close(dir_fd);
1296
1288
}
1297
1289
1298
1290
/* Kill the processes */
1318
1310
free_plugin_list();
1319
1311
1320
1312
free(plugindir);
1313
free(pluginhelperdir);
1321
1314
free(argfile);
1322
1315
1323
1316
return exitstatus;
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0