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