/mandos/release

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