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.7.468
- compare with another revision
- download diff
- download tarball
- view history from revision 237.7.468
- Committer: Teddy Hogeborn
- Date: 2018-02-06 19:49:19 UTC
- mto: (237.7.594 trunk)
- mto: This revision was merged to the branch mainline in revision 362.
- Revision ID: teddy@recompile.se-20180206194919-rfmlt49naz5jnpfx
Fix Python 3 issue
* (mandos/MandosServer.handle_ipc): Decode bytes into string.
* (mandos/MandosServer.handle_ipc): Decode bytes into string.
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
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
5
* Copyright © 2008-2017 Teddy Hogeborn
6
* Copyright © 2008-2017 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
14
16
* WITHOUT ANY WARRANTY; without even the implied warranty of
15
17
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16
18
* General Public License for more details.
17
19
*
18
20
* You should have received a copy of the GNU General Public License
19
* along with this program. If not, see
20
* <http://www.gnu.org/licenses/>.
21
* along with Mandos. If not, see <http://www.gnu.org/licenses/>.
21
22
*
22
23
* Contact the authors at <mandos@recompile.se>.
23
24
*/
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
WCOREDUMP() */
41
WEXITSTATUS(), WTERMSIG() */
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() */
76
76
#define BUFFER_SIZE 256
77
77
78
78
#define PDIR "/lib/mandos/plugins.d"
79
#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;
312
313
__attribute__((nonnull))
313
314
static void free_plugin(plugin *plugin_node){
314
315
316
free(plugin_node->name);
315
317
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
316
318
free(*arg);
317
319
}
347
349
348
350
int main(int argc, char *argv[]){
349
351
char *plugindir = NULL;
352
char *pluginhelperdir = NULL;
350
353
char *argfile = NULL;
351
354
FILE *conffp;
352
355
struct dirent **direntries = NULL;
414
417
.doc = "Group ID the plugins will run as", .group = 3 },
415
418
{ .name = "debug", .key = 132,
416
419
.doc = "Debug mode", .group = 4 },
420
{ .name = "plugin-helper-dir", .key = 133,
421
.arg = "DIRECTORY",
422
.doc = "Specify a different plugin helper directory",
423
.group = 2 },
417
424
/*
418
425
* These reproduce what we would get without ARGP_NO_HELP
419
426
*/
545
552
case 132: /* --debug */
546
553
debug = true;
547
554
break;
555
case 133: /* --plugin-helper-dir */
556
free(pluginhelperdir);
557
pluginhelperdir = strdup(arg);
558
if(pluginhelperdir != NULL){
559
errno = 0;
560
}
561
break;
548
562
/*
549
563
* These reproduce what we would get without ARGP_NO_HELP
550
564
*/
601
615
case 130: /* --userid */
602
616
case 131: /* --groupid */
603
617
case 132: /* --debug */
618
case 133: /* --plugin-helper-dir */
604
619
case '?': /* --help */
605
620
case -3: /* --usage */
606
621
case 'V': /* --version */
687
702
custom_argc += 1;
688
703
{
689
704
char **new_argv = realloc(custom_argv, sizeof(char *)
690
* ((unsigned int)
691
custom_argc + 1));
705
* ((size_t)custom_argc + 1));
692
706
if(new_argv == NULL){
693
707
error(0, errno, "realloc");
694
708
exitstatus = EX_OSERR;
761
775
goto fallback;
762
776
}
763
777
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
764
796
if(debug){
765
for(plugin *p = plugin_list; p != NULL; p=p->next){
797
for(plugin *p = plugin_list; p != NULL; p = p->next){
766
798
fprintf(stderr, "Plugin: %s has %d arguments\n",
767
799
p->name ? p->name : "Global", p->argc - 1);
768
800
for(char **a = p->argv; *a != NULL; a++){
777
809
778
810
if(getuid() == 0){
779
811
/* Work around Debian bug #633582:
780
<http://bugs.debian.org/633582> */
812
<https://bugs.debian.org/633582> */
781
813
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
782
814
if(plugindir_fd == -1){
783
815
if(errno != ENOENT){
795
827
}
796
828
}
797
829
}
798
TEMP_FAILURE_RETRY(close(plugindir_fd));
830
close(plugindir_fd);
799
831
}
800
832
}
801
833
860
892
return 1;
861
893
}
862
894
863
#ifdef __GLIBC__
864
#if __GLIBC_PREREQ(2, 15)
865
895
int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
866
896
alphasort);
867
#else /* not __GLIBC_PREREQ(2, 15) */
868
int numplugins = scandir(plugindir != NULL ? plugindir : PDIR,
869
&direntries, good_name, alphasort);
870
#endif /* not __GLIBC_PREREQ(2, 15) */
871
#else /* not __GLIBC__ */
872
int numplugins = scandir(plugindir != NULL ? plugindir : PDIR,
873
&direntries, good_name, alphasort);
874
#endif /* not __GLIBC__ */
875
897
if(numplugins == -1){
876
898
error(0, errno, "Could not scan plugin dir");
877
899
direntries = NULL;
893
915
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
894
916
if(ret == -1){
895
917
error(0, errno, "stat");
896
TEMP_FAILURE_RETRY(close(plugin_fd));
918
close(plugin_fd);
897
919
free(direntries[i]);
898
920
continue;
899
921
}
908
930
plugindir != NULL ? plugindir : PDIR,
909
931
direntries[i]->d_name);
910
932
}
911
TEMP_FAILURE_RETRY(close(plugin_fd));
933
close(plugin_fd);
912
934
free(direntries[i]);
913
935
continue;
914
936
}
916
938
plugin *p = getplugin(direntries[i]->d_name);
917
939
if(p == NULL){
918
940
error(0, errno, "getplugin");
919
TEMP_FAILURE_RETRY(close(plugin_fd));
941
close(plugin_fd);
920
942
free(direntries[i]);
921
943
continue;
922
944
}
925
947
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
926
948
direntries[i]->d_name);
927
949
}
928
TEMP_FAILURE_RETRY(close(plugin_fd));
950
close(plugin_fd);
929
951
free(direntries[i]);
930
952
continue;
931
953
}
971
993
if(pipefd[0] >= FD_SETSIZE){
972
994
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
973
995
FD_SETSIZE);
974
TEMP_FAILURE_RETRY(close(pipefd[0]));
975
TEMP_FAILURE_RETRY(close(pipefd[1]));
996
close(pipefd[0]);
997
close(pipefd[1]);
976
998
exitstatus = EX_OSERR;
977
999
free(direntries[i]);
978
1000
goto fallback;
982
1004
ret = set_cloexec_flag(pipefd[0]);
983
1005
if(ret < 0){
984
1006
error(0, errno, "set_cloexec_flag");
985
TEMP_FAILURE_RETRY(close(pipefd[0]));
986
TEMP_FAILURE_RETRY(close(pipefd[1]));
1007
close(pipefd[0]);
1008
close(pipefd[1]);
987
1009
exitstatus = EX_OSERR;
988
1010
free(direntries[i]);
989
1011
goto fallback;
991
1013
ret = set_cloexec_flag(pipefd[1]);
992
1014
if(ret < 0){
993
1015
error(0, errno, "set_cloexec_flag");
994
TEMP_FAILURE_RETRY(close(pipefd[0]));
995
TEMP_FAILURE_RETRY(close(pipefd[1]));
1016
close(pipefd[0]);
1017
close(pipefd[1]);
996
1018
exitstatus = EX_OSERR;
997
1019
free(direntries[i]);
998
1020
goto fallback;
1017
1039
error(0, errno, "fork");
1018
1040
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1019
1041
&sigchld_action.sa_mask, NULL));
1020
TEMP_FAILURE_RETRY(close(pipefd[0]));
1021
TEMP_FAILURE_RETRY(close(pipefd[1]));
1042
close(pipefd[0]);
1043
close(pipefd[1]);
1022
1044
exitstatus = EX_OSERR;
1023
1045
free(direntries[i]);
1024
1046
goto fallback;
1052
1074
/* no return */
1053
1075
}
1054
1076
/* Parent process */
1055
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1056
pipe */
1057
TEMP_FAILURE_RETRY(close(plugin_fd));
1077
close(pipefd[1]); /* Close unused write end of pipe */
1078
close(plugin_fd);
1058
1079
plugin *new_plugin = getplugin(direntries[i]->d_name);
1059
1080
if(new_plugin == NULL){
1060
1081
error(0, errno, "getplugin");
1084
1105
goto fallback;
1085
1106
}
1086
1107
1087
#if defined (__GNUC__) and defined (__GLIBC__)
1088
#if not __GLIBC_PREREQ(2, 16)
1089
#pragma GCC diagnostic push
1090
#pragma GCC diagnostic ignored "-Wsign-conversion"
1091
#endif
1092
#endif
1093
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1094
-Wconversion in GNU libc
1095
before 2.16 */
1096
#if defined (__GNUC__) and defined (__GLIBC__)
1097
#if not __GLIBC_PREREQ(2, 16)
1098
#pragma GCC diagnostic pop
1099
#endif
1100
#endif
1108
FD_SET(new_plugin->fd, &rfds_all);
1101
1109
1102
1110
if(maxfd < new_plugin->fd){
1103
1111
maxfd = new_plugin->fd;
1106
1114
1107
1115
free(direntries);
1108
1116
direntries = NULL;
1109
TEMP_FAILURE_RETRY(close(dir_fd));
1117
close(dir_fd);
1110
1118
dir_fd = -1;
1111
1119
free_plugin(getplugin(NULL));
1112
1120
1152
1160
(intmax_t) (proc->pid),
1153
1161
WTERMSIG(proc->status),
1154
1162
strsignal(WTERMSIG(proc->status)));
1155
} else if(WCOREDUMP(proc->status)){
1156
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1157
" core\n", proc->name, (intmax_t) (proc->pid));
1158
1163
}
1159
1164
}
1160
1165
1161
1166
/* Remove the plugin */
1162
#if defined (__GNUC__) and defined (__GLIBC__)
1163
#if not __GLIBC_PREREQ(2, 16)
1164
#pragma GCC diagnostic push
1165
#pragma GCC diagnostic ignored "-Wsign-conversion"
1166
#endif
1167
#endif
1168
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1169
-Wconversion in GNU libc
1170
before 2.16 */
1171
#if defined (__GNUC__) and defined (__GLIBC__)
1172
#if not __GLIBC_PREREQ(2, 16)
1173
#pragma GCC diagnostic pop
1174
#endif
1175
#endif
1167
FD_CLR(proc->fd, &rfds_all);
1176
1168
1177
1169
/* Block signal while modifying process_list */
1178
1170
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1218
1210
}
1219
1211
1220
1212
/* This process has not completed. Does it have any output? */
1221
#if defined (__GNUC__) and defined (__GLIBC__)
1222
#if not __GLIBC_PREREQ(2, 16)
1223
#pragma GCC diagnostic push
1224
#pragma GCC diagnostic ignored "-Wsign-conversion"
1225
#endif
1226
#endif
1227
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1228
warning from
1229
-Wconversion
1230
in GNU libc
1231
before
1232
2.16 */
1233
#if defined (__GNUC__) and defined (__GLIBC__)
1234
#if not __GLIBC_PREREQ(2, 16)
1235
#pragma GCC diagnostic pop
1236
#endif
1237
#endif
1213
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1238
1214
/* This process had nothing to say at this time */
1239
1215
proc = proc->next;
1240
1216
continue;
1310
1286
free(direntries);
1311
1287
1312
1288
if(dir_fd != -1){
1313
TEMP_FAILURE_RETRY(close(dir_fd));
1289
close(dir_fd);
1314
1290
}
1315
1291
1316
1292
/* Kill the processes */
1336
1312
free_plugin_list();
1337
1313
1338
1314
free(plugindir);
1315
free(pluginhelperdir);
1339
1316
free(argfile);
1340
1317
1341
1318
return exitstatus;
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0