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