/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
679 by Teddy Hogeborn
Update copyright year.
12
 * Copyright © 2008-2014 Teddy Hogeborn
13
 * Copyright © 2008-2014 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
743 by Teddy Hogeborn
Automatically determine the number of DH bits in the TLS handshake.
496
__attribute__((warn_unused_result, const))
497
static const char *safe_string(const char *str){
498
  if(str == NULL)
499
    return "(unknown)";
500
  return str;
501
}
502
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
503
__attribute__((warn_unused_result))
504
static const char *safer_gnutls_strerror(int value){
597 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
505
  const char *ret = gnutls_strerror(value);
743 by Teddy Hogeborn
Automatically determine the number of DH bits in the TLS handshake.
506
  return safe_string(ret);
13 by Björn Påhlsson
Added following support:
507
}
508
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
509
/* GnuTLS log function callback */
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
510
__attribute__((nonnull))
36 by Teddy Hogeborn
* TODO: Converted to org-mode style
511
static void debuggnutls(__attribute__((unused)) int level,
512
			const char* string){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
513
  fprintf_plus(stderr, "GnuTLS: %s", string);
13 by Björn Påhlsson
Added following support:
514
}
515
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
516
__attribute__((nonnull, warn_unused_result))
24.1.134 by Björn Påhlsson
plugin-runner: Added support for empty string arguments
517
static int init_gnutls_global(const char *pubkeyfilename,
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
518
			      const char *seckeyfilename,
519
			      mandos_context *mc){
13 by Björn Påhlsson
Added following support:
520
  int ret;
743 by Teddy Hogeborn
Automatically determine the number of DH bits in the TLS handshake.
521
  unsigned int uret;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
522
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
523
  if(debug){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
524
    fprintf_plus(stderr, "Initializing GnuTLS\n");
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
525
  }
24.1.29 by Björn Påhlsson
Added more header file comments
526
  
527
  ret = gnutls_global_init();
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
528
  if(ret != GNUTLS_E_SUCCESS){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
529
    fprintf_plus(stderr, "GnuTLS global_init: %s\n",
530
		 safer_gnutls_strerror(ret));
13 by Björn Påhlsson
Added following support:
531
    return -1;
532
  }
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
533
  
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
534
  if(debug){
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
535
    /* "Use a log level over 10 to enable all debugging options."
536
     * - GnuTLS manual
537
     */
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
538
    gnutls_global_set_log_level(11);
539
    gnutls_global_set_log_function(debuggnutls);
540
  }
541
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
542
  /* OpenPGP credentials */
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
543
  ret = gnutls_certificate_allocate_credentials(&mc->cred);
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
544
  if(ret != GNUTLS_E_SUCCESS){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
545
    fprintf_plus(stderr, "GnuTLS memory error: %s\n",
546
		 safer_gnutls_strerror(ret));
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
547
    gnutls_global_deinit();
13 by Björn Påhlsson
Added following support:
548
    return -1;
549
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
550
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
551
  if(debug){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
552
    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.
553
		 " secret key %s as GnuTLS credentials\n",
554
		 pubkeyfilename,
555
		 seckeyfilename);
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
556
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
557
  
13 by Björn Påhlsson
Added following support:
558
  ret = gnutls_certificate_set_openpgp_key_file
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
559
    (mc->cred, pubkeyfilename, seckeyfilename,
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
560
     GNUTLS_OPENPGP_FMT_BASE64);
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
561
  if(ret != GNUTLS_E_SUCCESS){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
562
    fprintf_plus(stderr,
563
		 "Error[%d] while reading the OpenPGP key pair ('%s',"
564
		 " '%s')\n", ret, pubkeyfilename, seckeyfilename);
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
565
    fprintf_plus(stderr, "The GnuTLS error is: %s\n",
566
		 safer_gnutls_strerror(ret));
24.1.20 by Björn Påhlsson
mandosclient
567
    goto globalfail;
13 by Björn Påhlsson
Added following support:
568
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
569
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
570
  /* GnuTLS server initialization */
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
571
  ret = gnutls_dh_params_init(&mc->dh_params);
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
572
  if(ret != GNUTLS_E_SUCCESS){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
573
    fprintf_plus(stderr, "Error in GnuTLS DH parameter"
574
		 " initialization: %s\n",
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
  }
743 by Teddy Hogeborn
Automatically determine the number of DH bits in the TLS handshake.
578
  if(mc->dh_bits == 0){
579
    /* Find out the optimal number of DH bits */
580
    /* Try to read the private key file */
581
    gnutls_datum_t buffer = { .data = NULL, .size = 0 };
582
    {
583
      int secfile = open(seckeyfilename, O_RDONLY);
584
      size_t buffer_capacity = 0;
585
      while(true){
586
	buffer_capacity = incbuffer((char **)&buffer.data,
587
				    (size_t)buffer.size,
588
				    (size_t)buffer_capacity);
589
	if(buffer_capacity == 0){
590
	  perror_plus("incbuffer");
591
	  free(buffer.data);
592
	  buffer.data = NULL;
593
	  break;
594
	}
595
	ssize_t bytes_read = read(secfile, buffer.data + buffer.size,
596
				  BUFFER_SIZE);
597
	/* EOF */
598
	if(bytes_read == 0){
599
	  break;
600
	}
601
	/* check bytes_read for failure */
602
	if(bytes_read < 0){
603
	  perror_plus("read");
604
	  free(buffer.data);
605
	  buffer.data = NULL;
606
	  break;
607
	}
608
	buffer.size += (unsigned int)bytes_read;
609
      }
610
      close(secfile);
611
    }
612
    /* If successful, use buffer to parse private key */
613
    gnutls_sec_param_t sec_param = GNUTLS_SEC_PARAM_ULTRA;
614
    if(buffer.data != NULL){
615
      {
616
	gnutls_openpgp_privkey_t privkey = NULL;
617
	ret = gnutls_openpgp_privkey_init(&privkey);
618
	if(ret != GNUTLS_E_SUCCESS){
619
	  fprintf_plus(stderr, "Error initializing OpenPGP key"
620
		       " structure: %s", safer_gnutls_strerror(ret));
621
	  free(buffer.data);
622
	  buffer.data = NULL;
623
	} else {
624
	  ret = gnutls_openpgp_privkey_import(privkey, &buffer,
625
					    GNUTLS_OPENPGP_FMT_BASE64,
626
					      "", 0);
627
	  if(ret != GNUTLS_E_SUCCESS){
628
	    fprintf_plus(stderr, "Error importing OpenPGP key : %s",
629
			 safer_gnutls_strerror(ret));
630
	    privkey = NULL;
631
	  }
632
	  free(buffer.data);
633
	  buffer.data = NULL;
634
	  if(privkey != NULL){
635
	    /* Use private key to suggest an appropriate sec_param */
636
	    sec_param = gnutls_openpgp_privkey_sec_param(privkey);
637
	    gnutls_openpgp_privkey_deinit(privkey);
638
	    if(debug){
639
	      fprintf_plus(stderr, "This OpenPGP key implies using a"
640
			   " GnuTLS security parameter \"%s\".\n",
641
			   safe_string(gnutls_sec_param_get_name
642
				       (sec_param)));
643
	    }
644
	  }
645
	}
646
      }
647
      if(sec_param == GNUTLS_SEC_PARAM_UNKNOWN){
648
	/* Err on the side of caution */
649
	sec_param = GNUTLS_SEC_PARAM_ULTRA;
650
	if(debug){
651
	  fprintf_plus(stderr, "Falling back to security parameter"
652
		       " \"%s\"\n",
653
		       safe_string(gnutls_sec_param_get_name
654
				   (sec_param)));
655
	}
656
      }
657
    }
658
    uret = gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH, sec_param);
659
    if(uret != 0){
660
      mc->dh_bits = uret;
661
      if(debug){
662
	fprintf_plus(stderr, "A \"%s\" GnuTLS security parameter"
663
		     " implies %u DH bits; using that.\n",
664
		     safe_string(gnutls_sec_param_get_name
665
				 (sec_param)),
666
		     mc->dh_bits);
667
      }
668
    } else {
669
      fprintf_plus(stderr, "Failed to get implied number of DH"
670
		   " bits for security parameter \"%s\"): %s\n",
671
		   safe_string(gnutls_sec_param_get_name(sec_param)),
672
		   safer_gnutls_strerror(ret));
673
      goto globalfail;
674
    }
675
  } else if(debug){
676
    fprintf_plus(stderr, "DH bits explicitly set to %u\n",
677
		 mc->dh_bits);
678
  }
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
679
  ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits);
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
680
  if(ret != GNUTLS_E_SUCCESS){
743 by Teddy Hogeborn
Automatically determine the number of DH bits in the TLS handshake.
681
    fprintf_plus(stderr, "Error in GnuTLS prime generation (%u bits):"
682
		 " %s\n", mc->dh_bits, safer_gnutls_strerror(ret));
24.1.20 by Björn Påhlsson
mandosclient
683
    goto globalfail;
13 by Björn Påhlsson
Added following support:
684
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
685
  
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
686
  gnutls_certificate_set_dh_params(mc->cred, mc->dh_params);
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
687
  
24.1.13 by Björn Påhlsson
mandosclient
688
  return 0;
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
689
  
24.1.20 by Björn Påhlsson
mandosclient
690
 globalfail:
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
691
  
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
692
  gnutls_certificate_free_credentials(mc->cred);
24.1.26 by Björn Påhlsson
tally count of used symbols
693
  gnutls_global_deinit();
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
694
  gnutls_dh_params_deinit(mc->dh_params);
24.1.20 by Björn Påhlsson
mandosclient
695
  return -1;
24.1.13 by Björn Påhlsson
mandosclient
696
}
697
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
698
__attribute__((nonnull, warn_unused_result))
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
699
static int init_gnutls_session(gnutls_session_t *session,
700
			       mandos_context *mc){
24.1.13 by Björn Påhlsson
mandosclient
701
  int ret;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
702
  /* GnuTLS session creation */
368 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
703
  do {
704
    ret = gnutls_init(session, GNUTLS_SERVER);
371 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Always fail and
705
    if(quit_now){
706
      return -1;
707
    }
368 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
708
  } while(ret == GNUTLS_E_INTERRUPTED or ret == GNUTLS_E_AGAIN);
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
709
  if(ret != GNUTLS_E_SUCCESS){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
710
    fprintf_plus(stderr,
711
		 "Error in GnuTLS session initialization: %s\n",
712
		 safer_gnutls_strerror(ret));
13 by Björn Påhlsson
Added following support:
713
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
714
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
715
  {
716
    const char *err;
368 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
717
    do {
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
718
      ret = gnutls_priority_set_direct(*session, mc->priority, &err);
371 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Always fail and
719
      if(quit_now){
720
	gnutls_deinit(*session);
721
	return -1;
722
      }
368 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
723
    } while(ret == GNUTLS_E_INTERRUPTED or ret == GNUTLS_E_AGAIN);
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
724
    if(ret != GNUTLS_E_SUCCESS){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
725
      fprintf_plus(stderr, "Syntax error at: %s\n", err);
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
726
      fprintf_plus(stderr, "GnuTLS error: %s\n",
727
		   safer_gnutls_strerror(ret));
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
728
      gnutls_deinit(*session);
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
729
      return -1;
730
    }
13 by Björn Påhlsson
Added following support:
731
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
732
  
368 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
733
  do {
734
    ret = gnutls_credentials_set(*session, GNUTLS_CRD_CERTIFICATE,
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
735
				 mc->cred);
371 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Always fail and
736
    if(quit_now){
737
      gnutls_deinit(*session);
738
      return -1;
739
    }
368 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
740
  } while(ret == GNUTLS_E_INTERRUPTED or ret == GNUTLS_E_AGAIN);
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
741
  if(ret != GNUTLS_E_SUCCESS){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
742
    fprintf_plus(stderr, "Error setting GnuTLS credentials: %s\n",
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
743
		 safer_gnutls_strerror(ret));
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
744
    gnutls_deinit(*session);
13 by Björn Påhlsson
Added following support:
745
    return -1;
746
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
747
  
13 by Björn Påhlsson
Added following support:
748
  /* ignore client certificate if any. */
368 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
749
  gnutls_certificate_server_set_request(*session, GNUTLS_CERT_IGNORE);
13 by Björn Påhlsson
Added following support:
750
  
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
751
  gnutls_dh_set_prime_bits(*session, mc->dh_bits);
13 by Björn Påhlsson
Added following support:
752
  
753
  return 0;
754
}
755
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
756
/* Avahi log function callback */
36 by Teddy Hogeborn
* TODO: Converted to org-mode style
757
static void empty_log(__attribute__((unused)) AvahiLogLevel level,
758
		      __attribute__((unused)) const char *txt){}
13 by Björn Påhlsson
Added following support:
759
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
760
/* Called when a Mandos server is found */
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
761
__attribute__((nonnull, warn_unused_result))
597 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
762
static int start_mandos_communication(const char *ip, in_port_t port,
24.1.9 by Björn Påhlsson
not working midwork...
763
				      AvahiIfIndex if_index,
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
764
				      int af, mandos_context *mc){
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
765
  int ret, tcp_sd = -1;
257.1.2 by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for
766
  ssize_t sret;
669 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
767
  struct sockaddr_storage to;
13 by Björn Påhlsson
Added following support:
768
  char *buffer = NULL;
372 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Bug fix:
769
  char *decrypted_buffer = NULL;
13 by Björn Påhlsson
Added following support:
770
  size_t buffer_length = 0;
771
  size_t buffer_capacity = 0;
24.1.10 by Björn Påhlsson
merge commit
772
  size_t written;
372 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Bug fix:
773
  int retval = -1;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
774
  gnutls_session_t session;
304 by Teddy Hogeborn
Four new interrelated features:
775
  int pf;			/* Protocol family */
776
  
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
777
  errno = 0;
778
  
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
779
  if(quit_now){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
780
    errno = EINTR;
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
781
    return -1;
782
  }
783
  
304 by Teddy Hogeborn
Four new interrelated features:
784
  switch(af){
785
  case AF_INET6:
786
    pf = PF_INET6;
787
    break;
788
  case AF_INET:
789
    pf = PF_INET;
790
    break;
791
  default:
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
792
    fprintf_plus(stderr, "Bad address family: %d\n", af);
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
793
    errno = EINVAL;
304 by Teddy Hogeborn
Four new interrelated features:
794
    return -1;
795
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
796
  
605 by Teddy Hogeborn
* plugins.d/mandos-client.c: Comment changes
797
  /* 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
798
  if(if_index != AVAHI_IF_UNSPEC and mc->interfaces != NULL){
799
    /* Check if the interface is one of the interfaces we are using */
800
    bool match = false;
801
    {
802
      char *interface = NULL;
803
      while((interface=argz_next(mc->interfaces, mc->interfaces_size,
804
				 interface))){
805
	if(if_nametoindex(interface) == (unsigned int)if_index){
806
	  match = true;
807
	  break;
808
	}
809
      }
810
    }
811
    if(not match){
605 by Teddy Hogeborn
* plugins.d/mandos-client.c: Comment changes
812
      /* This interface does not match any in the list, so we don't
813
	 connect to the server */
604 by Teddy Hogeborn
* plugins.d/mandos-client (start_mandos_communication): Bug fix; skip
814
      if(debug){
815
	char interface[IF_NAMESIZE];
816
	if(if_indextoname((unsigned int)if_index, interface) == NULL){
817
	  perror_plus("if_indextoname");
818
	} else {
819
	  fprintf_plus(stderr, "Skipping server on non-used interface"
820
		       " \"%s\"\n",
821
		       if_indextoname((unsigned int)if_index,
822
				      interface));
823
	}
824
      }
825
      return -1;
826
    }
827
  }
828
  
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
829
  ret = init_gnutls_session(&session, mc);
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
830
  if(ret != 0){
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
831
    return -1;
832
  }
833
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
834
  if(debug){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
835
    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
836
		 PRIuMAX "\n", ip, (uintmax_t)port);
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
837
  }
13 by Björn Påhlsson
Added following support:
838
  
304 by Teddy Hogeborn
Four new interrelated features:
839
  tcp_sd = socket(pf, SOCK_STREAM, 0);
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
840
  if(tcp_sd < 0){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
841
    int e = errno;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
842
    perror_plus("socket");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
843
    errno = e;
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
844
    goto mandos_end;
845
  }
846
  
847
  if(quit_now){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
848
    errno = EINTR;
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
849
    goto mandos_end;
13 by Björn Påhlsson
Added following support:
850
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
851
  
84 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do
852
  memset(&to, 0, sizeof(to));
304 by Teddy Hogeborn
Four new interrelated features:
853
  if(af == AF_INET6){
669 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
854
    ((struct sockaddr_in6 *)&to)->sin6_family = (sa_family_t)af;
855
    ret = inet_pton(af, ip, &((struct sockaddr_in6 *)&to)->sin6_addr);
304 by Teddy Hogeborn
Four new interrelated features:
856
  } else {			/* IPv4 */
669 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
857
    ((struct sockaddr_in *)&to)->sin_family = (sa_family_t)af;
858
    ret = inet_pton(af, ip, &((struct sockaddr_in *)&to)->sin_addr);
304 by Teddy Hogeborn
Four new interrelated features:
859
  }
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
860
  if(ret < 0 ){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
861
    int e = errno;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
862
    perror_plus("inet_pton");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
863
    errno = e;
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
864
    goto mandos_end;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
865
  }
13 by Björn Påhlsson
Added following support:
866
  if(ret == 0){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
867
    int e = errno;
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
868
    fprintf_plus(stderr, "Bad address: %s\n", ip);
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
869
    errno = e;
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
870
    goto mandos_end;
13 by Björn Påhlsson
Added following support:
871
  }
304 by Teddy Hogeborn
Four new interrelated features:
872
  if(af == AF_INET6){
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
873
    ((struct sockaddr_in6 *)&to)->sin6_port = htons(port);
669 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
874
    if(IN6_IS_ADDR_LINKLOCAL
875
       (&((struct sockaddr_in6 *)&to)->sin6_addr)){
304 by Teddy Hogeborn
Four new interrelated features:
876
      if(if_index == AVAHI_IF_UNSPEC){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
877
	fprintf_plus(stderr, "An IPv6 link-local address is"
878
		     " incomplete without a network interface\n");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
879
	errno = EINVAL;
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
880
	goto mandos_end;
304 by Teddy Hogeborn
Four new interrelated features:
881
      }
882
      /* Set the network interface number as scope */
669 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
883
      ((struct sockaddr_in6 *)&to)->sin6_scope_id = (uint32_t)if_index;
304 by Teddy Hogeborn
Four new interrelated features:
884
    }
885
  } else {
669 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
886
    ((struct sockaddr_in *)&to)->sin_port = htons(port);
304 by Teddy Hogeborn
Four new interrelated features:
887
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
888
  
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
889
  if(quit_now){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
890
    errno = EINTR;
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
891
    goto mandos_end;
892
  }
893
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
894
  if(debug){
304 by Teddy Hogeborn
Four new interrelated features:
895
    if(af == AF_INET6 and if_index != AVAHI_IF_UNSPEC){
896
      char interface[IF_NAMESIZE];
897
      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.
898
	perror_plus("if_indextoname");
304 by Teddy Hogeborn
Four new interrelated features:
899
      } else {
597 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
900
	fprintf_plus(stderr, "Connection to: %s%%%s, port %" PRIuMAX
901
		     "\n", ip, interface, (uintmax_t)port);
304 by Teddy Hogeborn
Four new interrelated features:
902
      }
903
    } else {
597 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
904
      fprintf_plus(stderr, "Connection to: %s, port %" PRIuMAX "\n",
905
		   ip, (uintmax_t)port);
304 by Teddy Hogeborn
Four new interrelated features:
906
    }
907
    char addrstr[(INET_ADDRSTRLEN > INET6_ADDRSTRLEN) ?
908
		 INET_ADDRSTRLEN : INET6_ADDRSTRLEN] = "";
909
    if(af == AF_INET6){
669 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
910
      ret = getnameinfo((struct sockaddr *)&to,
911
			sizeof(struct sockaddr_in6),
667 by Teddy Hogeborn
Use getnameinfo() instead of inet_ntop() in mandos-client.
912
			addrstr, sizeof(addrstr), NULL, 0,
913
			NI_NUMERICHOST);
304 by Teddy Hogeborn
Four new interrelated features:
914
    } else {
669 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
915
      ret = getnameinfo((struct sockaddr *)&to,
916
			sizeof(struct sockaddr_in),
667 by Teddy Hogeborn
Use getnameinfo() instead of inet_ntop() in mandos-client.
917
			addrstr, sizeof(addrstr), NULL, 0,
918
			NI_NUMERICHOST);
304 by Teddy Hogeborn
Four new interrelated features:
919
    }
667 by Teddy Hogeborn
Use getnameinfo() instead of inet_ntop() in mandos-client.
920
    if(ret == EAI_SYSTEM){
921
      perror_plus("getnameinfo");
922
    } else if(ret != 0) {
923
      fprintf_plus(stderr, "getnameinfo: %s", gai_strerror(ret));
924
    } else if(strcmp(addrstr, ip) != 0){
925
      fprintf_plus(stderr, "Canonical address form: %s\n", addrstr);
37 by Teddy Hogeborn
Non-tested commit for merge purposes.
926
    }
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
927
  }
13 by Björn Påhlsson
Added following support:
928
  
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
929
  if(quit_now){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
930
    errno = EINTR;
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
931
    goto mandos_end;
932
  }
933
  
304 by Teddy Hogeborn
Four new interrelated features:
934
  if(af == AF_INET6){
669 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
935
    ret = connect(tcp_sd, (struct sockaddr *)&to,
936
		  sizeof(struct sockaddr_in6));
304 by Teddy Hogeborn
Four new interrelated features:
937
  } else {
669 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
938
    ret = connect(tcp_sd, (struct sockaddr *)&to, /* IPv4 */
939
		  sizeof(struct sockaddr_in));
304 by Teddy Hogeborn
Four new interrelated features:
940
  }
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
941
  if(ret < 0){
671 by Teddy Hogeborn
White space fix: change "if (" to "if(" in C code.
942
    if((errno != ECONNREFUSED and errno != ENETUNREACH) or debug){
24.1.163 by Björn Påhlsson
mandos-client: Added never ending loop for --connect
943
      int e = errno;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
944
      perror_plus("connect");
24.1.163 by Björn Påhlsson
mandos-client: Added never ending loop for --connect
945
      errno = e;
946
    }
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
947
    goto mandos_end;
948
  }
949
  
950
  if(quit_now){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
951
    errno = EINTR;
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
952
    goto mandos_end;
13 by Björn Påhlsson
Added following support:
953
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
954
  
24.1.12 by Björn Påhlsson
merge +
955
  const char *out = mandos_protocol_version;
24.1.10 by Björn Påhlsson
merge commit
956
  written = 0;
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
957
  while(true){
24.1.10 by Björn Påhlsson
merge commit
958
    size_t out_size = strlen(out);
257.1.2 by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for
959
    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.
960
					out_size - written));
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
961
    if(ret == -1){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
962
      int e = errno;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
963
      perror_plus("write");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
964
      errno = e;
24.1.12 by Björn Påhlsson
merge +
965
      goto mandos_end;
24.1.10 by Björn Påhlsson
merge commit
966
    }
24.1.12 by Björn Påhlsson
merge +
967
    written += (size_t)ret;
24.1.10 by Björn Påhlsson
merge commit
968
    if(written < out_size){
969
      continue;
970
    } else {
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
971
      if(out == mandos_protocol_version){
24.1.10 by Björn Påhlsson
merge commit
972
	written = 0;
973
	out = "\r\n";
974
      } else {
975
	break;
976
      }
977
    }
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
978
  
979
    if(quit_now){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
980
      errno = EINTR;
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
981
      goto mandos_end;
982
    }
24.1.10 by Björn Påhlsson
merge commit
983
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
984
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
985
  if(debug){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
986
    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
987
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
988
  
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
989
  if(quit_now){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
990
    errno = EINTR;
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
991
    goto mandos_end;
992
  }
993
  
588 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Eliminate
994
  /* This casting via intptr_t is to eliminate warning about casting
995
     an int to a pointer type.  This is exactly how the GnuTLS Guile
996
     function "set-session-transport-fd!" does it. */
997
  gnutls_transport_set_ptr(session,
998
			   (gnutls_transport_ptr_t)(intptr_t)tcp_sd);
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
999
  
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
1000
  if(quit_now){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1001
    errno = EINTR;
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
1002
    goto mandos_end;
1003
  }
1004
  
363 by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes.
1005
  do {
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1006
    ret = gnutls_handshake(session);
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
1007
    if(quit_now){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1008
      errno = EINTR;
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
1009
      goto mandos_end;
1010
    }
24.1.29 by Björn Påhlsson
Added more header file comments
1011
  } while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED);
13 by Björn Påhlsson
Added following support:
1012
  
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1013
  if(ret != GNUTLS_E_SUCCESS){
25 by Teddy Hogeborn
* mandos-clients.conf ([DEFAULT]): New section.
1014
    if(debug){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
1015
      fprintf_plus(stderr, "*** GnuTLS Handshake failed ***\n");
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1016
      gnutls_perror(ret);
25 by Teddy Hogeborn
* mandos-clients.conf ([DEFAULT]): New section.
1017
    }
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1018
    errno = EPROTO;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1019
    goto mandos_end;
13 by Björn Påhlsson
Added following support:
1020
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1021
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1022
  /* Read OpenPGP packet that contains the wanted password */
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1023
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
1024
  if(debug){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1025
    fprintf_plus(stderr, "Retrieving OpenPGP encrypted password from"
1026
		 " %s\n", ip);
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
1027
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
1028
  
13 by Björn Påhlsson
Added following support:
1029
  while(true){
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
1030
    
1031
    if(quit_now){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1032
      errno = EINTR;
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
1033
      goto mandos_end;
1034
    }
1035
    
24.1.132 by Björn Påhlsson
Fixed a bug in fallback handling
1036
    buffer_capacity = incbuffer(&buffer, buffer_length,
505.3.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1037
				buffer_capacity);
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1038
    if(buffer_capacity == 0){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1039
      int e = errno;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1040
      perror_plus("incbuffer");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1041
      errno = e;
24.1.12 by Björn Påhlsson
merge +
1042
      goto mandos_end;
13 by Björn Påhlsson
Added following support:
1043
    }
1044
    
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
1045
    if(quit_now){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1046
      errno = EINTR;
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
1047
      goto mandos_end;
1048
    }
1049
    
257.1.2 by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for
1050
    sret = gnutls_record_recv(session, buffer+buffer_length,
1051
			      BUFFER_SIZE);
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1052
    if(sret == 0){
13 by Björn Påhlsson
Added following support:
1053
      break;
1054
    }
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1055
    if(sret < 0){
257.1.2 by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for
1056
      switch(sret){
13 by Björn Påhlsson
Added following support:
1057
      case GNUTLS_E_INTERRUPTED:
1058
      case GNUTLS_E_AGAIN:
1059
	break;
1060
      case GNUTLS_E_REHANDSHAKE:
363 by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes.
1061
	do {
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1062
	  ret = gnutls_handshake(session);
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
1063
	  
1064
	  if(quit_now){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1065
	    errno = EINTR;
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
1066
	    goto mandos_end;
1067
	  }
24.1.29 by Björn Påhlsson
Added more header file comments
1068
	} while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED);
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1069
	if(ret < 0){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1070
	  fprintf_plus(stderr, "*** GnuTLS Re-handshake failed "
1071
		       "***\n");
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1072
	  gnutls_perror(ret);
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1073
	  errno = EPROTO;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1074
	  goto mandos_end;
13 by Björn Påhlsson
Added following support:
1075
	}
1076
	break;
1077
      default:
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
1078
	fprintf_plus(stderr, "Unknown error while reading data from"
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1079
		     " encrypted session with Mandos server\n");
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1080
	gnutls_bye(session, GNUTLS_SHUT_RDWR);
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1081
	errno = EIO;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1082
	goto mandos_end;
13 by Björn Påhlsson
Added following support:
1083
      }
1084
    } else {
257.1.2 by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for
1085
      buffer_length += (size_t) sret;
13 by Björn Påhlsson
Added following support:
1086
    }
1087
  }
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
1088
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1089
  if(debug){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
1090
    fprintf_plus(stderr, "Closing TLS session\n");
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1091
  }
1092
  
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
1093
  if(quit_now){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1094
    errno = EINTR;
371 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Always fail and
1095
    goto mandos_end;
1096
  }
1097
  
1098
  do {
1099
    ret = gnutls_bye(session, GNUTLS_SHUT_RDWR);
1100
    if(quit_now){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1101
      errno = EINTR;
371 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Always fail and
1102
      goto mandos_end;
1103
    }
1104
  } while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED);
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
1105
  
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1106
  if(buffer_length > 0){
362 by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR
1107
    ssize_t decrypted_buffer_size;
505.3.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1108
    decrypted_buffer_size = pgp_packet_decrypt(buffer, buffer_length,
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1109
					       &decrypted_buffer, mc);
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1110
    if(decrypted_buffer_size >= 0){
361 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gpgme): Move variable "ret" into the
1111
      
24.1.10 by Björn Påhlsson
merge commit
1112
      written = 0;
28 by Teddy Hogeborn
* server.conf: New file.
1113
      while(written < (size_t) decrypted_buffer_size){
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
1114
	if(quit_now){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1115
	  errno = EINTR;
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
1116
	  goto mandos_end;
1117
	}
1118
	
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1119
	ret = (int)fwrite(decrypted_buffer + written, 1,
1120
			  (size_t)decrypted_buffer_size - written,
1121
			  stdout);
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1122
	if(ret == 0 and ferror(stdout)){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1123
	  int e = errno;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1124
	  if(debug){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
1125
	    fprintf_plus(stderr, "Error writing encrypted data: %s\n",
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1126
			 strerror(errno));
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1127
	  }
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1128
	  errno = e;
372 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Bug fix:
1129
	  goto mandos_end;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1130
	}
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
1131
	written += (size_t)ret;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1132
      }
372 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Bug fix:
1133
      retval = 0;
13 by Björn Påhlsson
Added following support:
1134
    }
1135
  }
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1136
  
1137
  /* Shutdown procedure */
1138
  
1139
 mandos_end:
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1140
  {
1141
    int e = errno;
1142
    free(decrypted_buffer);
1143
    free(buffer);
1144
    if(tcp_sd >= 0){
1145
      ret = (int)TEMP_FAILURE_RETRY(close(tcp_sd));
1146
    }
1147
    if(ret == -1){
1148
      if(e == 0){
1149
	e = errno;
1150
      }
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1151
      perror_plus("close");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1152
    }
1153
    gnutls_deinit(session);
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1154
    errno = e;
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1155
    if(quit_now){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1156
      errno = EINTR;
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1157
      retval = -1;
1158
    }
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
1159
  }
13 by Björn Påhlsson
Added following support:
1160
  return retval;
1161
}
1162
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1163
__attribute__((nonnull))
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
1164
static void resolve_callback(AvahiSServiceResolver *r,
1165
			     AvahiIfIndex interface,
304 by Teddy Hogeborn
Four new interrelated features:
1166
			     AvahiProtocol proto,
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
1167
			     AvahiResolverEvent event,
1168
			     const char *name,
1169
			     const char *type,
1170
			     const char *domain,
1171
			     const char *host_name,
1172
			     const AvahiAddress *address,
1173
			     uint16_t port,
1174
			     AVAHI_GCC_UNUSED AvahiStringList *txt,
1175
			     AVAHI_GCC_UNUSED AvahiLookupResultFlags
1176
			     flags,
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1177
			     void *mc){
597 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
1178
  if(r == NULL){
1179
    return;
1180
  }
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
1181
  
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1182
  /* Called whenever a service has been resolved successfully or
1183
     timed out */
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
1184
  
353 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
1185
  if(quit_now){
715 by Teddy Hogeborn
mandos-client: Bug Fix: Fix some memory leaks.
1186
    avahi_s_service_resolver_free(r);
353 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
1187
    return;
1188
  }
1189
  
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
1190
  switch(event){
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1191
  default:
1192
  case AVAHI_RESOLVER_FAILURE:
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1193
    fprintf_plus(stderr, "(Avahi Resolver) Failed to resolve service "
1194
		 "'%s' of type '%s' in domain '%s': %s\n", name, type,
1195
		 domain,
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1196
		 avahi_strerror(avahi_server_errno
1197
				(((mandos_context*)mc)->server)));
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1198
    break;
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
1199
    
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1200
  case AVAHI_RESOLVER_FOUND:
1201
    {
1202
      char ip[AVAHI_ADDRESS_STR_MAX];
1203
      avahi_address_snprint(ip, sizeof(ip), address);
1204
      if(debug){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
1205
	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.
1206
		     PRIdMAX ") on port %" PRIu16 "\n", name,
1207
		     host_name, ip, (intmax_t)interface, port);
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1208
      }
597 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
1209
      int ret = start_mandos_communication(ip, (in_port_t)port,
1210
					   interface,
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1211
					   avahi_proto_to_af(proto),
1212
					   mc);
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1213
      if(ret == 0){
601 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Removed "simple_poll"
1214
	avahi_simple_poll_quit(simple_poll);
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1215
      } else {
597 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
1216
	if(not add_server(ip, (in_port_t)port, interface,
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1217
			  avahi_proto_to_af(proto),
1218
			  &((mandos_context*)mc)->current_server)){
505.1.27 by teddy at bsnet
* plugins.d/mandos-client.c (add_server): Return bool; all callers
1219
	  fprintf_plus(stderr, "Failed to add server \"%s\" to server"
1220
		       " list\n", name);
1221
	}
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1222
      }
13 by Björn Påhlsson
Added following support:
1223
    }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1224
  }
1225
  avahi_s_service_resolver_free(r);
13 by Björn Påhlsson
Added following support:
1226
}
1227
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
1228
static void browse_callback(AvahiSServiceBrowser *b,
1229
			    AvahiIfIndex interface,
1230
			    AvahiProtocol protocol,
1231
			    AvahiBrowserEvent event,
1232
			    const char *name,
1233
			    const char *type,
1234
			    const char *domain,
1235
			    AVAHI_GCC_UNUSED AvahiLookupResultFlags
1236
			    flags,
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1237
			    void *mc){
597 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
1238
  if(b == NULL){
1239
    return;
1240
  }
24.1.9 by Björn Påhlsson
not working midwork...
1241
  
1242
  /* Called whenever a new services becomes available on the LAN or
1243
     is removed from the LAN */
1244
  
358 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
1245
  if(quit_now){
1246
    return;
1247
  }
1248
  
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
1249
  switch(event){
24.1.9 by Björn Påhlsson
not working midwork...
1250
  default:
1251
  case AVAHI_BROWSER_FAILURE:
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
1252
    
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
1253
    fprintf_plus(stderr, "(Avahi browser) %s\n",
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1254
		 avahi_strerror(avahi_server_errno
1255
				(((mandos_context*)mc)->server)));
601 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Removed "simple_poll"
1256
    avahi_simple_poll_quit(simple_poll);
24.1.9 by Björn Påhlsson
not working midwork...
1257
    return;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
1258
    
24.1.9 by Björn Påhlsson
not working midwork...
1259
  case AVAHI_BROWSER_NEW:
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1260
    /* We ignore the returned Avahi resolver object. In the callback
1261
       function we free it. If the Avahi server is terminated before
1262
       the callback function is called the Avahi server will free the
1263
       resolver for us. */
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
1264
    
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1265
    if(avahi_s_service_resolver_new(((mandos_context*)mc)->server,
1266
				    interface, protocol, name, type,
1267
				    domain, protocol, 0,
1268
				    resolve_callback, mc) == NULL)
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1269
      fprintf_plus(stderr, "Avahi: Failed to resolve service '%s':"
1270
		   " %s\n", name,
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1271
		   avahi_strerror(avahi_server_errno
1272
				  (((mandos_context*)mc)->server)));
24.1.9 by Björn Påhlsson
not working midwork...
1273
    break;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
1274
    
24.1.9 by Björn Påhlsson
not working midwork...
1275
  case AVAHI_BROWSER_REMOVE:
1276
    break;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
1277
    
24.1.9 by Björn Påhlsson
not working midwork...
1278
  case AVAHI_BROWSER_ALL_FOR_NOW:
1279
  case AVAHI_BROWSER_CACHE_EXHAUSTED:
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1280
    if(debug){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1281
      fprintf_plus(stderr, "No Mandos server found, still"
1282
		   " searching...\n");
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1283
    }
24.1.9 by Björn Påhlsson
not working midwork...
1284
    break;
1285
  }
13 by Björn Påhlsson
Added following support:
1286
}
1287
485 by Teddy Hogeborn
Merge from Björn.
1288
/* Signal handler that stops main loop after SIGTERM */
354 by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New.
1289
static void handle_sigterm(int sig){
308 by Teddy Hogeborn
* plugin-runner.c: Comment change.
1290
  if(quit_now){
1291
    return;
1292
  }
1293
  quit_now = 1;
354 by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New.
1294
  signal_received = sig;
24.1.134 by Björn Påhlsson
plugin-runner: Added support for empty string arguments
1295
  int old_errno = errno;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1296
  /* set main loop to exit */
601 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Removed "simple_poll"
1297
  if(simple_poll != NULL){
1298
    avahi_simple_poll_quit(simple_poll);
308 by Teddy Hogeborn
* plugin-runner.c: Comment change.
1299
  }
24.1.134 by Björn Påhlsson
plugin-runner: Added support for empty string arguments
1300
  errno = old_errno;
1301
}
1302
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1303
__attribute__((nonnull, warn_unused_result))
505.2.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1304
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
1305
  int ret;
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1306
  error_t ret_errno;
505.2.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1307
  
505.2.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1308
  int s = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
1309
  if(s < 0){
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1310
    ret_errno = errno;
505.2.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1311
    perror_plus("socket");
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1312
    errno = ret_errno;
505.2.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1313
    return false;
505.2.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1314
  }
505.2.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1315
  strcpy(ifr->ifr_name, ifname);
1316
  ret = ioctl(s, SIOCGIFFLAGS, ifr);
505.2.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1317
  if(ret == -1){
237.2.34 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1318
    if(debug){
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1319
      ret_errno = errno;
505.2.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1320
      perror_plus("ioctl SIOCGIFFLAGS");
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1321
      errno = ret_errno;
237.2.34 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1322
    }
505.2.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1323
    return false;
237.2.33 by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to
1324
  }
505.2.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1325
  return true;
1326
}
1327
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1328
__attribute__((nonnull, warn_unused_result))
505.2.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1329
bool good_flags(const char *ifname, const struct ifreq *ifr){
1330
  
237.2.33 by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to
1331
  /* Reject the loopback device */
505.2.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1332
  if(ifr->ifr_flags & IFF_LOOPBACK){
237.2.34 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1333
    if(debug){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1334
      fprintf_plus(stderr, "Rejecting loopback interface \"%s\"\n",
1335
		   ifname);
237.2.34 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1336
    }
505.2.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1337
    return false;
237.2.33 by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to
1338
  }
1339
  /* 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
1340
  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.
1341
    if(debug){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1342
      fprintf_plus(stderr, "Accepting point-to-point interface"
1343
		   " \"%s\"\n", ifname);
237.2.34 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1344
    }
505.2.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1345
    return true;
237.2.33 by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to
1346
  }
1347
  /* Otherwise, reject non-broadcast-capable devices */
505.2.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1348
  if(not (ifr->ifr_flags & IFF_BROADCAST)){
237.2.34 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1349
    if(debug){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1350
      fprintf_plus(stderr, "Rejecting non-broadcast interface"
1351
		   " \"%s\"\n", ifname);
237.2.34 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1352
    }
505.2.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1353
    return false;
237.2.33 by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to
1354
  }
481 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Reject non-ARP
1355
  /* Reject non-ARP interfaces (including dummy interfaces) */
505.2.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1356
  if(ifr->ifr_flags & IFF_NOARP){
481 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Reject non-ARP
1357
    if(debug){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1358
      fprintf_plus(stderr, "Rejecting non-ARP interface \"%s\"\n",
1359
		   ifname);
481 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Reject non-ARP
1360
    }
505.2.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1361
    return false;
481 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Reject non-ARP
1362
  }
505.2.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1363
  
237.2.33 by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to
1364
  /* Accept this device */
237.2.34 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1365
  if(debug){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
1366
    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
1367
  }
1368
  return true;
1369
}
1370
1371
/* 
1372
 * This function determines if a directory entry in /sys/class/net
1373
 * corresponds to an acceptable network device.
1374
 * (This function is passed to scandir(3) as a filter function.)
1375
 */
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1376
__attribute__((nonnull, warn_unused_result))
505.2.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1377
int good_interface(const struct dirent *if_entry){
1378
  if(if_entry->d_name[0] == '.'){
1379
    return 0;
1380
  }
505.3.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message.
1381
  
505.2.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1382
  struct ifreq ifr;
1383
  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.
1384
    if(debug){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1385
      fprintf_plus(stderr, "Failed to get flags for interface "
1386
		   "\"%s\"\n", if_entry->d_name);
505.3.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message.
1387
    }
505.2.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1388
    return 0;
1389
  }
1390
  
1391
  if(not good_flags(if_entry->d_name, &ifr)){
1392
    return 0;
237.2.34 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1393
  }
237.2.33 by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to
1394
  return 1;
1395
}
1396
505.2.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1397
/* 
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1398
 * This function determines if a network interface is up.
1399
 */
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1400
__attribute__((nonnull, warn_unused_result))
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1401
bool interface_is_up(const char *interface){
1402
  struct ifreq ifr;
1403
  if(not get_flags(interface, &ifr)){
1404
    if(debug){
1405
      fprintf_plus(stderr, "Failed to get flags for interface "
1406
		   "\"%s\"\n", interface);
1407
    }
1408
    return false;
1409
  }
1410
  
1411
  return (bool)(ifr.ifr_flags & IFF_UP);
1412
}
1413
1414
/* 
1415
 * This function determines if a network interface is running
1416
 */
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1417
__attribute__((nonnull, warn_unused_result))
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1418
bool interface_is_running(const char *interface){
1419
  struct ifreq ifr;
1420
  if(not get_flags(interface, &ifr)){
1421
    if(debug){
1422
      fprintf_plus(stderr, "Failed to get flags for interface "
1423
		   "\"%s\"\n", interface);
1424
    }
1425
    return false;
1426
  }
1427
  
1428
  return (bool)(ifr.ifr_flags & IFF_RUNNING);
505.2.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1429
}
1430
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1431
__attribute__((nonnull, pure, warn_unused_result))
24.1.172 by Björn Påhlsson
using scandir instead of readdir
1432
int notdotentries(const struct dirent *direntry){
1433
  /* Skip "." and ".." */
1434
  if(direntry->d_name[0] == '.'
1435
     and (direntry->d_name[1] == '\0'
1436
	  or (direntry->d_name[1] == '.'
1437
	      and direntry->d_name[2] == '\0'))){
1438
    return 0;
1439
  }
1440
  return 1;
1441
}
1442
505.2.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1443
/* Is this directory entry a runnable program? */
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1444
__attribute__((nonnull, warn_unused_result))
505.2.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1445
int runnable_hook(const struct dirent *direntry){
1446
  int ret;
505.3.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1447
  size_t sret;
505.2.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1448
  struct stat st;
1449
  
1450
  if((direntry->d_name)[0] == '\0'){
1451
    /* Empty name? */
1452
    return 0;
1453
  }
1454
  
505.3.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1455
  sret = strspn(direntry->d_name, "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
1456
		"abcdefghijklmnopqrstuvwxyz"
1457
		"0123456789"
688 by Teddy Hogeborn
Minor bug fix in mandos-client: Allow periods in network hook names.
1458
		"_.-");
505.3.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1459
  if((direntry->d_name)[sret] != '\0'){
1460
    /* Contains non-allowed characters */
1461
    if(debug){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
1462
      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.
1463
		   direntry->d_name);
505.3.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1464
    }
1465
    return 0;
1466
  }
505.2.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1467
  
693 by Teddy Hogeborn
Make mandos-client use fstatat().
1468
  ret = fstatat(hookdir_fd, direntry->d_name, &st, 0);
505.2.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1469
  if(ret == -1){
1470
    if(debug){
505.3.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1471
      perror_plus("Could not stat hook");
505.2.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1472
    }
1473
    return 0;
1474
  }
505.3.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message.
1475
  if(not (S_ISREG(st.st_mode))){
505.2.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1476
    /* Not a regular file */
505.3.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1477
    if(debug){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
1478
      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.
1479
		   direntry->d_name);
505.3.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1480
    }
505.2.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1481
    return 0;
1482
  }
1483
  if(not (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))){
1484
    /* Not executable */
505.3.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1485
    if(debug){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
1486
      fprintf_plus(stderr, "Ignoring hook \"%s\" - not executable\n",
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1487
		   direntry->d_name);
505.3.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1488
    }
505.2.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1489
    return 0;
1490
  }
505.3.12 by Teddy Hogeborn
* plugins.d/mandos-client.c (runnable_hook): Add debug output.
1491
  if(debug){
1492
    fprintf_plus(stderr, "Hook \"%s\" is acceptable\n",
1493
		 direntry->d_name);
1494
  }
505.2.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1495
  return 1;
1496
}
1497
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1498
__attribute__((nonnull, warn_unused_result))
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1499
int avahi_loop_with_timeout(AvahiSimplePoll *s, int retry_interval,
1500
			    mandos_context *mc){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1501
  int ret;
1502
  struct timespec now;
1503
  struct timespec waited_time;
1504
  intmax_t block_time;
491 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
1505
  
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1506
  while(true){
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1507
    if(mc->current_server == NULL){
671 by Teddy Hogeborn
White space fix: change "if (" to "if(" in C code.
1508
      if(debug){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1509
	fprintf_plus(stderr, "Wait until first server is found."
1510
		     " No timeout!\n");
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1511
      }
1512
      ret = avahi_simple_poll_iterate(s, -1);
1513
    } else {
671 by Teddy Hogeborn
White space fix: change "if (" to "if(" in C code.
1514
      if(debug){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1515
	fprintf_plus(stderr, "Check current_server if we should run"
1516
		     " it, or wait\n");
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1517
      }
1518
      /* the current time */
1519
      ret = clock_gettime(CLOCK_MONOTONIC, &now);
1520
      if(ret == -1){
1521
	perror_plus("clock_gettime");
1522
	return -1;
1523
      }
1524
      /* Calculating in ms how long time between now and server
1525
	 who we visted longest time ago. Now - last seen.  */
485 by Teddy Hogeborn
Merge from Björn.
1526
      waited_time.tv_sec = (now.tv_sec
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1527
			    - mc->current_server->last_seen.tv_sec);
485 by Teddy Hogeborn
Merge from Björn.
1528
      waited_time.tv_nsec = (now.tv_nsec
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1529
			     - mc->current_server->last_seen.tv_nsec);
485 by Teddy Hogeborn
Merge from Björn.
1530
      /* total time is 10s/10,000ms.
1531
	 Converting to s from ms by dividing by 1,000,
1532
	 and ns to ms by dividing by 1,000,000. */
1533
      block_time = ((retry_interval
1534
		     - ((intmax_t)waited_time.tv_sec * 1000))
1535
		    - ((intmax_t)waited_time.tv_nsec / 1000000));
491 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
1536
      
671 by Teddy Hogeborn
White space fix: change "if (" to "if(" in C code.
1537
      if(debug){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1538
	fprintf_plus(stderr, "Blocking for %" PRIdMAX " ms\n",
1539
		     block_time);
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1540
      }
491 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
1541
      
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1542
      if(block_time <= 0){
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1543
	ret = start_mandos_communication(mc->current_server->ip,
1544
					 mc->current_server->port,
1545
					 mc->current_server->if_index,
1546
					 mc->current_server->af, mc);
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1547
	if(ret == 0){
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1548
	  avahi_simple_poll_quit(s);
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1549
	  return 0;
1550
	}
485 by Teddy Hogeborn
Merge from Björn.
1551
	ret = clock_gettime(CLOCK_MONOTONIC,
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1552
			    &mc->current_server->last_seen);
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1553
	if(ret == -1){
1554
	  perror_plus("clock_gettime");
1555
	  return -1;
1556
	}
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1557
	mc->current_server = mc->current_server->next;
485 by Teddy Hogeborn
Merge from Björn.
1558
	block_time = 0; 	/* Call avahi to find new Mandos
1559
				   servers, but don't block */
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1560
      }
1561
      
1562
      ret = avahi_simple_poll_iterate(s, (int)block_time);
1563
    }
1564
    if(ret != 0){
671 by Teddy Hogeborn
White space fix: change "if (" to "if(" in C code.
1565
      if(ret > 0 or errno != EINTR){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1566
	return (ret != 1) ? ret : 0;
1567
      }
1568
    }
1569
  }
1570
}
1571
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1572
/* Set effective uid to 0, return errno */
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1573
__attribute__((warn_unused_result))
594.1.3 by Teddy Hogeborn
* plugins.d/mandos-client.c (raise_privileges,
1574
error_t raise_privileges(void){
1575
  error_t old_errno = errno;
1576
  error_t ret_errno = 0;
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1577
  if(seteuid(0) == -1){
594.1.3 by Teddy Hogeborn
* plugins.d/mandos-client.c (raise_privileges,
1578
    ret_errno = errno;
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1579
  }
1580
  errno = old_errno;
1581
  return ret_errno;
1582
}
1583
1584
/* Set effective and real user ID to 0.  Return errno. */
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1585
__attribute__((warn_unused_result))
594.1.3 by Teddy Hogeborn
* plugins.d/mandos-client.c (raise_privileges,
1586
error_t raise_privileges_permanently(void){
1587
  error_t old_errno = errno;
1588
  error_t ret_errno = raise_privileges();
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1589
  if(ret_errno != 0){
1590
    errno = old_errno;
1591
    return ret_errno;
1592
  }
1593
  if(setuid(0) == -1){
594.1.3 by Teddy Hogeborn
* plugins.d/mandos-client.c (raise_privileges,
1594
    ret_errno = errno;
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1595
  }
1596
  errno = old_errno;
1597
  return ret_errno;
1598
}
1599
1600
/* Set effective user ID to unprivileged saved user ID */
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1601
__attribute__((warn_unused_result))
594.1.3 by Teddy Hogeborn
* plugins.d/mandos-client.c (raise_privileges,
1602
error_t lower_privileges(void){
1603
  error_t old_errno = errno;
1604
  error_t ret_errno = 0;
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1605
  if(seteuid(uid) == -1){
594.1.3 by Teddy Hogeborn
* plugins.d/mandos-client.c (raise_privileges,
1606
    ret_errno = errno;
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1607
  }
1608
  errno = old_errno;
1609
  return ret_errno;
1610
}
1611
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1612
/* Lower privileges permanently */
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1613
__attribute__((warn_unused_result))
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1614
error_t lower_privileges_permanently(void){
1615
  error_t old_errno = errno;
1616
  error_t ret_errno = 0;
1617
  if(setuid(uid) == -1){
1618
    ret_errno = errno;
1619
  }
1620
  errno = old_errno;
1621
  return ret_errno;
1622
}
1623
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1624
__attribute__((nonnull))
1625
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.
1626
		       const float delay){
704 by Teddy Hogeborn
mandos-client: Fix some bugs on error conditions.
1627
  struct dirent **direntries = NULL;
691 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1628
  if(hookdir_fd == -1){
696 by Teddy Hogeborn
Bug fix for mandos-client: Run the network hook, not the directory.
1629
    hookdir_fd = open(hookdir, O_RDONLY);
691 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1630
    if(hookdir_fd == -1){
1631
      if(errno == ENOENT){
1632
	if(debug){
1633
	  fprintf_plus(stderr, "Network hook directory \"%s\" not"
1634
		       " found\n", hookdir);
1635
	}
1636
      } else {
1637
	perror_plus("open");
1638
      }
1639
      return;
1640
    }
1641
  }
1642
#ifdef __GLIBC__
1643
#if __GLIBC_PREREQ(2, 15)
1644
  int numhooks = scandirat(hookdir_fd, ".", &direntries,
1645
			   runnable_hook, alphasort);
1646
#else  /* not __GLIBC_PREREQ(2, 15) */
1647
  int numhooks = scandir(hookdir, &direntries, runnable_hook,
1648
			 alphasort);
1649
#endif	/* not __GLIBC_PREREQ(2, 15) */
1650
#else	/* not __GLIBC__ */
1651
  int numhooks = scandir(hookdir, &direntries, runnable_hook,
1652
			 alphasort);
1653
#endif	/* not __GLIBC__ */
505.3.8 by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New.
1654
  if(numhooks == -1){
691 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1655
    perror_plus("scandir");
1656
    return;
1657
  }
1658
  struct dirent *direntry;
1659
  int ret;
1660
  int devnull = open("/dev/null", O_RDONLY);
1661
  for(int i = 0; i < numhooks; i++){
1662
    direntry = direntries[i];
1663
    if(debug){
1664
      fprintf_plus(stderr, "Running network hook \"%s\"\n",
1665
		   direntry->d_name);
1666
    }
1667
    pid_t hook_pid = fork();
1668
    if(hook_pid == 0){
1669
      /* Child */
1670
      /* Raise privileges */
706 by Teddy Hogeborn
mandos-client: Better error messages.
1671
      errno = raise_privileges_permanently();
1672
      if(errno != 0){
691 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1673
	perror_plus("Failed to raise privileges");
1674
	_exit(EX_NOPERM);
1675
      }
1676
      /* Set group */
1677
      errno = 0;
1678
      ret = setgid(0);
1679
      if(ret == -1){
1680
	perror_plus("setgid");
1681
	_exit(EX_NOPERM);
1682
      }
1683
      /* Reset supplementary groups */
1684
      errno = 0;
1685
      ret = setgroups(0, NULL);
1686
      if(ret == -1){
1687
	perror_plus("setgroups");
1688
	_exit(EX_NOPERM);
1689
      }
1690
      ret = dup2(devnull, STDIN_FILENO);
1691
      if(ret == -1){
1692
	perror_plus("dup2(devnull, STDIN_FILENO)");
1693
	_exit(EX_OSERR);
1694
      }
1695
      ret = close(devnull);
1696
      if(ret == -1){
1697
	perror_plus("close");
1698
	_exit(EX_OSERR);
1699
      }
1700
      ret = dup2(STDERR_FILENO, STDOUT_FILENO);
1701
      if(ret == -1){
1702
	perror_plus("dup2(STDERR_FILENO, STDOUT_FILENO)");
1703
	_exit(EX_OSERR);
1704
      }
1705
      ret = setenv("MANDOSNETHOOKDIR", hookdir, 1);
1706
      if(ret == -1){
1707
	perror_plus("setenv");
1708
	_exit(EX_OSERR);
1709
      }
1710
      ret = setenv("DEVICE", interface, 1);
1711
      if(ret == -1){
1712
	perror_plus("setenv");
1713
	_exit(EX_OSERR);
1714
      }
1715
      ret = setenv("VERBOSITY", debug ? "1" : "0", 1);
1716
      if(ret == -1){
1717
	perror_plus("setenv");
1718
	_exit(EX_OSERR);
1719
      }
1720
      ret = setenv("MODE", mode, 1);
1721
      if(ret == -1){
1722
	perror_plus("setenv");
1723
	_exit(EX_OSERR);
1724
      }
1725
      char *delaystring;
1726
      ret = asprintf(&delaystring, "%f", (double)delay);
1727
      if(ret == -1){
505.3.8 by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New.
1728
	perror_plus("asprintf");
691 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1729
	_exit(EX_OSERR);
1730
      }
1731
      ret = setenv("DELAY", delaystring, 1);
1732
      if(ret == -1){
505.3.8 by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New.
1733
	free(delaystring);
691 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1734
	perror_plus("setenv");
1735
	_exit(EX_OSERR);
1736
      }
1737
      free(delaystring);
1738
      if(connect_to != NULL){
1739
	ret = setenv("CONNECT", connect_to, 1);
1740
	if(ret == -1){
1741
	  perror_plus("setenv");
1742
	  _exit(EX_OSERR);
1743
	}
1744
      }
696 by Teddy Hogeborn
Bug fix for mandos-client: Run the network hook, not the directory.
1745
      int hook_fd = openat(hookdir_fd, direntry->d_name, O_RDONLY);
1746
      if(hook_fd == -1){
1747
	perror_plus("openat");
1748
	_exit(EXIT_FAILURE);
1749
      }
1750
      if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){
1751
	perror_plus("close");
1752
	_exit(EXIT_FAILURE);
1753
      }
1754
      if(fexecve(hook_fd, (char *const []){ direntry->d_name, NULL },
1755
		 environ) == -1){
692 by Teddy Hogeborn
Make mandos-client use fexecve().
1756
	perror_plus("fexecve");
691 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1757
	_exit(EXIT_FAILURE);
1758
      }
1759
    } else {
733 by Teddy Hogeborn
mandos-client: Bug fix: Check fork() return value.
1760
      if(hook_pid == -1){
1761
	perror_plus("fork");
1762
	free(direntry);
1763
	continue;
1764
      }
691 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1765
      int status;
1766
      if(TEMP_FAILURE_RETRY(waitpid(hook_pid, &status, 0)) == -1){
1767
	perror_plus("waitpid");
715 by Teddy Hogeborn
mandos-client: Bug Fix: Fix some memory leaks.
1768
	free(direntry);
691 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1769
	continue;
1770
      }
1771
      if(WIFEXITED(status)){
1772
	if(WEXITSTATUS(status) != 0){
1773
	  fprintf_plus(stderr, "Warning: network hook \"%s\" exited"
1774
		       " with status %d\n", direntry->d_name,
1775
		       WEXITSTATUS(status));
715 by Teddy Hogeborn
mandos-client: Bug Fix: Fix some memory leaks.
1776
	  free(direntry);
691 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1777
	  continue;
1778
	}
1779
      } else if(WIFSIGNALED(status)){
1780
	fprintf_plus(stderr, "Warning: network hook \"%s\" died by"
1781
		     " signal %d\n", direntry->d_name,
1782
		     WTERMSIG(status));
715 by Teddy Hogeborn
mandos-client: Bug Fix: Fix some memory leaks.
1783
	free(direntry);
691 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1784
	continue;
505.3.8 by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New.
1785
      } else {
691 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1786
	fprintf_plus(stderr, "Warning: network hook \"%s\""
1787
		     " crashed\n", direntry->d_name);
715 by Teddy Hogeborn
mandos-client: Bug Fix: Fix some memory leaks.
1788
	free(direntry);
691 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1789
	continue;
1790
      }
1791
    }
1792
    if(debug){
1793
      fprintf_plus(stderr, "Network hook \"%s\" ran successfully\n",
1794
		   direntry->d_name);
1795
    }
715 by Teddy Hogeborn
mandos-client: Bug Fix: Fix some memory leaks.
1796
    free(direntry);
691 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1797
  }
704 by Teddy Hogeborn
mandos-client: Fix some bugs on error conditions.
1798
  free(direntries);
691 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1799
  if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){
1800
    perror_plus("close");
1801
  } else {
1802
    hookdir_fd = -1;
1803
  }
1804
  close(devnull);
505.3.8 by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New.
1805
}
1806
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1807
__attribute__((nonnull, warn_unused_result))
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1808
error_t bring_up_interface(const char *const interface,
1809
			   const float delay){
1810
  error_t old_errno = errno;
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1811
  int ret;
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1812
  struct ifreq network;
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1813
  unsigned int if_index = if_nametoindex(interface);
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1814
  if(if_index == 0){
1815
    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
1816
    errno = old_errno;
1817
    return ENXIO;
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1818
  }
1819
  
1820
  if(quit_now){
594.1.2 by Teddy Hogeborn
* plugins.d/mandos-client.c (bring_up_interface): Bug fix: Return
1821
    errno = old_errno;
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1822
    return EINTR;
1823
  }
1824
  
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1825
  if(not interface_is_up(interface)){
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1826
    error_t ret_errno = 0, ioctl_errno = 0;
1827
    if(not get_flags(interface, &network)){
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1828
      ret_errno = errno;
1829
      fprintf_plus(stderr, "Failed to get flags for interface "
1830
		   "\"%s\"\n", interface);
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1831
      errno = old_errno;
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1832
      return ret_errno;
1833
    }
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1834
    network.ifr_flags |= IFF_UP; /* set flag */
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1835
    
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1836
    int sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
1837
    if(sd == -1){
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1838
      ret_errno = errno;
1839
      perror_plus("socket");
1840
      errno = old_errno;
1841
      return ret_errno;
1842
    }
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1843
    
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1844
    if(quit_now){
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1845
      ret = (int)TEMP_FAILURE_RETRY(close(sd));
1846
      if(ret == -1){
1847
	perror_plus("close");
1848
      }
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1849
      errno = old_errno;
1850
      return EINTR;
1851
    }
1852
    
1853
    if(debug){
1854
      fprintf_plus(stderr, "Bringing up interface \"%s\"\n",
1855
		   interface);
1856
    }
1857
    
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1858
    /* Raise privileges */
1859
    ret_errno = raise_privileges();
680 by Teddy Hogeborn
Minor changes to minimize diff from last release.
1860
    if(ret_errno != 0){
706 by Teddy Hogeborn
mandos-client: Better error messages.
1861
      errno = ret_errno;
680 by Teddy Hogeborn
Minor changes to minimize diff from last release.
1862
      perror_plus("Failed to raise privileges");
1863
    }
1864
    
1865
#ifdef __linux__
1866
    int ret_linux;
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1867
    bool restore_loglevel = false;
1868
    if(ret_errno == 0){
1869
      /* Lower kernel loglevel to KERN_NOTICE to avoid KERN_INFO
1870
	 messages about the network interface to mess up the prompt */
1871
      ret_linux = klogctl(8, NULL, 5);
1872
      if(ret_linux == -1){
1873
	perror_plus("klogctl");
1874
      } else {
1875
	restore_loglevel = true;
1876
      }
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1877
    }
1878
#endif	/* __linux__ */
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1879
    int ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network);
1880
    ioctl_errno = errno;
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1881
#ifdef __linux__
1882
    if(restore_loglevel){
1883
      ret_linux = klogctl(7, NULL, 0);
1884
      if(ret_linux == -1){
1885
	perror_plus("klogctl");
1886
      }
1887
    }
1888
#endif	/* __linux__ */
1889
    
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1890
    /* If raise_privileges() succeeded above */
1891
    if(ret_errno == 0){
1892
      /* Lower privileges */
1893
      ret_errno = lower_privileges();
1894
      if(ret_errno != 0){
1895
	errno = ret_errno;
1896
	perror_plus("Failed to lower privileges");
1897
      }
1898
    }
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1899
    
1900
    /* Close the socket */
1901
    ret = (int)TEMP_FAILURE_RETRY(close(sd));
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1902
    if(ret == -1){
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1903
      perror_plus("close");
1904
    }
1905
    
1906
    if(ret_setflags == -1){
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1907
      errno = ioctl_errno;
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1908
      perror_plus("ioctl SIOCSIFFLAGS +IFF_UP");
594.1.2 by Teddy Hogeborn
* plugins.d/mandos-client.c (bring_up_interface): Bug fix: Return
1909
      errno = old_errno;
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1910
      return ioctl_errno;
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1911
    }
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1912
  } else if(debug){
1913
    fprintf_plus(stderr, "Interface \"%s\" is already up; good\n",
1914
		 interface);
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1915
  }
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1916
  
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1917
  /* Sleep checking until interface is running.
1918
     Check every 0.25s, up to total time of delay */
1919
  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.
1920
    if(interface_is_running(interface)){
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1921
      break;
1922
    }
1923
    struct timespec sleeptime = { .tv_nsec = 250000000 };
1924
    ret = nanosleep(&sleeptime, NULL);
1925
    if(ret == -1 and errno != EINTR){
1926
      perror_plus("nanosleep");
1927
    }
1928
  }
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1929
  
1930
  errno = old_errno;
1931
  return 0;
1932
}
1933
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1934
__attribute__((nonnull, warn_unused_result))
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1935
error_t take_down_interface(const char *const interface){
1936
  error_t old_errno = errno;
1937
  struct ifreq network;
1938
  unsigned int if_index = if_nametoindex(interface);
1939
  if(if_index == 0){
1940
    fprintf_plus(stderr, "No such interface: \"%s\"\n", interface);
1941
    errno = old_errno;
1942
    return ENXIO;
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1943
  }
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1944
  if(interface_is_up(interface)){
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1945
    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.
1946
    if(not get_flags(interface, &network) and debug){
1947
      ret_errno = errno;
1948
      fprintf_plus(stderr, "Failed to get flags for interface "
1949
		   "\"%s\"\n", interface);
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1950
      errno = old_errno;
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1951
      return ret_errno;
1952
    }
1953
    network.ifr_flags &= ~(short)IFF_UP; /* clear flag */
1954
    
666 by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full.
1955
    int sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1956
    if(sd == -1){
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1957
      ret_errno = errno;
1958
      perror_plus("socket");
1959
      errno = old_errno;
1960
      return ret_errno;
1961
    }
1962
    
1963
    if(debug){
1964
      fprintf_plus(stderr, "Taking down interface \"%s\"\n",
1965
		   interface);
1966
    }
1967
    
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1968
    /* Raise privileges */
1969
    ret_errno = raise_privileges();
1970
    if(ret_errno != 0){
706 by Teddy Hogeborn
mandos-client: Better error messages.
1971
      errno = ret_errno;
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1972
      perror_plus("Failed to raise privileges");
1973
    }
680 by Teddy Hogeborn
Minor changes to minimize diff from last release.
1974
    
666 by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full.
1975
    int ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network);
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1976
    ioctl_errno = errno;
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
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 */
666 by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full.
1989
    int 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.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1996
      perror_plus("ioctl SIOCSIFFLAGS -IFF_UP");
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.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1999
    }
2000
  } else if(debug){
2001
    fprintf_plus(stderr, "Interface \"%s\" is already down; odd\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.2 by Teddy Hogeborn
* plugins.d/mandos-client.c (bring_up_interface): Bug fix: Return
2005
  errno = old_errno;
2006
  return 0;
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
2007
}
2008
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
2009
int main(int argc, char *argv[]){
743 by Teddy Hogeborn
Automatically determine the number of DH bits in the TLS handshake.
2010
  mandos_context mc = { .server = NULL, .dh_bits = 0,
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
2011
			.priority = "SECURE256:!CTYPE-X.509:"
742 by Teddy Hogeborn
Add ":!RSA" to GnuTLS priority string, to disallow non-DHE kx.
2012
			"+CTYPE-OPENPGP:!RSA", .current_server = NULL,
603 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
2013
			.interfaces = NULL, .interfaces_size = 0 };
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2014
  AvahiSServiceBrowser *sb = NULL;
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2015
  error_t ret_errno;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2016
  int ret;
2017
  intmax_t tmpmax;
311 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
2018
  char *tmp;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2019
  int exitcode = EXIT_SUCCESS;
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2020
  char *interfaces_to_take_down = NULL;
2021
  size_t interfaces_to_take_down_size = 0;
673 by Teddy Hogeborn
Make mandos-client prefer /run/tmp over /tmp.
2022
  char run_tempdir[] = "/run/tmp/mandosXXXXXX";
2023
  char old_tempdir[] = "/tmp/mandosXXXXXX";
2024
  char *tempdir = NULL;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2025
  AvahiIfIndex if_index = AVAHI_IF_UNSPEC;
2026
  const char *seckey = PATHDIR "/" SECKEY;
2027
  const char *pubkey = PATHDIR "/" PUBKEY;
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2028
  char *interfaces_hooks = NULL;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2029
  
2030
  bool gnutls_initialized = false;
2031
  bool gpgme_initialized = false;
311 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
2032
  float delay = 2.5f;
485 by Teddy Hogeborn
Merge from Björn.
2033
  double retry_interval = 10; /* 10s between trying a server and
2034
				 retrying the same server again */
311 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
2035
  
369 by Teddy Hogeborn
* init.d-mandos (Required-Start, Required-Stop): Bug fix: Added
2036
  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
2037
  struct sigaction sigterm_action = { .sa_handler = handle_sigterm };
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2038
  
368 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
2039
  uid = getuid();
2040
  gid = getgid();
2041
  
2042
  /* Lower any group privileges we might have, just to be safe */
2043
  errno = 0;
2044
  ret = setgid(gid);
2045
  if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2046
    perror_plus("setgid");
368 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
2047
  }
2048
  
2049
  /* Lower user privileges (temporarily) */
2050
  errno = 0;
2051
  ret = seteuid(uid);
2052
  if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2053
    perror_plus("seteuid");
368 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
2054
  }
2055
  
2056
  if(quit_now){
2057
    goto end;
2058
  }
2059
  
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2060
  {
2061
    struct argp_option options[] = {
2062
      { .name = "debug", .key = 128,
2063
	.doc = "Debug mode", .group = 3 },
2064
      { .name = "connect", .key = 'c',
2065
	.arg = "ADDRESS:PORT",
2066
	.doc = "Connect directly to a specific Mandos server",
2067
	.group = 1 },
2068
      { .name = "interface", .key = 'i',
2069
	.arg = "NAME",
304 by Teddy Hogeborn
Four new interrelated features:
2070
	.doc = "Network interface that will be used to search for"
2071
	" Mandos servers",
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2072
	.group = 1 },
2073
      { .name = "seckey", .key = 's',
2074
	.arg = "FILE",
2075
	.doc = "OpenPGP secret key file base name",
2076
	.group = 1 },
2077
      { .name = "pubkey", .key = 'p',
2078
	.arg = "FILE",
2079
	.doc = "OpenPGP public key file base name",
2080
	.group = 2 },
2081
      { .name = "dh-bits", .key = 129,
2082
	.arg = "BITS",
2083
	.doc = "Bit length of the prime number used in the"
2084
	" Diffie-Hellman key exchange",
2085
	.group = 2 },
2086
      { .name = "priority", .key = 130,
2087
	.arg = "STRING",
2088
	.doc = "GnuTLS priority string for the TLS handshake",
2089
	.group = 1 },
2090
      { .name = "delay", .key = 131,
2091
	.arg = "SECONDS",
2092
	.doc = "Maximum delay to wait for interface startup",
2093
	.group = 2 },
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2094
      { .name = "retry", .key = 132,
2095
	.arg = "SECONDS",
535.1.1 by teddy at recompile
Add wireless network hook
2096
	.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.
2097
	.group = 2 },
505.3.4 by teddy at bsnet
* plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the
2098
      { .name = "network-hook-dir", .key = 133,
2099
	.arg = "DIR",
2100
	.doc = "Directory where network hooks are located",
2101
	.group = 2 },
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
2102
      /*
2103
       * These reproduce what we would get without ARGP_NO_HELP
2104
       */
2105
      { .name = "help", .key = '?',
2106
	.doc = "Give this help list", .group = -1 },
2107
      { .name = "usage", .key = -3,
2108
	.doc = "Give a short usage message", .group = -1 },
2109
      { .name = "version", .key = 'V',
2110
	.doc = "Print program version", .group = -1 },
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2111
      { .name = NULL }
2112
    };
2113
    
2114
    error_t parse_opt(int key, char *arg,
2115
		      struct argp_state *state){
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
2116
      errno = 0;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2117
      switch(key){
2118
      case 128:			/* --debug */
2119
	debug = true;
2120
	break;
2121
      case 'c':			/* --connect */
2122
	connect_to = arg;
2123
	break;
2124
      case 'i':			/* --interface */
603 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
2125
	ret_errno = argz_add_sep(&mc.interfaces, &mc.interfaces_size,
2126
				 arg, (int)',');
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2127
	if(ret_errno != 0){
2128
	  argp_error(state, "%s", strerror(ret_errno));
2129
	}
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2130
	break;
2131
      case 's':			/* --seckey */
2132
	seckey = arg;
2133
	break;
2134
      case 'p':			/* --pubkey */
2135
	pubkey = arg;
2136
	break;
2137
      case 129:			/* --dh-bits */
311 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
2138
	errno = 0;
2139
	tmpmax = strtoimax(arg, &tmp, 10);
2140
	if(errno != 0 or tmp == arg or *tmp != '\0'
2141
	   or tmpmax != (typeof(mc.dh_bits))tmpmax){
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
2142
	  argp_error(state, "Bad number of DH bits");
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2143
	}
2144
	mc.dh_bits = (typeof(mc.dh_bits))tmpmax;
2145
	break;
2146
      case 130:			/* --priority */
2147
	mc.priority = arg;
2148
	break;
2149
      case 131:			/* --delay */
311 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
2150
	errno = 0;
2151
	delay = strtof(arg, &tmp);
2152
	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
2153
	  argp_error(state, "Bad delay");
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2154
	}
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2155
      case 132:			/* --retry */
2156
	errno = 0;
2157
	retry_interval = strtod(arg, &tmp);
2158
	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.
2159
	   or (retry_interval * 1000) > INT_MAX
2160
	   or retry_interval < 0){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2161
	  argp_error(state, "Bad retry interval");
2162
	}
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2163
	break;
505.3.4 by teddy at bsnet
* plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the
2164
      case 133:			/* --network-hook-dir */
2165
	hookdir = arg;
2166
	break;
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
2167
	/*
2168
	 * These reproduce what we would get without ARGP_NO_HELP
2169
	 */
2170
      case '?':			/* --help */
2171
	argp_state_help(state, state->out_stream,
2172
			(ARGP_HELP_STD_HELP | ARGP_HELP_EXIT_ERR)
2173
			& ~(unsigned int)ARGP_HELP_EXIT_OK);
2174
      case -3:			/* --usage */
2175
	argp_state_help(state, state->out_stream,
2176
			ARGP_HELP_USAGE | ARGP_HELP_EXIT_ERR);
2177
      case 'V':			/* --version */
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2178
	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
2179
	exit(argp_err_exit_status);
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2180
	break;
2181
      default:
2182
	return ARGP_ERR_UNKNOWN;
2183
      }
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
2184
      return errno;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2185
    }
2186
    
2187
    struct argp argp = { .options = options, .parser = parse_opt,
2188
			 .args_doc = "",
2189
			 .doc = "Mandos client -- Get and decrypt"
2190
			 " passwords from a Mandos server" };
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
2191
    ret = argp_parse(&argp, argc, argv,
2192
		     ARGP_IN_ORDER | ARGP_NO_HELP, 0, NULL);
2193
    switch(ret){
2194
    case 0:
2195
      break;
2196
    case ENOMEM:
2197
    default:
2198
      errno = ret;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2199
      perror_plus("argp_parse");
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
2200
      exitcode = EX_OSERR;
2201
      goto end;
2202
    case EINVAL:
2203
      exitcode = EX_USAGE;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2204
      goto end;
2205
    }
2206
  }
487 by Teddy Hogeborn
* initramfs-tools-script: Abort if plugin-runner is missing. Removed
2207
    
505.3.16 by teddy at bsnet
* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly.
2208
  {
487 by Teddy Hogeborn
* initramfs-tools-script: Abort if plugin-runner is missing. Removed
2209
    /* Work around Debian bug #633582:
2210
       <http://bugs.debian.org/633582> */
2211
    
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2212
    /* Re-raise privileges */
2213
    ret_errno = raise_privileges();
2214
    if(ret_errno != 0){
2215
      errno = ret_errno;
2216
      perror_plus("Failed to raise privileges");
2217
    } else {
505.3.16 by teddy at bsnet
* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly.
2218
      struct stat st;
2219
      
2220
      if(strcmp(seckey, PATHDIR "/" SECKEY) == 0){
2221
	int seckey_fd = open(seckey, O_RDONLY);
2222
	if(seckey_fd == -1){
2223
	  perror_plus("open");
2224
	} else {
2225
	  ret = (int)TEMP_FAILURE_RETRY(fstat(seckey_fd, &st));
2226
	  if(ret == -1){
2227
	    perror_plus("fstat");
2228
	  } else {
2229
	    if(S_ISREG(st.st_mode)
2230
	       and st.st_uid == 0 and st.st_gid == 0){
2231
	      ret = fchown(seckey_fd, uid, gid);
2232
	      if(ret == -1){
2233
		perror_plus("fchown");
2234
	      }
2235
	    }
2236
	  }
2237
	  TEMP_FAILURE_RETRY(close(seckey_fd));
2238
	}
2239
      }
2240
    
2241
      if(strcmp(pubkey, PATHDIR "/" PUBKEY) == 0){
2242
	int pubkey_fd = open(pubkey, O_RDONLY);
2243
	if(pubkey_fd == -1){
2244
	  perror_plus("open");
2245
	} else {
2246
	  ret = (int)TEMP_FAILURE_RETRY(fstat(pubkey_fd, &st));
2247
	  if(ret == -1){
2248
	    perror_plus("fstat");
2249
	  } else {
2250
	    if(S_ISREG(st.st_mode)
2251
	       and st.st_uid == 0 and st.st_gid == 0){
2252
	      ret = fchown(pubkey_fd, uid, gid);
2253
	      if(ret == -1){
2254
		perror_plus("fchown");
2255
	      }
2256
	    }
2257
	  }
2258
	  TEMP_FAILURE_RETRY(close(pubkey_fd));
2259
	}
2260
      }
2261
    
505.3.11 by Teddy Hogeborn
* Makefile (run-client): Add "--network-hook-dir" option.
2262
      /* Lower privileges */
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2263
      ret_errno = lower_privileges();
2264
      if(ret_errno != 0){
2265
	errno = ret_errno;
2266
	perror_plus("Failed to lower privileges");
2267
      }
505.2.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
2268
    }
2269
  }
2270
  
604 by Teddy Hogeborn
* plugins.d/mandos-client (start_mandos_communication): Bug fix; skip
2271
  /* Remove invalid interface names (except "none") */
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2272
  {
2273
    char *interface = NULL;
603 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
2274
    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.
2275
				 interface))){
604 by Teddy Hogeborn
* plugins.d/mandos-client (start_mandos_communication): Bug fix; skip
2276
      if(strcmp(interface, "none") != 0
2277
	 and if_nametoindex(interface) == 0){
2278
	if(interface[0] != '\0'){
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2279
	  fprintf_plus(stderr, "Not using nonexisting interface"
2280
		       " \"%s\"\n", interface);
2281
	}
603 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
2282
	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.
2283
	interface = NULL;
2284
      }
2285
    }
2286
  }
2287
  
505.3.16 by teddy at bsnet
* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly.
2288
  /* Run network hooks */
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2289
  {
603 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
2290
    if(mc.interfaces != NULL){
2291
      interfaces_hooks = malloc(mc.interfaces_size);
599 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Bug fix: Set DEVICE environment
2292
      if(interfaces_hooks == NULL){
2293
	perror_plus("malloc");
2294
	goto end;
2295
      }
603 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
2296
      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.
2297
      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.
2298
    }
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2299
    run_network_hooks("start", interfaces_hooks != NULL ?
2300
		      interfaces_hooks : "", delay);
505.3.16 by teddy at bsnet
* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly.
2301
  }
2302
  
24.1.135 by Björn Påhlsson
Earlier signal handling
2303
  if(not debug){
2304
    avahi_set_log_function(empty_log);
2305
  }
505.2.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
2306
  
24.1.135 by Björn Påhlsson
Earlier signal handling
2307
  /* Initialize Avahi early so avahi_simple_poll_quit() can be called
2308
     from the signal handler */
2309
  /* Initialize the pseudo-RNG for Avahi */
2310
  srand((unsigned int) time(NULL));
601 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Removed "simple_poll"
2311
  simple_poll = avahi_simple_poll_new();
2312
  if(simple_poll == NULL){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
2313
    fprintf_plus(stderr,
2314
		 "Avahi: Failed to create simple poll object.\n");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2315
    exitcode = EX_UNAVAILABLE;
24.1.135 by Björn Påhlsson
Earlier signal handling
2316
    goto end;
2317
  }
309 by Teddy Hogeborn
Merge from Björn:
2318
  
24.1.135 by Björn Påhlsson
Earlier signal handling
2319
  sigemptyset(&sigterm_action.sa_mask);
309 by Teddy Hogeborn
Merge from Björn:
2320
  ret = sigaddset(&sigterm_action.sa_mask, SIGINT);
2321
  if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2322
    perror_plus("sigaddset");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2323
    exitcode = EX_OSERR;
309 by Teddy Hogeborn
Merge from Björn:
2324
    goto end;
2325
  }
2326
  ret = sigaddset(&sigterm_action.sa_mask, SIGHUP);
2327
  if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2328
    perror_plus("sigaddset");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2329
    exitcode = EX_OSERR;
309 by Teddy Hogeborn
Merge from Björn:
2330
    goto end;
2331
  }
24.1.135 by Björn Påhlsson
Earlier signal handling
2332
  ret = sigaddset(&sigterm_action.sa_mask, SIGTERM);
2333
  if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2334
    perror_plus("sigaddset");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2335
    exitcode = EX_OSERR;
24.1.135 by Björn Påhlsson
Earlier signal handling
2336
    goto end;
2337
  }
357 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
2338
  /* Need to check if the handler is SIG_IGN before handling:
2339
     | [[info:libc:Initial Signal Actions]] |
2340
     | [[info:libc:Basic Signal Handling]]  |
2341
  */
2342
  ret = sigaction(SIGINT, NULL, &old_sigterm_action);
2343
  if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2344
    perror_plus("sigaction");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2345
    return EX_OSERR;
357 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
2346
  }
2347
  if(old_sigterm_action.sa_handler != SIG_IGN){
2348
    ret = sigaction(SIGINT, &sigterm_action, NULL);
2349
    if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2350
      perror_plus("sigaction");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2351
      exitcode = EX_OSERR;
357 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
2352
      goto end;
2353
    }
2354
  }
2355
  ret = sigaction(SIGHUP, NULL, &old_sigterm_action);
2356
  if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2357
    perror_plus("sigaction");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2358
    return EX_OSERR;
357 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
2359
  }
2360
  if(old_sigterm_action.sa_handler != SIG_IGN){
2361
    ret = sigaction(SIGHUP, &sigterm_action, NULL);
2362
    if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2363
      perror_plus("sigaction");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2364
      exitcode = EX_OSERR;
357 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
2365
      goto end;
2366
    }
2367
  }
2368
  ret = sigaction(SIGTERM, NULL, &old_sigterm_action);
2369
  if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2370
    perror_plus("sigaction");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2371
    return EX_OSERR;
357 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
2372
  }
2373
  if(old_sigterm_action.sa_handler != SIG_IGN){
2374
    ret = sigaction(SIGTERM, &sigterm_action, NULL);
2375
    if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2376
      perror_plus("sigaction");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2377
      exitcode = EX_OSERR;
357 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
2378
      goto end;
2379
    }
354 by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New.
2380
  }
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2381
  
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2382
  /* If no interfaces were specified, make a list */
603 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
2383
  if(mc.interfaces == NULL){
699 by Teddy Hogeborn
Fix free() of possibly uninitialized pointer in mandos-client.
2384
    struct dirent **direntries = NULL;
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2385
    /* Look for any good interfaces */
2386
    ret = scandir(sys_class_net, &direntries, good_interface,
2387
		  alphasort);
2388
    if(ret >= 1){
2389
      /* Add all found interfaces to interfaces list */
2390
      for(int i = 0; i < ret; ++i){
603 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
2391
	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.
2392
			     direntries[i]->d_name);
2393
	if(ret_errno != 0){
666 by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full.
2394
	  errno = ret_errno;
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2395
	  perror_plus("argz_add");
715 by Teddy Hogeborn
mandos-client: Bug Fix: Fix some memory leaks.
2396
	  free(direntries[i]);
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2397
	  continue;
2398
	}
2399
	if(debug){
2400
	  fprintf_plus(stderr, "Will use interface \"%s\"\n",
2401
		       direntries[i]->d_name);
2402
	}
715 by Teddy Hogeborn
mandos-client: Bug Fix: Fix some memory leaks.
2403
	free(direntries[i]);
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2404
      }
2405
      free(direntries);
2406
    } else {
704 by Teddy Hogeborn
mandos-client: Fix some bugs on error conditions.
2407
      if(ret == 0){
2408
	free(direntries);
2409
      }
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2410
      fprintf_plus(stderr, "Could not find a network interface\n");
2411
      exitcode = EXIT_FAILURE;
2412
      goto end;
2413
    }
2414
  }
2415
  
605 by Teddy Hogeborn
* plugins.d/mandos-client.c: Comment changes
2416
  /* 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
2417
  {
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2418
    char *interface = NULL;
603 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
2419
    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.
2420
				 interface))){
604 by Teddy Hogeborn
* plugins.d/mandos-client (start_mandos_communication): Bug fix; skip
2421
      /* If interface name is "none", stop bringing up interfaces.
2422
	 Also remove all instances of "none" from the list */
2423
      if(strcmp(interface, "none") == 0){
2424
	argz_delete(&mc.interfaces, &mc.interfaces_size,
2425
		    interface);
2426
	interface = NULL;
2427
	while((interface = argz_next(mc.interfaces,
2428
				     mc.interfaces_size, interface))){
2429
	  if(strcmp(interface, "none") == 0){
2430
	    argz_delete(&mc.interfaces, &mc.interfaces_size,
2431
			interface);
2432
	    interface = NULL;
2433
	  }
2434
	}
2435
	break;
2436
      }
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2437
      bool interface_was_up = interface_is_up(interface);
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2438
      errno = bring_up_interface(interface, delay);
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2439
      if(not interface_was_up){
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2440
	if(errno != 0){
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2441
	  perror_plus("Failed to bring up interface");
2442
	} else {
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2443
	  errno = argz_add(&interfaces_to_take_down,
2444
			   &interfaces_to_take_down_size,
2445
			   interface);
2446
	  if(errno != 0){
666 by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full.
2447
	    perror_plus("argz_add");
2448
	  }
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2449
	}
2450
      }
2451
    }
2452
    if(debug and (interfaces_to_take_down == NULL)){
2453
      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().
2454
    }
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2455
  }
2456
  
604 by Teddy Hogeborn
* plugins.d/mandos-client (start_mandos_communication): Bug fix; skip
2457
  /* If we only got one interface, explicitly use only that one */
2458
  if(argz_count(mc.interfaces, mc.interfaces_size) == 1){
2459
    if(debug){
2460
      fprintf_plus(stderr, "Using only interface \"%s\"\n",
2461
		   mc.interfaces);
2462
    }
2463
    if_index = (AvahiIfIndex)if_nametoindex(mc.interfaces);
2464
  }
2465
  
353 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2466
  if(quit_now){
2467
    goto end;
2468
  }
2469
  
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
2470
  ret = init_gnutls_global(pubkey, seckey, &mc);
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2471
  if(ret == -1){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2472
    fprintf_plus(stderr, "init_gnutls_global failed\n");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2473
    exitcode = EX_UNAVAILABLE;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2474
    goto end;
2475
  } else {
2476
    gnutls_initialized = true;
2477
  }
2478
  
353 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2479
  if(quit_now){
2480
    goto end;
2481
  }
2482
  
673 by Teddy Hogeborn
Make mandos-client prefer /run/tmp over /tmp.
2483
  /* Try /run/tmp before /tmp */
2484
  tempdir = mkdtemp(run_tempdir);
2485
  if(tempdir == NULL and errno == ENOENT){
2486
      if(debug){
2487
	fprintf_plus(stderr, "Tempdir %s did not work, trying %s\n",
2488
		     run_tempdir, old_tempdir);
2489
      }
2490
      tempdir = mkdtemp(old_tempdir);
2491
  }
2492
  if(tempdir == NULL){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2493
    perror_plus("mkdtemp");
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2494
    goto end;
2495
  }
353 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2496
  
2497
  if(quit_now){
2498
    goto end;
2499
  }
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2500
  
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
2501
  if(not init_gpgme(pubkey, seckey, tempdir, &mc)){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2502
    fprintf_plus(stderr, "init_gpgme failed\n");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2503
    exitcode = EX_UNAVAILABLE;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2504
    goto end;
2505
  } else {
2506
    gpgme_initialized = true;
2507
  }
2508
  
353 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2509
  if(quit_now){
2510
    goto end;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2511
  }
2512
  
2513
  if(connect_to != NULL){
2514
    /* Connect directly, do not use Zeroconf */
2515
    /* (Mainly meant for debugging) */
2516
    char *address = strrchr(connect_to, ':');
594.1.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
2517
    
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2518
    if(address == NULL){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2519
      fprintf_plus(stderr, "No colon in address\n");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2520
      exitcode = EX_USAGE;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2521
      goto end;
2522
    }
353 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2523
    
2524
    if(quit_now){
2525
      goto end;
2526
    }
2527
    
597 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
2528
    in_port_t port;
311 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
2529
    errno = 0;
2530
    tmpmax = strtoimax(address+1, &tmp, 10);
2531
    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
2532
       or tmpmax != (in_port_t)tmpmax){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2533
      fprintf_plus(stderr, "Bad port number\n");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2534
      exitcode = EX_USAGE;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2535
      goto end;
2536
    }
604 by Teddy Hogeborn
* plugins.d/mandos-client (start_mandos_communication): Bug fix; skip
2537
    
353 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2538
    if(quit_now){
2539
      goto end;
2540
    }
2541
    
597 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
2542
    port = (in_port_t)tmpmax;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2543
    *address = '\0';
304 by Teddy Hogeborn
Four new interrelated features:
2544
    /* Colon in address indicates IPv6 */
2545
    int af;
491 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
2546
    if(strchr(connect_to, ':') != NULL){
304 by Teddy Hogeborn
Four new interrelated features:
2547
      af = AF_INET6;
491 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
2548
      /* Accept [] around IPv6 address - see RFC 5952 */
2549
      if(connect_to[0] == '[' and address[-1] == ']')
2550
	{
2551
	  connect_to++;
2552
	  address[-1] = '\0';
2553
	}
304 by Teddy Hogeborn
Four new interrelated features:
2554
    } else {
2555
      af = AF_INET;
2556
    }
491 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
2557
    address = connect_to;
353 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2558
    
2559
    if(quit_now){
2560
      goto end;
2561
    }
491 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
2562
    
24.1.163 by Björn Påhlsson
mandos-client: Added never ending loop for --connect
2563
    while(not quit_now){
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
2564
      ret = start_mandos_communication(address, port, if_index, af,
2565
				       &mc);
24.1.163 by Björn Påhlsson
mandos-client: Added never ending loop for --connect
2566
      if(quit_now or ret == 0){
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2567
	break;
2568
      }
491 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
2569
      if(debug){
505.3.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
2570
	fprintf_plus(stderr, "Retrying in %d seconds\n",
2571
		     (int)retry_interval);
491 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
2572
      }
620 by Teddy Hogeborn
* plugin-runner.c (main): Bug fix; do not ignore return value of
2573
      sleep((unsigned int)retry_interval);
492 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not even try to work around
2574
    }
2575
    
671 by Teddy Hogeborn
White space fix: change "if (" to "if(" in C code.
2576
    if(not quit_now){
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2577
      exitcode = EXIT_SUCCESS;
2578
    }
505.2.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
2579
    
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2580
    goto end;
2581
  }
353 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2582
  
2583
  if(quit_now){
2584
    goto end;
2585
  }
2586
  
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2587
  {
2588
    AvahiServerConfig config;
2589
    /* Do not publish any local Zeroconf records */
2590
    avahi_server_config_init(&config);
2591
    config.publish_hinfo = 0;
2592
    config.publish_addresses = 0;
2593
    config.publish_workstation = 0;
2594
    config.publish_domain = 0;
2595
    
2596
    /* Allocate a new server */
601 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Removed "simple_poll"
2597
    mc.server = avahi_server_new(avahi_simple_poll_get(simple_poll),
2598
				 &config, NULL, NULL, &ret_errno);
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2599
    
2600
    /* Free the Avahi configuration data */
2601
    avahi_server_config_free(&config);
2602
  }
2603
  
2604
  /* Check if creating the Avahi server object succeeded */
2605
  if(mc.server == NULL){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2606
    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.
2607
		 avahi_strerror(ret_errno));
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2608
    exitcode = EX_UNAVAILABLE;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2609
    goto end;
2610
  }
2611
  
353 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2612
  if(quit_now){
2613
    goto end;
2614
  }
2615
  
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2616
  /* Create the Avahi service browser */
2617
  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
2618
				   AVAHI_PROTO_UNSPEC, "_mandos._tcp",
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
2619
				   NULL, 0, browse_callback,
2620
				   (void *)&mc);
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2621
  if(sb == NULL){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2622
    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.
2623
		 avahi_strerror(avahi_server_errno(mc.server)));
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2624
    exitcode = EX_UNAVAILABLE;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2625
    goto end;
2626
  }
307 by Teddy Hogeborn
Merge from Björn:
2627
  
353 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2628
  if(quit_now){
2629
    goto end;
2630
  }
2631
  
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2632
  /* Run the main loop */
2633
  
2634
  if(debug){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2635
    fprintf_plus(stderr, "Starting Avahi loop search\n");
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2636
  }
687 by Teddy Hogeborn
White space fix only.
2637
  
601 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Removed "simple_poll"
2638
  ret = avahi_loop_with_timeout(simple_poll,
602 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
2639
				(int)(retry_interval * 1000), &mc);
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2640
  if(debug){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2641
    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.
2642
		 (ret == 0) ? "successfully" : "with error");
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2643
  }
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2644
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
2645
 end:
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2646
  
2647
  if(debug){
505.2.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2648
    fprintf_plus(stderr, "%s exiting\n", argv[0]);
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2649
  }
2650
  
2651
  /* Cleanup things */
604 by Teddy Hogeborn
* plugins.d/mandos-client (start_mandos_communication): Bug fix; skip
2652
  free(mc.interfaces);
2653
  
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2654
  if(sb != NULL)
2655
    avahi_s_service_browser_free(sb);
2656
  
2657
  if(mc.server != NULL)
2658
    avahi_server_free(mc.server);
2659
  
601 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Removed "simple_poll"
2660
  if(simple_poll != NULL)
2661
    avahi_simple_poll_free(simple_poll);
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2662
  
2663
  if(gnutls_initialized){
2664
    gnutls_certificate_free_credentials(mc.cred);
2665
    gnutls_global_deinit();
2666
    gnutls_dh_params_deinit(mc.dh_params);
2667
  }
2668
  
2669
  if(gpgme_initialized){
2670
    gpgme_release(mc.ctx);
2671
  }
505.3.12 by Teddy Hogeborn
* plugins.d/mandos-client.c (runnable_hook): Add debug output.
2672
  
485 by Teddy Hogeborn
Merge from Björn.
2673
  /* Cleans up the circular linked list of Mandos servers the client
2674
     has seen */
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2675
  if(mc.current_server != NULL){
2676
    mc.current_server->prev->next = NULL;
2677
    while(mc.current_server != NULL){
2678
      server *next = mc.current_server->next;
714 by Teddy Hogeborn
mandos-client: Fix mem free bug.
2679
#ifdef __GNUC__
2680
#pragma GCC diagnostic push
2681
#pragma GCC diagnostic ignored "-Wcast-qual"
2682
#endif
2683
      free((char *)(mc.current_server->ip));
2684
#ifdef __GNUC__
2685
#pragma GCC diagnostic pop
2686
#endif
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2687
      free(mc.current_server);
2688
      mc.current_server = next;
2689
    }
2690
  }
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2691
  
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2692
  /* Re-raise privileges */
505.3.8 by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New.
2693
  {
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2694
    ret_errno = raise_privileges();
2695
    if(ret_errno != 0){
706 by Teddy Hogeborn
mandos-client: Better error messages.
2696
      errno = ret_errno;
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2697
      perror_plus("Failed to raise privileges");
2698
    } else {
2699
      
2700
      /* Run network hooks */
2701
      run_network_hooks("stop", interfaces_hooks != NULL ?
2702
			interfaces_hooks : "", delay);
2703
      
2704
      /* Take down the network interfaces which were brought up */
2705
      {
2706
	char *interface = NULL;
2707
	while((interface=argz_next(interfaces_to_take_down,
2708
				   interfaces_to_take_down_size,
2709
				   interface))){
2710
	  ret_errno = take_down_interface(interface);
2711
	  if(ret_errno != 0){
2712
	    errno = ret_errno;
2713
	    perror_plus("Failed to take down interface");
2714
	  }
2715
	}
2716
	if(debug and (interfaces_to_take_down == NULL)){
2717
	  fprintf_plus(stderr, "No interfaces needed to be taken"
2718
		       " down\n");
2719
	}
2720
      }
2721
    }
680 by Teddy Hogeborn
Minor changes to minimize diff from last release.
2722
    
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2723
    ret_errno = lower_privileges_permanently();
2724
    if(ret_errno != 0){
706 by Teddy Hogeborn
mandos-client: Better error messages.
2725
      errno = ret_errno;
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2726
      perror_plus("Failed to lower privileges permanently");
2727
    }
594.1.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2728
  }
2729
  
2730
  free(interfaces_to_take_down);
2731
  free(interfaces_hooks);
350 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Take down network interface on
2732
  
24.1.172 by Björn Påhlsson
using scandir instead of readdir
2733
  /* Removes the GPGME temp directory and all files inside */
673 by Teddy Hogeborn
Make mandos-client prefer /run/tmp over /tmp.
2734
  if(tempdir != NULL){
24.1.172 by Björn Påhlsson
using scandir instead of readdir
2735
    struct dirent **direntries = NULL;
697 by Teddy Hogeborn
Address a very theoretical possible security issue in mandos-client.
2736
    int tempdir_fd = (int)TEMP_FAILURE_RETRY(open(tempdir, O_RDONLY |
2737
						  O_NOFOLLOW));
694 by Teddy Hogeborn
Make mandos-client use unlinkat() instead of remove().
2738
    if(tempdir_fd == -1){
2739
      perror_plus("open");
2740
    } else {
695 by Teddy Hogeborn
Make mandos-client use more scandirat().
2741
#ifdef __GLIBC__
2742
#if __GLIBC_PREREQ(2, 15)
2743
      int numentries = scandirat(tempdir_fd, ".", &direntries,
2744
				 notdotentries, alphasort);
2745
#else  /* not __GLIBC_PREREQ(2, 15) */
2746
      int numentries = scandir(tempdir, &direntries, notdotentries,
2747
			       alphasort);
2748
#endif	/* not __GLIBC_PREREQ(2, 15) */
2749
#else	/* not __GLIBC__ */
2750
      int numentries = scandir(tempdir, &direntries, notdotentries,
2751
			       alphasort);
2752
#endif	/* not __GLIBC__ */
704 by Teddy Hogeborn
mandos-client: Fix some bugs on error conditions.
2753
      if(numentries >= 0){
694 by Teddy Hogeborn
Make mandos-client use unlinkat() instead of remove().
2754
	for(int i = 0; i < numentries; i++){
2755
	  ret = unlinkat(tempdir_fd, direntries[i]->d_name, 0);
2756
	  if(ret == -1){
2757
	    fprintf_plus(stderr, "unlinkat(open(\"%s\", O_RDONLY),"
2758
			 " \"%s\", 0): %s\n", tempdir,
2759
			 direntries[i]->d_name, strerror(errno));
2760
	  }
715 by Teddy Hogeborn
mandos-client: Bug Fix: Fix some memory leaks.
2761
	  free(direntries[i]);
694 by Teddy Hogeborn
Make mandos-client use unlinkat() instead of remove().
2762
	}
2763
	
2764
	/* need to clean even if 0 because man page doesn't specify */
2765
	free(direntries);
2766
	if(numentries == -1){
2767
	  perror_plus("scandir");
2768
	}
2769
	ret = rmdir(tempdir);
2770
	if(ret == -1 and errno != ENOENT){
2771
	  perror_plus("rmdir");
2772
	}
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2773
      }
694 by Teddy Hogeborn
Make mandos-client use unlinkat() instead of remove().
2774
      TEMP_FAILURE_RETRY(close(tempdir_fd));
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2775
    }
2776
  }
2777
  
354 by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New.
2778
  if(quit_now){
357 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
2779
    sigemptyset(&old_sigterm_action.sa_mask);
2780
    old_sigterm_action.sa_handler = SIG_DFL;
374 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Try harder to raise signal on
2781
    ret = (int)TEMP_FAILURE_RETRY(sigaction(signal_received,
2782
					    &old_sigterm_action,
2783
					    NULL));
354 by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New.
2784
    if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2785
      perror_plus("sigaction");
354 by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New.
2786
    }
374 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Try harder to raise signal on
2787
    do {
2788
      ret = raise(signal_received);
2789
    } while(ret != 0 and errno == EINTR);
2790
    if(ret != 0){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2791
      perror_plus("raise");
374 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Try harder to raise signal on
2792
      abort();
2793
    }
2794
    TEMP_FAILURE_RETRY(pause());
354 by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New.
2795
  }
2796
  
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2797
  return exitcode;
13 by Björn Påhlsson
Added following support:
2798
}