To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to plugin-runner.c
- browse files at revision 237.25.5
- compare with another revision
- download diff
- download tarball
- view history from revision 237.25.5
- Committer: Teddy Hogeborn
- Date: 2015-07-05 21:38:01 UTC
- mto: (237.7.307 trunk)
- mto: This revision was merged to the branch mainline in revision 325.
- Revision ID: teddy@recompile.se-20150705213801-pi8vk0ovlumuj826
plugin-helpers/mandos-client-iprouteadddel.c: Fix #include lines.
(main): Fix minor typo in error message.
(main): Fix minor typo in error message.
added
removed
plugin-runner.c
2
2
/*
3
3
* Mandos plugin runner - Run Mandos plugins
4
4
*
5
* Copyright © 2008-2018 Teddy Hogeborn
6
* Copyright © 2008-2018 Björn Påhlsson
7
*
8
* This file is part of Mandos.
9
*
10
* Mandos is free software: you can redistribute it and/or modify it
11
* under the terms of the GNU General Public License as published by
12
* the Free Software Foundation, either version 3 of the License, or
13
* (at your option) any later version.
14
*
15
* Mandos is distributed in the hope that it will be useful, but
5
* Copyright © 2008-2014 Teddy Hogeborn
6
* Copyright © 2008-2014 Björn Påhlsson
7
*
8
* This program is free software: you can redistribute it and/or
9
* modify it under the terms of the GNU General Public License as
10
* published by the Free Software Foundation, either version 3 of the
11
* License, or (at your option) any later version.
12
*
13
* This program is distributed in the hope that it will be useful, but
16
14
* WITHOUT ANY WARRANTY; without even the implied warranty of
17
15
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18
16
* General Public License for more details.
19
17
*
20
18
* You should have received a copy of the GNU General Public License
21
* along with Mandos. If not, see <http://www.gnu.org/licenses/>.
19
* along with this program. If not, see
20
* <http://www.gnu.org/licenses/>.
22
21
*
23
22
* Contact the authors at <mandos@recompile.se>.
24
23
*/
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() */
40
WEXITSTATUS(), WTERMSIG(),
41
WCOREDUMP() */
42
42
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
43
43
#include <iso646.h> /* and, or, not */
44
44
#include <dirent.h> /* struct dirent, scandirat() */
583
583
if(arg[0] == '\0'){
584
584
break;
585
585
}
586
/* FALLTHROUGH */
587
586
default:
588
587
return ARGP_ERR_UNKNOWN;
589
588
}
702
701
custom_argc += 1;
703
702
{
704
703
char **new_argv = realloc(custom_argv, sizeof(char *)
705
* ((size_t)custom_argc + 1));
704
* ((unsigned int)
705
custom_argc + 1));
706
706
if(new_argv == NULL){
707
707
error(0, errno, "realloc");
708
708
exitstatus = EX_OSERR;
794
794
}
795
795
796
796
if(debug){
797
for(plugin *p = plugin_list; p != NULL; p = p->next){
797
for(plugin *p = plugin_list; p != NULL; p=p->next){
798
798
fprintf(stderr, "Plugin: %s has %d arguments\n",
799
799
p->name ? p->name : "Global", p->argc - 1);
800
800
for(char **a = p->argv; *a != NULL; a++){
809
809
810
810
if(getuid() == 0){
811
811
/* Work around Debian bug #633582:
812
<https://bugs.debian.org/633582> */
812
<http://bugs.debian.org/633582> */
813
813
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
814
814
if(plugindir_fd == -1){
815
815
if(errno != ENOENT){
827
827
}
828
828
}
829
829
}
830
close(plugindir_fd);
830
TEMP_FAILURE_RETRY(close(plugindir_fd));
831
831
}
832
832
}
833
833
892
892
return 1;
893
893
}
894
894
895
#ifdef __GLIBC__
896
#if __GLIBC_PREREQ(2, 15)
895
897
int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
896
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__ */
897
907
if(numplugins == -1){
898
908
error(0, errno, "Could not scan plugin dir");
899
909
direntries = NULL;
915
925
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
916
926
if(ret == -1){
917
927
error(0, errno, "stat");
918
close(plugin_fd);
928
TEMP_FAILURE_RETRY(close(plugin_fd));
919
929
free(direntries[i]);
920
930
continue;
921
931
}
930
940
plugindir != NULL ? plugindir : PDIR,
931
941
direntries[i]->d_name);
932
942
}
933
close(plugin_fd);
943
TEMP_FAILURE_RETRY(close(plugin_fd));
934
944
free(direntries[i]);
935
945
continue;
936
946
}
938
948
plugin *p = getplugin(direntries[i]->d_name);
939
949
if(p == NULL){
940
950
error(0, errno, "getplugin");
941
close(plugin_fd);
951
TEMP_FAILURE_RETRY(close(plugin_fd));
942
952
free(direntries[i]);
943
953
continue;
944
954
}
947
957
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
948
958
direntries[i]->d_name);
949
959
}
950
close(plugin_fd);
960
TEMP_FAILURE_RETRY(close(plugin_fd));
951
961
free(direntries[i]);
952
962
continue;
953
963
}
993
1003
if(pipefd[0] >= FD_SETSIZE){
994
1004
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
995
1005
FD_SETSIZE);
996
close(pipefd[0]);
997
close(pipefd[1]);
1006
TEMP_FAILURE_RETRY(close(pipefd[0]));
1007
TEMP_FAILURE_RETRY(close(pipefd[1]));
998
1008
exitstatus = EX_OSERR;
999
1009
free(direntries[i]);
1000
1010
goto fallback;
1004
1014
ret = set_cloexec_flag(pipefd[0]);
1005
1015
if(ret < 0){
1006
1016
error(0, errno, "set_cloexec_flag");
1007
close(pipefd[0]);
1008
close(pipefd[1]);
1017
TEMP_FAILURE_RETRY(close(pipefd[0]));
1018
TEMP_FAILURE_RETRY(close(pipefd[1]));
1009
1019
exitstatus = EX_OSERR;
1010
1020
free(direntries[i]);
1011
1021
goto fallback;
1013
1023
ret = set_cloexec_flag(pipefd[1]);
1014
1024
if(ret < 0){
1015
1025
error(0, errno, "set_cloexec_flag");
1016
close(pipefd[0]);
1017
close(pipefd[1]);
1026
TEMP_FAILURE_RETRY(close(pipefd[0]));
1027
TEMP_FAILURE_RETRY(close(pipefd[1]));
1018
1028
exitstatus = EX_OSERR;
1019
1029
free(direntries[i]);
1020
1030
goto fallback;
1039
1049
error(0, errno, "fork");
1040
1050
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1041
1051
&sigchld_action.sa_mask, NULL));
1042
close(pipefd[0]);
1043
close(pipefd[1]);
1052
TEMP_FAILURE_RETRY(close(pipefd[0]));
1053
TEMP_FAILURE_RETRY(close(pipefd[1]));
1044
1054
exitstatus = EX_OSERR;
1045
1055
free(direntries[i]);
1046
1056
goto fallback;
1074
1084
/* no return */
1075
1085
}
1076
1086
/* Parent process */
1077
close(pipefd[1]); /* Close unused write end of pipe */
1078
close(plugin_fd);
1087
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1088
pipe */
1089
TEMP_FAILURE_RETRY(close(plugin_fd));
1079
1090
plugin *new_plugin = getplugin(direntries[i]->d_name);
1080
1091
if(new_plugin == NULL){
1081
1092
error(0, errno, "getplugin");
1093
1104
1094
1105
new_plugin->pid = pid;
1095
1106
new_plugin->fd = pipefd[0];
1096
1097
if(debug){
1098
fprintf(stderr, "Plugin %s started (PID %" PRIdMAX ")\n",
1099
new_plugin->name, (intmax_t) (new_plugin->pid));
1100
}
1101
1107
1102
1108
/* Unblock SIGCHLD so signal handler can be run if this process
1103
1109
has already completed */
1104
1110
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1110
1116
goto fallback;
1111
1117
}
1112
1118
1113
FD_SET(new_plugin->fd, &rfds_all);
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
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
1114
1133
1115
1134
if(maxfd < new_plugin->fd){
1116
1135
maxfd = new_plugin->fd;
1119
1138
1120
1139
free(direntries);
1121
1140
direntries = NULL;
1122
close(dir_fd);
1141
TEMP_FAILURE_RETRY(close(dir_fd));
1123
1142
dir_fd = -1;
1124
1143
free_plugin(getplugin(NULL));
1125
1144
1165
1184
(intmax_t) (proc->pid),
1166
1185
WTERMSIG(proc->status),
1167
1186
strsignal(WTERMSIG(proc->status)));
1187
} else if(WCOREDUMP(proc->status)){
1188
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1189
" core\n", proc->name, (intmax_t) (proc->pid));
1168
1190
}
1169
1191
}
1170
1192
1171
1193
/* Remove the plugin */
1172
FD_CLR(proc->fd, &rfds_all);
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
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
1173
1208
1174
1209
/* Block signal while modifying process_list */
1175
1210
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1215
1250
}
1216
1251
1217
1252
/* This process has not completed. Does it have any output? */
1218
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
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
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1260
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
1219
1270
/* This process had nothing to say at this time */
1220
1271
proc = proc->next;
1221
1272
continue;
1291
1342
free(direntries);
1292
1343
1293
1344
if(dir_fd != -1){
1294
close(dir_fd);
1345
TEMP_FAILURE_RETRY(close(dir_fd));
1295
1346
}
1296
1347
1297
1348
/* Kill the processes */
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0