/mandos/trunk

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