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 390
- compare with another revision
- download diff
- download tarball
- view history from revision 390
- Committer: Teddy Hogeborn
- Date: 2009-10-18 16:09:05 UTC
- Revision ID: teddy@fukt.bsnet.se-20091018160905-ep07o5cwedsegz9x
* plugins.d/askpass-fifo.c: Do close(STDOUT_FILENO) before exiting to
check its return code. Use exit codes
from <sysexits.h>.
* plugins.d/splashy.c: Use exit codes from <sysexits.h> in the fork to
exec the "splashy_update" command.
check its return code. Use exit codes
from <sysexits.h>.
* plugins.d/splashy.c: Use exit codes from <sysexits.h> in the fork to
exec the "splashy_update" command.
- files modified:
- Makefile
added
removed
plugin-runner.c
23
23
*/
24
24
25
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
asprintf() */
26
asprintf(), O_CLOEXEC */
27
27
#include <stddef.h> /* size_t, NULL */
28
28
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
29
29
EXIT_SUCCESS, realloc() */
30
30
#include <stdbool.h> /* bool, true, false */
31
31
#include <stdio.h> /* perror, fileno(), fprintf(),
32
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, opendir(), stat(), struct
33
#include <sys/types.h> /* DIR, fdopendir(), stat(), struct
34
34
stat, waitpid(), WIFEXITED(),
35
35
WEXITSTATUS(), wait(), pid_t,
36
36
uid_t, gid_t, getuid(), getgid(),
42
42
WCOREDUMP() */
43
43
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
44
44
#include <iso646.h> /* and, or, not */
45
#include <dirent.h> /* DIR, struct dirent, opendir(),
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
46
46
readdir(), closedir(), dirfd() */
47
47
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
48
48
fcntl(), setuid(), setgid(),
230
230
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
231
231
*/
232
232
static int set_cloexec_flag(int fd){
233
int ret = TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
233
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
234
234
/* If reading the flags failed, return error indication now. */
235
235
if(ret < 0){
236
236
return ret;
237
237
}
238
238
/* Store modified flag word in the descriptor. */
239
return TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD, ret | FD_CLOEXEC));
239
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
240
ret | FD_CLOEXEC));
240
241
}
241
242
242
243
697
698
perror("setuid");
698
699
}
699
700
700
if(plugindir == NULL){
701
dir = opendir(PDIR);
702
} else {
703
dir = opendir(plugindir);
704
}
705
706
if(dir == NULL){
707
perror("Could not open plugin dir");
708
exitstatus = EXIT_FAILURE;
709
goto fallback;
710
}
711
712
/* Set the FD_CLOEXEC flag on the directory, if possible */
701
/* Open plugin directory with close_on_exec flag */
713
702
{
714
int dir_fd = dirfd(dir);
715
if(dir_fd >= 0){
716
ret = set_cloexec_flag(dir_fd);
717
if(ret < 0){
718
perror("set_cloexec_flag");
719
exitstatus = EXIT_FAILURE;
720
goto fallback;
721
}
703
int dir_fd = -1;
704
if(plugindir == NULL){
705
dir_fd = open(PDIR, O_RDONLY |
706
#ifdef O_CLOEXEC
707
O_CLOEXEC
708
#else /* not O_CLOEXEC */
709
0
710
#endif /* not O_CLOEXEC */
711
);
712
} else {
713
dir_fd = open(plugindir, O_RDONLY |
714
#ifdef O_CLOEXEC
715
O_CLOEXEC
716
#else /* not O_CLOEXEC */
717
0
718
#endif /* not O_CLOEXEC */
719
);
720
}
721
if(dir_fd == -1){
722
perror("Could not open plugin dir");
723
exitstatus = EXIT_FAILURE;
724
goto fallback;
725
}
726
727
#ifndef O_CLOEXEC
728
/* Set the FD_CLOEXEC flag on the directory */
729
ret = set_cloexec_flag(dir_fd);
730
if(ret < 0){
731
perror("set_cloexec_flag");
732
TEMP_FAILURE_RETRY(close(dir_fd));
733
exitstatus = EXIT_FAILURE;
734
goto fallback;
735
}
736
#endif /* O_CLOEXEC */
737
738
dir = fdopendir(dir_fd);
739
if(dir == NULL){
740
perror("Could not open plugin dir");
741
TEMP_FAILURE_RETRY(close(dir_fd));
742
exitstatus = EXIT_FAILURE;
743
goto fallback;
722
744
}
723
745
}
724
746
788
810
789
811
char *filename;
790
812
if(plugindir == NULL){
791
ret = TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
792
dirst->d_name));
813
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
814
dirst->d_name));
793
815
} else {
794
ret = TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s", plugindir,
795
dirst->d_name));
816
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
817
plugindir,
818
dirst->d_name));
796
819
}
797
820
if(ret < 0){
798
821
perror("asprintf");
799
822
continue;
800
823
}
801
824
802
ret = TEMP_FAILURE_RETRY(stat(filename, &st));
825
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
803
826
if(ret == -1){
804
827
perror("stat");
805
828
free(filename);
860
883
}
861
884
862
885
int pipefd[2];
863
ret = TEMP_FAILURE_RETRY(pipe(pipefd));
886
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
864
887
if(ret == -1){
865
888
perror("pipe");
866
889
exitstatus = EXIT_FAILURE;
880
903
goto fallback;
881
904
}
882
905
/* Block SIGCHLD until process is safely in process list */
883
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
884
&sigchld_action.sa_mask,
885
NULL));
906
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
907
&sigchld_action.sa_mask,
908
NULL));
886
909
if(ret < 0){
887
910
perror("sigprocmask");
888
911
exitstatus = EXIT_FAILURE;
942
965
plugin *new_plugin = getplugin(dirst->d_name);
943
966
if(new_plugin == NULL){
944
967
perror("getplugin");
945
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
946
&sigchld_action.sa_mask,
947
NULL));
968
ret = (int)(TEMP_FAILURE_RETRY
969
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
970
NULL)));
948
971
if(ret < 0){
949
972
perror("sigprocmask");
950
973
}
957
980
958
981
/* Unblock SIGCHLD so signal handler can be run if this process
959
982
has already completed */
960
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
961
&sigchld_action.sa_mask,
962
NULL));
983
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
984
&sigchld_action.sa_mask,
985
NULL));
963
986
if(ret < 0){
964
987
perror("sigprocmask");
965
988
exitstatus = EXIT_FAILURE;
966
989
goto fallback;
967
990
}
968
991
969
FD_SET(new_plugin->fd, &rfds_all);
992
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
993
-Wconversion */
970
994
971
995
if(maxfd < new_plugin->fd){
972
996
maxfd = new_plugin->fd;
1026
1050
}
1027
1051
1028
1052
/* Remove the plugin */
1029
FD_CLR(proc->fd, &rfds_all);
1053
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1054
-Wconversion */
1030
1055
1031
1056
/* Block signal while modifying process_list */
1032
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1033
&sigchld_action.sa_mask,
1034
NULL));
1057
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1058
(SIG_BLOCK,
1059
&sigchld_action.sa_mask,
1060
NULL));
1035
1061
if(ret < 0){
1036
1062
perror("sigprocmask");
1037
1063
exitstatus = EXIT_FAILURE;
1043
1069
proc = next_plugin;
1044
1070
1045
1071
/* We are done modifying process list, so unblock signal */
1046
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1047
&sigchld_action.sa_mask,
1048
NULL));
1072
ret = (int)(TEMP_FAILURE_RETRY
1073
(sigprocmask(SIG_UNBLOCK,
1074
&sigchld_action.sa_mask, NULL)));
1049
1075
if(ret < 0){
1050
1076
perror("sigprocmask");
1051
1077
exitstatus = EXIT_FAILURE;
1071
1097
}
1072
1098
1073
1099
/* This process has not completed. Does it have any output? */
1074
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1100
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1101
warning from
1102
-Wconversion */
1075
1103
/* This process had nothing to say at this time */
1076
1104
proc = proc->next;
1077
1105
continue;
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0