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