bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1 | /*  -*- coding: utf-8 -*- */
 | 
| 2 | /*
 | |
| 261
by Teddy Hogeborn * plugins.d/askpass-fifo.c: Fix name in header. | 3 |  * Mandos-client - get and decrypt data from a Mandos server
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 4 |  *
 | 
| 5 |  * This program is partly derived from an example program for an Avahi
 | |
| 6 |  * service browser, downloaded from
 | |
| 7 |  * <http://avahi.org/browser/examples/core-browse-services.c>.  This
 | |
| 8 |  * includes the following functions: "resolve_callback",
 | |
| 9 |  * "browse_callback", and parts of "main".
 | |
| 10 |  * 
 | |
| 28
by Teddy Hogeborn * server.conf: New file. | 11 |  * Everything else is
 | 
| 1234
by Teddy Hogeborn Update copyright year | 12 |  * Copyright © 2008-2021 Teddy Hogeborn
 | 
| 13 |  * Copyright © 2008-2021 Björn Påhlsson
 | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 14 |  * 
 | 
| 907
by Teddy Hogeborn Alter copyright notices slightly. Actual license is unchanged! | 15 |  * This file is part of Mandos.
 | 
| 16 |  * 
 | |
| 17 |  * Mandos is free software: you can redistribute it and/or modify it
 | |
| 18 |  * under the terms of the GNU General Public License as published by
 | |
| 19 |  * the Free Software Foundation, either version 3 of the License, or
 | |
| 20 |  * (at your option) any later version.
 | |
| 21 |  * 
 | |
| 22 |  * Mandos is distributed in the hope that it will be useful, but
 | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 23 |  * WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
| 24 |  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | |
| 25 |  * General Public License for more details.
 | |
| 26 |  * 
 | |
| 27 |  * You should have received a copy of the GNU General Public License
 | |
| 907
by Teddy Hogeborn Alter copyright notices slightly. Actual license is unchanged! | 28 |  * along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 29 |  * 
 | 
| 505.1.2
by Teddy Hogeborn Change "fukt.bsnet.se" to "recompile.se" throughout. | 30 |  * Contact the authors at <mandos@recompile.se>.
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 31 |  */
 | 
| 32 | ||
| 28
by Teddy Hogeborn * server.conf: New file. | 33 | /* Needed by GPGME, specifically gpgme_data_seek() */
 | 
| 317
by Teddy Hogeborn Use "getconf" to get correct LFS compile and link flags. | 34 | #ifndef _LARGEFILE_SOURCE
 | 
| 13
by Björn Påhlsson Added following support: | 35 | #define _LARGEFILE_SOURCE
 | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 36 | #endif /* not _LARGEFILE_SOURCE */ | 
| 317
by Teddy Hogeborn Use "getconf" to get correct LFS compile and link flags. | 37 | #ifndef _FILE_OFFSET_BITS
 | 
| 13
by Björn Påhlsson Added following support: | 38 | #define _FILE_OFFSET_BITS 64
 | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 39 | #endif /* not _FILE_OFFSET_BITS */ | 
| 13
by Björn Påhlsson Added following support: | 40 | |
| 1233
by Teddy Hogeborn Fix #include headers | 41 | #define _GNU_SOURCE /* program_invocation_short_name, | 
| 42 | 				   TEMP_FAILURE_RETRY(), O_CLOEXEC,
 | |
| 43 | 				   scandirat(), asprintf() */
 | |
| 304
by Teddy Hogeborn Four new interrelated features: | 44 | #include <stdbool.h> /* bool, false, true */ | 
| 1233
by Teddy Hogeborn Fix #include headers | 45 | #include <argp.h> /* argp_program_version, | 
| 46 | argp_program_bug_address, | |
| 47 | struct argp_option, | |
| 48 | struct argp_state, argp_error(), | |
| 49 | argp_state_help, | |
| 50 | ARGP_HELP_STD_HELP, | |
| 51 | ARGP_HELP_EXIT_ERR, | |
| 52 | ARGP_HELP_EXIT_OK, ARGP_HELP_USAGE, | |
| 53 | argp_err_exit_status, | |
| 54 | ARGP_ERR_UNKNOWN, struct argp, | |
| 55 | argp_parse(), ARGP_IN_ORDER, | |
| 56 | ARGP_NO_HELP */ | |
| 57 | #include <stddef.h> /* NULL, size_t */ | |
| 58 | #include <sys/types.h> /* uid_t, gid_t, sig_atomic_t, | |
| 59 | seteuid(), setuid(), pid_t, | |
| 60 | setgid(), getuid(), getgid() */ | |
| 61 | #include <unistd.h> /* uid_t, gid_t, TEMP_FAILURE_RETRY(), | |
| 62 | seteuid(), setuid(), close(), | |
| 63 | ssize_t, read(), fork(), setgid(), | |
| 64 | _exit(), dup2(), STDIN_FILENO, | |
| 65 | STDERR_FILENO, STDOUT_FILENO, | |
| 66 | fexecve(), write(), getuid(), | |
| 67 | getgid(), fchown(), symlink(), | |
| 68 | sleep(), unlinkat(), pause() */ | |
| 69 | #include <netinet/in.h> /* in_port_t, struct sockaddr_in6, | |
| 70 | sa_family_t, struct sockaddr_in, | |
| 71 | htons(), IN6_IS_ADDR_LINKLOCAL, | |
| 72 | INET_ADDRSTRLEN, INET6_ADDRSTRLEN, | |
| 73 | ntohl(), IPPROTO_IP */ | |
| 74 | #include <time.h> /* struct timespec, clock_gettime(), | |
| 75 | CLOCK_MONOTONIC, time_t, struct tm, | |
| 76 | gmtime_r(), clock_settime(), | |
| 77 | CLOCK_REALTIME, nanosleep() */ | |
| 78 | #include <errno.h> /* errno, | |
| 79 | program_invocation_short_name, | |
| 80 | EINTR, EINVAL, ENETUNREACH, | |
| 813
by Teddy Hogeborn Client: Remove new key directory introduced in GnuPG 2.1 | 81 | EHOSTUNREACH, ECONNREFUSED, EPROTO, | 
| 1233
by Teddy Hogeborn Fix #include headers | 82 | EIO, ENOENT, ENXIO, error_t, | 
| 83 | ENOMEM, EISDIR, ENOTEMPTY */ | |
| 84 | #include <stdio.h> /* fprintf(), stderr, perror(), FILE, | |
| 85 | vfprintf(), off_t, SEEK_SET, | |
| 86 | stdout, fwrite(), ferror(), | |
| 87 | fflush(), asprintf() */ | |
| 88 | #include <stdarg.h> /* va_list, va_start(), vfprintf() */ | |
| 89 | #include <stdlib.h> /* realloc(), free(), malloc(), | |
| 90 | getenv(), EXIT_FAILURE, setenv(), | |
| 91 | EXIT_SUCCESS, strtof(), strtod(), | |
| 92 | srand(), mkdtemp(), abort() */ | |
| 93 | #include <string.h> /* strdup(), strcmp(), strlen(), | |
| 94 | strerror(), strncpy(), strspn(), | |
| 95 | memcpy(), strrchr(), strchr(), | |
| 96 | strsignal() */ | |
| 97 | #include <fcntl.h> /* open(), O_RDONLY, O_DIRECTORY, | |
| 98 | O_PATH, O_CLOEXEC, openat(), | |
| 99 | O_NOFOLLOW, AT_REMOVEDIR */ | |
| 100 | #include <iso646.h> /* or, and, not */ | |
| 101 | #include <sys/stat.h> /* struct stat, fstat(), fstatat(), | |
| 102 | S_ISREG(), S_IXUSR, S_IXGRP, | |
| 103 | S_IXOTH, lstat() */ | |
| 104 | #include <net/if.h> /* IF_NAMESIZE, if_indextoname(), | |
| 105 | if_nametoindex(), SIOCGIFFLAGS, | |
| 106 | IFF_LOOPBACK, IFF_POINTOPOINT, | |
| 107 | IFF_BROADCAST, IFF_NOARP, IFF_UP, | |
| 108 | IFF_RUNNING, SIOCSIFFLAGS */ | |
| 109 | #include <sysexits.h> /* EX_NOPERM, EX_OSERR, | |
| 110 | EX_UNAVAILABLE, EX_USAGE */ | |
| 111 | #include <grp.h> /* setgroups() */ | |
| 505.3.3
by teddy at bsnet * plugins.d/mandos-client.c: Prefix all printouts with "Mandos plugin | 112 | #include <sys/wait.h> /* waitpid(), WIFEXITED(), | 
| 1233
by Teddy Hogeborn Fix #include headers | 113 | WEXITSTATUS(), WIFSIGNALED(), | 
| 114 | WTERMSIG() */ | |
| 115 | #include <signal.h> /* kill(), SIGTERM, struct sigaction, | |
| 116 | SIG_DFL, sigemptyset(), | |
| 117 | sigaddset(), SIGINT, SIGHUP, | |
| 118 | SIG_IGN, raise() */ | |
| 119 | #include <sys/socket.h> /* struct sockaddr_storage, AF_INET6, | |
| 120 | PF_INET6, AF_INET, PF_INET, | |
| 121 | socket(), SOCK_STREAM, | |
| 122 | SOCK_CLOEXEC, struct sockaddr, | |
| 123 | connect(), SOCK_DGRAM */ | |
| 124 | #include <argz.h> /* argz_next(), argz_add_sep(), | |
| 125 | argz_delete(), argz_stringify(), | |
| 126 | argz_add(), argz_count() */ | |
| 127 | #include <inttypes.h> /* PRIuMAX, uintmax_t, uint32_t, | |
| 128 | PRIdMAX, PRIu16, intmax_t, | |
| 129 | strtoimax() */ | |
| 130 | #include <arpa/inet.h> /* inet_pton() */ | |
| 131 | #include <stdint.h> /* uint32_t, intptr_t, uint16_t */ | |
| 667
by Teddy Hogeborn Use getnameinfo() instead of inet_ntop() in mandos-client. | 132 | #include <netdb.h> /* getnameinfo(), NI_NUMERICHOST, | 
| 133 | EAI_SYSTEM, gai_strerror() */ | |
| 1233
by Teddy Hogeborn Fix #include headers | 134 | #include <sys/ioctl.h> /* ioctl() */ | 
| 135 | #include <dirent.h> /* struct dirent, scandirat(), | |
| 136 | alphasort(), scandir() */ | |
| 137 | #include <limits.h> /* INT_MAX */ | |
| 307
by Teddy Hogeborn Merge from Björn: | 138 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 139 | #ifdef __linux__
 | 
| 24.1.124
by Björn Påhlsson Added lower kernel loglevel to reduce clutter on system console. | 140 | #include <sys/klog.h> /* klogctl() */ | 
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 141 | #endif /* __linux__ */ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 142 | |
| 143 | /* Avahi */
 | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 144 | /* All Avahi types, constants and functions
 | 
| 145 |  Avahi*, avahi_*,
 | |
| 146 |  AVAHI_* */
 | |
| 147 | #include <avahi-core/core.h> | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 148 | #include <avahi-core/lookup.h> | 
| 24.1.29
by Björn Påhlsson Added more header file comments | 149 | #include <avahi-core/log.h> | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 150 | #include <avahi-common/simple-watch.h> | 
| 151 | #include <avahi-common/malloc.h> | |
| 152 | #include <avahi-common/error.h> | |
| 153 | ||
| 154 | /* GnuTLS */
 | |
| 76
by Teddy Hogeborn * plugins.d/password-request.c (init_gnutls_global): Renamed | 155 | #include <gnutls/gnutls.h> /* All GnuTLS types, constants and | 
| 1233
by Teddy Hogeborn Fix #include headers | 156 | functions: gnutls_*, GNUTLS_* */ | 
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 157 | #if GNUTLS_VERSION_NUMBER < 0x030600
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 158 | #include <gnutls/openpgp.h> | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 159 | /* gnutls_certificate_set_openpgp_key_file(), | 
| 160 | 			    GNUTLS_OPENPGP_FMT_BASE64 */
 | |
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 161 | #elif GNUTLS_VERSION_NUMBER >= 0x030606
 | 
| 1233
by Teddy Hogeborn Fix #include headers | 162 | #include <gnutls/x509.h> /* GNUTLS_PKCS_PLAIN, | 
| 163 | GNUTLS_PKCS_NULL_PASSWORD */ | |
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 164 | #endif
 | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 165 | |
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 166 | /* GPGME */
 | 
| 76
by Teddy Hogeborn * plugins.d/password-request.c (init_gnutls_global): Renamed | 167 | #include <gpgme.h> /* All GPGME types, constants and | 
| 168 | functions: | |
| 1233
by Teddy Hogeborn Fix #include headers | 169 | gpgme_*, GPG_ERR_NO_*, | 
| 170 | GPGME_IMPORT_* | |
| 171 | GPGME_PROTOCOL_OpenPGP */ | |
| 13
by Björn Påhlsson Added following support: | 172 | |
| 173 | #define BUFFER_SIZE 256
 | |
| 37
by Teddy Hogeborn Non-tested commit for merge purposes. | 174 | |
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 175 | #define PATHDIR "/conf/conf.d/mandos"
 | 
| 176 | #define SECKEY "seckey.txt"
 | |
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 177 | #define PUBKEY "pubkey.txt"
 | 
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 178 | #define TLS_PRIVKEY "tls-privkey.pem"
 | 
| 179 | #define TLS_PUBKEY "tls-pubkey.pem"
 | |
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 180 | #define HOOKDIR "/lib/mandos/network-hooks.d"
 | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 181 | |
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 182 | bool debug = false; | 
| 43
by Teddy Hogeborn * plugins.d/mandosclient.c: Cosmetic changes. | 183 | static const char mandos_protocol_version[] = "1"; | 
| 680
by Teddy Hogeborn Minor changes to minimize diff from last release. | 184 | const char *argp_program_version = "mandos-client " VERSION; | 
| 185 | const char *argp_program_bug_address = "<mandos@recompile.se>"; | |
| 237.2.33
by teddy at bsnet * plugins.d/mandos-client.c: An empty interface name now means to | 186 | static const char sys_class_net[] = "/sys/class/net"; | 
| 187 | char *connect_to = NULL; | |
| 505.3.4
by teddy at bsnet * plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the | 188 | const char *hookdir = HOOKDIR; | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 189 | int hookdir_fd = -1; | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 190 | uid_t uid = 65534; | 
| 191 | gid_t gid = 65534; | |
| 24.1.10
by Björn Påhlsson merge commit | 192 | |
| 485
by Teddy Hogeborn Merge from Björn. | 193 | /* Doubly linked list that need to be circularly linked when used */
 | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 194 | typedef struct server{ | 
| 195 | const char *ip; | |
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 196 | in_port_t port; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 197 | AvahiIfIndex if_index; | 
| 198 | int af; | |
| 199 | struct timespec last_seen; | |
| 200 | struct server *next; | |
| 201 | struct server *prev; | |
| 202 | } server; | |
| 203 | ||
| 42
by Teddy Hogeborn * plugins.d/mandosclient.c (start_mandos_communication): Change "to" | 204 | /* Used for passing in values through the Avahi callback functions */
 | 
| 13
by Björn Påhlsson Added following support: | 205 | typedef struct { | 
| 24.1.9
by Björn Påhlsson not working midwork... | 206 | AvahiServer *server; | 
| 13
by Björn Påhlsson Added following support: | 207 | gnutls_certificate_credentials_t cred; | 
| 24.1.9
by Björn Påhlsson not working midwork... | 208 | unsigned int dh_bits; | 
| 24.1.13
by Björn Påhlsson mandosclient | 209 | gnutls_dh_params_t dh_params; | 
| 24.1.9
by Björn Påhlsson not working midwork... | 210 | const char *priority; | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 211 | gpgme_ctx_t ctx; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 212 | server *current_server; | 
| 603
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): New "interfaces" and | 213 | char *interfaces; | 
| 214 | size_t interfaces_size; | |
| 24.1.9
by Björn Påhlsson not working midwork... | 215 | } mandos_context; | 
| 13
by Björn Påhlsson Added following support: | 216 | |
| 601
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Removed "simple_poll" | 217 | /* global so signal handler can reach it*/
 | 
| 218 | AvahiSimplePoll *simple_poll; | |
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 219 | |
| 371
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Always fail and | 220 | sig_atomic_t quit_now = 0; | 
| 221 | int signal_received = 0; | |
| 222 | ||
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 223 | /* Function to use when printing errors */
 | 
| 224 | void perror_plus(const char *print_text){ | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 225 | int e = errno; | 
| 485
by Teddy Hogeborn Merge from Björn. | 226 | fprintf(stderr, "Mandos plugin %s: ", | 
| 227 | program_invocation_short_name); | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 228 | errno = e; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 229 | perror(print_text); | 
| 230 | }
 | |
| 231 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 232 | __attribute__((format (gnu_printf, 2, 3), nonnull)) | 
| 505.2.4
by Björn Påhlsson New convinence error printer: fprintf_plus | 233 | int fprintf_plus(FILE *stream, const char *format, ...){ | 
| 234 | va_list ap; | |
| 235 | va_start (ap, format); | |
| 236 |   
 | |
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 237 | TEMP_FAILURE_RETRY(fprintf(stream, "Mandos plugin %s: ", | 
| 238 | program_invocation_short_name)); | |
| 622
by Teddy Hogeborn * debian/control (Build-Depends): Depend on debhelper 8.9.7 for using | 239 | return (int)TEMP_FAILURE_RETRY(vfprintf(stream, format, ap)); | 
| 505.2.4
by Björn Påhlsson New convinence error printer: fprintf_plus | 240 | }
 | 
| 241 | ||
| 43
by Teddy Hogeborn * plugins.d/mandosclient.c: Cosmetic changes. | 242 | /*
 | 
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 243 |  * Make additional room in "buffer" for at least BUFFER_SIZE more
 | 
| 244 |  * bytes. "buffer_capacity" is how much is currently allocated,
 | |
| 245 |  * "buffer_length" is how much is already used.
 | |
| 43
by Teddy Hogeborn * plugins.d/mandosclient.c: Cosmetic changes. | 246 |  */
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 247 | __attribute__((nonnull, warn_unused_result)) | 
| 24.1.132
by Björn Påhlsson Fixed a bug in fallback handling | 248 | size_t incbuffer(char **buffer, size_t buffer_length, | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 249 | size_t buffer_capacity){ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 250 | if(buffer_length + BUFFER_SIZE > buffer_capacity){ | 
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 251 | char *new_buf = realloc(*buffer, buffer_capacity + BUFFER_SIZE); | 
| 252 | if(new_buf == NULL){ | |
| 253 | int old_errno = errno; | |
| 254 | free(*buffer); | |
| 255 | errno = old_errno; | |
| 256 | *buffer = NULL; | |
| 24.1.10
by Björn Påhlsson merge commit | 257 | return 0; | 
| 258 | } | |
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 259 | *buffer = new_buf; | 
| 24.1.10
by Björn Påhlsson merge commit | 260 | buffer_capacity += BUFFER_SIZE; | 
| 261 | } | |
| 262 | return buffer_capacity; | |
| 263 | }
 | |
| 264 | ||
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 265 | /* Add server to set of servers to retry periodically */
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 266 | __attribute__((nonnull, warn_unused_result)) | 
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 267 | bool add_server(const char *ip, in_port_t port, AvahiIfIndex if_index, | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 268 | int af, server **current_server){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 269 | int ret; | 
| 270 | server *new_server = malloc(sizeof(server)); | |
| 271 | if(new_server == NULL){ | |
| 272 | perror_plus("malloc"); | |
| 505.1.27
by teddy at bsnet * plugins.d/mandos-client.c (add_server): Return bool; all callers | 273 | return false; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 274 | } | 
| 275 | *new_server = (server){ .ip = strdup(ip), | |
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 276 | .port = port, | 
| 277 | .if_index = if_index, | |
| 278 | .af = af }; | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 279 | if(new_server->ip == NULL){ | 
| 280 | perror_plus("strdup"); | |
| 710
by Teddy Hogeborn mandos-client: Fix minor memory leak on memory full or clock failure. | 281 | free(new_server); | 
| 505.1.27
by teddy at bsnet * plugins.d/mandos-client.c (add_server): Return bool; all callers | 282 | return false; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 283 | } | 
| 668
by Teddy Hogeborn Do not add a new server to server list if clock_gettime() fails | 284 | ret = clock_gettime(CLOCK_MONOTONIC, &(new_server->last_seen)); | 
| 285 | if(ret == -1){ | |
| 286 | perror_plus("clock_gettime"); | |
| 714
by Teddy Hogeborn mandos-client: Fix mem free bug. | 287 | #ifdef __GNUC__
 | 
| 288 | #pragma GCC diagnostic push
 | |
| 289 | #pragma GCC diagnostic ignored "-Wcast-qual"
 | |
| 290 | #endif
 | |
| 291 | free((char *)(new_server->ip)); | |
| 292 | #ifdef __GNUC__
 | |
| 293 | #pragma GCC diagnostic pop
 | |
| 294 | #endif
 | |
| 710
by Teddy Hogeborn mandos-client: Fix minor memory leak on memory full or clock failure. | 295 | free(new_server); | 
| 668
by Teddy Hogeborn Do not add a new server to server list if clock_gettime() fails | 296 | return false; | 
| 297 | } | |
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 298 | /* Special case of first server */ | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 299 | if(*current_server == NULL){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 300 | new_server->next = new_server; | 
| 301 | new_server->prev = new_server; | |
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 302 | *current_server = new_server; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 303 | } else { | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 304 | /* Place the new server last in the list */ | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 305 | new_server->next = *current_server; | 
| 306 | new_server->prev = (*current_server)->prev; | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 307 | new_server->prev->next = new_server; | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 308 | (*current_server)->prev = new_server; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 309 | } | 
| 505.1.27
by teddy at bsnet * plugins.d/mandos-client.c (add_server): Return bool; all callers | 310 | return true; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 311 | }
 | 
| 312 | ||
| 951
by Teddy Hogeborn mandos-client: Set system clock if necessary | 313 | /* Set effective uid to 0, return errno */
 | 
| 314 | __attribute__((warn_unused_result)) | |
| 315 | int raise_privileges(void){ | |
| 316 | int old_errno = errno; | |
| 317 | int ret = 0; | |
| 318 | if(seteuid(0) == -1){ | |
| 319 | ret = errno; | |
| 320 | } | |
| 321 | errno = old_errno; | |
| 322 | return ret; | |
| 323 | }
 | |
| 324 | ||
| 325 | /* Set effective and real user ID to 0.  Return errno. */
 | |
| 326 | __attribute__((warn_unused_result)) | |
| 327 | int raise_privileges_permanently(void){ | |
| 328 | int old_errno = errno; | |
| 329 | int ret = raise_privileges(); | |
| 330 | if(ret != 0){ | |
| 331 | errno = old_errno; | |
| 332 | return ret; | |
| 333 | } | |
| 334 | if(setuid(0) == -1){ | |
| 335 | ret = errno; | |
| 336 | } | |
| 337 | errno = old_errno; | |
| 338 | return ret; | |
| 339 | }
 | |
| 340 | ||
| 341 | /* Set effective user ID to unprivileged saved user ID */
 | |
| 342 | __attribute__((warn_unused_result)) | |
| 343 | int lower_privileges(void){ | |
| 344 | int old_errno = errno; | |
| 345 | int ret = 0; | |
| 346 | if(seteuid(uid) == -1){ | |
| 347 | ret = errno; | |
| 348 | } | |
| 349 | errno = old_errno; | |
| 350 | return ret; | |
| 351 | }
 | |
| 352 | ||
| 353 | /* Lower privileges permanently */
 | |
| 354 | __attribute__((warn_unused_result)) | |
| 355 | int lower_privileges_permanently(void){ | |
| 356 | int old_errno = errno; | |
| 357 | int ret = 0; | |
| 358 | if(setuid(uid) == -1){ | |
| 359 | ret = errno; | |
| 360 | } | |
| 361 | errno = old_errno; | |
| 362 | return ret; | |
| 363 | }
 | |
| 364 | ||
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 365 | /* 
 | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 366 |  * Initialize GPGME.
 | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 367 |  */
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 368 | __attribute__((nonnull, warn_unused_result)) | 
| 673
by Teddy Hogeborn Make mandos-client prefer /run/tmp over /tmp. | 369 | static bool init_gpgme(const char * const seckey, | 
| 370 | const char * const pubkey, | |
| 371 | const char * const tempdir, | |
| 372 | mandos_context *mc){ | |
| 13
by Björn Påhlsson Added following support: | 373 | gpgme_error_t rc; | 
| 374 | gpgme_engine_info_t engine_info; | |
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 375 |   
 | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 376 | /* | 
| 288
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Use separate bool variable instead | 377 |    * Helper function to insert pub and seckey to the engine keyring.
 | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 378 |    */
 | 
| 673
by Teddy Hogeborn Make mandos-client prefer /run/tmp over /tmp. | 379 | bool import_key(const char * const filename){ | 
| 361
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gpgme): Move variable "ret" into the | 380 | int ret; | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 381 | int fd; | 
| 382 | gpgme_data_t pgp_data; | |
| 383 |     
 | |
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 384 | fd = (int)TEMP_FAILURE_RETRY(open(filename, O_RDONLY)); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 385 | if(fd == -1){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 386 | perror_plus("open"); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 387 | return false; | 
| 388 | } | |
| 389 |     
 | |
| 951
by Teddy Hogeborn mandos-client: Set system clock if necessary | 390 | /* Workaround for systems without a real-time clock; see also | 
| 391 |        Debian bug #894495: <https://bugs.debian.org/894495> */
 | |
| 392 | do { | |
| 393 | { | |
| 394 | time_t currtime = time(NULL); | |
| 395 | if(currtime != (time_t)-1){ | |
| 396 | struct tm tm; | |
| 397 | if(gmtime_r(&currtime, &tm) == NULL) { | |
| 398 | perror_plus("gmtime_r"); | |
| 399 | break; | |
| 400 | } | |
| 401 | if(tm.tm_year != 70 or tm.tm_mon != 0){ | |
| 402 | break; | |
| 403 | } | |
| 404 | if(debug){ | |
| 405 | fprintf_plus(stderr, "System clock is January 1970"); | |
| 406 | } | |
| 407 | } else { | |
| 408 | if(debug){ | |
| 409 | fprintf_plus(stderr, "System clock is invalid"); | |
| 410 | } | |
| 411 | } | |
| 412 | } | |
| 413 | struct stat keystat; | |
| 414 | ret = fstat(fd, &keystat); | |
| 415 | if(ret != 0){ | |
| 416 | perror_plus("fstat"); | |
| 417 | break; | |
| 418 | } | |
| 419 | ret = raise_privileges(); | |
| 420 | if(ret != 0){ | |
| 421 | errno = ret; | |
| 422 | perror_plus("Failed to raise privileges"); | |
| 423 | break; | |
| 424 | } | |
| 425 | if(debug){ | |
| 426 | fprintf_plus(stderr, | |
| 427 | "Setting system clock to key file mtime"); | |
| 428 | } | |
| 1217
by teddy at recompile mandos-client.c: Use clock_settime() instead of stime() | 429 | if(clock_settime(CLOCK_REALTIME, &keystat.st_mtim) != 0){ | 
| 430 | perror_plus("clock_settime"); | |
| 951
by Teddy Hogeborn mandos-client: Set system clock if necessary | 431 | } | 
| 432 | ret = lower_privileges(); | |
| 433 | if(ret != 0){ | |
| 434 | errno = ret; | |
| 435 | perror_plus("Failed to lower privileges"); | |
| 436 | } | |
| 437 | } while(false); | |
| 438 | ||
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 439 | rc = gpgme_data_new_from_fd(&pgp_data, fd); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 440 | if(rc != GPG_ERR_NO_ERROR){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 441 | fprintf_plus(stderr, "bad gpgme_data_new_from_fd: %s: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 442 | gpgme_strsource(rc), gpgme_strerror(rc)); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 443 | return false; | 
| 444 | } | |
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 445 |     
 | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 446 | rc = gpgme_op_import(mc->ctx, pgp_data); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 447 | if(rc != GPG_ERR_NO_ERROR){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 448 | fprintf_plus(stderr, "bad gpgme_op_import: %s: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 449 | gpgme_strsource(rc), gpgme_strerror(rc)); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 450 | return false; | 
| 451 | } | |
| 947
by Teddy Hogeborn Check for and report GPGME key import errors | 452 | { | 
| 453 | gpgme_import_result_t import_result | |
| 454 | = gpgme_op_import_result(mc->ctx); | |
| 455 | if((import_result->imported < 1 | |
| 456 | or import_result->not_imported > 0) | |
| 457 | and import_result->unchanged == 0){ | |
| 458 | fprintf_plus(stderr, "bad gpgme_op_import_results:\n"); | |
| 459 | fprintf_plus(stderr, | |
| 460 | "The total number of considered keys: %d\n", | |
| 461 | import_result->considered); | |
| 462 | fprintf_plus(stderr, | |
| 463 | "The number of keys without user ID: %d\n", | |
| 464 | import_result->no_user_id); | |
| 465 | fprintf_plus(stderr, | |
| 466 | "The total number of imported keys: %d\n", | |
| 467 | import_result->imported); | |
| 468 | fprintf_plus(stderr, "The number of imported RSA keys: %d\n", | |
| 469 | import_result->imported_rsa); | |
| 470 | fprintf_plus(stderr, "The number of unchanged keys: %d\n", | |
| 471 | import_result->unchanged); | |
| 472 | fprintf_plus(stderr, "The number of new user IDs: %d\n", | |
| 473 | import_result->new_user_ids); | |
| 474 | fprintf_plus(stderr, "The number of new sub keys: %d\n", | |
| 475 | import_result->new_sub_keys); | |
| 476 | fprintf_plus(stderr, "The number of new signatures: %d\n", | |
| 477 | import_result->new_signatures); | |
| 478 | fprintf_plus(stderr, "The number of new revocations: %d\n", | |
| 479 | import_result->new_revocations); | |
| 480 | fprintf_plus(stderr, | |
| 481 | "The total number of secret keys read: %d\n", | |
| 482 | import_result->secret_read); | |
| 483 | fprintf_plus(stderr, | |
| 484 | "The number of imported secret keys: %d\n", | |
| 485 | import_result->secret_imported); | |
| 486 | fprintf_plus(stderr, | |
| 487 | "The number of unchanged secret keys: %d\n", | |
| 488 | import_result->secret_unchanged); | |
| 489 | fprintf_plus(stderr, "The number of keys not imported: %d\n", | |
| 490 | import_result->not_imported); | |
| 491 | for(gpgme_import_status_t import_status | |
| 492 | = import_result->imports; | |
| 493 | import_status != NULL; | |
| 494 | import_status = import_status->next){ | |
| 495 | fprintf_plus(stderr, "Import status for key: %s\n", | |
| 496 | import_status->fpr); | |
| 497 | if(import_status->result != GPG_ERR_NO_ERROR){ | |
| 498 | fprintf_plus(stderr, "Import result: %s: %s\n", | |
| 499 | gpgme_strsource(import_status->result), | |
| 500 | gpgme_strerror(import_status->result)); | |
| 501 | } | |
| 502 | fprintf_plus(stderr, "Key status:\n"); | |
| 503 | fprintf_plus(stderr, | |
| 504 | import_status->status & GPGME_IMPORT_NEW | |
| 505 | ? "The key was new.\n" | |
| 506 | : "The key was not new.\n"); | |
| 507 | fprintf_plus(stderr, | |
| 508 | import_status->status & GPGME_IMPORT_UID | |
| 509 | ? "The key contained new user IDs.\n" | |
| 510 | : "The key did not contain new user IDs.\n"); | |
| 511 | fprintf_plus(stderr, | |
| 512 | import_status->status & GPGME_IMPORT_SIG | |
| 513 | ? "The key contained new signatures.\n" | |
| 514 | : "The key did not contain new signatures.\n"); | |
| 515 | fprintf_plus(stderr, | |
| 516 | import_status->status & GPGME_IMPORT_SUBKEY | |
| 517 | ? "The key contained new sub keys.\n" | |
| 518 | : "The key did not contain new sub keys.\n"); | |
| 519 | fprintf_plus(stderr, | |
| 520 | import_status->status & GPGME_IMPORT_SECRET | |
| 521 | ? "The key contained a secret key.\n" | |
| 522 | : "The key did not contain a secret key.\n"); | |
| 523 | } | |
| 524 | return false; | |
| 525 | } | |
| 526 | } | |
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 527 |     
 | 
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 528 | ret = close(fd); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 529 | if(ret == -1){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 530 | perror_plus("close"); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 531 | } | 
| 532 | gpgme_data_release(pgp_data); | |
| 533 | return true; | |
| 534 | } | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 535 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 536 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 537 | fprintf_plus(stderr, "Initializing GPGME\n"); | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 538 | } | 
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 539 |   
 | 
| 13
by Björn Påhlsson Added following support: | 540 | /* Init GPGME */ | 
| 541 | gpgme_check_version(NULL); | |
| 24.1.4
by Björn Påhlsson Added optional parameters certdir, certkey and certfile that can be iven at start in the command line. | 542 | rc = gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 543 | if(rc != GPG_ERR_NO_ERROR){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 544 | fprintf_plus(stderr, "bad gpgme_engine_check_version: %s: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 545 | gpgme_strsource(rc), gpgme_strerror(rc)); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 546 | return false; | 
| 24.1.4
by Björn Påhlsson Added optional parameters certdir, certkey and certfile that can be iven at start in the command line. | 547 | } | 
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 548 |   
 | 
| 492
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not even try to work around | 549 | /* Set GPGME home directory for the OpenPGP engine only */ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 550 | rc = gpgme_get_engine_info(&engine_info); | 
| 551 | if(rc != GPG_ERR_NO_ERROR){ | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 552 | fprintf_plus(stderr, "bad gpgme_get_engine_info: %s: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 553 | gpgme_strsource(rc), gpgme_strerror(rc)); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 554 | return false; | 
| 13
by Björn Påhlsson Added following support: | 555 | } | 
| 556 | while(engine_info != NULL){ | |
| 557 | if(engine_info->protocol == GPGME_PROTOCOL_OpenPGP){ | |
| 558 | gpgme_set_engine_info(GPGME_PROTOCOL_OpenPGP, | |
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 559 | engine_info->file_name, tempdir); | 
| 13
by Björn Påhlsson Added following support: | 560 | break; | 
| 561 | } | |
| 562 | engine_info = engine_info->next; | |
| 563 | } | |
| 564 | if(engine_info == NULL){ | |
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 565 | fprintf_plus(stderr, "Could not set GPGME home dir to %s\n", | 
| 566 | tempdir); | |
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 567 | return false; | 
| 568 | } | |
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 569 |   
 | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 570 | /* Create new GPGME "context" */ | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 571 | rc = gpgme_new(&(mc->ctx)); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 572 | if(rc != GPG_ERR_NO_ERROR){ | 
| 946
by Teddy Hogeborn Remove duplicate "Mandos plugin mandos-client:" in error output | 573 | fprintf_plus(stderr, "bad gpgme_new: %s: %s\n", | 
| 574 | gpgme_strsource(rc), gpgme_strerror(rc)); | |
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 575 | return false; | 
| 576 | } | |
| 577 |   
 | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 578 | if(not import_key(pubkey) or not import_key(seckey)){ | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 579 | return false; | 
| 580 | } | |
| 581 |   
 | |
| 355
by Teddy Hogeborn * mandos: White-space fixes only. | 582 | return true; | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 583 | }
 | 
| 584 | ||
| 585 | /* 
 | |
| 586 |  * Decrypt OpenPGP data.
 | |
| 587 |  * Returns -1 on error
 | |
| 588 |  */
 | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 589 | __attribute__((nonnull, warn_unused_result)) | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 590 | static ssize_t pgp_packet_decrypt(const char *cryptotext, | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 591 | size_t crypto_size, | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 592 | char **plaintext, | 
| 593 | mandos_context *mc){ | |
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 594 | gpgme_data_t dh_crypto, dh_plain; | 
| 595 | gpgme_error_t rc; | |
| 596 | ssize_t ret; | |
| 597 | size_t plaintext_capacity = 0; | |
| 598 | ssize_t plaintext_length = 0; | |
| 599 |   
 | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 600 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 601 | fprintf_plus(stderr, "Trying to decrypt OpenPGP data\n"); | 
| 13
by Björn Påhlsson Added following support: | 602 | } | 
| 603 |   
 | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 604 | /* Create new GPGME data buffer from memory cryptotext */ | 
| 605 | rc = gpgme_data_new_from_mem(&dh_crypto, cryptotext, crypto_size, | |
| 606 | 0); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 607 | if(rc != GPG_ERR_NO_ERROR){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 608 | fprintf_plus(stderr, "bad gpgme_data_new_from_mem: %s: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 609 | gpgme_strsource(rc), gpgme_strerror(rc)); | 
| 13
by Björn Påhlsson Added following support: | 610 | return -1; | 
| 611 | } | |
| 612 |   
 | |
| 613 | /* Create new empty GPGME data buffer for the plaintext */ | |
| 614 | rc = gpgme_data_new(&dh_plain); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 615 | if(rc != GPG_ERR_NO_ERROR){ | 
| 946
by Teddy Hogeborn Remove duplicate "Mandos plugin mandos-client:" in error output | 616 | fprintf_plus(stderr, "bad gpgme_data_new: %s: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 617 | gpgme_strsource(rc), gpgme_strerror(rc)); | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 618 | gpgme_data_release(dh_crypto); | 
| 13
by Björn Påhlsson Added following support: | 619 | return -1; | 
| 620 | } | |
| 621 |   
 | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 622 | /* Decrypt data from the cryptotext data buffer to the plaintext | 
| 623 |      data buffer */
 | |
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 624 | rc = gpgme_op_decrypt(mc->ctx, dh_crypto, dh_plain); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 625 | if(rc != GPG_ERR_NO_ERROR){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 626 | fprintf_plus(stderr, "bad gpgme_op_decrypt: %s: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 627 | gpgme_strsource(rc), gpgme_strerror(rc)); | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 628 | plaintext_length = -1; | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 629 | if(debug){ | 
| 99
by Teddy Hogeborn * mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify. | 630 | gpgme_decrypt_result_t result; | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 631 | result = gpgme_op_decrypt_result(mc->ctx); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 632 | if(result == NULL){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 633 | fprintf_plus(stderr, "gpgme_op_decrypt_result failed\n"); | 
| 99
by Teddy Hogeborn * mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify. | 634 | } else { | 
| 944
by Teddy Hogeborn Don't print NULL string pointers in error message output | 635 | if(result->unsupported_algorithm != NULL) { | 
| 636 | fprintf_plus(stderr, "Unsupported algorithm: %s\n", | |
| 637 | result->unsupported_algorithm); | |
| 638 | } | |
| 945
by Teddy Hogeborn Print a boolean more readably in error message output | 639 | fprintf_plus(stderr, "Wrong key usage: %s\n", | 
| 640 | result->wrong_key_usage ? "Yes" : "No"); | |
| 99
by Teddy Hogeborn * mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify. | 641 | if(result->file_name != NULL){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 642 | fprintf_plus(stderr, "File name: %s\n", result->file_name); | 
| 99
by Teddy Hogeborn * mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify. | 643 | } | 
| 948
by Teddy Hogeborn Minor code cleanup | 644 | |
| 645 | for(gpgme_recipient_t r = result->recipients; r != NULL; | |
| 646 | r = r->next){ | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 647 | fprintf_plus(stderr, "Public key algorithm: %s\n", | 
| 948
by Teddy Hogeborn Minor code cleanup | 648 | gpgme_pubkey_algo_name(r->pubkey_algo)); | 
| 649 | fprintf_plus(stderr, "Key ID: %s\n", r->keyid); | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 650 | fprintf_plus(stderr, "Secret key available: %s\n", | 
| 948
by Teddy Hogeborn Minor code cleanup | 651 | r->status == GPG_ERR_NO_SECKEY ? "No" : "Yes"); | 
| 99
by Teddy Hogeborn * mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify. | 652 | } | 
| 653 | } | |
| 654 | } | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 655 | goto decrypt_end; | 
| 13
by Björn Påhlsson Added following support: | 656 | } | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 657 |   
 | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 658 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 659 | fprintf_plus(stderr, "Decryption of OpenPGP data succeeded\n"); | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 660 | } | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 661 |   
 | 
| 13
by Björn Påhlsson Added following support: | 662 | /* Seek back to the beginning of the GPGME plaintext data buffer */ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 663 | if(gpgme_data_seek(dh_plain, (off_t)0, SEEK_SET) == -1){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 664 | perror_plus("gpgme_data_seek"); | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 665 | plaintext_length = -1; | 
| 666 | goto decrypt_end; | |
| 24.1.5
by Björn Påhlsson plugbasedclient: | 667 | } | 
| 668 |   
 | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 669 | *plaintext = NULL; | 
| 13
by Björn Påhlsson Added following support: | 670 | while(true){ | 
| 24.1.132
by Björn Påhlsson Fixed a bug in fallback handling | 671 | plaintext_capacity = incbuffer(plaintext, | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 672 | (size_t)plaintext_length, | 
| 673 | plaintext_capacity); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 674 | if(plaintext_capacity == 0){ | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 675 | perror_plus("incbuffer"); | 
| 676 | plaintext_length = -1; | |
| 677 | goto decrypt_end; | |
| 13
by Björn Påhlsson Added following support: | 678 | } | 
| 679 |     
 | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 680 | ret = gpgme_data_read(dh_plain, *plaintext + plaintext_length, | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 681 | BUFFER_SIZE); | 
| 13
by Björn Påhlsson Added following support: | 682 | /* Print the data, if any */ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 683 | if(ret == 0){ | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 684 | /* EOF */ | 
| 13
by Björn Påhlsson Added following support: | 685 | break; | 
| 686 | } | |
| 687 | if(ret < 0){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 688 | perror_plus("gpgme_data_read"); | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 689 | plaintext_length = -1; | 
| 690 | goto decrypt_end; | |
| 13
by Björn Påhlsson Added following support: | 691 | } | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 692 | plaintext_length += ret; | 
| 13
by Björn Påhlsson Added following support: | 693 | } | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 694 |   
 | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 695 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 696 | fprintf_plus(stderr, "Decrypted password is: "); | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 697 | for(ssize_t i = 0; i < plaintext_length; i++){ | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 698 | fprintf(stderr, "%02hhX ", (*plaintext)[i]); | 
| 699 | } | |
| 700 | fprintf(stderr, "\n"); | |
| 701 | } | |
| 702 |   
 | |
| 703 | decrypt_end: | |
| 704 |   
 | |
| 705 | /* Delete the GPGME cryptotext data buffer */ | |
| 706 | gpgme_data_release(dh_crypto); | |
| 15.1.3
by Björn Påhlsson Added getopt_long support for mandosclient and passprompt | 707 |   
 | 
| 708 | /* Delete the GPGME plaintext data buffer */ | |
| 13
by Björn Påhlsson Added following support: | 709 | gpgme_data_release(dh_plain); | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 710 | return plaintext_length; | 
| 13
by Björn Påhlsson Added following support: | 711 | }
 | 
| 712 | ||
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 713 | __attribute__((warn_unused_result, const)) | 
| 714 | static const char *safe_string(const char *str){ | |
| 715 | if(str == NULL) | |
| 716 | return "(unknown)"; | |
| 717 | return str; | |
| 718 | }
 | |
| 719 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 720 | __attribute__((warn_unused_result)) | 
| 721 | static const char *safer_gnutls_strerror(int value){ | |
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 722 | const char *ret = gnutls_strerror(value); | 
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 723 | return safe_string(ret); | 
| 13
by Björn Påhlsson Added following support: | 724 | }
 | 
| 725 | ||
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 726 | /* GnuTLS log function callback */
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 727 | __attribute__((nonnull)) | 
| 36
by Teddy Hogeborn * TODO: Converted to org-mode style | 728 | static void debuggnutls(__attribute__((unused)) int level, | 
| 729 | const char* string){ | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 730 | fprintf_plus(stderr, "GnuTLS: %s", string); | 
| 13
by Björn Påhlsson Added following support: | 731 | }
 | 
| 732 | ||
| 811
by Teddy Hogeborn Client: Remove an incorrect "nonnull" attribute | 733 | __attribute__((nonnull(1, 2, 4), warn_unused_result)) | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 734 | static int init_gnutls_global(const char *pubkeyfilename, | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 735 | const char *seckeyfilename, | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 736 | const char *dhparamsfilename, | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 737 | mandos_context *mc){ | 
| 13
by Björn Påhlsson Added following support: | 738 | int ret; | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 739 |   
 | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 740 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 741 | fprintf_plus(stderr, "Initializing GnuTLS\n"); | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 742 | } | 
| 24.1.29
by Björn Påhlsson Added more header file comments | 743 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 744 | if(debug){ | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 745 | /* "Use a log level over 10 to enable all debugging options." | 
| 746 |      * - GnuTLS manual
 | |
| 747 |      */
 | |
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 748 | gnutls_global_set_log_level(11); | 
| 749 | gnutls_global_set_log_function(debuggnutls); | |
| 750 | } | |
| 751 |   
 | |
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 752 | /* OpenPGP credentials */ | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 753 | ret = gnutls_certificate_allocate_credentials(&mc->cred); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 754 | if(ret != GNUTLS_E_SUCCESS){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 755 | fprintf_plus(stderr, "GnuTLS memory error: %s\n", | 
| 756 | safer_gnutls_strerror(ret)); | |
| 13
by Björn Påhlsson Added following support: | 757 | return -1; | 
| 758 | } | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 759 |   
 | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 760 | if(debug){ | 
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 761 | fprintf_plus(stderr, "Attempting to use public key %s and" | 
| 762 | " private key %s as GnuTLS credentials\n", | |
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 763 | pubkeyfilename, | 
| 764 | seckeyfilename); | |
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 765 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 766 |   
 | 
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 767 | #if GNUTLS_VERSION_NUMBER >= 0x030606
 | 
| 768 | ret = gnutls_certificate_set_rawpk_key_file | |
| 769 | (mc->cred, pubkeyfilename, seckeyfilename, | |
| 770 | GNUTLS_X509_FMT_PEM, /* format */ | |
| 771 | NULL, /* pass */ | |
| 772 | /* key_usage */ | |
| 773 | GNUTLS_KEY_DIGITAL_SIGNATURE | GNUTLS_KEY_KEY_ENCIPHERMENT, | |
| 774 | NULL, /* names */ | |
| 775 | 0, /* names_length */ | |
| 776 | /* privkey_flags */ | |
| 777 | GNUTLS_PKCS_PLAIN | GNUTLS_PKCS_NULL_PASSWORD, | |
| 778 | 0); /* pkcs11_flags */ | |
| 779 | #elif GNUTLS_VERSION_NUMBER < 0x030600
 | |
| 13
by Björn Påhlsson Added following support: | 780 | ret = gnutls_certificate_set_openpgp_key_file | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 781 | (mc->cred, pubkeyfilename, seckeyfilename, | 
| 76
by Teddy Hogeborn * plugins.d/password-request.c (init_gnutls_global): Renamed | 782 | GNUTLS_OPENPGP_FMT_BASE64); | 
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 783 | #else
 | 
| 784 | #error "Needs GnuTLS 3.6.6 or later, or before 3.6.0"
 | |
| 785 | #endif
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 786 | if(ret != GNUTLS_E_SUCCESS){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 787 | fprintf_plus(stderr, | 
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 788 | "Error[%d] while reading the key pair ('%s'," | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 789 | " '%s')\n", ret, pubkeyfilename, seckeyfilename); | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 790 | fprintf_plus(stderr, "The GnuTLS error is: %s\n", | 
| 791 | safer_gnutls_strerror(ret)); | |
| 24.1.20
by Björn Påhlsson mandosclient | 792 | goto globalfail; | 
| 13
by Björn Påhlsson Added following support: | 793 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 794 |   
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 795 | /* GnuTLS server initialization */ | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 796 | ret = gnutls_dh_params_init(&mc->dh_params); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 797 | if(ret != GNUTLS_E_SUCCESS){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 798 | fprintf_plus(stderr, "Error in GnuTLS DH parameter" | 
| 799 | " initialization: %s\n", | |
| 800 | safer_gnutls_strerror(ret)); | |
| 24.1.20
by Björn Påhlsson mandosclient | 801 | goto globalfail; | 
| 13
by Björn Påhlsson Added following support: | 802 | } | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 803 | /* If a Diffie-Hellman parameters file was given, try to use it */ | 
| 804 | if(dhparamsfilename != NULL){ | |
| 805 | gnutls_datum_t params = { .data = NULL, .size = 0 }; | |
| 806 | do { | |
| 807 | int dhpfile = open(dhparamsfilename, O_RDONLY); | |
| 808 | if(dhpfile == -1){ | |
| 809 | perror_plus("open"); | |
| 810 | dhparamsfilename = NULL; | |
| 811 | break; | |
| 812 | } | |
| 813 | size_t params_capacity = 0; | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 814 | while(true){ | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 815 | params_capacity = incbuffer((char **)¶ms.data, | 
| 816 | (size_t)params.size, | |
| 817 | (size_t)params_capacity); | |
| 818 | if(params_capacity == 0){ | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 819 | perror_plus("incbuffer"); | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 820 | free(params.data); | 
| 821 | params.data = NULL; | |
| 822 | dhparamsfilename = NULL; | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 823 | break; | 
| 824 | } | |
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 825 | ssize_t bytes_read = read(dhpfile, | 
| 826 | params.data + params.size, | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 827 | BUFFER_SIZE); | 
| 828 | /* EOF */ | |
| 829 | if(bytes_read == 0){ | |
| 830 | break; | |
| 831 | } | |
| 832 | /* check bytes_read for failure */ | |
| 833 | if(bytes_read < 0){ | |
| 834 | perror_plus("read"); | |
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 835 | free(params.data); | 
| 836 | params.data = NULL; | |
| 837 | dhparamsfilename = NULL; | |
| 838 | break; | |
| 839 | } | |
| 840 | params.size += (unsigned int)bytes_read; | |
| 841 | } | |
| 941
by Teddy Hogeborn Check return values from newly added close() calls | 842 | ret = close(dhpfile); | 
| 843 | if(ret == -1){ | |
| 844 | perror_plus("close"); | |
| 845 | } | |
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 846 | if(params.data == NULL){ | 
| 847 | dhparamsfilename = NULL; | |
| 848 | } | |
| 849 | if(dhparamsfilename == NULL){ | |
| 850 | break; | |
| 851 | } | |
| 852 | ret = gnutls_dh_params_import_pkcs3(mc->dh_params, ¶ms, | |
| 853 | GNUTLS_X509_FMT_PEM); | |
| 854 | if(ret != GNUTLS_E_SUCCESS){ | |
| 855 | fprintf_plus(stderr, "Failed to parse DH parameters in file" | |
| 856 | " \"%s\": %s\n", dhparamsfilename, | |
| 857 | safer_gnutls_strerror(ret)); | |
| 858 | dhparamsfilename = NULL; | |
| 859 | } | |
| 877
by Teddy Hogeborn Fix bug where Mandos client would crash on exit | 860 | free(params.data); | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 861 | } while(false); | 
| 862 | } | |
| 863 | if(dhparamsfilename == NULL){ | |
| 864 | if(mc->dh_bits == 0){ | |
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 865 | #if GNUTLS_VERSION_NUMBER < 0x030600
 | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 866 | /* Find out the optimal number of DH bits */ | 
| 867 | /* Try to read the private key file */ | |
| 868 | gnutls_datum_t buffer = { .data = NULL, .size = 0 }; | |
| 869 | do { | |
| 870 | int secfile = open(seckeyfilename, O_RDONLY); | |
| 871 | if(secfile == -1){ | |
| 872 | perror_plus("open"); | |
| 873 | break; | |
| 874 | } | |
| 875 | size_t buffer_capacity = 0; | |
| 876 | while(true){ | |
| 877 | buffer_capacity = incbuffer((char **)&buffer.data, | |
| 878 | (size_t)buffer.size, | |
| 879 | (size_t)buffer_capacity); | |
| 880 | if(buffer_capacity == 0){ | |
| 881 | perror_plus("incbuffer"); | |
| 882 | free(buffer.data); | |
| 883 | buffer.data = NULL; | |
| 884 | break; | |
| 885 | } | |
| 886 | ssize_t bytes_read = read(secfile, | |
| 887 | buffer.data + buffer.size, | |
| 888 | BUFFER_SIZE); | |
| 889 | /* EOF */ | |
| 890 | if(bytes_read == 0){ | |
| 891 | break; | |
| 892 | } | |
| 893 | /* check bytes_read for failure */ | |
| 894 | if(bytes_read < 0){ | |
| 895 | perror_plus("read"); | |
| 896 | free(buffer.data); | |
| 897 | buffer.data = NULL; | |
| 898 | break; | |
| 899 | } | |
| 900 | buffer.size += (unsigned int)bytes_read; | |
| 901 | } | |
| 902 | close(secfile); | |
| 903 | } while(false); | |
| 904 | /* If successful, use buffer to parse private key */ | |
| 905 | gnutls_sec_param_t sec_param = GNUTLS_SEC_PARAM_ULTRA; | |
| 906 | if(buffer.data != NULL){ | |
| 907 | { | |
| 908 | gnutls_openpgp_privkey_t privkey = NULL; | |
| 909 | ret = gnutls_openpgp_privkey_init(&privkey); | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 910 | if(ret != GNUTLS_E_SUCCESS){ | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 911 | fprintf_plus(stderr, "Error initializing OpenPGP key" | 
| 912 | " structure: %s", | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 913 | safer_gnutls_strerror(ret)); | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 914 | free(buffer.data); | 
| 915 | buffer.data = NULL; | |
| 916 | } else { | |
| 917 | ret = gnutls_openpgp_privkey_import | |
| 918 | (privkey, &buffer, GNUTLS_OPENPGP_FMT_BASE64, "", 0); | |
| 919 | if(ret != GNUTLS_E_SUCCESS){ | |
| 920 | fprintf_plus(stderr, "Error importing OpenPGP key : %s", | |
| 921 | safer_gnutls_strerror(ret)); | |
| 922 | privkey = NULL; | |
| 923 | } | |
| 924 | free(buffer.data); | |
| 925 | buffer.data = NULL; | |
| 926 | if(privkey != NULL){ | |
| 927 | /* Use private key to suggest an appropriate | |
| 928 | 		 sec_param */
 | |
| 929 | sec_param = gnutls_openpgp_privkey_sec_param(privkey); | |
| 930 | gnutls_openpgp_privkey_deinit(privkey); | |
| 931 | if(debug){ | |
| 932 | fprintf_plus(stderr, "This OpenPGP key implies using" | |
| 933 | " a GnuTLS security parameter \"%s\".\n", | |
| 934 | safe_string(gnutls_sec_param_get_name | |
| 935 | (sec_param))); | |
| 936 | } | |
| 937 | } | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 938 | } | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 939 | } | 
| 940 | if(sec_param == GNUTLS_SEC_PARAM_UNKNOWN){ | |
| 941 | /* Err on the side of caution */ | |
| 942 | sec_param = GNUTLS_SEC_PARAM_ULTRA; | |
| 943 | if(debug){ | |
| 944 | fprintf_plus(stderr, "Falling back to security parameter" | |
| 945 | " \"%s\"\n", | |
| 946 | safe_string(gnutls_sec_param_get_name | |
| 947 | (sec_param))); | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 948 | } | 
| 949 | } | |
| 950 | } | |
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 951 | unsigned int uret = gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH, sec_param); | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 952 | if(uret != 0){ | 
| 953 | mc->dh_bits = uret; | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 954 | if(debug){ | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 955 | fprintf_plus(stderr, "A \"%s\" GnuTLS security parameter" | 
| 956 | " implies %u DH bits; using that.\n", | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 957 | safe_string(gnutls_sec_param_get_name | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 958 | (sec_param)), | 
| 959 | mc->dh_bits); | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 960 | } | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 961 | } else { | 
| 962 | fprintf_plus(stderr, "Failed to get implied number of DH" | |
| 963 | " bits for security parameter \"%s\"): %s\n", | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 964 | safe_string(gnutls_sec_param_get_name | 
| 965 | (sec_param)), | |
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 966 | safer_gnutls_strerror(ret)); | 
| 967 | goto globalfail; | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 968 | } | 
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 969 | #endif
 | 
| 970 | } else { /* dh_bits != 0 */ | |
| 971 | if(debug){ | |
| 972 | fprintf_plus(stderr, "DH bits explicitly set to %u\n", | |
| 973 | mc->dh_bits); | |
| 974 | } | |
| 975 | ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits); | |
| 976 | if(ret != GNUTLS_E_SUCCESS){ | |
| 977 | fprintf_plus(stderr, "Error in GnuTLS prime generation (%u" | |
| 978 | " bits): %s\n", mc->dh_bits, | |
| 979 | safer_gnutls_strerror(ret)); | |
| 980 | goto globalfail; | |
| 981 | } | |
| 982 | gnutls_certificate_set_dh_params(mc->cred, mc->dh_params); | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 983 | } | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 984 | } | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 985 |   
 | 
| 24.1.13
by Björn Påhlsson mandosclient | 986 | return 0; | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 987 |   
 | 
| 24.1.20
by Björn Påhlsson mandosclient | 988 | globalfail: | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 989 |   
 | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 990 | gnutls_certificate_free_credentials(mc->cred); | 
| 991 | gnutls_dh_params_deinit(mc->dh_params); | |
| 24.1.20
by Björn Påhlsson mandosclient | 992 | return -1; | 
| 24.1.13
by Björn Påhlsson mandosclient | 993 | }
 | 
| 994 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 995 | __attribute__((nonnull, warn_unused_result)) | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 996 | static int init_gnutls_session(gnutls_session_t *session, | 
| 997 | mandos_context *mc){ | |
| 24.1.13
by Björn Påhlsson mandosclient | 998 | int ret; | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 999 | /* GnuTLS session creation */ | 
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 1000 | do { | 
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 1001 | ret = gnutls_init(session, (GNUTLS_SERVER | 
| 1002 | #if GNUTLS_VERSION_NUMBER >= 0x030506
 | |
| 1003 | | GNUTLS_NO_TICKETS | |
| 1004 | #endif
 | |
| 1005 | #if GNUTLS_VERSION_NUMBER >= 0x030606
 | |
| 1006 | | GNUTLS_ENABLE_RAWPK | |
| 1007 | #endif
 | |
| 1008 | )); | |
| 371
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Always fail and | 1009 | if(quit_now){ | 
| 1010 | return -1; | |
| 1011 | } | |
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 1012 | } while(ret == GNUTLS_E_INTERRUPTED or ret == GNUTLS_E_AGAIN); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1013 | if(ret != GNUTLS_E_SUCCESS){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1014 | fprintf_plus(stderr, | 
| 1015 | "Error in GnuTLS session initialization: %s\n", | |
| 1016 | safer_gnutls_strerror(ret)); | |
| 13
by Björn Påhlsson Added following support: | 1017 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1018 |   
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1019 | { | 
| 1020 | const char *err; | |
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 1021 | do { | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1022 | ret = gnutls_priority_set_direct(*session, mc->priority, &err); | 
| 371
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Always fail and | 1023 | if(quit_now){ | 
| 1024 | gnutls_deinit(*session); | |
| 1025 | return -1; | |
| 1026 | } | |
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 1027 | } while(ret == GNUTLS_E_INTERRUPTED or ret == GNUTLS_E_AGAIN); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1028 | if(ret != GNUTLS_E_SUCCESS){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1029 | fprintf_plus(stderr, "Syntax error at: %s\n", err); | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1030 | fprintf_plus(stderr, "GnuTLS error: %s\n", | 
| 1031 | safer_gnutls_strerror(ret)); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1032 | gnutls_deinit(*session); | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1033 | return -1; | 
| 1034 | } | |
| 13
by Björn Påhlsson Added following support: | 1035 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1036 |   
 | 
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 1037 | do { | 
| 1038 | ret = gnutls_credentials_set(*session, GNUTLS_CRD_CERTIFICATE, | |
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1039 | mc->cred); | 
| 371
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Always fail and | 1040 | if(quit_now){ | 
| 1041 | gnutls_deinit(*session); | |
| 1042 | return -1; | |
| 1043 | } | |
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 1044 | } while(ret == GNUTLS_E_INTERRUPTED or ret == GNUTLS_E_AGAIN); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1045 | if(ret != GNUTLS_E_SUCCESS){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1046 | fprintf_plus(stderr, "Error setting GnuTLS credentials: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1047 | safer_gnutls_strerror(ret)); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1048 | gnutls_deinit(*session); | 
| 13
by Björn Påhlsson Added following support: | 1049 | return -1; | 
| 1050 | } | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1051 |   
 | 
| 13
by Björn Påhlsson Added following support: | 1052 | /* ignore client certificate if any. */ | 
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 1053 | gnutls_certificate_server_set_request(*session, GNUTLS_CERT_IGNORE); | 
| 13
by Björn Påhlsson Added following support: | 1054 |   
 | 
| 1055 | return 0; | |
| 1056 | }
 | |
| 1057 | ||
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1058 | /* Avahi log function callback */
 | 
| 36
by Teddy Hogeborn * TODO: Converted to org-mode style | 1059 | static void empty_log(__attribute__((unused)) AvahiLogLevel level, | 
| 1060 | __attribute__((unused)) const char *txt){} | |
| 13
by Björn Påhlsson Added following support: | 1061 | |
| 738.1.6
by Teddy Hogeborn Fix minor bugs and typos and add some more debug output. | 1062 | /* Helper function to add_local_route() and delete_local_route() */
 | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1063 | __attribute__((nonnull, warn_unused_result)) | 
| 738.1.6
by Teddy Hogeborn Fix minor bugs and typos and add some more debug output. | 1064 | static bool add_delete_local_route(const bool add, | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1065 | const char *address, | 
| 1066 | AvahiIfIndex if_index){ | |
| 1067 | int ret; | |
| 1068 | char helper[] = "mandos-client-iprouteadddel"; | |
| 1069 | char add_arg[] = "add"; | |
| 738.1.4
by Teddy Hogeborn Add plugin for mandos-client to add and delete local routes. | 1070 | char delete_arg[] = "delete"; | 
| 738.1.6
by Teddy Hogeborn Fix minor bugs and typos and add some more debug output. | 1071 | char debug_flag[] = "--debug"; | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1072 | char *pluginhelperdir = getenv("MANDOSPLUGINHELPERDIR"); | 
| 1073 | if(pluginhelperdir == NULL){ | |
| 1074 | if(debug){ | |
| 1075 | fprintf_plus(stderr, "MANDOSPLUGINHELPERDIR environment" | |
| 1076 | " variable not set; cannot run helper\n"); | |
| 1077 | } | |
| 1078 | return false; | |
| 1079 | } | |
| 1080 |   
 | |
| 1081 | char interface[IF_NAMESIZE]; | |
| 1082 | if(if_indextoname((unsigned int)if_index, interface) == NULL){ | |
| 1083 | perror_plus("if_indextoname"); | |
| 1084 | return false; | |
| 1085 | } | |
| 1086 |   
 | |
| 1087 | int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY)); | |
| 1088 | if(devnull == -1){ | |
| 1089 | perror_plus("open(\"/dev/null\", O_RDONLY)"); | |
| 1090 | return false; | |
| 1091 | } | |
| 1092 | pid_t pid = fork(); | |
| 1093 | if(pid == 0){ | |
| 1094 | /* Child */ | |
| 1095 | /* Raise privileges */ | |
| 1096 | errno = raise_privileges_permanently(); | |
| 1097 | if(errno != 0){ | |
| 1098 | perror_plus("Failed to raise privileges"); | |
| 1099 | /* _exit(EX_NOPERM); */ | |
| 1100 | } else { | |
| 1101 | /* Set group */ | |
| 1102 | errno = 0; | |
| 1103 | ret = setgid(0); | |
| 1104 | if(ret == -1){ | |
| 1105 | perror_plus("setgid"); | |
| 1213
by teddy at recompile Fix file descriptor leak in mandos-client | 1106 | close(devnull); | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1107 | _exit(EX_NOPERM); | 
| 1108 | } | |
| 1109 | /* Reset supplementary groups */ | |
| 1110 | errno = 0; | |
| 1111 | ret = setgroups(0, NULL); | |
| 1112 | if(ret == -1){ | |
| 1113 | perror_plus("setgroups"); | |
| 1213
by teddy at recompile Fix file descriptor leak in mandos-client | 1114 | close(devnull); | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1115 | _exit(EX_NOPERM); | 
| 1116 | } | |
| 1117 | } | |
| 1118 | ret = dup2(devnull, STDIN_FILENO); | |
| 1119 | if(ret == -1){ | |
| 1120 | perror_plus("dup2(devnull, STDIN_FILENO)"); | |
| 1213
by teddy at recompile Fix file descriptor leak in mandos-client | 1121 | close(devnull); | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1122 | _exit(EX_OSERR); | 
| 1123 | } | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 1124 | ret = close(devnull); | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1125 | if(ret == -1){ | 
| 1126 | perror_plus("close"); | |
| 1127 | } | |
| 1128 | ret = dup2(STDERR_FILENO, STDOUT_FILENO); | |
| 1129 | if(ret == -1){ | |
| 1130 | perror_plus("dup2(STDERR_FILENO, STDOUT_FILENO)"); | |
| 1131 | _exit(EX_OSERR); | |
| 1132 | } | |
| 1133 | int helperdir_fd = (int)TEMP_FAILURE_RETRY(open(pluginhelperdir, | |
| 1134 | O_RDONLY | |
| 1135 | | O_DIRECTORY | |
| 1136 | | O_PATH | |
| 1137 | | O_CLOEXEC)); | |
| 738.1.3
by Teddy Hogeborn mandos-client: Minor changes to check for more error conditions. | 1138 | if(helperdir_fd == -1){ | 
| 1139 | perror_plus("open"); | |
| 1140 | _exit(EX_UNAVAILABLE); | |
| 1141 | } | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1142 | int helper_fd = (int)TEMP_FAILURE_RETRY(openat(helperdir_fd, | 
| 1143 | helper, O_RDONLY)); | |
| 738.1.3
by Teddy Hogeborn mandos-client: Minor changes to check for more error conditions. | 1144 | if(helper_fd == -1){ | 
| 1145 | perror_plus("openat"); | |
| 775
by Teddy Hogeborn plugin-runner: Minor fix: close helperdir before exiting in fork. | 1146 | close(helperdir_fd); | 
| 738.1.3
by Teddy Hogeborn mandos-client: Minor changes to check for more error conditions. | 1147 | _exit(EX_UNAVAILABLE); | 
| 1148 | } | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 1149 | close(helperdir_fd); | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1150 | #ifdef __GNUC__
 | 
| 1151 | #pragma GCC diagnostic push
 | |
| 1152 | #pragma GCC diagnostic ignored "-Wcast-qual"
 | |
| 1153 | #endif
 | |
| 1154 | if(fexecve(helper_fd, (char *const []) | |
| 738.1.4
by Teddy Hogeborn Add plugin for mandos-client to add and delete local routes. | 1155 | { helper, add ? add_arg : delete_arg, (char *)address, | 
| 738.1.6
by Teddy Hogeborn Fix minor bugs and typos and add some more debug output. | 1156 | interface, debug ? debug_flag : NULL, NULL }, | 
| 1157 | environ) == -1){ | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1158 | #ifdef __GNUC__
 | 
| 1159 | #pragma GCC diagnostic pop
 | |
| 1160 | #endif
 | |
| 1161 | perror_plus("fexecve"); | |
| 1162 | _exit(EXIT_FAILURE); | |
| 1163 | } | |
| 1164 | } | |
| 1165 | if(pid == -1){ | |
| 1166 | perror_plus("fork"); | |
| 1213
by teddy at recompile Fix file descriptor leak in mandos-client | 1167 | close(devnull); | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1168 | return false; | 
| 1169 | } | |
| 1213
by teddy at recompile Fix file descriptor leak in mandos-client | 1170 | ret = close(devnull); | 
| 1171 | if(ret == -1){ | |
| 1172 | perror_plus("close"); | |
| 1173 | } | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1174 | int status; | 
| 1175 | pid_t pret = -1; | |
| 1176 | errno = 0; | |
| 1177 | do { | |
| 1178 | pret = waitpid(pid, &status, 0); | |
| 1179 | if(pret == -1 and errno == EINTR and quit_now){ | |
| 1180 | int errno_raising = 0; | |
| 1181 | if((errno = raise_privileges()) != 0){ | |
| 1182 | errno_raising = errno; | |
| 1183 | perror_plus("Failed to raise privileges in order to" | |
| 1184 | " kill helper program"); | |
| 1185 | } | |
| 1186 | if(kill(pid, SIGTERM) == -1){ | |
| 1187 | perror_plus("kill"); | |
| 1188 | } | |
| 1189 | if((errno_raising == 0) and (errno = lower_privileges()) != 0){ | |
| 1190 | perror_plus("Failed to lower privileges after killing" | |
| 1191 | " helper program"); | |
| 1192 | } | |
| 1193 | return false; | |
| 1194 | } | |
| 1195 | } while(pret == -1 and errno == EINTR); | |
| 1196 | if(pret == -1){ | |
| 1197 | perror_plus("waitpid"); | |
| 1198 | return false; | |
| 1199 | } | |
| 1200 | if(WIFEXITED(status)){ | |
| 1201 | if(WEXITSTATUS(status) != 0){ | |
| 1202 | fprintf_plus(stderr, "Error: iprouteadddel exited" | |
| 1203 | " with status %d\n", WEXITSTATUS(status)); | |
| 1204 | return false; | |
| 1205 | } | |
| 1206 | return true; | |
| 1207 | } | |
| 1208 | if(WIFSIGNALED(status)){ | |
| 1209 | fprintf_plus(stderr, "Error: iprouteadddel died by" | |
| 1210 | " signal %d\n", WTERMSIG(status)); | |
| 1211 | return false; | |
| 1212 | } | |
| 1213 | fprintf_plus(stderr, "Error: iprouteadddel crashed\n"); | |
| 1214 | return false; | |
| 1215 | }
 | |
| 1216 | ||
| 1217 | __attribute__((nonnull, warn_unused_result)) | |
| 1218 | static bool add_local_route(const char *address, | |
| 1219 | AvahiIfIndex if_index){ | |
| 738.1.6
by Teddy Hogeborn Fix minor bugs and typos and add some more debug output. | 1220 | if(debug){ | 
| 1221 | fprintf_plus(stderr, "Adding route to %s\n", address); | |
| 1222 | } | |
| 1223 | return add_delete_local_route(true, address, if_index); | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1224 | }
 | 
| 1225 | ||
| 1226 | __attribute__((nonnull, warn_unused_result)) | |
| 738.1.6
by Teddy Hogeborn Fix minor bugs and typos and add some more debug output. | 1227 | static bool delete_local_route(const char *address, | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1228 | AvahiIfIndex if_index){ | 
| 738.1.6
by Teddy Hogeborn Fix minor bugs and typos and add some more debug output. | 1229 | if(debug){ | 
| 1230 | fprintf_plus(stderr, "Removing route to %s\n", address); | |
| 1231 | } | |
| 1232 | return add_delete_local_route(false, address, if_index); | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1233 | }
 | 
| 1234 | ||
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1235 | /* Called when a Mandos server is found */
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1236 | __attribute__((nonnull, warn_unused_result)) | 
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 1237 | static int start_mandos_communication(const char *ip, in_port_t port, | 
| 24.1.9
by Björn Påhlsson not working midwork... | 1238 | AvahiIfIndex if_index, | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1239 | int af, mandos_context *mc){ | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1240 | int ret, tcp_sd = -1; | 
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 1241 | ssize_t sret; | 
| 669
by Teddy Hogeborn Use "struct sockaddr_storage" instead of a union in mandos-client. | 1242 | struct sockaddr_storage to; | 
| 13
by Björn Påhlsson Added following support: | 1243 | char *buffer = NULL; | 
| 372
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Bug fix: | 1244 | char *decrypted_buffer = NULL; | 
| 13
by Björn Påhlsson Added following support: | 1245 | size_t buffer_length = 0; | 
| 1246 | size_t buffer_capacity = 0; | |
| 24.1.10
by Björn Påhlsson merge commit | 1247 | size_t written; | 
| 372
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Bug fix: | 1248 | int retval = -1; | 
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 1249 | gnutls_session_t session; | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1250 | int pf; /* Protocol family */ | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1251 | bool route_added = false; | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1252 |   
 | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1253 | errno = 0; | 
| 1254 |   
 | |
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1255 | if(quit_now){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1256 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1257 | return -1; | 
| 1258 | } | |
| 1259 |   
 | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1260 | switch(af){ | 
| 1261 | case AF_INET6: | |
| 1262 | pf = PF_INET6; | |
| 1263 | break; | |
| 1264 | case AF_INET: | |
| 1265 | pf = PF_INET; | |
| 1266 | break; | |
| 1267 | default: | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1268 | fprintf_plus(stderr, "Bad address family: %d\n", af); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1269 | errno = EINVAL; | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1270 | return -1; | 
| 1271 | } | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1272 |   
 | 
| 605
by Teddy Hogeborn * plugins.d/mandos-client.c: Comment changes | 1273 | /* If the interface is specified and we have a list of interfaces */ | 
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 1274 | if(if_index != AVAHI_IF_UNSPEC and mc->interfaces != NULL){ | 
| 1275 | /* Check if the interface is one of the interfaces we are using */ | |
| 1276 | bool match = false; | |
| 1277 | { | |
| 1278 | char *interface = NULL; | |
| 890
by Teddy Hogeborn Add spaces around all '=' signs in all C code. | 1279 | while((interface = argz_next(mc->interfaces, | 
| 1280 | mc->interfaces_size, | |
| 1281 | interface))){ | |
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 1282 | if(if_nametoindex(interface) == (unsigned int)if_index){ | 
| 1283 | match = true; | |
| 1284 | break; | |
| 1285 | } | |
| 1286 | } | |
| 1287 | } | |
| 1288 | if(not match){ | |
| 605
by Teddy Hogeborn * plugins.d/mandos-client.c: Comment changes | 1289 | /* This interface does not match any in the list, so we don't | 
| 1290 | 	 connect to the server */
 | |
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 1291 | if(debug){ | 
| 1292 | char interface[IF_NAMESIZE]; | |
| 1293 | if(if_indextoname((unsigned int)if_index, interface) == NULL){ | |
| 1294 | perror_plus("if_indextoname"); | |
| 1295 | } else { | |
| 1296 | fprintf_plus(stderr, "Skipping server on non-used interface" | |
| 1297 | " \"%s\"\n", | |
| 1298 | if_indextoname((unsigned int)if_index, | |
| 1299 | interface)); | |
| 1300 | } | |
| 1301 | } | |
| 1302 | return -1; | |
| 1303 | } | |
| 1304 | } | |
| 1305 |   
 | |
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1306 | ret = init_gnutls_session(&session, mc); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1307 | if(ret != 0){ | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1308 | return -1; | 
| 1309 | } | |
| 1310 |   
 | |
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 1311 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1312 | fprintf_plus(stderr, "Setting up a TCP connection to %s, port %" | 
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 1313 | PRIuMAX "\n", ip, (uintmax_t)port); | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 1314 | } | 
| 13
by Björn Påhlsson Added following support: | 1315 |   
 | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1316 | tcp_sd = socket(pf, SOCK_STREAM | SOCK_CLOEXEC, 0); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1317 | if(tcp_sd < 0){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1318 | int e = errno; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1319 | perror_plus("socket"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1320 | errno = e; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1321 | goto mandos_end; | 
| 1322 | } | |
| 1323 |   
 | |
| 1324 | if(quit_now){ | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1325 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1326 | goto mandos_end; | 
| 13
by Björn Påhlsson Added following support: | 1327 | } | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 1328 |   
 | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1329 | if(af == AF_INET6){ | 
| 773
by Teddy Hogeborn mandos-client: Don't use memset(). | 1330 | struct sockaddr_in6 *to6 = (struct sockaddr_in6 *)&to; | 
| 1331 | *to6 = (struct sockaddr_in6){ .sin6_family = (sa_family_t)af }; | |
| 1332 | ret = inet_pton(af, ip, &to6->sin6_addr); | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1333 | } else { /* IPv4 */ | 
| 773
by Teddy Hogeborn mandos-client: Don't use memset(). | 1334 | struct sockaddr_in *to4 = (struct sockaddr_in *)&to; | 
| 1335 | *to4 = (struct sockaddr_in){ .sin_family = (sa_family_t)af }; | |
| 1336 | ret = inet_pton(af, ip, &to4->sin_addr); | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1337 | } | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1338 | if(ret < 0 ){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1339 | int e = errno; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1340 | perror_plus("inet_pton"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1341 | errno = e; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1342 | goto mandos_end; | 
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 1343 | } | 
| 13
by Björn Påhlsson Added following support: | 1344 | if(ret == 0){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1345 | int e = errno; | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1346 | fprintf_plus(stderr, "Bad address: %s\n", ip); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1347 | errno = e; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1348 | goto mandos_end; | 
| 13
by Björn Påhlsson Added following support: | 1349 | } | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1350 | if(af == AF_INET6){ | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1351 | ((struct sockaddr_in6 *)&to)->sin6_port = htons(port); | 
| 669
by Teddy Hogeborn Use "struct sockaddr_storage" instead of a union in mandos-client. | 1352 | if(IN6_IS_ADDR_LINKLOCAL | 
| 1353 | (&((struct sockaddr_in6 *)&to)->sin6_addr)){ | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1354 | if(if_index == AVAHI_IF_UNSPEC){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1355 | fprintf_plus(stderr, "An IPv6 link-local address is" | 
| 1356 | " incomplete without a network interface\n"); | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1357 | errno = EINVAL; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1358 | goto mandos_end; | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1359 | } | 
| 1360 | /* Set the network interface number as scope */ | |
| 669
by Teddy Hogeborn Use "struct sockaddr_storage" instead of a union in mandos-client. | 1361 | ((struct sockaddr_in6 *)&to)->sin6_scope_id = (uint32_t)if_index; | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1362 | } | 
| 1363 | } else { | |
| 669
by Teddy Hogeborn Use "struct sockaddr_storage" instead of a union in mandos-client. | 1364 | ((struct sockaddr_in *)&to)->sin_port = htons(port); | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1365 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1366 |   
 | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1367 | if(quit_now){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1368 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1369 | goto mandos_end; | 
| 1370 | } | |
| 1371 |   
 | |
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 1372 | if(debug){ | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1373 | if(af == AF_INET6 and if_index != AVAHI_IF_UNSPEC){ | 
| 1374 | char interface[IF_NAMESIZE]; | |
| 1375 | if(if_indextoname((unsigned int)if_index, interface) == NULL){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1376 | perror_plus("if_indextoname"); | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1377 | } else { | 
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 1378 | fprintf_plus(stderr, "Connection to: %s%%%s, port %" PRIuMAX | 
| 1379 | "\n", ip, interface, (uintmax_t)port); | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1380 | } | 
| 1381 | } else { | |
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 1382 | fprintf_plus(stderr, "Connection to: %s, port %" PRIuMAX "\n", | 
| 1383 | ip, (uintmax_t)port); | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1384 | } | 
| 1385 | char addrstr[(INET_ADDRSTRLEN > INET6_ADDRSTRLEN) ? | |
| 1386 | INET_ADDRSTRLEN : INET6_ADDRSTRLEN] = ""; | |
| 1387 | if(af == AF_INET6){ | |
| 669
by Teddy Hogeborn Use "struct sockaddr_storage" instead of a union in mandos-client. | 1388 | ret = getnameinfo((struct sockaddr *)&to, | 
| 1389 | sizeof(struct sockaddr_in6), | |
| 667
by Teddy Hogeborn Use getnameinfo() instead of inet_ntop() in mandos-client. | 1390 | addrstr, sizeof(addrstr), NULL, 0, | 
| 1391 | NI_NUMERICHOST); | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1392 | } else { | 
| 669
by Teddy Hogeborn Use "struct sockaddr_storage" instead of a union in mandos-client. | 1393 | ret = getnameinfo((struct sockaddr *)&to, | 
| 1394 | sizeof(struct sockaddr_in), | |
| 667
by Teddy Hogeborn Use getnameinfo() instead of inet_ntop() in mandos-client. | 1395 | addrstr, sizeof(addrstr), NULL, 0, | 
| 1396 | NI_NUMERICHOST); | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1397 | } | 
| 667
by Teddy Hogeborn Use getnameinfo() instead of inet_ntop() in mandos-client. | 1398 | if(ret == EAI_SYSTEM){ | 
| 1399 | perror_plus("getnameinfo"); | |
| 1400 | } else if(ret != 0) { | |
| 1401 | fprintf_plus(stderr, "getnameinfo: %s", gai_strerror(ret)); | |
| 1402 | } else if(strcmp(addrstr, ip) != 0){ | |
| 1403 | fprintf_plus(stderr, "Canonical address form: %s\n", addrstr); | |
| 37
by Teddy Hogeborn Non-tested commit for merge purposes. | 1404 | } | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 1405 | } | 
| 13
by Björn Påhlsson Added following support: | 1406 |   
 | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1407 | if(quit_now){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1408 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1409 | goto mandos_end; | 
| 1410 | } | |
| 1411 |   
 | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1412 | while(true){ | 
| 1413 | if(af == AF_INET6){ | |
| 1414 | ret = connect(tcp_sd, (struct sockaddr *)&to, | |
| 1415 | sizeof(struct sockaddr_in6)); | |
| 1416 | } else { | |
| 1417 | ret = connect(tcp_sd, (struct sockaddr *)&to, /* IPv4 */ | |
| 1418 | sizeof(struct sockaddr_in)); | |
| 1419 | } | |
| 1420 | if(ret < 0){ | |
| 790
by Teddy Hogeborn Bug fix: Add local route also when host is unreachable. | 1421 | if(((errno == ENETUNREACH) or (errno == EHOSTUNREACH)) | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1422 | and if_index != AVAHI_IF_UNSPEC | 
| 1423 | and connect_to == NULL | |
| 1424 | and not route_added and | |
| 1425 | ((af == AF_INET6 and not | |
| 1426 | IN6_IS_ADDR_LINKLOCAL(&(((struct sockaddr_in6 *) | |
| 1427 | &to)->sin6_addr))) | |
| 1428 | or (af == AF_INET and | |
| 1429 | /* Not a a IPv4LL address */ | |
| 1430 | (ntohl(((struct sockaddr_in *)&to)->sin_addr.s_addr) | |
| 1431 | & 0xFFFF0000L) != 0xA9FE0000L))){ | |
| 1432 | /* Work around Avahi bug - Avahi does not announce link-local | |
| 1433 | 	   addresses if it has a global address, so local hosts with
 | |
| 1434 | 	   *only* a link-local address (e.g. Mandos clients) cannot
 | |
| 1435 | 	   connect to a Mandos server announced by Avahi on a server
 | |
| 1436 | 	   host with a global address.  Work around this by retrying
 | |
| 1437 | 	   with an explicit route added with the server's address.
 | |
| 1438 | 	   
 | |
| 1439 | 	   Avahi bug reference:
 | |
| 868
by Teddy Hogeborn Change all http:// URLs to https:// wherever possible. | 1440 | 	   https://lists.freedesktop.org/archives/avahi/2010-February/001833.html
 | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1441 | 	   https://bugs.debian.org/587961
 | 
| 1442 | 	*/
 | |
| 738.1.6
by Teddy Hogeborn Fix minor bugs and typos and add some more debug output. | 1443 | if(debug){ | 
| 1444 | fprintf_plus(stderr, "Mandos server unreachable, trying" | |
| 1445 | " direct route\n"); | |
| 1446 | } | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1447 | int e = errno; | 
| 1448 | route_added = add_local_route(ip, if_index); | |
| 1449 | if(route_added){ | |
| 1450 | continue; | |
| 1451 | } | |
| 1452 | errno = e; | |
| 1453 | } | |
| 1454 | if(errno != ECONNREFUSED or debug){ | |
| 1455 | int e = errno; | |
| 1456 | perror_plus("connect"); | |
| 1457 | errno = e; | |
| 1458 | } | |
| 1459 | goto mandos_end; | |
| 1460 | } | |
| 1461 |     
 | |
| 1462 | if(quit_now){ | |
| 1463 | errno = EINTR; | |
| 1464 | goto mandos_end; | |
| 1465 | } | |
| 1466 | break; | |
| 13
by Björn Påhlsson Added following support: | 1467 | } | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 1468 |   
 | 
| 24.1.12
by Björn Påhlsson merge + | 1469 | const char *out = mandos_protocol_version; | 
| 24.1.10
by Björn Påhlsson merge commit | 1470 | written = 0; | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1471 | while(true){ | 
| 24.1.10
by Björn Påhlsson merge commit | 1472 | size_t out_size = strlen(out); | 
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 1473 | ret = (int)TEMP_FAILURE_RETRY(write(tcp_sd, out + written, | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 1474 | out_size - written)); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1475 | if(ret == -1){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1476 | int e = errno; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1477 | perror_plus("write"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1478 | errno = e; | 
| 24.1.12
by Björn Påhlsson merge + | 1479 | goto mandos_end; | 
| 24.1.10
by Björn Påhlsson merge commit | 1480 | } | 
| 24.1.12
by Björn Påhlsson merge + | 1481 | written += (size_t)ret; | 
| 24.1.10
by Björn Påhlsson merge commit | 1482 | if(written < out_size){ | 
| 1483 | continue; | |
| 1484 | } else { | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1485 | if(out == mandos_protocol_version){ | 
| 24.1.10
by Björn Påhlsson merge commit | 1486 | written = 0; | 
| 1487 | out = "\r\n"; | |
| 1488 | } else { | |
| 1489 | break; | |
| 1490 | } | |
| 1491 | } | |
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1492 |   
 | 
| 1493 | if(quit_now){ | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1494 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1495 | goto mandos_end; | 
| 1496 | } | |
| 24.1.10
by Björn Påhlsson merge commit | 1497 | } | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 1498 |   
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1499 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1500 | fprintf_plus(stderr, "Establishing TLS session with %s\n", ip); | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 1501 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1502 |   
 | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1503 | if(quit_now){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1504 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1505 | goto mandos_end; | 
| 1506 | } | |
| 1507 |   
 | |
| 588
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Eliminate | 1508 | /* This casting via intptr_t is to eliminate warning about casting | 
| 1509 |      an int to a pointer type.  This is exactly how the GnuTLS Guile
 | |
| 1510 |      function "set-session-transport-fd!" does it. */
 | |
| 1511 | gnutls_transport_set_ptr(session, | |
| 1512 | (gnutls_transport_ptr_t)(intptr_t)tcp_sd); | |
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 1513 |   
 | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1514 | if(quit_now){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1515 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1516 | goto mandos_end; | 
| 1517 | } | |
| 1518 |   
 | |
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 1519 | do { | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1520 | ret = gnutls_handshake(session); | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1521 | if(quit_now){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1522 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1523 | goto mandos_end; | 
| 1524 | } | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 1525 | } while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED); | 
| 13
by Björn Påhlsson Added following support: | 1526 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1527 | if(ret != GNUTLS_E_SUCCESS){ | 
| 25
by Teddy Hogeborn * mandos-clients.conf ([DEFAULT]): New section. | 1528 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1529 | fprintf_plus(stderr, "*** GnuTLS Handshake failed ***\n"); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1530 | gnutls_perror(ret); | 
| 25
by Teddy Hogeborn * mandos-clients.conf ([DEFAULT]): New section. | 1531 | } | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1532 | errno = EPROTO; | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1533 | goto mandos_end; | 
| 13
by Björn Påhlsson Added following support: | 1534 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1535 |   
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1536 | /* Read OpenPGP packet that contains the wanted password */ | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1537 |   
 | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 1538 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1539 | fprintf_plus(stderr, "Retrieving OpenPGP encrypted password from" | 
| 1540 | " %s\n", ip); | |
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 1541 | } | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 1542 |   
 | 
| 13
by Björn Påhlsson Added following support: | 1543 | while(true){ | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1544 |     
 | 
| 1545 | if(quit_now){ | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1546 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1547 | goto mandos_end; | 
| 1548 | } | |
| 1549 |     
 | |
| 24.1.132
by Björn Påhlsson Fixed a bug in fallback handling | 1550 | buffer_capacity = incbuffer(&buffer, buffer_length, | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 1551 | buffer_capacity); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1552 | if(buffer_capacity == 0){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1553 | int e = errno; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1554 | perror_plus("incbuffer"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1555 | errno = e; | 
| 24.1.12
by Björn Påhlsson merge + | 1556 | goto mandos_end; | 
| 13
by Björn Påhlsson Added following support: | 1557 | } | 
| 1558 |     
 | |
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1559 | if(quit_now){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1560 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1561 | goto mandos_end; | 
| 1562 | } | |
| 1563 |     
 | |
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 1564 | sret = gnutls_record_recv(session, buffer+buffer_length, | 
| 1565 | BUFFER_SIZE); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1566 | if(sret == 0){ | 
| 13
by Björn Påhlsson Added following support: | 1567 | break; | 
| 1568 | } | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1569 | if(sret < 0){ | 
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 1570 | switch(sret){ | 
| 13
by Björn Påhlsson Added following support: | 1571 | case GNUTLS_E_INTERRUPTED: | 
| 1572 | case GNUTLS_E_AGAIN: | |
| 1573 | break; | |
| 1574 | case GNUTLS_E_REHANDSHAKE: | |
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 1575 | do { | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1576 | ret = gnutls_handshake(session); | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1577 | 	  
 | 
| 1578 | if(quit_now){ | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1579 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1580 | goto mandos_end; | 
| 1581 | } | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 1582 | } while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1583 | if(ret < 0){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1584 | fprintf_plus(stderr, "*** GnuTLS Re-handshake failed " | 
| 1585 | "***\n"); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1586 | gnutls_perror(ret); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1587 | errno = EPROTO; | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1588 | goto mandos_end; | 
| 13
by Björn Påhlsson Added following support: | 1589 | } | 
| 1590 | break; | |
| 1591 | default: | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1592 | fprintf_plus(stderr, "Unknown error while reading data from" | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1593 | " encrypted session with Mandos server\n"); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1594 | gnutls_bye(session, GNUTLS_SHUT_RDWR); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1595 | errno = EIO; | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1596 | goto mandos_end; | 
| 13
by Björn Påhlsson Added following support: | 1597 | } | 
| 1598 | } else { | |
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 1599 | buffer_length += (size_t) sret; | 
| 13
by Björn Påhlsson Added following support: | 1600 | } | 
| 1601 | } | |
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 1602 |   
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1603 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1604 | fprintf_plus(stderr, "Closing TLS session\n"); | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1605 | } | 
| 1606 |   
 | |
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1607 | if(quit_now){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1608 | errno = EINTR; | 
| 371
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Always fail and | 1609 | goto mandos_end; | 
| 1610 | } | |
| 1611 |   
 | |
| 1612 | do { | |
| 1613 | ret = gnutls_bye(session, GNUTLS_SHUT_RDWR); | |
| 1614 | if(quit_now){ | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1615 | errno = EINTR; | 
| 371
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Always fail and | 1616 | goto mandos_end; | 
| 1617 | } | |
| 1618 | } while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED); | |
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1619 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1620 | if(buffer_length > 0){ | 
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 1621 | ssize_t decrypted_buffer_size; | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 1622 | decrypted_buffer_size = pgp_packet_decrypt(buffer, buffer_length, | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1623 | &decrypted_buffer, mc); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1624 | if(decrypted_buffer_size >= 0){ | 
| 361
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gpgme): Move variable "ret" into the | 1625 |       
 | 
| 866
by Teddy Hogeborn mandos-client: Bug fix: flush stdout to detect write errors. | 1626 | clearerr(stdout); | 
| 24.1.10
by Björn Påhlsson merge commit | 1627 | written = 0; | 
| 28
by Teddy Hogeborn * server.conf: New file. | 1628 | while(written < (size_t) decrypted_buffer_size){ | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1629 | if(quit_now){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1630 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1631 | goto mandos_end; | 
| 1632 | } | |
| 1633 | 	
 | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1634 | ret = (int)fwrite(decrypted_buffer + written, 1, | 
| 1635 | (size_t)decrypted_buffer_size - written, | |
| 1636 | stdout); | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1637 | if(ret == 0 and ferror(stdout)){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1638 | int e = errno; | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1639 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1640 | fprintf_plus(stderr, "Error writing encrypted data: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1641 | strerror(errno)); | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1642 | } | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1643 | errno = e; | 
| 372
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Bug fix: | 1644 | goto mandos_end; | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1645 | } | 
| 22
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to | 1646 | written += (size_t)ret; | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1647 | } | 
| 866
by Teddy Hogeborn mandos-client: Bug fix: flush stdout to detect write errors. | 1648 | ret = fflush(stdout); | 
| 1649 | if(ret != 0){ | |
| 1650 | int e = errno; | |
| 1651 | if(debug){ | |
| 1652 | fprintf_plus(stderr, "Error writing encrypted data: %s\n", | |
| 1653 | strerror(errno)); | |
| 1654 | } | |
| 1655 | errno = e; | |
| 1656 | goto mandos_end; | |
| 1657 | } | |
| 372
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Bug fix: | 1658 | retval = 0; | 
| 13
by Björn Påhlsson Added following support: | 1659 | } | 
| 1660 | } | |
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1661 |   
 | 
| 1662 | /* Shutdown procedure */ | |
| 1663 |   
 | |
| 1664 | mandos_end: | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1665 | { | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1666 | if(route_added){ | 
| 738.1.6
by Teddy Hogeborn Fix minor bugs and typos and add some more debug output. | 1667 | if(not delete_local_route(ip, if_index)){ | 
| 1668 | fprintf_plus(stderr, "Failed to delete local route to %s on" | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1669 | " interface %d", ip, if_index); | 
| 1670 | } | |
| 1671 | } | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1672 | int e = errno; | 
| 1673 | free(decrypted_buffer); | |
| 1674 | free(buffer); | |
| 1675 | if(tcp_sd >= 0){ | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 1676 | ret = close(tcp_sd); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1677 | } | 
| 1678 | if(ret == -1){ | |
| 1679 | if(e == 0){ | |
| 1680 | e = errno; | |
| 1681 | } | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1682 | perror_plus("close"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1683 | } | 
| 1684 | gnutls_deinit(session); | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1685 | errno = e; | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1686 | if(quit_now){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1687 | errno = EINTR; | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1688 | retval = -1; | 
| 1689 | } | |
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1690 | } | 
| 13
by Björn Påhlsson Added following support: | 1691 | return retval; | 
| 1692 | }
 | |
| 1693 | ||
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 1694 | static void resolve_callback(AvahiSServiceResolver *r, | 
| 1695 | AvahiIfIndex interface, | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1696 | AvahiProtocol proto, | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 1697 | AvahiResolverEvent event, | 
| 1698 | const char *name, | |
| 1699 | const char *type, | |
| 1700 | const char *domain, | |
| 1701 | const char *host_name, | |
| 1702 | const AvahiAddress *address, | |
| 1703 | uint16_t port, | |
| 1704 | AVAHI_GCC_UNUSED AvahiStringList *txt, | |
| 1705 | AVAHI_GCC_UNUSED AvahiLookupResultFlags | |
| 1706 | flags, | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1707 | void *mc){ | 
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 1708 | if(r == NULL){ | 
| 1709 | return; | |
| 1710 | } | |
| 22
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to | 1711 |   
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1712 | /* Called whenever a service has been resolved successfully or | 
| 1713 |      timed out */
 | |
| 22
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to | 1714 |   
 | 
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 1715 | if(quit_now){ | 
| 715
by Teddy Hogeborn mandos-client: Bug Fix: Fix some memory leaks. | 1716 | avahi_s_service_resolver_free(r); | 
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 1717 | return; | 
| 1718 | } | |
| 1719 |   
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1720 | switch(event){ | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1721 | default: | 
| 1722 | case AVAHI_RESOLVER_FAILURE: | |
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1723 | fprintf_plus(stderr, "(Avahi Resolver) Failed to resolve service " | 
| 1724 | "'%s' of type '%s' in domain '%s': %s\n", name, type, | |
| 1725 | domain, | |
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1726 | avahi_strerror(avahi_server_errno | 
| 1727 | (((mandos_context*)mc)->server))); | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1728 | break; | 
| 22
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to | 1729 |     
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1730 | case AVAHI_RESOLVER_FOUND: | 
| 1731 | { | |
| 1732 | char ip[AVAHI_ADDRESS_STR_MAX]; | |
| 1733 | avahi_address_snprint(ip, sizeof(ip), address); | |
| 1734 | if(debug){ | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1735 | fprintf_plus(stderr, "Mandos server \"%s\" found on %s (%s, %" | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1736 | PRIdMAX ") on port %" PRIu16 "\n", name, | 
| 1737 | host_name, ip, (intmax_t)interface, port); | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1738 | } | 
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 1739 | int ret = start_mandos_communication(ip, (in_port_t)port, | 
| 1740 | interface, | |
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1741 | avahi_proto_to_af(proto), | 
| 1742 | mc); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1743 | if(ret == 0){ | 
| 601
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Removed "simple_poll" | 1744 | avahi_simple_poll_quit(simple_poll); | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1745 | } else { | 
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 1746 | if(not add_server(ip, (in_port_t)port, interface, | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1747 | avahi_proto_to_af(proto), | 
| 1748 | &((mandos_context*)mc)->current_server)){ | |
| 505.1.27
by teddy at bsnet * plugins.d/mandos-client.c (add_server): Return bool; all callers | 1749 | fprintf_plus(stderr, "Failed to add server \"%s\" to server" | 
| 1750 | " list\n", name); | |
| 1751 | } | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1752 | } | 
| 13
by Björn Påhlsson Added following support: | 1753 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1754 | } | 
| 1755 | avahi_s_service_resolver_free(r); | |
| 13
by Björn Påhlsson Added following support: | 1756 | }
 | 
| 1757 | ||
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1758 | static void browse_callback(AvahiSServiceBrowser *b, | 
| 1759 | AvahiIfIndex interface, | |
| 1760 | AvahiProtocol protocol, | |
| 1761 | AvahiBrowserEvent event, | |
| 1762 | const char *name, | |
| 1763 | const char *type, | |
| 1764 | const char *domain, | |
| 1765 | AVAHI_GCC_UNUSED AvahiLookupResultFlags | |
| 1766 | flags, | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1767 | void *mc){ | 
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 1768 | if(b == NULL){ | 
| 1769 | return; | |
| 1770 | } | |
| 24.1.9
by Björn Påhlsson not working midwork... | 1771 |   
 | 
| 1772 | /* Called whenever a new services becomes available on the LAN or | |
| 1773 |      is removed from the LAN */
 | |
| 1774 |   
 | |
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1775 | if(quit_now){ | 
| 1776 | return; | |
| 1777 | } | |
| 1778 |   
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1779 | switch(event){ | 
| 24.1.9
by Björn Påhlsson not working midwork... | 1780 | default: | 
| 1781 | case AVAHI_BROWSER_FAILURE: | |
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 1782 |     
 | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1783 | fprintf_plus(stderr, "(Avahi browser) %s\n", | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1784 | avahi_strerror(avahi_server_errno | 
| 1785 | (((mandos_context*)mc)->server))); | |
| 601
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Removed "simple_poll" | 1786 | avahi_simple_poll_quit(simple_poll); | 
| 24.1.9
by Björn Påhlsson not working midwork... | 1787 | return; | 
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 1788 |     
 | 
| 24.1.9
by Björn Påhlsson not working midwork... | 1789 | case AVAHI_BROWSER_NEW: | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1790 | /* We ignore the returned Avahi resolver object. In the callback | 
| 1791 |        function we free it. If the Avahi server is terminated before
 | |
| 1792 |        the callback function is called the Avahi server will free the
 | |
| 1793 |        resolver for us. */
 | |
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 1794 |     
 | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1795 | if(avahi_s_service_resolver_new(((mandos_context*)mc)->server, | 
| 1796 | interface, protocol, name, type, | |
| 1797 | domain, protocol, 0, | |
| 1798 | resolve_callback, mc) == NULL) | |
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1799 | fprintf_plus(stderr, "Avahi: Failed to resolve service '%s':" | 
| 1800 | " %s\n", name, | |
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1801 | avahi_strerror(avahi_server_errno | 
| 1802 | (((mandos_context*)mc)->server))); | |
| 24.1.9
by Björn Påhlsson not working midwork... | 1803 | break; | 
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 1804 |     
 | 
| 24.1.9
by Björn Påhlsson not working midwork... | 1805 | case AVAHI_BROWSER_REMOVE: | 
| 1806 | break; | |
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 1807 |     
 | 
| 24.1.9
by Björn Påhlsson not working midwork... | 1808 | case AVAHI_BROWSER_ALL_FOR_NOW: | 
| 1809 | case AVAHI_BROWSER_CACHE_EXHAUSTED: | |
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1810 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1811 | fprintf_plus(stderr, "No Mandos server found, still" | 
| 1812 | " searching...\n"); | |
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1813 | } | 
| 24.1.9
by Björn Påhlsson not working midwork... | 1814 | break; | 
| 1815 | } | |
| 13
by Björn Påhlsson Added following support: | 1816 | }
 | 
| 1817 | ||
| 485
by Teddy Hogeborn Merge from Björn. | 1818 | /* Signal handler that stops main loop after SIGTERM */
 | 
| 354
by Teddy Hogeborn * plugins.d/mandos-client.c (signal_received): New. | 1819 | static void handle_sigterm(int sig){ | 
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 1820 | if(quit_now){ | 
| 1821 | return; | |
| 1822 | } | |
| 1823 | quit_now = 1; | |
| 354
by Teddy Hogeborn * plugins.d/mandos-client.c (signal_received): New. | 1824 | signal_received = sig; | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 1825 | int old_errno = errno; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1826 | /* set main loop to exit */ | 
| 601
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Removed "simple_poll" | 1827 | if(simple_poll != NULL){ | 
| 1828 | avahi_simple_poll_quit(simple_poll); | |
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 1829 | } | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 1830 | errno = old_errno; | 
| 1831 | }
 | |
| 1832 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1833 | __attribute__((nonnull, warn_unused_result)) | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1834 | bool get_flags(const char *ifname, struct ifreq *ifr){ | 
| 505.2.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1835 | int ret; | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 1836 | int old_errno; | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1837 |   
 | 
| 505.2.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1838 | int s = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP); | 
| 1839 | if(s < 0){ | |
| 819
by Teddy Hogeborn errno is of type int, not error_t | 1840 | old_errno = errno; | 
| 505.2.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1841 | perror_plus("socket"); | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 1842 | errno = old_errno; | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1843 | return false; | 
| 505.2.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1844 | } | 
| 798
by Teddy Hogeborn plugins.d/mandos-client.c (get_flags): Use strncpy(), not strcpy(). | 1845 | strncpy(ifr->ifr_name, ifname, IF_NAMESIZE); | 
| 1846 | ifr->ifr_name[IF_NAMESIZE-1] = '\0'; /* NUL terminate */ | |
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1847 | ret = ioctl(s, SIOCGIFFLAGS, ifr); | 
| 505.2.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1848 | if(ret == -1){ | 
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1849 | if(debug){ | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 1850 | old_errno = errno; | 
| 505.2.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1851 | perror_plus("ioctl SIOCGIFFLAGS"); | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 1852 | errno = old_errno; | 
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1853 | } | 
| 941
by Teddy Hogeborn Check return values from newly added close() calls | 1854 | if((close(s) == -1) and debug){ | 
| 1855 | old_errno = errno; | |
| 1856 | perror_plus("close"); | |
| 1857 | errno = old_errno; | |
| 1858 | } | |
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1859 | return false; | 
| 237.2.33
by teddy at bsnet * plugins.d/mandos-client.c: An empty interface name now means to | 1860 | } | 
| 941
by Teddy Hogeborn Check return values from newly added close() calls | 1861 | if((close(s) == -1) and debug){ | 
| 1862 | old_errno = errno; | |
| 1863 | perror_plus("close"); | |
| 1864 | errno = old_errno; | |
| 1865 | } | |
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1866 | return true; | 
| 1867 | }
 | |
| 1868 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1869 | __attribute__((nonnull, warn_unused_result)) | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1870 | bool good_flags(const char *ifname, const struct ifreq *ifr){ | 
| 1871 |   
 | |
| 237.2.33
by teddy at bsnet * plugins.d/mandos-client.c: An empty interface name now means to | 1872 | /* Reject the loopback device */ | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1873 | if(ifr->ifr_flags & IFF_LOOPBACK){ | 
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1874 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1875 | fprintf_plus(stderr, "Rejecting loopback interface \"%s\"\n", | 
| 1876 | ifname); | |
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1877 | } | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1878 | return false; | 
| 237.2.33
by teddy at bsnet * plugins.d/mandos-client.c: An empty interface name now means to | 1879 | } | 
| 1880 | /* Accept point-to-point devices only if connect_to is specified */ | |
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1881 | if(connect_to != NULL and (ifr->ifr_flags & IFF_POINTOPOINT)){ | 
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1882 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1883 | fprintf_plus(stderr, "Accepting point-to-point interface" | 
| 1884 | " \"%s\"\n", ifname); | |
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1885 | } | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1886 | return true; | 
| 237.2.33
by teddy at bsnet * plugins.d/mandos-client.c: An empty interface name now means to | 1887 | } | 
| 1888 | /* Otherwise, reject non-broadcast-capable devices */ | |
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1889 | if(not (ifr->ifr_flags & IFF_BROADCAST)){ | 
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1890 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1891 | fprintf_plus(stderr, "Rejecting non-broadcast interface" | 
| 1892 | " \"%s\"\n", ifname); | |
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1893 | } | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1894 | return false; | 
| 237.2.33
by teddy at bsnet * plugins.d/mandos-client.c: An empty interface name now means to | 1895 | } | 
| 481
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Reject non-ARP | 1896 | /* Reject non-ARP interfaces (including dummy interfaces) */ | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1897 | if(ifr->ifr_flags & IFF_NOARP){ | 
| 481
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Reject non-ARP | 1898 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1899 | fprintf_plus(stderr, "Rejecting non-ARP interface \"%s\"\n", | 
| 1900 | ifname); | |
| 481
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Reject non-ARP | 1901 | } | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1902 | return false; | 
| 481
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Reject non-ARP | 1903 | } | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1904 |   
 | 
| 237.2.33
by teddy at bsnet * plugins.d/mandos-client.c: An empty interface name now means to | 1905 | /* Accept this device */ | 
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1906 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1907 | fprintf_plus(stderr, "Interface \"%s\" is good\n", ifname); | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1908 | } | 
| 1909 | return true; | |
| 1910 | }
 | |
| 1911 | ||
| 1912 | /* 
 | |
| 1913 |  * This function determines if a directory entry in /sys/class/net
 | |
| 1914 |  * corresponds to an acceptable network device.
 | |
| 1915 |  * (This function is passed to scandir(3) as a filter function.)
 | |
| 1916 |  */
 | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1917 | __attribute__((nonnull, warn_unused_result)) | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1918 | int good_interface(const struct dirent *if_entry){ | 
| 1919 | if(if_entry->d_name[0] == '.'){ | |
| 1920 | return 0; | |
| 1921 | } | |
| 505.3.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Add error message. | 1922 |   
 | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1923 | struct ifreq ifr; | 
| 1924 | if(not get_flags(if_entry->d_name, &ifr)){ | |
| 505.3.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Add error message. | 1925 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1926 | fprintf_plus(stderr, "Failed to get flags for interface " | 
| 1927 | "\"%s\"\n", if_entry->d_name); | |
| 505.3.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Add error message. | 1928 | } | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1929 | return 0; | 
| 1930 | } | |
| 1931 |   
 | |
| 1932 | if(not good_flags(if_entry->d_name, &ifr)){ | |
| 1933 | return 0; | |
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1934 | } | 
| 237.2.33
by teddy at bsnet * plugins.d/mandos-client.c: An empty interface name now means to | 1935 | return 1; | 
| 1936 | }
 | |
| 1937 | ||
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 1938 | /* 
 | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 1939 |  * This function determines if a network interface is up.
 | 
| 1940 |  */
 | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1941 | __attribute__((nonnull, warn_unused_result)) | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 1942 | bool interface_is_up(const char *interface){ | 
| 1943 | struct ifreq ifr; | |
| 1944 | if(not get_flags(interface, &ifr)){ | |
| 1945 | if(debug){ | |
| 1946 | fprintf_plus(stderr, "Failed to get flags for interface " | |
| 1947 | "\"%s\"\n", interface); | |
| 1948 | } | |
| 1949 | return false; | |
| 1950 | } | |
| 1951 |   
 | |
| 1952 | return (bool)(ifr.ifr_flags & IFF_UP); | |
| 1953 | }
 | |
| 1954 | ||
| 1955 | /* 
 | |
| 1956 |  * This function determines if a network interface is running
 | |
| 1957 |  */
 | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1958 | __attribute__((nonnull, warn_unused_result)) | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 1959 | bool interface_is_running(const char *interface){ | 
| 1960 | struct ifreq ifr; | |
| 1961 | if(not get_flags(interface, &ifr)){ | |
| 1962 | if(debug){ | |
| 1963 | fprintf_plus(stderr, "Failed to get flags for interface " | |
| 1964 | "\"%s\"\n", interface); | |
| 1965 | } | |
| 1966 | return false; | |
| 1967 | } | |
| 1968 |   
 | |
| 1969 | return (bool)(ifr.ifr_flags & IFF_RUNNING); | |
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 1970 | }
 | 
| 1971 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1972 | __attribute__((nonnull, pure, warn_unused_result)) | 
| 24.1.172
by Björn Påhlsson using scandir instead of readdir | 1973 | int notdotentries(const struct dirent *direntry){ | 
| 1974 | /* Skip "." and ".." */ | |
| 1975 | if(direntry->d_name[0] == '.' | |
| 1976 | and (direntry->d_name[1] == '\0' | |
| 1977 | or (direntry->d_name[1] == '.' | |
| 1978 | and direntry->d_name[2] == '\0'))){ | |
| 1979 | return 0; | |
| 1980 | } | |
| 1981 | return 1; | |
| 1982 | }
 | |
| 1983 | ||
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 1984 | /* Is this directory entry a runnable program? */
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1985 | __attribute__((nonnull, warn_unused_result)) | 
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 1986 | int runnable_hook(const struct dirent *direntry){ | 
| 1987 | int ret; | |
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 1988 | size_t sret; | 
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 1989 | struct stat st; | 
| 1990 |   
 | |
| 1991 | if((direntry->d_name)[0] == '\0'){ | |
| 1992 | /* Empty name? */ | |
| 1993 | return 0; | |
| 1994 | } | |
| 1995 |   
 | |
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 1996 | sret = strspn(direntry->d_name, "ABCDEFGHIJKLMNOPQRSTUVWXYZ" | 
| 1997 | "abcdefghijklmnopqrstuvwxyz" | |
| 1998 | "0123456789" | |
| 688
by Teddy Hogeborn Minor bug fix in mandos-client: Allow periods in network hook names. | 1999 | "_.-"); | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 2000 | if((direntry->d_name)[sret] != '\0'){ | 
| 2001 | /* Contains non-allowed characters */ | |
| 2002 | if(debug){ | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 2003 | fprintf_plus(stderr, "Ignoring hook \"%s\" with bad name\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 2004 | direntry->d_name); | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 2005 | } | 
| 2006 | return 0; | |
| 2007 | } | |
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 2008 |   
 | 
| 693
by Teddy Hogeborn Make mandos-client use fstatat(). | 2009 | ret = fstatat(hookdir_fd, direntry->d_name, &st, 0); | 
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 2010 | if(ret == -1){ | 
| 2011 | if(debug){ | |
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 2012 | perror_plus("Could not stat hook"); | 
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 2013 | } | 
| 2014 | return 0; | |
| 2015 | } | |
| 505.3.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Add error message. | 2016 | if(not (S_ISREG(st.st_mode))){ | 
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 2017 | /* Not a regular file */ | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 2018 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 2019 | fprintf_plus(stderr, "Ignoring hook \"%s\" - not a file\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 2020 | direntry->d_name); | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 2021 | } | 
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 2022 | return 0; | 
| 2023 | } | |
| 2024 | if(not (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))){ | |
| 2025 | /* Not executable */ | |
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 2026 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 2027 | fprintf_plus(stderr, "Ignoring hook \"%s\" - not executable\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 2028 | direntry->d_name); | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 2029 | } | 
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 2030 | return 0; | 
| 2031 | } | |
| 505.3.12
by Teddy Hogeborn * plugins.d/mandos-client.c (runnable_hook): Add debug output. | 2032 | if(debug){ | 
| 2033 | fprintf_plus(stderr, "Hook \"%s\" is acceptable\n", | |
| 2034 | direntry->d_name); | |
| 2035 | } | |
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 2036 | return 1; | 
| 2037 | }
 | |
| 2038 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2039 | __attribute__((nonnull, warn_unused_result)) | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 2040 | int avahi_loop_with_timeout(AvahiSimplePoll *s, int retry_interval, | 
| 2041 | mandos_context *mc){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2042 | int ret; | 
| 2043 | struct timespec now; | |
| 2044 | struct timespec waited_time; | |
| 2045 | intmax_t block_time; | |
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 2046 |   
 | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2047 | while(true){ | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 2048 | if(mc->current_server == NULL){ | 
| 671
by Teddy Hogeborn White space fix: change "if (" to "if(" in C code. | 2049 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 2050 | fprintf_plus(stderr, "Wait until first server is found." | 
| 2051 | " No timeout!\n"); | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2052 | } | 
| 2053 | ret = avahi_simple_poll_iterate(s, -1); | |
| 2054 | } else { | |
| 671
by Teddy Hogeborn White space fix: change "if (" to "if(" in C code. | 2055 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 2056 | fprintf_plus(stderr, "Check current_server if we should run" | 
| 2057 | " it, or wait\n"); | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2058 | } | 
| 2059 | /* the current time */ | |
| 2060 | ret = clock_gettime(CLOCK_MONOTONIC, &now); | |
| 2061 | if(ret == -1){ | |
| 2062 | perror_plus("clock_gettime"); | |
| 2063 | return -1; | |
| 2064 | } | |
| 2065 | /* Calculating in ms how long time between now and server | |
| 2066 | 	 who we visted longest time ago. Now - last seen.  */
 | |
| 485
by Teddy Hogeborn Merge from Björn. | 2067 | waited_time.tv_sec = (now.tv_sec | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 2068 | - mc->current_server->last_seen.tv_sec); | 
| 485
by Teddy Hogeborn Merge from Björn. | 2069 | waited_time.tv_nsec = (now.tv_nsec | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 2070 | - mc->current_server->last_seen.tv_nsec); | 
| 485
by Teddy Hogeborn Merge from Björn. | 2071 | /* total time is 10s/10,000ms. | 
| 2072 | 	 Converting to s from ms by dividing by 1,000,
 | |
| 2073 | 	 and ns to ms by dividing by 1,000,000. */
 | |
| 2074 | block_time = ((retry_interval | |
| 2075 | - ((intmax_t)waited_time.tv_sec * 1000)) | |
| 2076 | - ((intmax_t)waited_time.tv_nsec / 1000000)); | |
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 2077 |       
 | 
| 671
by Teddy Hogeborn White space fix: change "if (" to "if(" in C code. | 2078 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 2079 | fprintf_plus(stderr, "Blocking for %" PRIdMAX " ms\n", | 
| 2080 | block_time); | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2081 | } | 
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 2082 |       
 | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2083 | if(block_time <= 0){ | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 2084 | ret = start_mandos_communication(mc->current_server->ip, | 
| 2085 | mc->current_server->port, | |
| 2086 | mc->current_server->if_index, | |
| 2087 | mc->current_server->af, mc); | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2088 | if(ret == 0){ | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 2089 | avahi_simple_poll_quit(s); | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2090 | return 0; | 
| 2091 | } | |
| 485
by Teddy Hogeborn Merge from Björn. | 2092 | ret = clock_gettime(CLOCK_MONOTONIC, | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 2093 | &mc->current_server->last_seen); | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2094 | if(ret == -1){ | 
| 2095 | perror_plus("clock_gettime"); | |
| 2096 | return -1; | |
| 2097 | } | |
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 2098 | mc->current_server = mc->current_server->next; | 
| 485
by Teddy Hogeborn Merge from Björn. | 2099 | block_time = 0; /* Call avahi to find new Mandos | 
| 2100 | 				   servers, but don't block */
 | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2101 | } | 
| 2102 |       
 | |
| 2103 | ret = avahi_simple_poll_iterate(s, (int)block_time); | |
| 2104 | } | |
| 2105 | if(ret != 0){ | |
| 671
by Teddy Hogeborn White space fix: change "if (" to "if(" in C code. | 2106 | if(ret > 0 or errno != EINTR){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2107 | return (ret != 1) ? ret : 0; | 
| 2108 | } | |
| 2109 | } | |
| 2110 | } | |
| 2111 | }
 | |
| 2112 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2113 | __attribute__((nonnull)) | 
| 2114 | void run_network_hooks(const char *mode, const char *interface, | |
| 505.3.8
by Teddy Hogeborn * plugins.d/mandos-client.c (run_network_hooks): New. | 2115 | const float delay){ | 
| 704
by Teddy Hogeborn mandos-client: Fix some bugs on error conditions. | 2116 | struct dirent **direntries = NULL; | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2117 | if(hookdir_fd == -1){ | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 2118 | hookdir_fd = open(hookdir, O_RDONLY | O_DIRECTORY | O_PATH | 
| 2119 | | O_CLOEXEC); | |
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2120 | if(hookdir_fd == -1){ | 
| 2121 | if(errno == ENOENT){ | |
| 2122 | if(debug){ | |
| 2123 | fprintf_plus(stderr, "Network hook directory \"%s\" not" | |
| 2124 | " found\n", hookdir); | |
| 2125 | } | |
| 2126 | } else { | |
| 2127 | perror_plus("open"); | |
| 2128 | } | |
| 2129 | return; | |
| 2130 | } | |
| 2131 | } | |
| 935
by Teddy Hogeborn Client: Bug fix: Possible memory leak if failing to open /dev/null | 2132 | int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY)); | 
| 2133 | if(devnull == -1){ | |
| 2134 | perror_plus("open(\"/dev/null\", O_RDONLY)"); | |
| 2135 | return; | |
| 2136 | } | |
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2137 | int numhooks = scandirat(hookdir_fd, ".", &direntries, | 
| 2138 | runnable_hook, alphasort); | |
| 505.3.8
by Teddy Hogeborn * plugins.d/mandos-client.c (run_network_hooks): New. | 2139 | if(numhooks == -1){ | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2140 | perror_plus("scandir"); | 
| 935
by Teddy Hogeborn Client: Bug fix: Possible memory leak if failing to open /dev/null | 2141 | close(devnull); | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2142 | return; | 
| 2143 | } | |
| 2144 | struct dirent *direntry; | |
| 2145 | int ret; | |
| 2146 | for(int i = 0; i < numhooks; i++){ | |
| 2147 | direntry = direntries[i]; | |
| 2148 | if(debug){ | |
| 2149 | fprintf_plus(stderr, "Running network hook \"%s\"\n", | |
| 2150 | direntry->d_name); | |
| 2151 | } | |
| 2152 | pid_t hook_pid = fork(); | |
| 2153 | if(hook_pid == 0){ | |
| 2154 | /* Child */ | |
| 2155 | /* Raise privileges */ | |
| 706
by Teddy Hogeborn mandos-client: Better error messages. | 2156 | errno = raise_privileges_permanently(); | 
| 2157 | if(errno != 0){ | |
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2158 | perror_plus("Failed to raise privileges"); | 
| 2159 | _exit(EX_NOPERM); | |
| 2160 | } | |
| 2161 | /* Set group */ | |
| 2162 | errno = 0; | |
| 2163 | ret = setgid(0); | |
| 2164 | if(ret == -1){ | |
| 2165 | perror_plus("setgid"); | |
| 2166 | _exit(EX_NOPERM); | |
| 2167 | } | |
| 2168 | /* Reset supplementary groups */ | |
| 2169 | errno = 0; | |
| 2170 | ret = setgroups(0, NULL); | |
| 2171 | if(ret == -1){ | |
| 2172 | perror_plus("setgroups"); | |
| 2173 | _exit(EX_NOPERM); | |
| 2174 | } | |
| 2175 | ret = setenv("MANDOSNETHOOKDIR", hookdir, 1); | |
| 2176 | if(ret == -1){ | |
| 2177 | perror_plus("setenv"); | |
| 2178 | _exit(EX_OSERR); | |
| 2179 | } | |
| 2180 | ret = setenv("DEVICE", interface, 1); | |
| 2181 | if(ret == -1){ | |
| 2182 | perror_plus("setenv"); | |
| 2183 | _exit(EX_OSERR); | |
| 2184 | } | |
| 2185 | ret = setenv("VERBOSITY", debug ? "1" : "0", 1); | |
| 2186 | if(ret == -1){ | |
| 2187 | perror_plus("setenv"); | |
| 2188 | _exit(EX_OSERR); | |
| 2189 | } | |
| 2190 | ret = setenv("MODE", mode, 1); | |
| 2191 | if(ret == -1){ | |
| 2192 | perror_plus("setenv"); | |
| 2193 | _exit(EX_OSERR); | |
| 2194 | } | |
| 2195 | char *delaystring; | |
| 2196 | ret = asprintf(&delaystring, "%f", (double)delay); | |
| 2197 | if(ret == -1){ | |
| 505.3.8
by Teddy Hogeborn * plugins.d/mandos-client.c (run_network_hooks): New. | 2198 | perror_plus("asprintf"); | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2199 | _exit(EX_OSERR); | 
| 2200 | } | |
| 2201 | ret = setenv("DELAY", delaystring, 1); | |
| 2202 | if(ret == -1){ | |
| 505.3.8
by Teddy Hogeborn * plugins.d/mandos-client.c (run_network_hooks): New. | 2203 | free(delaystring); | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2204 | perror_plus("setenv"); | 
| 2205 | _exit(EX_OSERR); | |
| 2206 | } | |
| 2207 | free(delaystring); | |
| 2208 | if(connect_to != NULL){ | |
| 2209 | ret = setenv("CONNECT", connect_to, 1); | |
| 2210 | if(ret == -1){ | |
| 2211 | perror_plus("setenv"); | |
| 2212 | _exit(EX_OSERR); | |
| 2213 | } | |
| 2214 | } | |
| 738.1.3
by Teddy Hogeborn mandos-client: Minor changes to check for more error conditions. | 2215 | int hook_fd = (int)TEMP_FAILURE_RETRY(openat(hookdir_fd, | 
| 2216 | direntry->d_name, | |
| 2217 | O_RDONLY)); | |
| 696
by Teddy Hogeborn Bug fix for mandos-client: Run the network hook, not the directory. | 2218 | if(hook_fd == -1){ | 
| 2219 | perror_plus("openat"); | |
| 2220 | _exit(EXIT_FAILURE); | |
| 2221 | } | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 2222 | if(close(hookdir_fd) == -1){ | 
| 696
by Teddy Hogeborn Bug fix for mandos-client: Run the network hook, not the directory. | 2223 | perror_plus("close"); | 
| 2224 | _exit(EXIT_FAILURE); | |
| 2225 | } | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 2226 | ret = dup2(devnull, STDIN_FILENO); | 
| 2227 | if(ret == -1){ | |
| 2228 | perror_plus("dup2(devnull, STDIN_FILENO)"); | |
| 2229 | _exit(EX_OSERR); | |
| 2230 | } | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 2231 | ret = close(devnull); | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 2232 | if(ret == -1){ | 
| 2233 | perror_plus("close"); | |
| 2234 | _exit(EX_OSERR); | |
| 2235 | } | |
| 2236 | ret = dup2(STDERR_FILENO, STDOUT_FILENO); | |
| 2237 | if(ret == -1){ | |
| 2238 | perror_plus("dup2(STDERR_FILENO, STDOUT_FILENO)"); | |
| 2239 | _exit(EX_OSERR); | |
| 2240 | } | |
| 696
by Teddy Hogeborn Bug fix for mandos-client: Run the network hook, not the directory. | 2241 | if(fexecve(hook_fd, (char *const []){ direntry->d_name, NULL }, | 
| 2242 | environ) == -1){ | |
| 692
by Teddy Hogeborn Make mandos-client use fexecve(). | 2243 | perror_plus("fexecve"); | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2244 | _exit(EXIT_FAILURE); | 
| 2245 | } | |
| 2246 | } else { | |
| 733
by Teddy Hogeborn mandos-client: Bug fix: Check fork() return value. | 2247 | if(hook_pid == -1){ | 
| 2248 | perror_plus("fork"); | |
| 2249 | free(direntry); | |
| 2250 | continue; | |
| 2251 | } | |
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2252 | int status; | 
| 2253 | if(TEMP_FAILURE_RETRY(waitpid(hook_pid, &status, 0)) == -1){ | |
| 2254 | perror_plus("waitpid"); | |
| 715
by Teddy Hogeborn mandos-client: Bug Fix: Fix some memory leaks. | 2255 | free(direntry); | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2256 | continue; | 
| 2257 | } | |
| 2258 | if(WIFEXITED(status)){ | |
| 2259 | if(WEXITSTATUS(status) != 0){ | |
| 2260 | fprintf_plus(stderr, "Warning: network hook \"%s\" exited" | |
| 2261 | " with status %d\n", direntry->d_name, | |
| 2262 | WEXITSTATUS(status)); | |
| 715
by Teddy Hogeborn mandos-client: Bug Fix: Fix some memory leaks. | 2263 | free(direntry); | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2264 | continue; | 
| 2265 | } | |
| 2266 | } else if(WIFSIGNALED(status)){ | |
| 2267 | fprintf_plus(stderr, "Warning: network hook \"%s\" died by" | |
| 2268 | " signal %d\n", direntry->d_name, | |
| 2269 | WTERMSIG(status)); | |
| 715
by Teddy Hogeborn mandos-client: Bug Fix: Fix some memory leaks. | 2270 | free(direntry); | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2271 | continue; | 
| 505.3.8
by Teddy Hogeborn * plugins.d/mandos-client.c (run_network_hooks): New. | 2272 | } else { | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2273 | fprintf_plus(stderr, "Warning: network hook \"%s\"" | 
| 2274 | " crashed\n", direntry->d_name); | |
| 715
by Teddy Hogeborn mandos-client: Bug Fix: Fix some memory leaks. | 2275 | free(direntry); | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2276 | continue; | 
| 2277 | } | |
| 2278 | } | |
| 2279 | if(debug){ | |
| 2280 | fprintf_plus(stderr, "Network hook \"%s\" ran successfully\n", | |
| 2281 | direntry->d_name); | |
| 2282 | } | |
| 715
by Teddy Hogeborn mandos-client: Bug Fix: Fix some memory leaks. | 2283 | free(direntry); | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2284 | } | 
| 704
by Teddy Hogeborn mandos-client: Fix some bugs on error conditions. | 2285 | free(direntries); | 
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 2286 | if(close(hookdir_fd) == -1){ | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2287 | perror_plus("close"); | 
| 2288 | } else { | |
| 2289 | hookdir_fd = -1; | |
| 2290 | } | |
| 2291 | close(devnull); | |
| 505.3.8
by Teddy Hogeborn * plugins.d/mandos-client.c (run_network_hooks): New. | 2292 | }
 | 
| 2293 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2294 | __attribute__((nonnull, warn_unused_result)) | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2295 | int bring_up_interface(const char *const interface, | 
| 2296 | const float delay){ | |
| 2297 | int old_errno = errno; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2298 | int ret; | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2299 | struct ifreq network; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2300 | unsigned int if_index = if_nametoindex(interface); | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2301 | if(if_index == 0){ | 
| 2302 | fprintf_plus(stderr, "No such interface: \"%s\"\n", interface); | |
| 594.1.2
by Teddy Hogeborn * plugins.d/mandos-client.c (bring_up_interface): Bug fix: Return | 2303 | errno = old_errno; | 
| 2304 | return ENXIO; | |
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2305 | } | 
| 2306 |   
 | |
| 2307 | if(quit_now){ | |
| 594.1.2
by Teddy Hogeborn * plugins.d/mandos-client.c (bring_up_interface): Bug fix: Return | 2308 | errno = old_errno; | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2309 | return EINTR; | 
| 2310 | } | |
| 2311 |   
 | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2312 | if(not interface_is_up(interface)){ | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2313 | int ret_errno = 0; | 
| 2314 | int ioctl_errno = 0; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2315 | if(not get_flags(interface, &network)){ | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2316 | ret_errno = errno; | 
| 2317 | fprintf_plus(stderr, "Failed to get flags for interface " | |
| 2318 | "\"%s\"\n", interface); | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2319 | errno = old_errno; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2320 | return ret_errno; | 
| 2321 | } | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2322 | network.ifr_flags |= IFF_UP; /* set flag */ | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2323 |     
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2324 | int sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP); | 
| 2325 | if(sd == -1){ | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2326 | ret_errno = errno; | 
| 2327 | perror_plus("socket"); | |
| 2328 | errno = old_errno; | |
| 2329 | return ret_errno; | |
| 2330 | } | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2331 |     
 | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2332 | if(quit_now){ | 
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 2333 | ret = close(sd); | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2334 | if(ret == -1){ | 
| 2335 | perror_plus("close"); | |
| 2336 | } | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2337 | errno = old_errno; | 
| 2338 | return EINTR; | |
| 2339 | } | |
| 2340 |     
 | |
| 2341 | if(debug){ | |
| 2342 | fprintf_plus(stderr, "Bringing up interface \"%s\"\n", | |
| 2343 | interface); | |
| 2344 | } | |
| 2345 |     
 | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2346 | /* Raise privileges */ | 
| 2347 | ret_errno = raise_privileges(); | |
| 680
by Teddy Hogeborn Minor changes to minimize diff from last release. | 2348 | if(ret_errno != 0){ | 
| 706
by Teddy Hogeborn mandos-client: Better error messages. | 2349 | errno = ret_errno; | 
| 680
by Teddy Hogeborn Minor changes to minimize diff from last release. | 2350 | perror_plus("Failed to raise privileges"); | 
| 2351 | } | |
| 2352 |     
 | |
| 2353 | #ifdef __linux__
 | |
| 2354 | int ret_linux; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2355 | bool restore_loglevel = false; | 
| 2356 | if(ret_errno == 0){ | |
| 2357 | /* Lower kernel loglevel to KERN_NOTICE to avoid KERN_INFO | |
| 2358 | 	 messages about the network interface to mess up the prompt */
 | |
| 2359 | ret_linux = klogctl(8, NULL, 5); | |
| 2360 | if(ret_linux == -1){ | |
| 2361 | perror_plus("klogctl"); | |
| 2362 | } else { | |
| 2363 | restore_loglevel = true; | |
| 2364 | } | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2365 | } | 
| 2366 | #endif /* __linux__ */ | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2367 | int ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network); | 
| 2368 | ioctl_errno = errno; | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2369 | #ifdef __linux__
 | 
| 2370 | if(restore_loglevel){ | |
| 2371 | ret_linux = klogctl(7, NULL, 0); | |
| 2372 | if(ret_linux == -1){ | |
| 2373 | perror_plus("klogctl"); | |
| 2374 | } | |
| 2375 | } | |
| 2376 | #endif /* __linux__ */ | |
| 2377 |     
 | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2378 | /* If raise_privileges() succeeded above */ | 
| 2379 | if(ret_errno == 0){ | |
| 2380 | /* Lower privileges */ | |
| 2381 | ret_errno = lower_privileges(); | |
| 2382 | if(ret_errno != 0){ | |
| 2383 | errno = ret_errno; | |
| 2384 | perror_plus("Failed to lower privileges"); | |
| 2385 | } | |
| 2386 | } | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2387 |     
 | 
| 2388 | /* Close the socket */ | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 2389 | ret = close(sd); | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2390 | if(ret == -1){ | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2391 | perror_plus("close"); | 
| 2392 | } | |
| 2393 |     
 | |
| 2394 | if(ret_setflags == -1){ | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2395 | errno = ioctl_errno; | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2396 | perror_plus("ioctl SIOCSIFFLAGS +IFF_UP"); | 
| 594.1.2
by Teddy Hogeborn * plugins.d/mandos-client.c (bring_up_interface): Bug fix: Return | 2397 | errno = old_errno; | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2398 | return ioctl_errno; | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2399 | } | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2400 | } else if(debug){ | 
| 2401 | fprintf_plus(stderr, "Interface \"%s\" is already up; good\n", | |
| 2402 | interface); | |
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2403 | } | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2404 |   
 | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2405 | /* Sleep checking until interface is running. | 
| 2406 |      Check every 0.25s, up to total time of delay */
 | |
| 890
by Teddy Hogeborn Add spaces around all '=' signs in all C code. | 2407 | for(int i = 0; i < delay * 4; i++){ | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2408 | if(interface_is_running(interface)){ | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2409 | break; | 
| 2410 | } | |
| 2411 | struct timespec sleeptime = { .tv_nsec = 250000000 }; | |
| 2412 | ret = nanosleep(&sleeptime, NULL); | |
| 2413 | if(ret == -1 and errno != EINTR){ | |
| 2414 | perror_plus("nanosleep"); | |
| 2415 | } | |
| 2416 | } | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2417 |   
 | 
| 2418 | errno = old_errno; | |
| 2419 | return 0; | |
| 2420 | }
 | |
| 2421 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2422 | __attribute__((nonnull, warn_unused_result)) | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2423 | int take_down_interface(const char *const interface){ | 
| 2424 | int old_errno = errno; | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2425 | struct ifreq network; | 
| 2426 | unsigned int if_index = if_nametoindex(interface); | |
| 2427 | if(if_index == 0){ | |
| 2428 | fprintf_plus(stderr, "No such interface: \"%s\"\n", interface); | |
| 2429 | errno = old_errno; | |
| 2430 | return ENXIO; | |
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2431 | } | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2432 | if(interface_is_up(interface)){ | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2433 | int ret_errno = 0; | 
| 2434 | int ioctl_errno = 0; | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2435 | if(not get_flags(interface, &network) and debug){ | 
| 2436 | ret_errno = errno; | |
| 2437 | fprintf_plus(stderr, "Failed to get flags for interface " | |
| 2438 | "\"%s\"\n", interface); | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2439 | errno = old_errno; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2440 | return ret_errno; | 
| 2441 | } | |
| 2442 | network.ifr_flags &= ~(short)IFF_UP; /* clear flag */ | |
| 2443 |     
 | |
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 2444 | int sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP); | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2445 | if(sd == -1){ | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2446 | ret_errno = errno; | 
| 2447 | perror_plus("socket"); | |
| 2448 | errno = old_errno; | |
| 2449 | return ret_errno; | |
| 2450 | } | |
| 2451 |     
 | |
| 2452 | if(debug){ | |
| 2453 | fprintf_plus(stderr, "Taking down interface \"%s\"\n", | |
| 2454 | interface); | |
| 2455 | } | |
| 2456 |     
 | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2457 | /* Raise privileges */ | 
| 2458 | ret_errno = raise_privileges(); | |
| 2459 | if(ret_errno != 0){ | |
| 706
by Teddy Hogeborn mandos-client: Better error messages. | 2460 | errno = ret_errno; | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2461 | perror_plus("Failed to raise privileges"); | 
| 2462 | } | |
| 680
by Teddy Hogeborn Minor changes to minimize diff from last release. | 2463 |     
 | 
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 2464 | int ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network); | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2465 | ioctl_errno = errno; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2466 |     
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2467 | /* If raise_privileges() succeeded above */ | 
| 2468 | if(ret_errno == 0){ | |
| 2469 | /* Lower privileges */ | |
| 2470 | ret_errno = lower_privileges(); | |
| 2471 | if(ret_errno != 0){ | |
| 2472 | errno = ret_errno; | |
| 2473 | perror_plus("Failed to lower privileges"); | |
| 2474 | } | |
| 2475 | } | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2476 |     
 | 
| 2477 | /* Close the socket */ | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 2478 | int ret = close(sd); | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2479 | if(ret == -1){ | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2480 | perror_plus("close"); | 
| 2481 | } | |
| 2482 |     
 | |
| 2483 | if(ret_setflags == -1){ | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2484 | errno = ioctl_errno; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2485 | perror_plus("ioctl SIOCSIFFLAGS -IFF_UP"); | 
| 2486 | errno = old_errno; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2487 | return ioctl_errno; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2488 | } | 
| 2489 | } else if(debug){ | |
| 2490 | fprintf_plus(stderr, "Interface \"%s\" is already down; odd\n", | |
| 2491 | interface); | |
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2492 | } | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2493 |   
 | 
| 594.1.2
by Teddy Hogeborn * plugins.d/mandos-client.c (bring_up_interface): Bug fix: Return | 2494 | errno = old_errno; | 
| 2495 | return 0; | |
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2496 | }
 | 
| 2497 | ||
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 2498 | int main(int argc, char *argv[]){ | 
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 2499 | mandos_context mc = { .server = NULL, .dh_bits = 0, | 
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 2500 | #if GNUTLS_VERSION_NUMBER >= 0x030606
 | 
| 2501 | .priority = "SECURE128:!CTYPE-X.509" | |
| 2502 | ":+CTYPE-RAWPK:!RSA:!VERS-ALL:+VERS-TLS1.3" | |
| 2503 | ":%PROFILE_ULTRA", | |
| 2504 | #elif GNUTLS_VERSION_NUMBER < 0x030600
 | |
| 777
by Teddy Hogeborn Bug fix for GnuTLS 3: be compatible with old 2048-bit DSA keys. | 2505 | .priority = "SECURE256:!CTYPE-X.509" | 
| 2506 | ":+CTYPE-OPENPGP:!RSA:+SIGN-DSA-SHA256", | |
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 2507 | #else
 | 
| 2508 | #error "Needs GnuTLS 3.6.6 or later, or before 3.6.0"
 | |
| 2509 | #endif
 | |
| 777
by Teddy Hogeborn Bug fix for GnuTLS 3: be compatible with old 2048-bit DSA keys. | 2510 | .current_server = NULL, .interfaces = NULL, | 
| 2511 | .interfaces_size = 0 }; | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2512 | AvahiSServiceBrowser *sb = NULL; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2513 | error_t ret_errno; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2514 | int ret; | 
| 2515 | intmax_t tmpmax; | |
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 2516 | char *tmp; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2517 | int exitcode = EXIT_SUCCESS; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2518 | char *interfaces_to_take_down = NULL; | 
| 2519 | size_t interfaces_to_take_down_size = 0; | |
| 673
by Teddy Hogeborn Make mandos-client prefer /run/tmp over /tmp. | 2520 | char run_tempdir[] = "/run/tmp/mandosXXXXXX"; | 
| 2521 | char old_tempdir[] = "/tmp/mandosXXXXXX"; | |
| 2522 | char *tempdir = NULL; | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2523 | AvahiIfIndex if_index = AVAHI_IF_UNSPEC; | 
| 2524 | const char *seckey = PATHDIR "/" SECKEY; | |
| 2525 | const char *pubkey = PATHDIR "/" PUBKEY; | |
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 2526 | #if GNUTLS_VERSION_NUMBER >= 0x030606
 | 
| 2527 | const char *tls_privkey = PATHDIR "/" TLS_PRIVKEY; | |
| 2528 | const char *tls_pubkey = PATHDIR "/" TLS_PUBKEY; | |
| 2529 | #endif
 | |
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 2530 | const char *dh_params_file = NULL; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2531 | char *interfaces_hooks = NULL; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2532 |   
 | 
| 2533 | bool gnutls_initialized = false; | |
| 2534 | bool gpgme_initialized = false; | |
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 2535 | float delay = 2.5f; | 
| 485
by Teddy Hogeborn Merge from Björn. | 2536 | double retry_interval = 10; /* 10s between trying a server and | 
| 2537 | 				 retrying the same server again */
 | |
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 2538 |   
 | 
| 369
by Teddy Hogeborn * init.d-mandos (Required-Start, Required-Stop): Bug fix: Added | 2539 | struct sigaction old_sigterm_action = { .sa_handler = SIG_DFL }; | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 2540 | struct sigaction sigterm_action = { .sa_handler = handle_sigterm }; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2541 |   
 | 
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 2542 | uid = getuid(); | 
| 2543 | gid = getgid(); | |
| 2544 |   
 | |
| 2545 | /* Lower any group privileges we might have, just to be safe */ | |
| 2546 | errno = 0; | |
| 2547 | ret = setgid(gid); | |
| 2548 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2549 | perror_plus("setgid"); | 
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 2550 | } | 
| 2551 |   
 | |
| 2552 | /* Lower user privileges (temporarily) */ | |
| 2553 | errno = 0; | |
| 2554 | ret = seteuid(uid); | |
| 2555 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2556 | perror_plus("seteuid"); | 
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 2557 | } | 
| 2558 |   
 | |
| 2559 | if(quit_now){ | |
| 2560 | goto end; | |
| 2561 | } | |
| 2562 |   
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2563 | { | 
| 2564 | struct argp_option options[] = { | |
| 2565 | { .name = "debug", .key = 128, | |
| 2566 | .doc = "Debug mode", .group = 3 }, | |
| 2567 | { .name = "connect", .key = 'c', | |
| 2568 | .arg = "ADDRESS:PORT", | |
| 2569 | .doc = "Connect directly to a specific Mandos server", | |
| 2570 | .group = 1 }, | |
| 2571 | { .name = "interface", .key = 'i', | |
| 2572 | .arg = "NAME", | |
| 304
by Teddy Hogeborn Four new interrelated features: | 2573 | .doc = "Network interface that will be used to search for" | 
| 2574 | " Mandos servers", | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2575 | .group = 1 }, | 
| 2576 | { .name = "seckey", .key = 's', | |
| 2577 | .arg = "FILE", | |
| 2578 | .doc = "OpenPGP secret key file base name", | |
| 2579 | .group = 1 }, | |
| 2580 | { .name = "pubkey", .key = 'p', | |
| 2581 | .arg = "FILE", | |
| 2582 | .doc = "OpenPGP public key file base name", | |
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 2583 | .group = 1 }, | 
| 2584 | { .name = "tls-privkey", .key = 't', | |
| 2585 | .arg = "FILE", | |
| 2586 | #if GNUTLS_VERSION_NUMBER >= 0x030606
 | |
| 2587 | .doc = "TLS private key file base name", | |
| 2588 | #else
 | |
| 2589 | .doc = "Dummy; ignored (requires GnuTLS 3.6.6)", | |
| 2590 | #endif
 | |
| 2591 | .group = 1 }, | |
| 2592 | { .name = "tls-pubkey", .key = 'T', | |
| 2593 | .arg = "FILE", | |
| 2594 | #if GNUTLS_VERSION_NUMBER >= 0x030606
 | |
| 2595 | .doc = "TLS public key file base name", | |
| 2596 | #else
 | |
| 2597 | .doc = "Dummy; ignored (requires GnuTLS 3.6.6)", | |
| 2598 | #endif
 | |
| 2599 | .group = 1 }, | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2600 | { .name = "dh-bits", .key = 129, | 
| 2601 | .arg = "BITS", | |
| 2602 | .doc = "Bit length of the prime number used in the" | |
| 2603 | " Diffie-Hellman key exchange", | |
| 2604 | .group = 2 }, | |
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 2605 | { .name = "dh-params", .key = 134, | 
| 2606 | .arg = "FILE", | |
| 2607 | .doc = "PEM-encoded PKCS#3 file with pre-generated parameters" | |
| 2608 | " for the Diffie-Hellman key exchange", | |
| 2609 | .group = 2 }, | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2610 | { .name = "priority", .key = 130, | 
| 2611 | .arg = "STRING", | |
| 2612 | .doc = "GnuTLS priority string for the TLS handshake", | |
| 2613 | .group = 1 }, | |
| 2614 | { .name = "delay", .key = 131, | |
| 2615 | .arg = "SECONDS", | |
| 2616 | .doc = "Maximum delay to wait for interface startup", | |
| 2617 | .group = 2 }, | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2618 | { .name = "retry", .key = 132, | 
| 2619 | .arg = "SECONDS", | |
| 535.1.1
by teddy at recompile Add wireless network hook | 2620 | .doc = "Retry interval used when denied by the Mandos server", | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2621 | .group = 2 }, | 
| 505.3.4
by teddy at bsnet * plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the | 2622 | { .name = "network-hook-dir", .key = 133, | 
| 2623 | .arg = "DIR", | |
| 2624 | .doc = "Directory where network hooks are located", | |
| 2625 | .group = 2 }, | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2626 | /* | 
| 2627 |        * These reproduce what we would get without ARGP_NO_HELP
 | |
| 2628 |        */
 | |
| 2629 | { .name = "help", .key = '?', | |
| 2630 | .doc = "Give this help list", .group = -1 }, | |
| 2631 | { .name = "usage", .key = -3, | |
| 2632 | .doc = "Give a short usage message", .group = -1 }, | |
| 2633 | { .name = "version", .key = 'V', | |
| 2634 | .doc = "Print program version", .group = -1 }, | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2635 | { .name = NULL } | 
| 2636 | }; | |
| 2637 |     
 | |
| 2638 | error_t parse_opt(int key, char *arg, | |
| 2639 | struct argp_state *state){ | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2640 | errno = 0; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2641 | switch(key){ | 
| 2642 | case 128: /* --debug */ | |
| 2643 | debug = true; | |
| 2644 | break; | |
| 2645 | case 'c': /* --connect */ | |
| 2646 | connect_to = arg; | |
| 2647 | break; | |
| 2648 | case 'i': /* --interface */ | |
| 603
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): New "interfaces" and | 2649 | ret_errno = argz_add_sep(&mc.interfaces, &mc.interfaces_size, | 
| 2650 | arg, (int)','); | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2651 | if(ret_errno != 0){ | 
| 2652 | argp_error(state, "%s", strerror(ret_errno)); | |
| 2653 | } | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2654 | break; | 
| 2655 | case 's': /* --seckey */ | |
| 2656 | seckey = arg; | |
| 2657 | break; | |
| 2658 | case 'p': /* --pubkey */ | |
| 2659 | pubkey = arg; | |
| 2660 | break; | |
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 2661 | case 't': /* --tls-privkey */ | 
| 2662 | #if GNUTLS_VERSION_NUMBER >= 0x030606
 | |
| 2663 | tls_privkey = arg; | |
| 2664 | #endif
 | |
| 2665 | break; | |
| 2666 | case 'T': /* --tls-pubkey */ | |
| 2667 | #if GNUTLS_VERSION_NUMBER >= 0x030606
 | |
| 2668 | tls_pubkey = arg; | |
| 2669 | #endif
 | |
| 2670 | break; | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2671 | case 129: /* --dh-bits */ | 
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 2672 | errno = 0; | 
| 2673 | tmpmax = strtoimax(arg, &tmp, 10); | |
| 2674 | if(errno != 0 or tmp == arg or *tmp != '\0' | |
| 2675 | or tmpmax != (typeof(mc.dh_bits))tmpmax){ | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2676 | argp_error(state, "Bad number of DH bits"); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2677 | } | 
| 2678 | mc.dh_bits = (typeof(mc.dh_bits))tmpmax; | |
| 2679 | break; | |
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 2680 | case 134: /* --dh-params */ | 
| 2681 | dh_params_file = arg; | |
| 2682 | break; | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2683 | case 130: /* --priority */ | 
| 2684 | mc.priority = arg; | |
| 2685 | break; | |
| 2686 | case 131: /* --delay */ | |
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 2687 | errno = 0; | 
| 2688 | delay = strtof(arg, &tmp); | |
| 2689 | if(errno != 0 or tmp == arg or *tmp != '\0'){ | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2690 | argp_error(state, "Bad delay"); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2691 | } | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2692 | case 132: /* --retry */ | 
| 2693 | errno = 0; | |
| 2694 | retry_interval = strtod(arg, &tmp); | |
| 2695 | if(errno != 0 or tmp == arg or *tmp != '\0' | |
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 2696 | or (retry_interval * 1000) > INT_MAX | 
| 2697 | or retry_interval < 0){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2698 | argp_error(state, "Bad retry interval"); | 
| 2699 | } | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2700 | break; | 
| 505.3.4
by teddy at bsnet * plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the | 2701 | case 133: /* --network-hook-dir */ | 
| 2702 | hookdir = arg; | |
| 2703 | break; | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2704 | /* | 
| 2705 | 	 * These reproduce what we would get without ARGP_NO_HELP
 | |
| 2706 | 	 */
 | |
| 2707 | case '?': /* --help */ | |
| 2708 | argp_state_help(state, state->out_stream, | |
| 2709 | (ARGP_HELP_STD_HELP | ARGP_HELP_EXIT_ERR) | |
| 2710 | & ~(unsigned int)ARGP_HELP_EXIT_OK); | |
| 975
by Teddy Hogeborn Fix warnings from -Wimplicit-fallthrough | 2711 | __builtin_unreachable(); | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2712 | case -3: /* --usage */ | 
| 2713 | argp_state_help(state, state->out_stream, | |
| 2714 | ARGP_HELP_USAGE | ARGP_HELP_EXIT_ERR); | |
| 975
by Teddy Hogeborn Fix warnings from -Wimplicit-fallthrough | 2715 | __builtin_unreachable(); | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2716 | case 'V': /* --version */ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 2717 | fprintf_plus(state->out_stream, "%s\n", argp_program_version); | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2718 | exit(argp_err_exit_status); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2719 | break; | 
| 2720 | default: | |
| 2721 | return ARGP_ERR_UNKNOWN; | |
| 2722 | } | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2723 | return errno; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2724 | } | 
| 2725 |     
 | |
| 2726 | struct argp argp = { .options = options, .parser = parse_opt, | |
| 2727 | .args_doc = "", | |
| 2728 | .doc = "Mandos client -- Get and decrypt" | |
| 2729 | " passwords from a Mandos server" }; | |
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2730 | ret_errno = argp_parse(&argp, argc, argv, | 
| 2731 | ARGP_IN_ORDER | ARGP_NO_HELP, 0, NULL); | |
| 2732 | switch(ret_errno){ | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2733 | case 0: | 
| 2734 | break; | |
| 2735 | case ENOMEM: | |
| 2736 | default: | |
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2737 | errno = ret_errno; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2738 | perror_plus("argp_parse"); | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2739 | exitcode = EX_OSERR; | 
| 2740 | goto end; | |
| 2741 | case EINVAL: | |
| 2742 | exitcode = EX_USAGE; | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2743 | goto end; | 
| 2744 | } | |
| 2745 | } | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 2746 |   
 | 
| 505.3.16
by teddy at bsnet * network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. | 2747 | { | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2748 | /* Re-raise privileges */ | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2749 | ret = raise_privileges(); | 
| 2750 | if(ret != 0){ | |
| 2751 | errno = ret; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2752 | perror_plus("Failed to raise privileges"); | 
| 2753 | } else { | |
| 505.3.16
by teddy at bsnet * network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. | 2754 | struct stat st; | 
| 2755 |       
 | |
| 1231
by Teddy Hogeborn Work around Debian bug #981302 | 2756 | /* Work around Debian bug #633582: | 
| 2757 | 	 <https://bugs.debian.org/633582> */
 | |
| 2758 | ||
| 505.3.16
by teddy at bsnet * network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. | 2759 | if(strcmp(seckey, PATHDIR "/" SECKEY) == 0){ | 
| 2760 | int seckey_fd = open(seckey, O_RDONLY); | |
| 2761 | if(seckey_fd == -1){ | |
| 2762 | perror_plus("open"); | |
| 2763 | } else { | |
| 2764 | ret = (int)TEMP_FAILURE_RETRY(fstat(seckey_fd, &st)); | |
| 2765 | if(ret == -1){ | |
| 2766 | perror_plus("fstat"); | |
| 2767 | } else { | |
| 2768 | if(S_ISREG(st.st_mode) | |
| 2769 | and st.st_uid == 0 and st.st_gid == 0){ | |
| 2770 | ret = fchown(seckey_fd, uid, gid); | |
| 2771 | if(ret == -1){ | |
| 2772 | perror_plus("fchown"); | |
| 2773 | } | |
| 2774 | } | |
| 2775 | } | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 2776 | close(seckey_fd); | 
| 505.3.16
by teddy at bsnet * network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. | 2777 | } | 
| 2778 | } | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 2779 |       
 | 
| 505.3.16
by teddy at bsnet * network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. | 2780 | if(strcmp(pubkey, PATHDIR "/" PUBKEY) == 0){ | 
| 2781 | int pubkey_fd = open(pubkey, O_RDONLY); | |
| 2782 | if(pubkey_fd == -1){ | |
| 2783 | perror_plus("open"); | |
| 2784 | } else { | |
| 2785 | ret = (int)TEMP_FAILURE_RETRY(fstat(pubkey_fd, &st)); | |
| 2786 | if(ret == -1){ | |
| 2787 | perror_plus("fstat"); | |
| 2788 | } else { | |
| 2789 | if(S_ISREG(st.st_mode) | |
| 2790 | and st.st_uid == 0 and st.st_gid == 0){ | |
| 2791 | ret = fchown(pubkey_fd, uid, gid); | |
| 2792 | if(ret == -1){ | |
| 2793 | perror_plus("fchown"); | |
| 2794 | } | |
| 2795 | } | |
| 2796 | } | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 2797 | close(pubkey_fd); | 
| 505.3.16
by teddy at bsnet * network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. | 2798 | } | 
| 2799 | } | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 2800 |       
 | 
| 776
by Teddy Hogeborn mandos-client: Bug fix: don't crash if --dh-params was not used. | 2801 | if(dh_params_file != NULL | 
| 2802 | and strcmp(dh_params_file, PATHDIR "/dhparams.pem" ) == 0){ | |
| 765
by Teddy Hogeborn Install client Diffie-Hellman parameters into initramfs. | 2803 | int dhparams_fd = open(dh_params_file, O_RDONLY); | 
| 2804 | if(dhparams_fd == -1){ | |
| 2805 | perror_plus("open"); | |
| 2806 | } else { | |
| 2807 | ret = (int)TEMP_FAILURE_RETRY(fstat(dhparams_fd, &st)); | |
| 2808 | if(ret == -1){ | |
| 2809 | perror_plus("fstat"); | |
| 2810 | } else { | |
| 2811 | if(S_ISREG(st.st_mode) | |
| 2812 | and st.st_uid == 0 and st.st_gid == 0){ | |
| 2813 | ret = fchown(dhparams_fd, uid, gid); | |
| 2814 | if(ret == -1){ | |
| 2815 | perror_plus("fchown"); | |
| 2816 | } | |
| 2817 | } | |
| 2818 | } | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 2819 | close(dhparams_fd); | 
| 765
by Teddy Hogeborn Install client Diffie-Hellman parameters into initramfs. | 2820 | } | 
| 2821 | } | |
| 2822 |       
 | |
| 1231
by Teddy Hogeborn Work around Debian bug #981302 | 2823 | /* Work around Debian bug #981302 | 
| 2824 | 	 <https://bugs.debian.org/981302> */
 | |
| 2825 | if(lstat("/dev/fd", &st) != 0 and errno == ENOENT){ | |
| 2826 | ret = symlink("/proc/self/fd", "/dev/fd"); | |
| 2827 | if(ret == -1){ | |
| 2828 | perror_plus("Failed to create /dev/fd symlink"); | |
| 2829 | } | |
| 2830 | } | |
| 2831 | ||
| 505.3.11
by Teddy Hogeborn * Makefile (run-client): Add "--network-hook-dir" option. | 2832 | /* Lower privileges */ | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2833 | ret = lower_privileges(); | 
| 2834 | if(ret != 0){ | |
| 2835 | errno = ret; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2836 | perror_plus("Failed to lower privileges"); | 
| 2837 | } | |
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 2838 | } | 
| 2839 | } | |
| 2840 |   
 | |
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 2841 | /* Remove invalid interface names (except "none") */ | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2842 | { | 
| 2843 | char *interface = NULL; | |
| 603
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): New "interfaces" and | 2844 | while((interface = argz_next(mc.interfaces, mc.interfaces_size, | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2845 | interface))){ | 
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 2846 | if(strcmp(interface, "none") != 0 | 
| 2847 | and if_nametoindex(interface) == 0){ | |
| 2848 | if(interface[0] != '\0'){ | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2849 | fprintf_plus(stderr, "Not using nonexisting interface" | 
| 2850 | " \"%s\"\n", interface); | |
| 2851 | } | |
| 603
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): New "interfaces" and | 2852 | argz_delete(&mc.interfaces, &mc.interfaces_size, interface); | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2853 | interface = NULL; | 
| 2854 | } | |
| 2855 | } | |
| 2856 | } | |
| 2857 |   
 | |
| 505.3.16
by teddy at bsnet * network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. | 2858 | /* Run network hooks */ | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2859 | { | 
| 603
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): New "interfaces" and | 2860 | if(mc.interfaces != NULL){ | 
| 2861 | interfaces_hooks = malloc(mc.interfaces_size); | |
| 599
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Bug fix: Set DEVICE environment | 2862 | if(interfaces_hooks == NULL){ | 
| 2863 | perror_plus("malloc"); | |
| 2864 | goto end; | |
| 2865 | } | |
| 603
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): New "interfaces" and | 2866 | memcpy(interfaces_hooks, mc.interfaces, mc.interfaces_size); | 
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 2867 | argz_stringify(interfaces_hooks, mc.interfaces_size, (int)','); | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2868 | } | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2869 | run_network_hooks("start", interfaces_hooks != NULL ? | 
| 2870 | interfaces_hooks : "", delay); | |
| 505.3.16
by teddy at bsnet * network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. | 2871 | } | 
| 2872 |   
 | |
| 24.1.135
by Björn Påhlsson Earlier signal handling | 2873 | if(not debug){ | 
| 2874 | avahi_set_log_function(empty_log); | |
| 2875 | } | |
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 2876 |   
 | 
| 24.1.135
by Björn Påhlsson Earlier signal handling | 2877 | /* Initialize Avahi early so avahi_simple_poll_quit() can be called | 
| 2878 |      from the signal handler */
 | |
| 2879 | /* Initialize the pseudo-RNG for Avahi */ | |
| 2880 | srand((unsigned int) time(NULL)); | |
| 601
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Removed "simple_poll" | 2881 | simple_poll = avahi_simple_poll_new(); | 
| 2882 | if(simple_poll == NULL){ | |
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 2883 | fprintf_plus(stderr, | 
| 2884 | "Avahi: Failed to create simple poll object.\n"); | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2885 | exitcode = EX_UNAVAILABLE; | 
| 24.1.135
by Björn Påhlsson Earlier signal handling | 2886 | goto end; | 
| 2887 | } | |
| 309
by Teddy Hogeborn Merge from Björn: | 2888 |   
 | 
| 24.1.135
by Björn Påhlsson Earlier signal handling | 2889 | sigemptyset(&sigterm_action.sa_mask); | 
| 309
by Teddy Hogeborn Merge from Björn: | 2890 | ret = sigaddset(&sigterm_action.sa_mask, SIGINT); | 
| 2891 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2892 | perror_plus("sigaddset"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2893 | exitcode = EX_OSERR; | 
| 309
by Teddy Hogeborn Merge from Björn: | 2894 | goto end; | 
| 2895 | } | |
| 2896 | ret = sigaddset(&sigterm_action.sa_mask, SIGHUP); | |
| 2897 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2898 | perror_plus("sigaddset"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2899 | exitcode = EX_OSERR; | 
| 309
by Teddy Hogeborn Merge from Björn: | 2900 | goto end; | 
| 2901 | } | |
| 24.1.135
by Björn Påhlsson Earlier signal handling | 2902 | ret = sigaddset(&sigterm_action.sa_mask, SIGTERM); | 
| 2903 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2904 | perror_plus("sigaddset"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2905 | exitcode = EX_OSERR; | 
| 24.1.135
by Björn Påhlsson Earlier signal handling | 2906 | goto end; | 
| 2907 | } | |
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 2908 | /* Need to check if the handler is SIG_IGN before handling: | 
| 2909 |      | [[info:libc:Initial Signal Actions]] |
 | |
| 2910 |      | [[info:libc:Basic Signal Handling]]  |
 | |
| 2911 |   */
 | |
| 2912 | ret = sigaction(SIGINT, NULL, &old_sigterm_action); | |
| 2913 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2914 | perror_plus("sigaction"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2915 | return EX_OSERR; | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 2916 | } | 
| 2917 | if(old_sigterm_action.sa_handler != SIG_IGN){ | |
| 2918 | ret = sigaction(SIGINT, &sigterm_action, NULL); | |
| 2919 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2920 | perror_plus("sigaction"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2921 | exitcode = EX_OSERR; | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 2922 | goto end; | 
| 2923 | } | |
| 2924 | } | |
| 2925 | ret = sigaction(SIGHUP, NULL, &old_sigterm_action); | |
| 2926 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2927 | perror_plus("sigaction"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2928 | return EX_OSERR; | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 2929 | } | 
| 2930 | if(old_sigterm_action.sa_handler != SIG_IGN){ | |
| 2931 | ret = sigaction(SIGHUP, &sigterm_action, NULL); | |
| 2932 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2933 | perror_plus("sigaction"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2934 | exitcode = EX_OSERR; | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 2935 | goto end; | 
| 2936 | } | |
| 2937 | } | |
| 2938 | ret = sigaction(SIGTERM, NULL, &old_sigterm_action); | |
| 2939 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2940 | perror_plus("sigaction"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2941 | return EX_OSERR; | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 2942 | } | 
| 2943 | if(old_sigterm_action.sa_handler != SIG_IGN){ | |
| 2944 | ret = sigaction(SIGTERM, &sigterm_action, NULL); | |
| 2945 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2946 | perror_plus("sigaction"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2947 | exitcode = EX_OSERR; | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 2948 | goto end; | 
| 2949 | } | |
| 354
by Teddy Hogeborn * plugins.d/mandos-client.c (signal_received): New. | 2950 | } | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2951 |   
 | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2952 | /* If no interfaces were specified, make a list */ | 
| 603
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): New "interfaces" and | 2953 | if(mc.interfaces == NULL){ | 
| 699
by Teddy Hogeborn Fix free() of possibly uninitialized pointer in mandos-client. | 2954 | struct dirent **direntries = NULL; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2955 | /* Look for any good interfaces */ | 
| 2956 | ret = scandir(sys_class_net, &direntries, good_interface, | |
| 2957 | alphasort); | |
| 2958 | if(ret >= 1){ | |
| 2959 | /* Add all found interfaces to interfaces list */ | |
| 2960 | for(int i = 0; i < ret; ++i){ | |
| 603
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): New "interfaces" and | 2961 | ret_errno = argz_add(&mc.interfaces, &mc.interfaces_size, | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2962 | direntries[i]->d_name); | 
| 2963 | if(ret_errno != 0){ | |
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 2964 | errno = ret_errno; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2965 | perror_plus("argz_add"); | 
| 715
by Teddy Hogeborn mandos-client: Bug Fix: Fix some memory leaks. | 2966 | free(direntries[i]); | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2967 | continue; | 
| 2968 | } | |
| 2969 | if(debug){ | |
| 2970 | fprintf_plus(stderr, "Will use interface \"%s\"\n", | |
| 2971 | direntries[i]->d_name); | |
| 2972 | } | |
| 715
by Teddy Hogeborn mandos-client: Bug Fix: Fix some memory leaks. | 2973 | free(direntries[i]); | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2974 | } | 
| 2975 | free(direntries); | |
| 2976 | } else { | |
| 704
by Teddy Hogeborn mandos-client: Fix some bugs on error conditions. | 2977 | if(ret == 0){ | 
| 2978 | free(direntries); | |
| 2979 | } | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2980 | fprintf_plus(stderr, "Could not find a network interface\n"); | 
| 2981 | exitcode = EXIT_FAILURE; | |
| 2982 | goto end; | |
| 2983 | } | |
| 2984 | } | |
| 2985 |   
 | |
| 605
by Teddy Hogeborn * plugins.d/mandos-client.c: Comment changes | 2986 | /* Bring up interfaces which are down, and remove any "none"s */ | 
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 2987 | { | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2988 | char *interface = NULL; | 
| 603
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): New "interfaces" and | 2989 | while((interface = argz_next(mc.interfaces, mc.interfaces_size, | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2990 | interface))){ | 
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 2991 | /* If interface name is "none", stop bringing up interfaces. | 
| 2992 | 	 Also remove all instances of "none" from the list */
 | |
| 2993 | if(strcmp(interface, "none") == 0){ | |
| 2994 | argz_delete(&mc.interfaces, &mc.interfaces_size, | |
| 2995 | interface); | |
| 2996 | interface = NULL; | |
| 2997 | while((interface = argz_next(mc.interfaces, | |
| 2998 | mc.interfaces_size, interface))){ | |
| 2999 | if(strcmp(interface, "none") == 0){ | |
| 3000 | argz_delete(&mc.interfaces, &mc.interfaces_size, | |
| 3001 | interface); | |
| 3002 | interface = NULL; | |
| 3003 | } | |
| 3004 | } | |
| 3005 | break; | |
| 3006 | } | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 3007 | bool interface_was_up = interface_is_up(interface); | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 3008 | errno = bring_up_interface(interface, delay); | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 3009 | if(not interface_was_up){ | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 3010 | if(errno != 0){ | 
| 767
by Teddy Hogeborn plugins.d/mandos-client.c (main): See why it failed to bring up interface. | 3011 | fprintf_plus(stderr, "Failed to bring up interface \"%s\":" | 
| 3012 | " %s\n", interface, strerror(errno)); | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 3013 | } else { | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 3014 | errno = argz_add(&interfaces_to_take_down, | 
| 3015 | &interfaces_to_take_down_size, | |
| 3016 | interface); | |
| 3017 | if(errno != 0){ | |
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 3018 | perror_plus("argz_add"); | 
| 3019 | } | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 3020 | } | 
| 3021 | } | |
| 3022 | } | |
| 3023 | if(debug and (interfaces_to_take_down == NULL)){ | |
| 3024 | fprintf_plus(stderr, "No interfaces were brought up\n"); | |
| 365
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Bug fix: Check result of setgid(). | 3025 | } | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3026 | } | 
| 3027 |   
 | |
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 3028 | /* If we only got one interface, explicitly use only that one */ | 
| 3029 | if(argz_count(mc.interfaces, mc.interfaces_size) == 1){ | |
| 3030 | if(debug){ | |
| 3031 | fprintf_plus(stderr, "Using only interface \"%s\"\n", | |
| 3032 | mc.interfaces); | |
| 3033 | } | |
| 3034 | if_index = (AvahiIfIndex)if_nametoindex(mc.interfaces); | |
| 3035 | } | |
| 3036 |   
 | |
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 3037 | if(quit_now){ | 
| 3038 | goto end; | |
| 3039 | } | |
| 3040 |   
 | |
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 3041 | #if GNUTLS_VERSION_NUMBER >= 0x030606
 | 
| 3042 | ret = init_gnutls_global(tls_pubkey, tls_privkey, dh_params_file, &mc); | |
| 3043 | #elif GNUTLS_VERSION_NUMBER < 0x030600
 | |
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 3044 | ret = init_gnutls_global(pubkey, seckey, dh_params_file, &mc); | 
| 962
by Teddy Hogeborn Add support for using raw public keys in TLS (RFC 7250) | 3045 | #else
 | 
| 3046 | #error "Needs GnuTLS 3.6.6 or later, or before 3.6.0"
 | |
| 3047 | #endif
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3048 | if(ret == -1){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 3049 | fprintf_plus(stderr, "init_gnutls_global failed\n"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 3050 | exitcode = EX_UNAVAILABLE; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3051 | goto end; | 
| 3052 | } else { | |
| 3053 | gnutls_initialized = true; | |
| 3054 | } | |
| 3055 |   
 | |
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 3056 | if(quit_now){ | 
| 3057 | goto end; | |
| 3058 | } | |
| 3059 |   
 | |
| 673
by Teddy Hogeborn Make mandos-client prefer /run/tmp over /tmp. | 3060 | /* Try /run/tmp before /tmp */ | 
| 3061 | tempdir = mkdtemp(run_tempdir); | |
| 3062 | if(tempdir == NULL and errno == ENOENT){ | |
| 3063 | if(debug){ | |
| 3064 | fprintf_plus(stderr, "Tempdir %s did not work, trying %s\n", | |
| 3065 | run_tempdir, old_tempdir); | |
| 3066 | } | |
| 3067 | tempdir = mkdtemp(old_tempdir); | |
| 3068 | } | |
| 3069 | if(tempdir == NULL){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 3070 | perror_plus("mkdtemp"); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3071 | goto end; | 
| 3072 | } | |
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 3073 |   
 | 
| 3074 | if(quit_now){ | |
| 3075 | goto end; | |
| 3076 | } | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3077 |   
 | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 3078 | if(not init_gpgme(pubkey, seckey, tempdir, &mc)){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 3079 | fprintf_plus(stderr, "init_gpgme failed\n"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 3080 | exitcode = EX_UNAVAILABLE; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3081 | goto end; | 
| 3082 | } else { | |
| 3083 | gpgme_initialized = true; | |
| 3084 | } | |
| 3085 |   
 | |
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 3086 | if(quit_now){ | 
| 3087 | goto end; | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3088 | } | 
| 3089 |   
 | |
| 3090 | if(connect_to != NULL){ | |
| 3091 | /* Connect directly, do not use Zeroconf */ | |
| 3092 | /* (Mainly meant for debugging) */ | |
| 3093 | char *address = strrchr(connect_to, ':'); | |
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 3094 |     
 | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3095 | if(address == NULL){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 3096 | fprintf_plus(stderr, "No colon in address\n"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 3097 | exitcode = EX_USAGE; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3098 | goto end; | 
| 3099 | } | |
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 3100 |     
 | 
| 3101 | if(quit_now){ | |
| 3102 | goto end; | |
| 3103 | } | |
| 3104 |     
 | |
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 3105 | in_port_t port; | 
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 3106 | errno = 0; | 
| 3107 | tmpmax = strtoimax(address+1, &tmp, 10); | |
| 3108 | if(errno != 0 or tmp == address+1 or *tmp != '\0' | |
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 3109 | or tmpmax != (in_port_t)tmpmax){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 3110 | fprintf_plus(stderr, "Bad port number\n"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 3111 | exitcode = EX_USAGE; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3112 | goto end; | 
| 3113 | } | |
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 3114 |     
 | 
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 3115 | if(quit_now){ | 
| 3116 | goto end; | |
| 3117 | } | |
| 3118 |     
 | |
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 3119 | port = (in_port_t)tmpmax; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3120 | *address = '\0'; | 
| 304
by Teddy Hogeborn Four new interrelated features: | 3121 | /* Colon in address indicates IPv6 */ | 
| 3122 | int af; | |
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 3123 | if(strchr(connect_to, ':') != NULL){ | 
| 304
by Teddy Hogeborn Four new interrelated features: | 3124 | af = AF_INET6; | 
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 3125 | /* Accept [] around IPv6 address - see RFC 5952 */ | 
| 3126 | if(connect_to[0] == '[' and address[-1] == ']') | |
| 3127 | { | |
| 3128 | connect_to++; | |
| 3129 | address[-1] = '\0'; | |
| 3130 | } | |
| 304
by Teddy Hogeborn Four new interrelated features: | 3131 | } else { | 
| 3132 | af = AF_INET; | |
| 3133 | } | |
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 3134 | address = connect_to; | 
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 3135 |     
 | 
| 3136 | if(quit_now){ | |
| 3137 | goto end; | |
| 3138 | } | |
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 3139 |     
 | 
| 24.1.163
by Björn Påhlsson mandos-client: Added never ending loop for --connect | 3140 | while(not quit_now){ | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 3141 | ret = start_mandos_communication(address, port, if_index, af, | 
| 3142 | &mc); | |
| 24.1.163
by Björn Påhlsson mandos-client: Added never ending loop for --connect | 3143 | if(quit_now or ret == 0){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 3144 | break; | 
| 3145 | } | |
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 3146 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 3147 | fprintf_plus(stderr, "Retrying in %d seconds\n", | 
| 3148 | (int)retry_interval); | |
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 3149 | } | 
| 620
by Teddy Hogeborn * plugin-runner.c (main): Bug fix; do not ignore return value of | 3150 | sleep((unsigned int)retry_interval); | 
| 492
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not even try to work around | 3151 | } | 
| 3152 |     
 | |
| 671
by Teddy Hogeborn White space fix: change "if (" to "if(" in C code. | 3153 | if(not quit_now){ | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3154 | exitcode = EXIT_SUCCESS; | 
| 3155 | } | |
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 3156 |     
 | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3157 | goto end; | 
| 3158 | } | |
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 3159 |   
 | 
| 3160 | if(quit_now){ | |
| 3161 | goto end; | |
| 3162 | } | |
| 3163 |   
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3164 | { | 
| 3165 | AvahiServerConfig config; | |
| 3166 | /* Do not publish any local Zeroconf records */ | |
| 3167 | avahi_server_config_init(&config); | |
| 3168 | config.publish_hinfo = 0; | |
| 3169 | config.publish_addresses = 0; | |
| 3170 | config.publish_workstation = 0; | |
| 3171 | config.publish_domain = 0; | |
| 3172 |     
 | |
| 3173 | /* Allocate a new server */ | |
| 601
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Removed "simple_poll" | 3174 | mc.server = avahi_server_new(avahi_simple_poll_get(simple_poll), | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 3175 | &config, NULL, NULL, &ret); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3176 |     
 | 
| 3177 | /* Free the Avahi configuration data */ | |
| 3178 | avahi_server_config_free(&config); | |
| 3179 | } | |
| 3180 |   
 | |
| 3181 | /* Check if creating the Avahi server object succeeded */ | |
| 3182 | if(mc.server == NULL){ | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 3183 | fprintf_plus(stderr, "Failed to create Avahi server: %s\n", | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 3184 | avahi_strerror(ret)); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 3185 | exitcode = EX_UNAVAILABLE; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3186 | goto end; | 
| 3187 | } | |
| 3188 |   
 | |
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 3189 | if(quit_now){ | 
| 3190 | goto end; | |
| 3191 | } | |
| 3192 |   
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3193 | /* Create the Avahi service browser */ | 
| 3194 | sb = avahi_s_service_browser_new(mc.server, if_index, | |
| 313
by Teddy Hogeborn * plugins.d/mandos-client.c (browse_callback, main): Do not require | 3195 | AVAHI_PROTO_UNSPEC, "_mandos._tcp", | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 3196 | NULL, 0, browse_callback, | 
| 3197 | (void *)&mc); | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3198 | if(sb == NULL){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 3199 | fprintf_plus(stderr, "Failed to create service browser: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 3200 | avahi_strerror(avahi_server_errno(mc.server))); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 3201 | exitcode = EX_UNAVAILABLE; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3202 | goto end; | 
| 3203 | } | |
| 307
by Teddy Hogeborn Merge from Björn: | 3204 |   
 | 
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 3205 | if(quit_now){ | 
| 3206 | goto end; | |
| 3207 | } | |
| 3208 |   
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3209 | /* Run the main loop */ | 
| 3210 |   
 | |
| 3211 | if(debug){ | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 3212 | fprintf_plus(stderr, "Starting Avahi loop search\n"); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3213 | } | 
| 687
by Teddy Hogeborn White space fix only. | 3214 |   
 | 
| 601
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Removed "simple_poll" | 3215 | ret = avahi_loop_with_timeout(simple_poll, | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 3216 | (int)(retry_interval * 1000), &mc); | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 3217 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 3218 | fprintf_plus(stderr, "avahi_loop_with_timeout exited %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 3219 | (ret == 0) ? "successfully" : "with error"); | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 3220 | } | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3221 |   
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 3222 | end: | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3223 |   
 | 
| 3224 | if(debug){ | |
| 870
by Teddy Hogeborn Show what signal, if any, made mandos-client exit. | 3225 | if(signal_received){ | 
| 3226 | fprintf_plus(stderr, "%s exiting due to signal %d: %s\n", | |
| 3227 | argv[0], signal_received, | |
| 3228 | strsignal(signal_received)); | |
| 3229 | } else { | |
| 3230 | fprintf_plus(stderr, "%s exiting\n", argv[0]); | |
| 3231 | } | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3232 | } | 
| 3233 |   
 | |
| 3234 | /* Cleanup things */ | |
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 3235 | free(mc.interfaces); | 
| 3236 |   
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3237 | if(sb != NULL) | 
| 3238 | avahi_s_service_browser_free(sb); | |
| 3239 |   
 | |
| 3240 | if(mc.server != NULL) | |
| 3241 | avahi_server_free(mc.server); | |
| 3242 |   
 | |
| 601
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Removed "simple_poll" | 3243 | if(simple_poll != NULL) | 
| 3244 | avahi_simple_poll_free(simple_poll); | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3245 |   
 | 
| 3246 | if(gnutls_initialized){ | |
| 3247 | gnutls_certificate_free_credentials(mc.cred); | |
| 3248 | gnutls_dh_params_deinit(mc.dh_params); | |
| 3249 | } | |
| 3250 |   
 | |
| 3251 | if(gpgme_initialized){ | |
| 3252 | gpgme_release(mc.ctx); | |
| 3253 | } | |
| 505.3.12
by Teddy Hogeborn * plugins.d/mandos-client.c (runnable_hook): Add debug output. | 3254 |   
 | 
| 485
by Teddy Hogeborn Merge from Björn. | 3255 | /* Cleans up the circular linked list of Mandos servers the client | 
| 3256 |      has seen */
 | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 3257 | if(mc.current_server != NULL){ | 
| 3258 | mc.current_server->prev->next = NULL; | |
| 3259 | while(mc.current_server != NULL){ | |
| 3260 | server *next = mc.current_server->next; | |
| 714
by Teddy Hogeborn mandos-client: Fix mem free bug. | 3261 | #ifdef __GNUC__
 | 
| 3262 | #pragma GCC diagnostic push
 | |
| 3263 | #pragma GCC diagnostic ignored "-Wcast-qual"
 | |
| 3264 | #endif
 | |
| 3265 | free((char *)(mc.current_server->ip)); | |
| 3266 | #ifdef __GNUC__
 | |
| 3267 | #pragma GCC diagnostic pop
 | |
| 3268 | #endif
 | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 3269 | free(mc.current_server); | 
| 3270 | mc.current_server = next; | |
| 3271 | } | |
| 3272 | } | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3273 |   
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 3274 | /* Re-raise privileges */ | 
| 505.3.8
by Teddy Hogeborn * plugins.d/mandos-client.c (run_network_hooks): New. | 3275 | { | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 3276 | ret = raise_privileges(); | 
| 3277 | if(ret != 0){ | |
| 3278 | errno = ret; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 3279 | perror_plus("Failed to raise privileges"); | 
| 3280 | } else { | |
| 3281 |       
 | |
| 3282 | /* Run network hooks */ | |
| 3283 | run_network_hooks("stop", interfaces_hooks != NULL ? | |
| 3284 | interfaces_hooks : "", delay); | |
| 3285 |       
 | |
| 3286 | /* Take down the network interfaces which were brought up */ | |
| 3287 | { | |
| 3288 | char *interface = NULL; | |
| 890
by Teddy Hogeborn Add spaces around all '=' signs in all C code. | 3289 | while((interface = argz_next(interfaces_to_take_down, | 
| 3290 | interfaces_to_take_down_size, | |
| 3291 | interface))){ | |
| 819
by Teddy Hogeborn errno is of type int, not error_t | 3292 | ret = take_down_interface(interface); | 
| 3293 | if(ret != 0){ | |
| 3294 | errno = ret; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 3295 | perror_plus("Failed to take down interface"); | 
| 3296 | } | |
| 3297 | } | |
| 3298 | if(debug and (interfaces_to_take_down == NULL)){ | |
| 3299 | fprintf_plus(stderr, "No interfaces needed to be taken" | |
| 3300 | " down\n"); | |
| 3301 | } | |
| 3302 | } | |
| 3303 | } | |
| 680
by Teddy Hogeborn Minor changes to minimize diff from last release. | 3304 |     
 | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 3305 | ret = lower_privileges_permanently(); | 
| 3306 | if(ret != 0){ | |
| 3307 | errno = ret; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 3308 | perror_plus("Failed to lower privileges permanently"); | 
| 3309 | } | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 3310 | } | 
| 3311 |   
 | |
| 3312 | free(interfaces_to_take_down); | |
| 3313 | free(interfaces_hooks); | |
| 350
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Take down network interface on | 3314 |   
 | 
| 813
by Teddy Hogeborn Client: Remove new key directory introduced in GnuPG 2.1 | 3315 | void clean_dir_at(int base, const char * const dirname, | 
| 3316 | uintmax_t level){ | |
| 3317 | struct dirent **direntries = NULL; | |
| 3318 | int dret; | |
| 3319 | int dir_fd = (int)TEMP_FAILURE_RETRY(openat(base, dirname, | |
| 3320 | O_RDONLY | |
| 3321 | | O_NOFOLLOW | |
| 3322 | | O_DIRECTORY | |
| 3323 | | O_PATH)); | |
| 3324 | if(dir_fd == -1){ | |
| 3325 | perror_plus("open"); | |
| 936
by Teddy Hogeborn Client: Bug fix: Don't try to clean directory which fails to open | 3326 | return; | 
| 813
by Teddy Hogeborn Client: Remove new key directory introduced in GnuPG 2.1 | 3327 | } | 
| 3328 | int numentries = scandirat(dir_fd, ".", &direntries, | |
| 3329 | notdotentries, alphasort); | |
| 3330 | if(numentries >= 0){ | |
| 3331 | for(int i = 0; i < numentries; i++){ | |
| 3332 | if(debug){ | |
| 3333 | fprintf_plus(stderr, "Unlinking \"%s/%s\"\n", | |
| 3334 | dirname, direntries[i]->d_name); | |
| 3335 | } | |
| 3336 | dret = unlinkat(dir_fd, direntries[i]->d_name, 0); | |
| 3337 | if(dret == -1){ | |
| 3338 | if(errno == EISDIR){ | |
| 3339 | dret = unlinkat(dir_fd, direntries[i]->d_name, | |
| 3340 | AT_REMOVEDIR); | |
| 3341 | } | |
| 3342 | if((dret == -1) and (errno == ENOTEMPTY) | |
| 3343 | and (strcmp(direntries[i]->d_name, "private-keys-v1.d") | |
| 3344 | == 0) and (level == 0)){ | |
| 3345 | /* Recurse only in this special case */ | |
| 3346 | clean_dir_at(dir_fd, direntries[i]->d_name, level+1); | |
| 3347 | dret = 0; | |
| 3348 | } | |
| 934
by Teddy Hogeborn Client: Don't print failures to remove nonexisting files. | 3349 | if((dret == -1) and (errno != ENOENT)){ | 
| 813
by Teddy Hogeborn Client: Remove new key directory introduced in GnuPG 2.1 | 3350 | fprintf_plus(stderr, "unlink(\"%s/%s\"): %s\n", dirname, | 
| 3351 | direntries[i]->d_name, strerror(errno)); | |
| 3352 | } | |
| 3353 | } | |
| 3354 | free(direntries[i]); | |
| 3355 | } | |
| 3356 |       
 | |
| 3357 | /* need to clean even if 0 because man page doesn't specify */ | |
| 3358 | free(direntries); | |
| 3359 | dret = unlinkat(base, dirname, AT_REMOVEDIR); | |
| 3360 | if(dret == -1 and errno != ENOENT){ | |
| 3361 | perror_plus("rmdir"); | |
| 3362 | } | |
| 3363 | } else { | |
| 3364 | perror_plus("scandirat"); | |
| 3365 | } | |
| 3366 | close(dir_fd); | |
| 3367 | } | |
| 3368 |   
 | |
| 24.1.172
by Björn Påhlsson using scandir instead of readdir | 3369 | /* Removes the GPGME temp directory and all files inside */ | 
| 673
by Teddy Hogeborn Make mandos-client prefer /run/tmp over /tmp. | 3370 | if(tempdir != NULL){ | 
| 813
by Teddy Hogeborn Client: Remove new key directory introduced in GnuPG 2.1 | 3371 | clean_dir_at(-1, tempdir, 0); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3372 | } | 
| 3373 |   
 | |
| 354
by Teddy Hogeborn * plugins.d/mandos-client.c (signal_received): New. | 3374 | if(quit_now){ | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 3375 | sigemptyset(&old_sigterm_action.sa_mask); | 
| 3376 | old_sigterm_action.sa_handler = SIG_DFL; | |
| 374
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Try harder to raise signal on | 3377 | ret = (int)TEMP_FAILURE_RETRY(sigaction(signal_received, | 
| 3378 | &old_sigterm_action, | |
| 3379 | NULL)); | |
| 354
by Teddy Hogeborn * plugins.d/mandos-client.c (signal_received): New. | 3380 | if(ret == -1){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 3381 | perror_plus("sigaction"); | 
| 354
by Teddy Hogeborn * plugins.d/mandos-client.c (signal_received): New. | 3382 | } | 
| 374
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Try harder to raise signal on | 3383 | do { | 
| 3384 | ret = raise(signal_received); | |
| 3385 | } while(ret != 0 and errno == EINTR); | |
| 3386 | if(ret != 0){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 3387 | perror_plus("raise"); | 
| 374
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Try harder to raise signal on | 3388 | abort(); | 
| 3389 | } | |
| 3390 | TEMP_FAILURE_RETRY(pause()); | |
| 354
by Teddy Hogeborn * plugins.d/mandos-client.c (signal_received): New. | 3391 | } | 
| 3392 |   
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3393 | return exitcode; | 
| 13
by Björn Påhlsson Added following support: | 3394 | }
 |