/mandos/release

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