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 693
- compare with another revision
- download diff
- download tarball
- view history from revision 693
- Committer: Teddy Hogeborn
- Date: 2014-06-07 22:37:22 UTC
- Revision ID: teddy@recompile.se-20140607223722-55qmdr3n9x39pvx4
Make mandos-client use fstatat().
* plugins.d/mandos-client.d (runnable_hook): Use fstatat().
* plugins.d/mandos-client.d (runnable_hook): Use fstatat().
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-2014 Teddy Hogeborn
6
* Copyright © 2008-2014 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
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
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() */
33
#include <sys/types.h> /* DIR, fdopendir(), fstat(), 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
WEXITSTATUS(), WTERMSIG() */
41
WEXITSTATUS(), WTERMSIG(),
42
WCOREDUMP() */
41
43
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
42
44
#include <iso646.h> /* and, or, not */
43
#include <dirent.h> /* struct dirent, scandirat() */
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
46
readdir(), closedir(), dirfd() */
44
47
#include <unistd.h> /* fcntl(), F_GETFD, F_SETFD,
45
48
FD_CLOEXEC, write(), STDOUT_FILENO,
46
49
struct stat, fstat(), close(),
47
50
setgid(), setuid(), S_ISREG(),
48
faccessat() pipe2(), fork(),
51
faccessat() pipe(), fork(),
49
52
_exit(), dup2(), fexecve(), read()
50
53
*/
51
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
52
FD_CLOEXEC, openat(), scandirat(),
53
pipe2() */
55
FD_CLOEXEC, openat() */
54
56
#include <string.h> /* strsep, strlen(), strsignal(),
55
57
strcmp(), strncmp() */
56
58
#include <errno.h> /* errno */
75
77
#define BUFFER_SIZE 256
76
78
77
79
#define PDIR "/lib/mandos/plugins.d"
78
#define PHDIR "/lib/mandos/plugin-helpers"
79
80
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
80
81
81
82
const char *argp_program_version = "plugin-runner " VERSION;
240
241
return add_to_char_array(def, &(p->environ), &(p->envc));
241
242
}
242
243
243
#ifndef O_CLOEXEC
244
244
/*
245
245
* Based on the example in the GNU LibC manual chapter 13.13 "File
246
246
* Descriptor Flags".
257
257
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
258
258
ret | FD_CLOEXEC));
259
259
}
260
#endif /* not O_CLOEXEC */
261
260
262
261
263
262
/* Mark processes as completed when they exit, and save their exit
347
346
348
347
int main(int argc, char *argv[]){
349
348
char *plugindir = NULL;
350
char *pluginhelperdir = NULL;
351
349
char *argfile = NULL;
352
350
FILE *conffp;
353
struct dirent **direntries = NULL;
351
DIR *dir = NULL;
352
struct dirent *dirst;
354
353
struct stat st;
355
354
fd_set rfds_all;
356
355
int ret, maxfd = 0;
364
363
.sa_flags = SA_NOCLDSTOP };
365
364
char **custom_argv = NULL;
366
365
int custom_argc = 0;
367
int dir_fd = -1;
366
int dir_fd;
368
367
369
368
/* Establish a signal handler */
370
369
sigemptyset(&sigchld_action.sa_mask);
415
414
.doc = "Group ID the plugins will run as", .group = 3 },
416
415
{ .name = "debug", .key = 132,
417
416
.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 },
422
417
/*
423
418
* These reproduce what we would get without ARGP_NO_HELP
424
419
*/
550
545
case 132: /* --debug */
551
546
debug = true;
552
547
break;
553
case 133: /* --plugin-helper-dir */
554
free(pluginhelperdir);
555
pluginhelperdir = strdup(arg);
556
if(pluginhelperdir != NULL){
557
errno = 0;
558
}
559
break;
560
548
/*
561
549
* These reproduce what we would get without ARGP_NO_HELP
562
550
*/
613
601
case 130: /* --userid */
614
602
case 131: /* --groupid */
615
603
case 132: /* --debug */
616
case 133: /* --plugin-helper-dir */
617
604
case '?': /* --help */
618
605
case -3: /* --usage */
619
606
case 'V': /* --version */
700
687
custom_argc += 1;
701
688
{
702
689
char **new_argv = realloc(custom_argv, sizeof(char *)
703
* ((size_t)custom_argc + 1));
690
* ((unsigned int)
691
custom_argc + 1));
704
692
if(new_argv == NULL){
705
693
error(0, errno, "realloc");
706
694
exitstatus = EX_OSERR;
773
761
goto fallback;
774
762
}
775
763
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
794
764
if(debug){
795
765
for(plugin *p = plugin_list; p != NULL; p=p->next){
796
766
fprintf(stderr, "Plugin: %s has %d arguments\n",
825
795
}
826
796
}
827
797
}
828
close(plugindir_fd);
798
TEMP_FAILURE_RETRY(close(plugindir_fd));
829
799
}
830
800
}
831
801
859
829
ret = set_cloexec_flag(dir_fd);
860
830
if(ret < 0){
861
831
error(0, errno, "set_cloexec_flag");
832
TEMP_FAILURE_RETRY(close(dir_fd));
862
833
exitstatus = EX_OSERR;
863
834
goto fallback;
864
835
}
865
836
#endif /* O_CLOEXEC */
837
838
dir = fdopendir(dir_fd);
839
if(dir == NULL){
840
error(0, errno, "Could not open plugin dir");
841
TEMP_FAILURE_RETRY(close(dir_fd));
842
exitstatus = EX_OSERR;
843
goto fallback;
844
}
866
845
}
867
846
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 };
847
FD_ZERO(&rfds_all);
848
849
/* Read and execute any executable in the plugin directory*/
850
while(true){
851
do {
852
dirst = readdir(dir);
853
} while(dirst == NULL and errno == EINTR);
854
855
/* All directory entries have been processed */
856
if(dirst == NULL){
857
if(errno == EBADF){
858
error(0, errno, "readdir");
859
exitstatus = EX_IOERR;
860
goto fallback;
861
}
862
break;
863
}
864
865
/* Ignore dotfiles, backup files and other junk */
866
{
867
bool bad_name = false;
868
const char * const patterns[] = { ".*", "#*#", "*~",
869
"*.dpkg-new", "*.dpkg-old",
870
"*.dpkg-bak", "*.dpkg-divert",
871
NULL };
872
872
#ifdef __GNUC__
873
873
#pragma GCC diagnostic push
874
874
#pragma GCC diagnostic ignored "-Wcast-qual"
875
875
#endif
876
for(const char **pat = (const char **)patterns;
877
*pat != NULL; pat++){
876
for(const char **pat = (const char **)patterns;
877
*pat != NULL; pat++){
878
878
#ifdef __GNUC__
879
879
#pragma GCC diagnostic pop
880
880
#endif
881
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
882
!= FNM_NOMATCH){
883
if(debug){
881
if(fnmatch(*pat, dirst->d_name,
882
FNM_FILE_NAME | FNM_PERIOD) != FNM_NOMATCH){
883
if(debug){
884
884
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
885
" matching pattern %s\n", dirent->d_name, *pat);
885
" matching pattern %s\n", dirst->d_name, *pat);
886
}
887
bad_name = true;
888
break;
886
889
}
887
return 0;
890
}
891
if(bad_name){
892
continue;
888
893
}
889
894
}
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;
900
}
901
902
FD_ZERO(&rfds_all);
903
904
/* Read and execute any executable in the plugin directory*/
905
for(int i = 0; i < numplugins; i++){
906
895
907
int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY);
896
int plugin_fd = openat(dir_fd, dirst->d_name, O_RDONLY |
897
#ifdef O_CLOEXEC
898
O_CLOEXEC
899
#else /* not O_CLOEXEC */
900
0
901
#endif /* not O_CLOEXEC */
902
);
908
903
if(plugin_fd == -1){
909
904
error(0, errno, "Could not open plugin");
910
free(direntries[i]);
911
continue;
912
}
905
continue;
906
}
907
#ifndef O_CLOEXEC
908
/* Set the FD_CLOEXEC flag on the plugin FD */
909
ret = set_cloexec_flag(plugin_fd);
910
if(ret < 0){
911
error(0, errno, "set_cloexec_flag");
912
TEMP_FAILURE_RETRY(close(plugin_fd));
913
continue;
914
}
915
#endif /* O_CLOEXEC */
913
916
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
914
917
if(ret == -1){
915
918
error(0, errno, "stat");
916
close(plugin_fd);
917
free(direntries[i]);
919
TEMP_FAILURE_RETRY(close(plugin_fd));
918
920
continue;
919
921
}
920
922
921
923
/* Ignore non-executable files */
922
924
if(not S_ISREG(st.st_mode)
923
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
924
X_OK, 0)) != 0)){
925
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, dirst->d_name, X_OK,
926
0)) != 0)){
925
927
if(debug){
926
928
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
927
929
" with bad type or mode\n",
928
plugindir != NULL ? plugindir : PDIR,
929
direntries[i]->d_name);
930
plugindir != NULL ? plugindir : PDIR, dirst->d_name);
930
931
}
931
close(plugin_fd);
932
free(direntries[i]);
932
TEMP_FAILURE_RETRY(close(plugin_fd));
933
933
continue;
934
934
}
935
935
936
plugin *p = getplugin(direntries[i]->d_name);
936
plugin *p = getplugin(dirst->d_name);
937
937
if(p == NULL){
938
938
error(0, errno, "getplugin");
939
close(plugin_fd);
940
free(direntries[i]);
939
TEMP_FAILURE_RETRY(close(plugin_fd));
941
940
continue;
942
941
}
943
942
if(p->disabled){
944
943
if(debug){
945
944
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
946
direntries[i]->d_name);
945
dirst->d_name);
947
946
}
948
close(plugin_fd);
949
free(direntries[i]);
947
TEMP_FAILURE_RETRY(close(plugin_fd));
950
948
continue;
951
949
}
952
950
{
977
975
}
978
976
979
977
int pipefd[2];
980
#ifndef O_CLOEXEC
981
978
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 */
985
979
if(ret == -1){
986
980
error(0, errno, "pipe");
987
981
exitstatus = EX_OSERR;
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
982
goto fallback;
983
}
1001
984
/* Ask OS to automatic close the pipe on exec */
1002
985
ret = set_cloexec_flag(pipefd[0]);
1003
986
if(ret < 0){
1004
987
error(0, errno, "set_cloexec_flag");
1005
close(pipefd[0]);
1006
close(pipefd[1]);
1007
988
exitstatus = EX_OSERR;
1008
free(direntries[i]);
1009
989
goto fallback;
1010
990
}
1011
991
ret = set_cloexec_flag(pipefd[1]);
1012
992
if(ret < 0){
1013
993
error(0, errno, "set_cloexec_flag");
1014
close(pipefd[0]);
1015
close(pipefd[1]);
1016
994
exitstatus = EX_OSERR;
1017
free(direntries[i]);
1018
995
goto fallback;
1019
996
}
1020
#endif /* not O_CLOEXEC */
1021
997
/* Block SIGCHLD until process is safely in process list */
1022
998
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1023
999
&sigchld_action.sa_mask,
1025
1001
if(ret < 0){
1026
1002
error(0, errno, "sigprocmask");
1027
1003
exitstatus = EX_OSERR;
1028
free(direntries[i]);
1029
1004
goto fallback;
1030
1005
}
1031
1006
/* Starting a new process to be watched */
1035
1010
} while(pid == -1 and errno == EINTR);
1036
1011
if(pid == -1){
1037
1012
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]);
1042
1013
exitstatus = EX_OSERR;
1043
free(direntries[i]);
1044
1014
goto fallback;
1045
1015
}
1046
1016
if(pid == 0){
1062
1032
_exit(EX_OSERR);
1063
1033
}
1064
1034
1035
if(dirfd(dir) < 0){
1036
/* If dir has no file descriptor, we could not set FD_CLOEXEC
1037
above and must now close it manually here. */
1038
closedir(dir);
1039
}
1065
1040
if(fexecve(plugin_fd, p->argv,
1066
1041
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1067
1042
error(0, errno, "fexecve for %s/%s",
1068
plugindir != NULL ? plugindir : PDIR,
1069
direntries[i]->d_name);
1043
plugindir != NULL ? plugindir : PDIR, dirst->d_name);
1070
1044
_exit(EX_OSERR);
1071
1045
}
1072
1046
/* no return */
1073
1047
}
1074
1048
/* Parent process */
1075
close(pipefd[1]); /* Close unused write end of pipe */
1076
close(plugin_fd);
1077
plugin *new_plugin = getplugin(direntries[i]->d_name);
1049
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1050
pipe */
1051
TEMP_FAILURE_RETRY(close(plugin_fd));
1052
plugin *new_plugin = getplugin(dirst->d_name);
1078
1053
if(new_plugin == NULL){
1079
1054
error(0, errno, "getplugin");
1080
1055
ret = (int)(TEMP_FAILURE_RETRY
1084
1059
error(0, errno, "sigprocmask");
1085
1060
}
1086
1061
exitstatus = EX_OSERR;
1087
free(direntries[i]);
1088
1062
goto fallback;
1089
1063
}
1090
free(direntries[i]);
1091
1064
1092
1065
new_plugin->pid = pid;
1093
1066
new_plugin->fd = pipefd[0];
1103
1076
goto fallback;
1104
1077
}
1105
1078
1106
FD_SET(new_plugin->fd, &rfds_all);
1079
#if defined (__GNUC__) and defined (__GLIBC__)
1080
#if not __GLIBC_PREREQ(2, 16)
1081
#pragma GCC diagnostic push
1082
#pragma GCC diagnostic ignored "-Wsign-conversion"
1083
#endif
1084
#endif
1085
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1086
-Wconversion in GNU libc
1087
before 2.16 */
1088
#if defined (__GNUC__) and defined (__GLIBC__)
1089
#if not __GLIBC_PREREQ(2, 16)
1090
#pragma GCC diagnostic pop
1091
#endif
1092
#endif
1107
1093
1108
1094
if(maxfd < new_plugin->fd){
1109
1095
maxfd = new_plugin->fd;
1110
1096
}
1111
1097
}
1112
1098
1113
free(direntries);
1114
direntries = NULL;
1115
close(dir_fd);
1116
dir_fd = -1;
1099
TEMP_FAILURE_RETRY(closedir(dir));
1100
dir = NULL;
1117
1101
free_plugin(getplugin(NULL));
1118
1102
1119
1103
for(plugin *p = plugin_list; p != NULL; p = p->next){
1158
1142
(intmax_t) (proc->pid),
1159
1143
WTERMSIG(proc->status),
1160
1144
strsignal(WTERMSIG(proc->status)));
1145
} else if(WCOREDUMP(proc->status)){
1146
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1147
" core\n", proc->name, (intmax_t) (proc->pid));
1161
1148
}
1162
1149
}
1163
1150
1164
1151
/* Remove the plugin */
1165
FD_CLR(proc->fd, &rfds_all);
1152
#if defined (__GNUC__) and defined (__GLIBC__)
1153
#if not __GLIBC_PREREQ(2, 16)
1154
#pragma GCC diagnostic push
1155
#pragma GCC diagnostic ignored "-Wsign-conversion"
1156
#endif
1157
#endif
1158
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1159
-Wconversion in GNU libc
1160
before 2.16 */
1161
#if defined (__GNUC__) and defined (__GLIBC__)
1162
#if not __GLIBC_PREREQ(2, 16)
1163
#pragma GCC diagnostic pop
1164
#endif
1165
#endif
1166
1166
1167
1167
/* Block signal while modifying process_list */
1168
1168
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1208
1208
}
1209
1209
1210
1210
/* This process has not completed. Does it have any output? */
1211
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1211
#if defined (__GNUC__) and defined (__GLIBC__)
1212
#if not __GLIBC_PREREQ(2, 16)
1213
#pragma GCC diagnostic push
1214
#pragma GCC diagnostic ignored "-Wsign-conversion"
1215
#endif
1216
#endif
1217
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1218
warning from
1219
-Wconversion
1220
in GNU libc
1221
before
1222
2.16 */
1223
#if defined (__GNUC__) and defined (__GLIBC__)
1224
#if not __GLIBC_PREREQ(2, 16)
1225
#pragma GCC diagnostic pop
1226
#endif
1227
#endif
1212
1228
/* This process had nothing to say at this time */
1213
1229
proc = proc->next;
1214
1230
continue;
1281
1297
free(custom_argv);
1282
1298
}
1283
1299
1284
free(direntries);
1285
1286
if(dir_fd != -1){
1287
close(dir_fd);
1300
if(dir != NULL){
1301
closedir(dir);
1288
1302
}
1289
1303
1290
1304
/* Kill the processes */
1310
1324
free_plugin_list();
1311
1325
1312
1326
free(plugindir);
1313
free(pluginhelperdir);
1314
1327
free(argfile);
1315
1328
1316
1329
return exitstatus;
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0