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