/mandos/release

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