/mandos/trunk

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