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 394
- compare with another revision
- download diff
- download tarball
- view history from revision 394
- Committer: Teddy Hogeborn
- Date: 2009-10-24 19:17:52 UTC
- Revision ID: teddy@fukt.bsnet.se-20091024191752-7g6xlf6wpp2pdexb
Convert some programs to use the exit codes from <sysexits.h>. Change
all programs using the "argp" parsing functions to use them correctly;
checking return value, using argp_error() to report parse errors etc.
* plugin-runner.c: Use <sysexits.h> exit codes. Always use fallback,
even on option errors, except for "--help", etc.
(getplugin): Make sure "errno" is set correctly on return.
(main): Declare our own "--help", "--usage", and "--version"
options which do not cause the fallback to be invoked.
In all other options, use fallback on any error.
(parse_opt, parse_opt_config_file): Reset errno at start and return
errno. No need to check "arg"
for NULL. New "--help",
"--usage", and "--version"
options.
(parse_opt): Accept empty string as global option. Do not print
errors which will be detected and reported later. Do
"argp_error()" on parse error or empty plugin names.
* plugins.d/mandos-client.c: Use <sysexits.h> exit codes. Do not
return successful exit code on "--help",
etc. since this would give the wrong
message to "plugin-runner".
(main): Declare our own "--help", "--usage", and "--version"
options which do not return a successful exit code.
(parse_opt): Reset errno at start and return errno. Do
"argp_error()" on parse errors. New "--help",
"--usage", and "--version" options.
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
not return successful exit code on
"--help", etc. since this would give
the wrong message to "plugin-runner".
(main): Declare our own "--help", "--usage", and "--version" options
which do not return a successful exit code. Do
close(STDOUT_FILENO) after writing to check its return code.
(parse_opt): Reset errno at start and return errno.
all programs using the "argp" parsing functions to use them correctly;
checking return value, using argp_error() to report parse errors etc.
* plugin-runner.c: Use <sysexits.h> exit codes. Always use fallback,
even on option errors, except for "--help", etc.
(getplugin): Make sure "errno" is set correctly on return.
(main): Declare our own "--help", "--usage", and "--version"
options which do not cause the fallback to be invoked.
In all other options, use fallback on any error.
(parse_opt, parse_opt_config_file): Reset errno at start and return
errno. No need to check "arg"
for NULL. New "--help",
"--usage", and "--version"
options.
(parse_opt): Accept empty string as global option. Do not print
errors which will be detected and reported later. Do
"argp_error()" on parse error or empty plugin names.
* plugins.d/mandos-client.c: Use <sysexits.h> exit codes. Do not
return successful exit code on "--help",
etc. since this would give the wrong
message to "plugin-runner".
(main): Declare our own "--help", "--usage", and "--version"
options which do not return a successful exit code.
(parse_opt): Reset errno at start and return errno. Do
"argp_error()" on parse errors. New "--help",
"--usage", and "--version" options.
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
not return successful exit code on
"--help", etc. since this would give
the wrong message to "plugin-runner".
(main): Declare our own "--help", "--usage", and "--version" options
which do not return a successful exit code. Do
close(STDOUT_FILENO) after writing to check its return code.
(parse_opt): Reset errno at start and return errno.
- files removed:
- DBUS-API
- debian/source
- network-hooks.d
- files modified:
- .bzrignore
added
removed
plugin-runner.c
2
2
/*
3
3
* Mandos plugin runner - Run Mandos plugins
4
4
*
5
* Copyright © 2008-2013 Teddy Hogeborn
6
* Copyright © 2008-2013 Björn Påhlsson
5
* Copyright © 2008,2009 Teddy Hogeborn
6
* Copyright © 2008,2009 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
26
asprintf(), O_CLOEXEC */
27
27
#include <stddef.h> /* size_t, NULL */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
29
realloc() */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
29
EXIT_SUCCESS, realloc() */
30
30
#include <stdbool.h> /* bool, true, false */
31
#include <stdio.h> /* fileno(), fprintf(),
31
#include <stdio.h> /* perror, fileno(), fprintf(),
32
32
stderr, STDOUT_FILENO */
33
33
#include <sys/types.h> /* DIR, fdopendir(), stat(), struct
34
34
stat, waitpid(), WIFEXITED(),
54
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
55
55
FD_CLOEXEC */
56
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal(), strcmp(), strncmp() */
57
strsignal() */
58
58
#include <errno.h> /* errno */
59
59
#include <argp.h> /* struct argp_option, struct
60
60
argp_state, struct argp,
68
68
*/
69
69
#include <errno.h> /* errno, EBADF */
70
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
71
#include <sysexits.h> /* EX_OSERR, EX_USAGE, EX_IOERR,
72
EX_CONFIG, EX_UNAVAILABLE, EX_OK */
73
#include <errno.h> /* errno */
74
#include <error.h> /* error() */
71
#include <sysexits.h> /* EX_OSERR, EX_USAGE */
75
72
76
73
#define BUFFER_SIZE 256
77
74
79
76
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
80
77
81
78
const char *argp_program_version = "plugin-runner " VERSION;
82
const char *argp_program_bug_address = "<mandos@recompile.se>";
79
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
83
80
84
81
typedef struct plugin{
85
82
char *name; /* can be NULL or any plugin name */
171
168
}
172
169
173
170
/* Helper function for add_argument and add_environment */
174
__attribute__((nonnull))
175
171
static bool add_to_char_array(const char *new, char ***array,
176
172
int *len){
177
173
/* Resize the pointed-to array to hold one more pointer */
178
char **new_array = NULL;
179
174
do {
180
new_array = realloc(*array, sizeof(char *)
181
* (size_t) ((*len) + 2));
182
} while(new_array == NULL and errno == EINTR);
175
*array = realloc(*array, sizeof(char *)
176
* (size_t) ((*len) + 2));
177
} while(*array == NULL and errno == EINTR);
183
178
/* Malloc check */
184
if(new_array == NULL){
179
if(*array == NULL){
185
180
return false;
186
181
}
187
*array = new_array;
188
182
/* Make a copy of the new string */
189
183
char *copy;
190
184
do {
202
196
}
203
197
204
198
/* Add to a plugin's argument vector */
205
__attribute__((nonnull(2)))
206
199
static bool add_argument(plugin *p, const char *arg){
207
200
if(p == NULL){
208
201
return false;
211
204
}
212
205
213
206
/* Add to a plugin's environment */
214
__attribute__((nonnull(2)))
215
207
static bool add_environment(plugin *p, const char *def, bool replace){
216
208
if(p == NULL){
217
209
return false;
219
211
/* namelen = length of name of environment variable */
220
212
size_t namelen = (size_t)(strchrnul(def, '=') - def);
221
213
/* Search for this environment variable */
222
for(char **envdef = p->environ; *envdef != NULL; envdef++){
223
if(strncmp(*envdef, def, namelen + 1) == 0){
214
for(char **e = p->environ; *e != NULL; e++){
215
if(strncmp(*e, def, namelen + 1) == 0){
224
216
/* It already exists */
225
217
if(replace){
226
char *new_envdef;
218
char *new;
227
219
do {
228
new_envdef = realloc(*envdef, strlen(def) + 1);
229
} while(new_envdef == NULL and errno == EINTR);
230
if(new_envdef == NULL){
220
new = realloc(*e, strlen(def) + 1);
221
} while(new == NULL and errno == EINTR);
222
if(new == NULL){
231
223
return false;
232
224
}
233
*envdef = new_envdef;
234
strcpy(*envdef, def);
225
*e = new;
226
strcpy(*e, def);
235
227
}
236
228
return true;
237
229
}
273
265
/* No child processes */
274
266
break;
275
267
}
276
error(0, errno, "waitpid");
268
perror("waitpid");
277
269
}
278
270
279
271
/* A child exited, find it in process_list */
291
283
}
292
284
293
285
/* Prints out a password to stdout */
294
__attribute__((nonnull))
295
286
static bool print_out_password(const char *buffer, size_t length){
296
287
ssize_t ret;
297
288
for(size_t written = 0; written < length; written += (size_t)ret){
305
296
}
306
297
307
298
/* Removes and free a plugin from the plugin list */
308
__attribute__((nonnull))
309
299
static void free_plugin(plugin *plugin_node){
310
300
311
301
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
366
356
sigemptyset(&sigchld_action.sa_mask);
367
357
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
368
358
if(ret == -1){
369
error(0, errno, "sigaddset");
370
exitstatus = EX_OSERR;
359
perror("sigaddset");
360
exitstatus = EXIT_FAILURE;
371
361
goto fallback;
372
362
}
373
363
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
374
364
if(ret == -1){
375
error(0, errno, "sigaction");
376
exitstatus = EX_OSERR;
365
perror("sigaction");
366
exitstatus = EXIT_FAILURE;
377
367
goto fallback;
378
368
}
379
369
423
413
{ .name = NULL }
424
414
};
425
415
426
__attribute__((nonnull(3)))
427
416
error_t parse_opt(int key, char *arg, struct argp_state *state){
428
417
errno = 0;
429
418
switch(key){
430
419
char *tmp;
431
intmax_t tmp_id;
420
intmax_t tmpmax;
432
421
case 'g': /* --global-options */
433
422
{
434
423
char *plugin_option;
507
496
/* This is already done by parse_opt_config_file() */
508
497
break;
509
498
case 130: /* --userid */
510
tmp_id = strtoimax(arg, &tmp, 10);
499
tmpmax = strtoimax(arg, &tmp, 10);
511
500
if(errno != 0 or tmp == arg or *tmp != '\0'
512
or tmp_id != (uid_t)tmp_id){
501
or tmpmax != (uid_t)tmpmax){
513
502
argp_error(state, "Bad user ID number: \"%s\", using %"
514
503
PRIdMAX, arg, (intmax_t)uid);
515
504
break;
516
505
}
517
uid = (uid_t)tmp_id;
506
uid = (uid_t)tmpmax;
518
507
break;
519
508
case 131: /* --groupid */
520
tmp_id = strtoimax(arg, &tmp, 10);
509
tmpmax = strtoimax(arg, &tmp, 10);
521
510
if(errno != 0 or tmp == arg or *tmp != '\0'
522
or tmp_id != (gid_t)tmp_id){
511
or tmpmax != (gid_t)tmpmax){
523
512
argp_error(state, "Bad group ID number: \"%s\", using %"
524
513
PRIdMAX, arg, (intmax_t)gid);
525
514
break;
526
515
}
527
gid = (gid_t)tmp_id;
516
gid = (gid_t)tmpmax;
528
517
break;
529
518
case 132: /* --debug */
530
519
debug = true;
609
598
case ENOMEM:
610
599
default:
611
600
errno = ret;
612
error(0, errno, "argp_parse");
601
perror("argp_parse");
613
602
exitstatus = EX_OSERR;
614
603
goto fallback;
615
604
case EINVAL:
636
625
custom_argc = 1;
637
626
custom_argv = malloc(sizeof(char*) * 2);
638
627
if(custom_argv == NULL){
639
error(0, errno, "malloc");
640
exitstatus = EX_OSERR;
628
perror("malloc");
629
exitstatus = EXIT_FAILURE;
641
630
goto fallback;
642
631
}
643
632
custom_argv[0] = argv[0];
659
648
}
660
649
new_arg = strdup(p);
661
650
if(new_arg == NULL){
662
error(0, errno, "strdup");
663
exitstatus = EX_OSERR;
651
perror("strdup");
652
exitstatus = EXIT_FAILURE;
664
653
free(org_line);
665
654
goto fallback;
666
655
}
667
656
668
657
custom_argc += 1;
669
{
670
char **new_argv = realloc(custom_argv, sizeof(char *)
671
* ((unsigned int)
672
custom_argc + 1));
673
if(new_argv == NULL){
674
error(0, errno, "realloc");
675
exitstatus = EX_OSERR;
676
free(new_arg);
677
free(org_line);
678
goto fallback;
679
} else {
680
custom_argv = new_argv;
681
}
658
custom_argv = realloc(custom_argv, sizeof(char *)
659
* ((unsigned int) custom_argc + 1));
660
if(custom_argv == NULL){
661
perror("realloc");
662
exitstatus = EXIT_FAILURE;
663
free(org_line);
664
goto fallback;
682
665
}
683
666
custom_argv[custom_argc-1] = new_arg;
684
667
custom_argv[custom_argc] = NULL;
688
671
ret = fclose(conffp);
689
672
} while(ret == EOF and errno == EINTR);
690
673
if(ret == EOF){
691
error(0, errno, "fclose");
692
exitstatus = EX_IOERR;
674
perror("fclose");
675
exitstatus = EXIT_FAILURE;
693
676
goto fallback;
694
677
}
695
678
free(org_line);
697
680
/* Check for harmful errors and go to fallback. Other errors might
698
681
not affect opening plugins */
699
682
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
700
error(0, errno, "fopen");
701
exitstatus = EX_OSERR;
683
perror("fopen");
684
exitstatus = EXIT_FAILURE;
702
685
goto fallback;
703
686
}
704
687
}
714
697
case ENOMEM:
715
698
default:
716
699
errno = ret;
717
error(0, errno, "argp_parse");
700
perror("argp_parse");
718
701
exitstatus = EX_OSERR;
719
702
goto fallback;
720
703
case EINVAL:
734
717
case ENOMEM:
735
718
default:
736
719
errno = ret;
737
error(0, errno, "argp_parse");
720
perror("argp_parse");
738
721
exitstatus = EX_OSERR;
739
722
goto fallback;
740
723
case EINVAL:
756
739
}
757
740
}
758
741
759
if(getuid() == 0){
760
/* Work around Debian bug #633582:
761
<http://bugs.debian.org/633582> */
762
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
763
if(plugindir_fd == -1){
764
error(0, errno, "open");
765
} else {
766
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
767
if(ret == -1){
768
error(0, errno, "fstat");
769
} else {
770
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
771
ret = fchown(plugindir_fd, uid, gid);
772
if(ret == -1){
773
error(0, errno, "fchown");
774
}
775
}
776
}
777
TEMP_FAILURE_RETRY(close(plugindir_fd));
778
}
779
}
780
781
/* Lower permissions */
782
ret = setgid(gid);
742
/* Strip permissions down to nobody */
743
setgid(gid);
783
744
if(ret == -1){
784
error(0, errno, "setgid");
745
perror("setgid");
785
746
}
786
747
ret = setuid(uid);
787
748
if(ret == -1){
788
error(0, errno, "setuid");
749
perror("setuid");
789
750
}
790
751
791
752
/* Open plugin directory with close_on_exec flag */
809
770
);
810
771
}
811
772
if(dir_fd == -1){
812
error(0, errno, "Could not open plugin dir");
813
exitstatus = EX_UNAVAILABLE;
773
perror("Could not open plugin dir");
774
exitstatus = EXIT_FAILURE;
814
775
goto fallback;
815
776
}
816
777
818
779
/* Set the FD_CLOEXEC flag on the directory */
819
780
ret = set_cloexec_flag(dir_fd);
820
781
if(ret < 0){
821
error(0, errno, "set_cloexec_flag");
782
perror("set_cloexec_flag");
822
783
TEMP_FAILURE_RETRY(close(dir_fd));
823
exitstatus = EX_OSERR;
784
exitstatus = EXIT_FAILURE;
824
785
goto fallback;
825
786
}
826
787
#endif /* O_CLOEXEC */
827
788
828
789
dir = fdopendir(dir_fd);
829
790
if(dir == NULL){
830
error(0, errno, "Could not open plugin dir");
791
perror("Could not open plugin dir");
831
792
TEMP_FAILURE_RETRY(close(dir_fd));
832
exitstatus = EX_OSERR;
793
exitstatus = EXIT_FAILURE;
833
794
goto fallback;
834
795
}
835
796
}
845
806
/* All directory entries have been processed */
846
807
if(dirst == NULL){
847
808
if(errno == EBADF){
848
error(0, errno, "readdir");
849
exitstatus = EX_IOERR;
809
perror("readdir");
810
exitstatus = EXIT_FAILURE;
850
811
goto fallback;
851
812
}
852
813
break;
858
819
{
859
820
bool bad_name = false;
860
821
861
const char * const bad_prefixes[] = { ".", "#", NULL };
822
const char const *bad_prefixes[] = { ".", "#", NULL };
862
823
863
const char * const bad_suffixes[] = { "~", "#", ".dpkg-new",
824
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
864
825
".dpkg-old",
865
826
".dpkg-bak",
866
827
".dpkg-divert", NULL };
867
#ifdef __GNUC__
868
#pragma GCC diagnostic push
869
#pragma GCC diagnostic ignored "-Wcast-qual"
870
#endif
871
for(const char **pre = (const char **)bad_prefixes;
872
*pre != NULL; pre++){
873
#ifdef __GNUC__
874
#pragma GCC diagnostic pop
875
#endif
828
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
876
829
size_t pre_len = strlen(*pre);
877
830
if((d_name_len >= pre_len)
878
831
and strncmp((dirst->d_name), *pre, pre_len) == 0){
887
840
if(bad_name){
888
841
continue;
889
842
}
890
#ifdef __GNUC__
891
#pragma GCC diagnostic push
892
#pragma GCC diagnostic ignored "-Wcast-qual"
893
#endif
894
for(const char **suf = (const char **)bad_suffixes;
895
*suf != NULL; suf++){
896
#ifdef __GNUC__
897
#pragma GCC diagnostic pop
898
#endif
843
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
899
844
size_t suf_len = strlen(*suf);
900
845
if((d_name_len >= suf_len)
901
and (strcmp((dirst->d_name) + d_name_len-suf_len, *suf)
846
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
902
847
== 0)){
903
848
if(debug){
904
849
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
924
869
dirst->d_name));
925
870
}
926
871
if(ret < 0){
927
error(0, errno, "asprintf");
872
perror("asprintf");
928
873
continue;
929
874
}
930
875
931
876
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
932
877
if(ret == -1){
933
error(0, errno, "stat");
878
perror("stat");
934
879
free(filename);
935
880
continue;
936
881
}
948
893
949
894
plugin *p = getplugin(dirst->d_name);
950
895
if(p == NULL){
951
error(0, errno, "getplugin");
896
perror("getplugin");
952
897
free(filename);
953
898
continue;
954
899
}
966
911
if(g != NULL){
967
912
for(char **a = g->argv + 1; *a != NULL; a++){
968
913
if(not add_argument(p, *a)){
969
error(0, errno, "add_argument");
914
perror("add_argument");
970
915
}
971
916
}
972
917
/* Add global environment variables */
973
918
for(char **e = g->environ; *e != NULL; e++){
974
919
if(not add_environment(p, *e, false)){
975
error(0, errno, "add_environment");
920
perror("add_environment");
976
921
}
977
922
}
978
923
}
983
928
if(p->environ[0] != NULL){
984
929
for(char **e = environ; *e != NULL; e++){
985
930
if(not add_environment(p, *e, false)){
986
error(0, errno, "add_environment");
931
perror("add_environment");
987
932
}
988
933
}
989
934
}
991
936
int pipefd[2];
992
937
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
993
938
if(ret == -1){
994
error(0, errno, "pipe");
995
exitstatus = EX_OSERR;
939
perror("pipe");
940
exitstatus = EXIT_FAILURE;
996
941
goto fallback;
997
942
}
998
943
/* Ask OS to automatic close the pipe on exec */
999
944
ret = set_cloexec_flag(pipefd[0]);
1000
945
if(ret < 0){
1001
error(0, errno, "set_cloexec_flag");
1002
exitstatus = EX_OSERR;
946
perror("set_cloexec_flag");
947
exitstatus = EXIT_FAILURE;
1003
948
goto fallback;
1004
949
}
1005
950
ret = set_cloexec_flag(pipefd[1]);
1006
951
if(ret < 0){
1007
error(0, errno, "set_cloexec_flag");
1008
exitstatus = EX_OSERR;
952
perror("set_cloexec_flag");
953
exitstatus = EXIT_FAILURE;
1009
954
goto fallback;
1010
955
}
1011
956
/* Block SIGCHLD until process is safely in process list */
1013
958
&sigchld_action.sa_mask,
1014
959
NULL));
1015
960
if(ret < 0){
1016
error(0, errno, "sigprocmask");
1017
exitstatus = EX_OSERR;
961
perror("sigprocmask");
962
exitstatus = EXIT_FAILURE;
1018
963
goto fallback;
1019
964
}
1020
965
/* Starting a new process to be watched */
1023
968
pid = fork();
1024
969
} while(pid == -1 and errno == EINTR);
1025
970
if(pid == -1){
1026
error(0, errno, "fork");
1027
exitstatus = EX_OSERR;
971
perror("fork");
972
exitstatus = EXIT_FAILURE;
1028
973
goto fallback;
1029
974
}
1030
975
if(pid == 0){
1031
976
/* this is the child process */
1032
977
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1033
978
if(ret < 0){
1034
error(0, errno, "sigaction");
1035
_exit(EX_OSERR);
979
perror("sigaction");
980
_exit(EXIT_FAILURE);
1036
981
}
1037
982
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1038
983
if(ret < 0){
1039
error(0, errno, "sigprocmask");
1040
_exit(EX_OSERR);
984
perror("sigprocmask");
985
_exit(EXIT_FAILURE);
1041
986
}
1042
987
1043
988
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1044
989
if(ret == -1){
1045
error(0, errno, "dup2");
1046
_exit(EX_OSERR);
990
perror("dup2");
991
_exit(EXIT_FAILURE);
1047
992
}
1048
993
1049
994
if(dirfd(dir) < 0){
1053
998
}
1054
999
if(p->environ[0] == NULL){
1055
1000
if(execv(filename, p->argv) < 0){
1056
error(0, errno, "execv for %s", filename);
1057
_exit(EX_OSERR);
1001
perror("execv");
1002
_exit(EXIT_FAILURE);
1058
1003
}
1059
1004
} else {
1060
1005
if(execve(filename, p->argv, p->environ) < 0){
1061
error(0, errno, "execve for %s", filename);
1062
_exit(EX_OSERR);
1006
perror("execve");
1007
_exit(EXIT_FAILURE);
1063
1008
}
1064
1009
}
1065
1010
/* no return */
1070
1015
free(filename);
1071
1016
plugin *new_plugin = getplugin(dirst->d_name);
1072
1017
if(new_plugin == NULL){
1073
error(0, errno, "getplugin");
1018
perror("getplugin");
1074
1019
ret = (int)(TEMP_FAILURE_RETRY
1075
1020
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1076
1021
NULL)));
1077
1022
if(ret < 0){
1078
error(0, errno, "sigprocmask");
1023
perror("sigprocmask");
1079
1024
}
1080
exitstatus = EX_OSERR;
1025
exitstatus = EXIT_FAILURE;
1081
1026
goto fallback;
1082
1027
}
1083
1028
1090
1035
&sigchld_action.sa_mask,
1091
1036
NULL));
1092
1037
if(ret < 0){
1093
error(0, errno, "sigprocmask");
1094
exitstatus = EX_OSERR;
1038
perror("sigprocmask");
1039
exitstatus = EXIT_FAILURE;
1095
1040
goto fallback;
1096
1041
}
1097
1042
1098
#if defined (__GNUC__) and defined (__GLIBC__)
1099
#if not __GLIBC_PREREQ(2, 16)
1100
#pragma GCC diagnostic push
1101
#pragma GCC diagnostic ignored "-Wsign-conversion"
1102
#endif
1103
#endif
1104
1043
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1105
-Wconversion in GNU libc
1106
before 2.16 */
1107
#if defined (__GNUC__) and defined (__GLIBC__)
1108
#if not __GLIBC_PREREQ(2, 16)
1109
#pragma GCC diagnostic pop
1110
#endif
1111
#endif
1044
-Wconversion */
1112
1045
1113
1046
if(maxfd < new_plugin->fd){
1114
1047
maxfd = new_plugin->fd;
1135
1068
fd_set rfds = rfds_all;
1136
1069
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
1137
1070
if(select_ret == -1 and errno != EINTR){
1138
error(0, errno, "select");
1139
exitstatus = EX_OSERR;
1071
perror("select");
1072
exitstatus = EXIT_FAILURE;
1140
1073
goto fallback;
1141
1074
}
1142
1075
/* OK, now either a process completed, or something can be read
1168
1101
}
1169
1102
1170
1103
/* Remove the plugin */
1171
#if defined (__GNUC__) and defined (__GLIBC__)
1172
#if not __GLIBC_PREREQ(2, 16)
1173
#pragma GCC diagnostic push
1174
#pragma GCC diagnostic ignored "-Wsign-conversion"
1175
#endif
1176
#endif
1177
1104
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1178
-Wconversion in GNU libc
1179
before 2.16 */
1180
#if defined (__GNUC__) and defined (__GLIBC__)
1181
#if not __GLIBC_PREREQ(2, 16)
1182
#pragma GCC diagnostic pop
1183
#endif
1184
#endif
1105
-Wconversion */
1185
1106
1186
1107
/* Block signal while modifying process_list */
1187
1108
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1189
1110
&sigchld_action.sa_mask,
1190
1111
NULL));
1191
1112
if(ret < 0){
1192
error(0, errno, "sigprocmask");
1193
exitstatus = EX_OSERR;
1113
perror("sigprocmask");
1114
exitstatus = EXIT_FAILURE;
1194
1115
goto fallback;
1195
1116
}
1196
1117
1203
1124
(sigprocmask(SIG_UNBLOCK,
1204
1125
&sigchld_action.sa_mask, NULL)));
1205
1126
if(ret < 0){
1206
error(0, errno, "sigprocmask");
1207
exitstatus = EX_OSERR;
1127
perror("sigprocmask");
1128
exitstatus = EXIT_FAILURE;
1208
1129
goto fallback;
1209
1130
}
1210
1131
1220
1141
bool bret = print_out_password(proc->buffer,
1221
1142
proc->buffer_length);
1222
1143
if(not bret){
1223
error(0, errno, "print_out_password");
1224
exitstatus = EX_IOERR;
1144
perror("print_out_password");
1145
exitstatus = EXIT_FAILURE;
1225
1146
}
1226
1147
goto fallback;
1227
1148
}
1228
1149
1229
1150
/* This process has not completed. Does it have any output? */
1230
#if defined (__GNUC__) and defined (__GLIBC__)
1231
#if not __GLIBC_PREREQ(2, 16)
1232
#pragma GCC diagnostic push
1233
#pragma GCC diagnostic ignored "-Wsign-conversion"
1234
#endif
1235
#endif
1236
1151
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1237
1152
warning from
1238
-Wconversion
1239
in GNU libc
1240
before
1241
2.16 */
1242
#if defined (__GNUC__) and defined (__GLIBC__)
1243
#if not __GLIBC_PREREQ(2, 16)
1244
#pragma GCC diagnostic pop
1245
#endif
1246
#endif
1153
-Wconversion */
1247
1154
/* This process had nothing to say at this time */
1248
1155
proc = proc->next;
1249
1156
continue;
1250
1157
}
1251
1158
/* Before reading, make the process' data buffer large enough */
1252
1159
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1253
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1254
+ (size_t) BUFFER_SIZE);
1255
if(new_buffer == NULL){
1256
error(0, errno, "malloc");
1257
exitstatus = EX_OSERR;
1160
proc->buffer = realloc(proc->buffer, proc->buffer_size
1161
+ (size_t) BUFFER_SIZE);
1162
if(proc->buffer == NULL){
1163
perror("malloc");
1164
exitstatus = EXIT_FAILURE;
1258
1165
goto fallback;
1259
1166
}
1260
proc->buffer = new_buffer;
1261
1167
proc->buffer_size += BUFFER_SIZE;
1262
1168
}
1263
1169
/* Read from the process */
1282
1188
1283
1189
fallback:
1284
1190
1285
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1286
and exitstatus != EX_OK)){
1191
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1287
1192
/* Fallback if all plugins failed, none are found or an error
1288
1193
occured */
1289
1194
bool bret;
1297
1202
}
1298
1203
bret = print_out_password(passwordbuffer, len);
1299
1204
if(not bret){
1300
error(0, errno, "print_out_password");
1301
exitstatus = EX_IOERR;
1205
perror("print_out_password");
1206
exitstatus = EXIT_FAILURE;
1302
1207
}
1303
1208
}
1304
1209
1305
1210
/* Restore old signal handler */
1306
1211
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1307
1212
if(ret == -1){
1308
error(0, errno, "sigaction");
1309
exitstatus = EX_OSERR;
1213
perror("sigaction");
1214
exitstatus = EXIT_FAILURE;
1310
1215
}
1311
1216
1312
1217
if(custom_argv != NULL){
1327
1232
ret = kill(p->pid, SIGTERM);
1328
1233
if(ret == -1 and errno != ESRCH){
1329
1234
/* Set-uid proccesses might not get closed */
1330
error(0, errno, "kill");
1235
perror("kill");
1331
1236
}
1332
1237
}
1333
1238
}
1337
1242
ret = wait(NULL);
1338
1243
} while(ret >= 0);
1339
1244
if(errno != ECHILD){
1340
error(0, errno, "wait");
1245
perror("wait");
1341
1246
}
1342
1247
1343
1248
free_plugin_list();
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0