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 466
- compare with another revision
- download diff
- download tarball
- view history from revision 466
- Committer: Teddy Hogeborn
- Date: 2011-02-27 17:26:35 UTC
- Revision ID: teddy@fukt.bsnet.se-20110227172635-hw1sire7k3vuo1co
Update copyright year to "2011" wherever appropriate.
- files removed:
- debian/mandos-client.examples
- 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-2016 Teddy Hogeborn
6
* Copyright © 2008-2016 Björn Påhlsson
5
* Copyright © 2008-2010 Teddy Hogeborn
6
* Copyright © 2008-2010 Björn Påhlsson
7
7
*
8
8
* This program is free software: you can redistribute it and/or
9
9
* modify it under the terms of the GNU General Public License as
19
19
* along with this program. If not, see
20
20
* <http://www.gnu.org/licenses/>.
21
21
*
22
* Contact the authors at <mandos@recompile.se>.
22
* Contact the authors at <mandos@fukt.bsnet.se>.
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;
83
const char *argp_program_bug_address = "<mandos@recompile.se>";
82
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
84
83
85
84
typedef struct plugin{
86
85
char *name; /* can be NULL or any plugin name */
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
* ((size_t)custom_argc + 1));
705
if(new_argv == NULL){
706
error(0, errno, "realloc");
707
exitstatus = EX_OSERR;
708
free(new_arg);
709
free(org_line);
710
goto fallback;
711
} else {
712
custom_argv = new_argv;
713
}
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;
714
668
}
715
669
custom_argv[custom_argc-1] = new_arg;
716
670
custom_argv[custom_argc] = NULL;
774
728
goto fallback;
775
729
}
776
730
777
{
778
char *pluginhelperenv;
779
bool bret = true;
780
ret = asprintf(&pluginhelperenv, "MANDOSPLUGINHELPERDIR=%s",
781
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
782
if(ret != -1){
783
bret = add_environment(getplugin(NULL), pluginhelperenv, true);
784
}
785
if(ret == -1 or not bret){
786
error(0, errno, "Failed to set MANDOSPLUGINHELPERDIR"
787
" environment variable to \"%s\" for all plugins\n",
788
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
789
}
790
if(ret != -1){
791
free(pluginhelperenv);
792
}
793
}
794
795
731
if(debug){
796
732
for(plugin *p = plugin_list; p != NULL; p=p->next){
797
733
fprintf(stderr, "Plugin: %s has %d arguments\n",
806
742
}
807
743
}
808
744
809
if(getuid() == 0){
810
/* Work around Debian bug #633582:
811
<http://bugs.debian.org/633582> */
812
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
813
if(plugindir_fd == -1){
814
if(errno != ENOENT){
815
error(0, errno, "open(\"" PDIR "\")");
816
}
817
} else {
818
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
819
if(ret == -1){
820
error(0, errno, "fstat");
821
} else {
822
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
823
ret = fchown(plugindir_fd, uid, gid);
824
if(ret == -1){
825
error(0, errno, "fchown");
826
}
827
}
828
}
829
close(plugindir_fd);
830
}
831
}
832
833
/* Lower permissions */
834
ret = setgid(gid);
745
/* Strip permissions down to nobody */
746
setgid(gid);
835
747
if(ret == -1){
836
748
error(0, errno, "setgid");
837
749
}
842
754
843
755
/* Open plugin directory with close_on_exec flag */
844
756
{
845
dir_fd = open(plugindir != NULL ? plugindir : PDIR, O_RDONLY |
846
#ifdef O_CLOEXEC
847
O_CLOEXEC
848
#else /* not O_CLOEXEC */
849
0
850
#endif /* not O_CLOEXEC */
851
);
757
int dir_fd = -1;
758
if(plugindir == NULL){
759
dir_fd = open(PDIR, O_RDONLY |
760
#ifdef O_CLOEXEC
761
O_CLOEXEC
762
#else /* not O_CLOEXEC */
763
0
764
#endif /* not O_CLOEXEC */
765
);
766
} else {
767
dir_fd = open(plugindir, O_RDONLY |
768
#ifdef O_CLOEXEC
769
O_CLOEXEC
770
#else /* not O_CLOEXEC */
771
0
772
#endif /* not O_CLOEXEC */
773
);
774
}
852
775
if(dir_fd == -1){
853
776
error(0, errno, "Could not open plugin dir");
854
777
exitstatus = EX_UNAVAILABLE;
860
783
ret = set_cloexec_flag(dir_fd);
861
784
if(ret < 0){
862
785
error(0, errno, "set_cloexec_flag");
786
TEMP_FAILURE_RETRY(close(dir_fd));
863
787
exitstatus = EX_OSERR;
864
788
goto fallback;
865
789
}
866
790
#endif /* O_CLOEXEC */
867
}
868
869
int good_name(const struct dirent * const dirent){
870
const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new",
871
"*.dpkg-old", "*.dpkg-bak",
872
"*.dpkg-divert", NULL };
873
#ifdef __GNUC__
874
#pragma GCC diagnostic push
875
#pragma GCC diagnostic ignored "-Wcast-qual"
876
#endif
877
for(const char **pat = (const char **)patterns;
878
*pat != NULL; pat++){
879
#ifdef __GNUC__
880
#pragma GCC diagnostic pop
881
#endif
882
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
883
!= FNM_NOMATCH){
884
if(debug){
885
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
886
" matching pattern %s\n", dirent->d_name, *pat);
887
}
888
return 0;
889
}
791
792
dir = fdopendir(dir_fd);
793
if(dir == NULL){
794
error(0, errno, "Could not open plugin dir");
795
TEMP_FAILURE_RETRY(close(dir_fd));
796
exitstatus = EX_OSERR;
797
goto fallback;
890
798
}
891
return 1;
892
}
893
894
#ifdef __GLIBC__
895
#if __GLIBC_PREREQ(2, 15)
896
int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
897
alphasort);
898
#else /* not __GLIBC_PREREQ(2, 15) */
899
int numplugins = scandir(plugindir != NULL ? plugindir : PDIR,
900
&direntries, good_name, alphasort);
901
#endif /* not __GLIBC_PREREQ(2, 15) */
902
#else /* not __GLIBC__ */
903
int numplugins = scandir(plugindir != NULL ? plugindir : PDIR,
904
&direntries, good_name, alphasort);
905
#endif /* not __GLIBC__ */
906
if(numplugins == -1){
907
error(0, errno, "Could not scan plugin dir");
908
direntries = NULL;
909
exitstatus = EX_OSERR;
910
goto fallback;
911
799
}
912
800
913
801
FD_ZERO(&rfds_all);
914
802
915
803
/* Read and execute any executable in the plugin directory*/
916
for(int i = 0; i < numplugins; i++){
917
918
int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY);
919
if(plugin_fd == -1){
920
error(0, errno, "Could not open plugin");
921
free(direntries[i]);
804
while(true){
805
do {
806
dirst = readdir(dir);
807
} while(dirst == NULL and errno == EINTR);
808
809
/* All directory entries have been processed */
810
if(dirst == NULL){
811
if(errno == EBADF){
812
error(0, errno, "readdir");
813
exitstatus = EX_IOERR;
814
goto fallback;
815
}
816
break;
817
}
818
819
d_name_len = strlen(dirst->d_name);
820
821
/* Ignore dotfiles, backup files and other junk */
822
{
823
bool bad_name = false;
824
825
const char const *bad_prefixes[] = { ".", "#", NULL };
826
827
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
828
".dpkg-old",
829
".dpkg-bak",
830
".dpkg-divert", NULL };
831
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
832
size_t pre_len = strlen(*pre);
833
if((d_name_len >= pre_len)
834
and strncmp((dirst->d_name), *pre, pre_len) == 0){
835
if(debug){
836
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
837
" with bad prefix %s\n", dirst->d_name, *pre);
838
}
839
bad_name = true;
840
break;
841
}
842
}
843
if(bad_name){
844
continue;
845
}
846
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
847
size_t suf_len = strlen(*suf);
848
if((d_name_len >= suf_len)
849
and (strcmp((dirst->d_name) + d_name_len-suf_len, *suf)
850
== 0)){
851
if(debug){
852
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
853
" with bad suffix %s\n", dirst->d_name, *suf);
854
}
855
bad_name = true;
856
break;
857
}
858
}
859
860
if(bad_name){
861
continue;
862
}
863
}
864
865
char *filename;
866
if(plugindir == NULL){
867
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
868
dirst->d_name));
869
} else {
870
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
871
plugindir,
872
dirst->d_name));
873
}
874
if(ret < 0){
875
error(0, errno, "asprintf");
922
876
continue;
923
877
}
924
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
878
879
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
925
880
if(ret == -1){
926
881
error(0, errno, "stat");
927
close(plugin_fd);
928
free(direntries[i]);
882
free(filename);
929
883
continue;
930
884
}
931
885
932
886
/* Ignore non-executable files */
933
887
if(not S_ISREG(st.st_mode)
934
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
935
X_OK, 0)) != 0)){
888
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
936
889
if(debug){
937
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
938
" with bad type or mode\n",
939
plugindir != NULL ? plugindir : PDIR,
940
direntries[i]->d_name);
890
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
891
" with bad type or mode\n", filename);
941
892
}
942
close(plugin_fd);
943
free(direntries[i]);
893
free(filename);
944
894
continue;
945
895
}
946
896
947
plugin *p = getplugin(direntries[i]->d_name);
897
plugin *p = getplugin(dirst->d_name);
948
898
if(p == NULL){
949
899
error(0, errno, "getplugin");
950
close(plugin_fd);
951
free(direntries[i]);
900
free(filename);
952
901
continue;
953
902
}
954
903
if(p->disabled){
955
904
if(debug){
956
905
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
957
direntries[i]->d_name);
906
dirst->d_name);
958
907
}
959
close(plugin_fd);
960
free(direntries[i]);
908
free(filename);
961
909
continue;
962
910
}
963
911
{
977
925
}
978
926
}
979
927
}
980
/* If this plugin has any environment variables, we need to
981
duplicate the environment from this process, too. */
928
/* If this plugin has any environment variables, we will call
929
using execve and need to duplicate the environment from this
930
process, too. */
982
931
if(p->environ[0] != NULL){
983
932
for(char **e = environ; *e != NULL; e++){
984
933
if(not add_environment(p, *e, false)){
988
937
}
989
938
990
939
int pipefd[2];
991
#ifndef O_CLOEXEC
992
940
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
993
#else /* O_CLOEXEC */
994
ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC));
995
#endif /* O_CLOEXEC */
996
941
if(ret == -1){
997
942
error(0, errno, "pipe");
998
943
exitstatus = EX_OSERR;
999
free(direntries[i]);
1000
goto fallback;
1001
}
1002
if(pipefd[0] >= FD_SETSIZE){
1003
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
1004
FD_SETSIZE);
1005
close(pipefd[0]);
1006
close(pipefd[1]);
1007
exitstatus = EX_OSERR;
1008
free(direntries[i]);
1009
goto fallback;
1010
}
1011
#ifndef O_CLOEXEC
944
goto fallback;
945
}
1012
946
/* Ask OS to automatic close the pipe on exec */
1013
947
ret = set_cloexec_flag(pipefd[0]);
1014
948
if(ret < 0){
1015
949
error(0, errno, "set_cloexec_flag");
1016
close(pipefd[0]);
1017
close(pipefd[1]);
1018
950
exitstatus = EX_OSERR;
1019
free(direntries[i]);
1020
951
goto fallback;
1021
952
}
1022
953
ret = set_cloexec_flag(pipefd[1]);
1023
954
if(ret < 0){
1024
955
error(0, errno, "set_cloexec_flag");
1025
close(pipefd[0]);
1026
close(pipefd[1]);
1027
956
exitstatus = EX_OSERR;
1028
free(direntries[i]);
1029
957
goto fallback;
1030
958
}
1031
#endif /* not O_CLOEXEC */
1032
959
/* Block SIGCHLD until process is safely in process list */
1033
960
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1034
961
&sigchld_action.sa_mask,
1036
963
if(ret < 0){
1037
964
error(0, errno, "sigprocmask");
1038
965
exitstatus = EX_OSERR;
1039
free(direntries[i]);
1040
966
goto fallback;
1041
967
}
1042
968
/* Starting a new process to be watched */
1046
972
} while(pid == -1 and errno == EINTR);
1047
973
if(pid == -1){
1048
974
error(0, errno, "fork");
1049
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1050
&sigchld_action.sa_mask, NULL));
1051
close(pipefd[0]);
1052
close(pipefd[1]);
1053
975
exitstatus = EX_OSERR;
1054
free(direntries[i]);
1055
976
goto fallback;
1056
977
}
1057
978
if(pid == 0){
1073
994
_exit(EX_OSERR);
1074
995
}
1075
996
1076
if(fexecve(plugin_fd, p->argv,
1077
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1078
error(0, errno, "fexecve for %s/%s",
1079
plugindir != NULL ? plugindir : PDIR,
1080
direntries[i]->d_name);
1081
_exit(EX_OSERR);
997
if(dirfd(dir) < 0){
998
/* If dir has no file descriptor, we could not set FD_CLOEXEC
999
above and must now close it manually here. */
1000
closedir(dir);
1001
}
1002
if(p->environ[0] == NULL){
1003
if(execv(filename, p->argv) < 0){
1004
error(0, errno, "execv for %s", filename);
1005
_exit(EX_OSERR);
1006
}
1007
} else {
1008
if(execve(filename, p->argv, p->environ) < 0){
1009
error(0, errno, "execve for %s", filename);
1010
_exit(EX_OSERR);
1011
}
1082
1012
}
1083
1013
/* no return */
1084
1014
}
1085
1015
/* Parent process */
1086
close(pipefd[1]); /* Close unused write end of pipe */
1087
close(plugin_fd);
1088
plugin *new_plugin = getplugin(direntries[i]->d_name);
1016
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1017
pipe */
1018
free(filename);
1019
plugin *new_plugin = getplugin(dirst->d_name);
1089
1020
if(new_plugin == NULL){
1090
1021
error(0, errno, "getplugin");
1091
1022
ret = (int)(TEMP_FAILURE_RETRY
1095
1026
error(0, errno, "sigprocmask");
1096
1027
}
1097
1028
exitstatus = EX_OSERR;
1098
free(direntries[i]);
1099
1029
goto fallback;
1100
1030
}
1101
free(direntries[i]);
1102
1031
1103
1032
new_plugin->pid = pid;
1104
1033
new_plugin->fd = pipefd[0];
1114
1043
goto fallback;
1115
1044
}
1116
1045
1117
#if defined (__GNUC__) and defined (__GLIBC__)
1118
#if not __GLIBC_PREREQ(2, 16)
1119
#pragma GCC diagnostic push
1120
#pragma GCC diagnostic ignored "-Wsign-conversion"
1121
#endif
1122
#endif
1123
1046
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1124
-Wconversion in GNU libc
1125
before 2.16 */
1126
#if defined (__GNUC__) and defined (__GLIBC__)
1127
#if not __GLIBC_PREREQ(2, 16)
1128
#pragma GCC diagnostic pop
1129
#endif
1130
#endif
1047
-Wconversion */
1131
1048
1132
1049
if(maxfd < new_plugin->fd){
1133
1050
maxfd = new_plugin->fd;
1134
1051
}
1135
1052
}
1136
1053
1137
free(direntries);
1138
direntries = NULL;
1139
close(dir_fd);
1140
dir_fd = -1;
1054
TEMP_FAILURE_RETRY(closedir(dir));
1055
dir = NULL;
1141
1056
free_plugin(getplugin(NULL));
1142
1057
1143
1058
for(plugin *p = plugin_list; p != NULL; p = p->next){
1189
1104
}
1190
1105
1191
1106
/* Remove the plugin */
1192
#if defined (__GNUC__) and defined (__GLIBC__)
1193
#if not __GLIBC_PREREQ(2, 16)
1194
#pragma GCC diagnostic push
1195
#pragma GCC diagnostic ignored "-Wsign-conversion"
1196
#endif
1197
#endif
1198
1107
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1199
-Wconversion in GNU libc
1200
before 2.16 */
1201
#if defined (__GNUC__) and defined (__GLIBC__)
1202
#if not __GLIBC_PREREQ(2, 16)
1203
#pragma GCC diagnostic pop
1204
#endif
1205
#endif
1108
-Wconversion */
1206
1109
1207
1110
/* Block signal while modifying process_list */
1208
1111
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1248
1151
}
1249
1152
1250
1153
/* This process has not completed. Does it have any output? */
1251
#if defined (__GNUC__) and defined (__GLIBC__)
1252
#if not __GLIBC_PREREQ(2, 16)
1253
#pragma GCC diagnostic push
1254
#pragma GCC diagnostic ignored "-Wsign-conversion"
1255
#endif
1256
#endif
1257
1154
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1258
1155
warning from
1259
-Wconversion
1260
in GNU libc
1261
before
1262
2.16 */
1263
#if defined (__GNUC__) and defined (__GLIBC__)
1264
#if not __GLIBC_PREREQ(2, 16)
1265
#pragma GCC diagnostic pop
1266
#endif
1267
#endif
1156
-Wconversion */
1268
1157
/* This process had nothing to say at this time */
1269
1158
proc = proc->next;
1270
1159
continue;
1271
1160
}
1272
1161
/* Before reading, make the process' data buffer large enough */
1273
1162
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1274
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1275
+ (size_t) BUFFER_SIZE);
1276
if(new_buffer == NULL){
1163
proc->buffer = realloc(proc->buffer, proc->buffer_size
1164
+ (size_t) BUFFER_SIZE);
1165
if(proc->buffer == NULL){
1277
1166
error(0, errno, "malloc");
1278
1167
exitstatus = EX_OSERR;
1279
1168
goto fallback;
1280
1169
}
1281
proc->buffer = new_buffer;
1282
1170
proc->buffer_size += BUFFER_SIZE;
1283
1171
}
1284
1172
/* Read from the process */
1337
1225
free(custom_argv);
1338
1226
}
1339
1227
1340
free(direntries);
1341
1342
if(dir_fd != -1){
1343
close(dir_fd);
1228
if(dir != NULL){
1229
closedir(dir);
1344
1230
}
1345
1231
1346
1232
/* Kill the processes */
1366
1252
free_plugin_list();
1367
1253
1368
1254
free(plugindir);
1369
free(pluginhelperdir);
1370
1255
free(argfile);
1371
1256
1372
1257
return exitstatus;
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0