/mandos/release

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