/mandos/trunk

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