/mandos/release

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