/mandos/trunk

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