/mandos/trunk

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

  • Committer: Teddy Hogeborn
  • Date: 2015-07-09 20:32:52 UTC
  • Revision ID: teddy@recompile.se-20150709203252-u10p7trfsxc1a9yp
Install client Diffie-Hellman parameters into initramfs.

* debian/control (Package: mandos-client/Recommends): Added
  "gnutls-bin | openssl" (to generate DH parameters).
* debian/mandos-client.postinst (create_dh_params): New function
                                                    called on package
                                                    configure.
* plugins.d/mandos-client.c (main): Bug fix: Work around Debian bug
                                    #633582 also for the
                                    "client-dhparams.pem" file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
37
37
#include <sys/select.h>         /* fd_set, select(), FD_ZERO(),
38
38
                                   FD_SET(), FD_ISSET(), FD_CLR */
39
39
#include <sys/wait.h>           /* wait(), waitpid(), WIFEXITED(),
40
 
                                   WEXITSTATUS(), WTERMSIG() */
 
40
                                   WEXITSTATUS(), WTERMSIG(),
 
41
                                   WCOREDUMP() */
41
42
#include <sys/stat.h>           /* struct stat, fstat(), S_ISREG() */
42
43
#include <iso646.h>             /* and, or, not */
43
44
#include <dirent.h>             /* struct dirent, scandirat() */
700
701
        custom_argc += 1;
701
702
        {
702
703
          char **new_argv = realloc(custom_argv, sizeof(char *)
703
 
                                    * ((size_t)custom_argc + 1));
 
704
                                    * ((unsigned int)
 
705
                                       custom_argc + 1));
704
706
          if(new_argv == NULL){
705
707
            error(0, errno, "realloc");
706
708
            exitstatus = EX_OSERR;
825
827
          }
826
828
        }
827
829
      }
828
 
      close(plugindir_fd);
 
830
      TEMP_FAILURE_RETRY(close(plugindir_fd));
829
831
    }
830
832
  }
831
833
  
890
892
    return 1;
891
893
  }
892
894
  
 
895
#ifdef __GLIBC__
 
896
#if __GLIBC_PREREQ(2, 15)
893
897
  int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
894
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__ */
895
907
  if(numplugins == -1){
896
908
    error(0, errno, "Could not scan plugin dir");
897
909
    direntries = NULL;
913
925
    ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
914
926
    if(ret == -1){
915
927
      error(0, errno, "stat");
916
 
      close(plugin_fd);
 
928
      TEMP_FAILURE_RETRY(close(plugin_fd));
917
929
      free(direntries[i]);
918
930
      continue;
919
931
    }
928
940
                plugindir != NULL ? plugindir : PDIR,
929
941
                direntries[i]->d_name);
930
942
      }
931
 
      close(plugin_fd);
 
943
      TEMP_FAILURE_RETRY(close(plugin_fd));
932
944
      free(direntries[i]);
933
945
      continue;
934
946
    }
936
948
    plugin *p = getplugin(direntries[i]->d_name);
937
949
    if(p == NULL){
938
950
      error(0, errno, "getplugin");
939
 
      close(plugin_fd);
 
951
      TEMP_FAILURE_RETRY(close(plugin_fd));
940
952
      free(direntries[i]);
941
953
      continue;
942
954
    }
945
957
        fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
946
958
                direntries[i]->d_name);
947
959
      }
948
 
      close(plugin_fd);
 
960
      TEMP_FAILURE_RETRY(close(plugin_fd));
949
961
      free(direntries[i]);
950
962
      continue;
951
963
    }
991
1003
    if(pipefd[0] >= FD_SETSIZE){
992
1004
      fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
993
1005
              FD_SETSIZE);
994
 
      close(pipefd[0]);
995
 
      close(pipefd[1]);
 
1006
      TEMP_FAILURE_RETRY(close(pipefd[0]));
 
1007
      TEMP_FAILURE_RETRY(close(pipefd[1]));
996
1008
      exitstatus = EX_OSERR;
997
1009
      free(direntries[i]);
998
1010
      goto fallback;
1002
1014
    ret = set_cloexec_flag(pipefd[0]);
1003
1015
    if(ret < 0){
1004
1016
      error(0, errno, "set_cloexec_flag");
1005
 
      close(pipefd[0]);
1006
 
      close(pipefd[1]);
 
1017
      TEMP_FAILURE_RETRY(close(pipefd[0]));
 
1018
      TEMP_FAILURE_RETRY(close(pipefd[1]));
1007
1019
      exitstatus = EX_OSERR;
1008
1020
      free(direntries[i]);
1009
1021
      goto fallback;
1011
1023
    ret = set_cloexec_flag(pipefd[1]);
1012
1024
    if(ret < 0){
1013
1025
      error(0, errno, "set_cloexec_flag");
1014
 
      close(pipefd[0]);
1015
 
      close(pipefd[1]);
 
1026
      TEMP_FAILURE_RETRY(close(pipefd[0]));
 
1027
      TEMP_FAILURE_RETRY(close(pipefd[1]));
1016
1028
      exitstatus = EX_OSERR;
1017
1029
      free(direntries[i]);
1018
1030
      goto fallback;
1037
1049
      error(0, errno, "fork");
1038
1050
      TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1039
1051
                                     &sigchld_action.sa_mask, NULL));
1040
 
      close(pipefd[0]);
1041
 
      close(pipefd[1]);
 
1052
      TEMP_FAILURE_RETRY(close(pipefd[0]));
 
1053
      TEMP_FAILURE_RETRY(close(pipefd[1]));
1042
1054
      exitstatus = EX_OSERR;
1043
1055
      free(direntries[i]);
1044
1056
      goto fallback;
1072
1084
      /* no return */
1073
1085
    }
1074
1086
    /* Parent process */
1075
 
    close(pipefd[1]);           /* Close unused write end of pipe */
1076
 
    close(plugin_fd);
 
1087
    TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
 
1088
                                             pipe */
 
1089
    TEMP_FAILURE_RETRY(close(plugin_fd));
1077
1090
    plugin *new_plugin = getplugin(direntries[i]->d_name);
1078
1091
    if(new_plugin == NULL){
1079
1092
      error(0, errno, "getplugin");
1103
1116
      goto fallback;
1104
1117
    }
1105
1118
    
1106
 
    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
1107
1133
    
1108
1134
    if(maxfd < new_plugin->fd){
1109
1135
      maxfd = new_plugin->fd;
1112
1138
  
1113
1139
  free(direntries);
1114
1140
  direntries = NULL;
1115
 
  close(dir_fd);
 
1141
  TEMP_FAILURE_RETRY(close(dir_fd));
1116
1142
  dir_fd = -1;
1117
1143
  free_plugin(getplugin(NULL));
1118
1144
  
1158
1184
                      (intmax_t) (proc->pid),
1159
1185
                      WTERMSIG(proc->status),
1160
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));
1161
1190
            }
1162
1191
          }
1163
1192
          
1164
1193
          /* Remove the plugin */
1165
 
          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
1166
1208
          
1167
1209
          /* Block signal while modifying process_list */
1168
1210
          ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1208
1250
      }
1209
1251
      
1210
1252
      /* This process has not completed.  Does it have any output? */
1211
 
      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
1212
1270
        /* This process had nothing to say at this time */
1213
1271
        proc = proc->next;
1214
1272
        continue;
1284
1342
  free(direntries);
1285
1343
  
1286
1344
  if(dir_fd != -1){
1287
 
    close(dir_fd);
 
1345
    TEMP_FAILURE_RETRY(close(dir_fd));
1288
1346
  }
1289
1347
  
1290
1348
  /* Kill the processes */