/mandos/trunk

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