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