/mandos/release

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