/mandos/trunk

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