/mandos/trunk

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