/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
/*
3
 * Mandos client - get and decrypt data from a Mandos server
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
246 by Teddy Hogeborn
* README: Update copyright year; add "2009".
12
 * Copyright © 2008,2009 Teddy Hogeborn
13
 * Copyright © 2008,2009 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
 * 
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
29
 * Contact the authors at <mandos@fukt.bsnet.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() */
13 by Björn Påhlsson
Added following support:
33
#define _LARGEFILE_SOURCE
34
#define _FILE_OFFSET_BITS 64
35
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
36
#define _GNU_SOURCE		/* TEMP_FAILURE_RETRY(), asprintf() */
24.1.10 by Björn Påhlsson
merge commit
37
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
38
#include <stdio.h>		/* fprintf(), stderr, fwrite(),
39
				   stdout, ferror() */
24.1.26 by Björn Påhlsson
tally count of used symbols
40
#include <stdint.h> 		/* uint16_t, uint32_t */
41
#include <stddef.h>		/* NULL, size_t, ssize_t */
24.1.29 by Björn Påhlsson
Added more header file comments
42
#include <stdlib.h> 		/* free(), EXIT_SUCCESS, EXIT_FAILURE,
43
				   srand() */
24.1.26 by Björn Påhlsson
tally count of used symbols
44
#include <stdbool.h>		/* bool, true */
24.1.29 by Björn Påhlsson
Added more header file comments
45
#include <string.h>		/* memset(), strcmp(), strlen(),
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
46
				   strerror(), asprintf(), strcpy() */
24.1.29 by Björn Påhlsson
Added more header file comments
47
#include <sys/ioctl.h>          /* ioctl */
24.1.26 by Björn Påhlsson
tally count of used symbols
48
#include <sys/types.h>		/* socket(), inet_pton(), sockaddr,
24.1.29 by Björn Påhlsson
Added more header file comments
49
				   sockaddr_in6, PF_INET6,
50
				   SOCK_STREAM, INET6_ADDRSTRLEN,
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
51
				   uid_t, gid_t, open(), opendir(), DIR */
52
#include <sys/stat.h>		/* open() */
24.1.26 by Björn Påhlsson
tally count of used symbols
53
#include <sys/socket.h>		/* socket(), struct sockaddr_in6,
54
				   struct in6_addr, inet_pton(),
55
				   connect() */
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
56
#include <fcntl.h>		/* open() */
57
#include <dirent.h>		/* opendir(), struct dirent, readdir() */
58
#include <inttypes.h>		/* PRIu16 */
24.1.29 by Björn Påhlsson
Added more header file comments
59
#include <assert.h>		/* assert() */
60
#include <errno.h>		/* perror(), errno */
61
#include <time.h>		/* time() */
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
62
#include <net/if.h>		/* ioctl, ifreq, SIOCGIFFLAGS, IFF_UP,
24.1.26 by Björn Påhlsson
tally count of used symbols
63
				   SIOCSIFFLAGS, if_indextoname(),
64
				   if_nametoindex(), IF_NAMESIZE */
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
65
#include <netinet/in.h>
24.1.29 by Björn Påhlsson
Added more header file comments
66
#include <unistd.h>		/* close(), SEEK_SET, off_t, write(),
67
				   getuid(), getgid(), setuid(),
68
				   setgid() */
24.1.26 by Björn Påhlsson
tally count of used symbols
69
#include <arpa/inet.h>		/* inet_pton(), htons */
24.1.29 by Björn Påhlsson
Added more header file comments
70
#include <iso646.h>		/* not, and */
71
#include <argp.h>		/* struct argp_option, error_t, struct
72
				   argp_state, struct argp,
73
				   argp_parse(), ARGP_KEY_ARG,
74
				   ARGP_KEY_END, ARGP_ERR_UNKNOWN */
24.1.26 by Björn Påhlsson
tally count of used symbols
75
76
/* Avahi */
24.1.29 by Björn Påhlsson
Added more header file comments
77
/* All Avahi types, constants and functions
78
 Avahi*, avahi_*,
79
 AVAHI_* */
80
#include <avahi-core/core.h>
24.1.26 by Björn Påhlsson
tally count of used symbols
81
#include <avahi-core/lookup.h>
24.1.29 by Björn Påhlsson
Added more header file comments
82
#include <avahi-core/log.h>
24.1.26 by Björn Påhlsson
tally count of used symbols
83
#include <avahi-common/simple-watch.h>
84
#include <avahi-common/malloc.h>
85
#include <avahi-common/error.h>
86
87
/* GnuTLS */
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
88
#include <gnutls/gnutls.h>	/* All GnuTLS types, constants and
89
				   functions:
24.1.29 by Björn Påhlsson
Added more header file comments
90
				   gnutls_*
24.1.26 by Björn Påhlsson
tally count of used symbols
91
				   init_gnutls_session(),
24.1.29 by Björn Påhlsson
Added more header file comments
92
				   GNUTLS_* */
93
#include <gnutls/openpgp.h>     /* gnutls_certificate_set_openpgp_key_file(),
94
				   GNUTLS_OPENPGP_FMT_BASE64 */
24.1.26 by Björn Påhlsson
tally count of used symbols
95
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
96
/* GPGME */
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
97
#include <gpgme.h> 		/* All GPGME types, constants and
98
				   functions:
24.1.29 by Björn Påhlsson
Added more header file comments
99
				   gpgme_*
24.1.26 by Björn Påhlsson
tally count of used symbols
100
				   GPGME_PROTOCOL_OpenPGP,
24.1.29 by Björn Påhlsson
Added more header file comments
101
				   GPG_ERR_NO_* */
13 by Björn Påhlsson
Added following support:
102
103
#define BUFFER_SIZE 256
37 by Teddy Hogeborn
Non-tested commit for merge purposes.
104
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
105
#define PATHDIR "/conf/conf.d/mandos"
106
#define SECKEY "seckey.txt"
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
107
#define PUBKEY "pubkey.txt"
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
108
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
109
bool debug = false;
43 by Teddy Hogeborn
* plugins.d/mandosclient.c: Cosmetic changes.
110
static const char mandos_protocol_version[] = "1";
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
111
const char *argp_program_version = "mandos-client " VERSION;
24.1.14 by Björn Påhlsson
mandosclient
112
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
24.1.10 by Björn Påhlsson
merge commit
113
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
114
/* Used for passing in values through the Avahi callback functions */
13 by Björn Påhlsson
Added following support:
115
typedef struct {
24.1.9 by Björn Påhlsson
not working midwork...
116
  AvahiSimplePoll *simple_poll;
117
  AvahiServer *server;
13 by Björn Påhlsson
Added following support:
118
  gnutls_certificate_credentials_t cred;
24.1.9 by Björn Påhlsson
not working midwork...
119
  unsigned int dh_bits;
24.1.13 by Björn Påhlsson
mandosclient
120
  gnutls_dh_params_t dh_params;
24.1.9 by Björn Påhlsson
not working midwork...
121
  const char *priority;
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
122
  gpgme_ctx_t ctx;
24.1.9 by Björn Påhlsson
not working midwork...
123
} mandos_context;
13 by Björn Påhlsson
Added following support:
124
43 by Teddy Hogeborn
* plugins.d/mandosclient.c: Cosmetic changes.
125
/*
126
 * Make room in "buffer" for at least BUFFER_SIZE additional bytes.
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
127
 * "buffer_capacity" is how much is currently allocated,
43 by Teddy Hogeborn
* plugins.d/mandosclient.c: Cosmetic changes.
128
 * "buffer_length" is how much is already used.
129
 */
24.1.12 by Björn Påhlsson
merge +
130
size_t adjustbuffer(char **buffer, size_t buffer_length,
24.1.10 by Björn Påhlsson
merge commit
131
		  size_t buffer_capacity){
132
  if (buffer_length + BUFFER_SIZE > buffer_capacity){
24.1.12 by Björn Påhlsson
merge +
133
    *buffer = realloc(*buffer, buffer_capacity + BUFFER_SIZE);
24.1.10 by Björn Påhlsson
merge commit
134
    if (buffer == NULL){
135
      return 0;
136
    }
137
    buffer_capacity += BUFFER_SIZE;
138
  }
139
  return buffer_capacity;
140
}
141
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
142
/* 
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
143
 * Initialize GPGME.
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
144
 */
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
145
static bool init_gpgme(mandos_context *mc, const char *seckey,
146
		       const char *pubkey, const char *tempdir){
147
  int ret;
13 by Björn Påhlsson
Added following support:
148
  gpgme_error_t rc;
149
  gpgme_engine_info_t engine_info;
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
150
  
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
151
  
152
  /*
153
   * Helper function to insert pub and seckey to the enigne keyring.
154
   */
155
  bool import_key(const char *filename){
156
    int fd;
157
    gpgme_data_t pgp_data;
158
    
159
    fd = TEMP_FAILURE_RETRY(open(filename, O_RDONLY));
160
    if(fd == -1){
161
      perror("open");
162
      return false;
163
    }
164
    
165
    rc = gpgme_data_new_from_fd(&pgp_data, fd);
166
    if (rc != GPG_ERR_NO_ERROR){
167
      fprintf(stderr, "bad gpgme_data_new_from_fd: %s: %s\n",
168
	      gpgme_strsource(rc), gpgme_strerror(rc));
169
      return false;
170
    }
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
171
    
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
172
    rc = gpgme_op_import(mc->ctx, pgp_data);
173
    if (rc != GPG_ERR_NO_ERROR){
174
      fprintf(stderr, "bad gpgme_op_import: %s: %s\n",
175
	      gpgme_strsource(rc), gpgme_strerror(rc));
176
      return false;
177
    }
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
178
    
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
179
    ret = TEMP_FAILURE_RETRY(close(fd));
180
    if(ret == -1){
181
      perror("close");
182
    }
183
    gpgme_data_release(pgp_data);
184
    return true;
185
  }
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
186
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
187
  if (debug){
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
188
    fprintf(stderr, "Initialize gpgme\n");
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
189
  }
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
190
  
13 by Björn Påhlsson
Added following support:
191
  /* Init GPGME */
192
  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.
193
  rc = gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP);
194
  if (rc != GPG_ERR_NO_ERROR){
195
    fprintf(stderr, "bad gpgme_engine_check_version: %s: %s\n",
196
	    gpgme_strsource(rc), gpgme_strerror(rc));
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
197
    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.
198
  }
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
199
  
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
200
    /* Set GPGME home directory for the OpenPGP engine only */
13 by Björn Påhlsson
Added following support:
201
  rc = gpgme_get_engine_info (&engine_info);
202
  if (rc != GPG_ERR_NO_ERROR){
203
    fprintf(stderr, "bad gpgme_get_engine_info: %s: %s\n",
204
	    gpgme_strsource(rc), gpgme_strerror(rc));
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
205
    return false;
13 by Björn Påhlsson
Added following support:
206
  }
207
  while(engine_info != NULL){
208
    if(engine_info->protocol == GPGME_PROTOCOL_OpenPGP){
209
      gpgme_set_engine_info(GPGME_PROTOCOL_OpenPGP,
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
210
			    engine_info->file_name, tempdir);
13 by Björn Påhlsson
Added following support:
211
      break;
212
    }
213
    engine_info = engine_info->next;
214
  }
215
  if(engine_info == NULL){
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
216
    fprintf(stderr, "Could not set GPGME home dir to %s\n", tempdir);
217
    return false;
218
  }
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
219
  
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
220
  /* Create new GPGME "context" */
221
  rc = gpgme_new(&(mc->ctx));
222
  if (rc != GPG_ERR_NO_ERROR){
223
    fprintf(stderr, "bad gpgme_new: %s: %s\n",
224
	    gpgme_strsource(rc), gpgme_strerror(rc));
225
    return false;
226
  }
227
  
228
  if (not import_key(pubkey) or not import_key(seckey)){
229
    return false;
230
  }
231
  
232
  return true; 
233
}
234
235
/* 
236
 * Decrypt OpenPGP data.
237
 * Returns -1 on error
238
 */
239
static ssize_t pgp_packet_decrypt (const mandos_context *mc,
240
				   const char *cryptotext,
241
				   size_t crypto_size,
242
				   char **plaintext){
243
  gpgme_data_t dh_crypto, dh_plain;
244
  gpgme_error_t rc;
245
  ssize_t ret;
246
  size_t plaintext_capacity = 0;
247
  ssize_t plaintext_length = 0;
248
  
249
  if (debug){
250
    fprintf(stderr, "Trying to decrypt OpenPGP data\n");
13 by Björn Påhlsson
Added following support:
251
  }
252
  
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
253
  /* Create new GPGME data buffer from memory cryptotext */
254
  rc = gpgme_data_new_from_mem(&dh_crypto, cryptotext, crypto_size,
255
			       0);
13 by Björn Påhlsson
Added following support:
256
  if (rc != GPG_ERR_NO_ERROR){
257
    fprintf(stderr, "bad gpgme_data_new_from_mem: %s: %s\n",
258
	    gpgme_strsource(rc), gpgme_strerror(rc));
259
    return -1;
260
  }
261
  
262
  /* Create new empty GPGME data buffer for the plaintext */
263
  rc = gpgme_data_new(&dh_plain);
264
  if (rc != GPG_ERR_NO_ERROR){
265
    fprintf(stderr, "bad gpgme_data_new: %s: %s\n",
266
	    gpgme_strsource(rc), gpgme_strerror(rc));
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
267
    gpgme_data_release(dh_crypto);
13 by Björn Påhlsson
Added following support:
268
    return -1;
269
  }
270
  
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
271
  /* Decrypt data from the cryptotext data buffer to the plaintext
272
     data buffer */
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
273
  rc = gpgme_op_decrypt(mc->ctx, dh_crypto, dh_plain);
13 by Björn Påhlsson
Added following support:
274
  if (rc != GPG_ERR_NO_ERROR){
275
    fprintf(stderr, "bad gpgme_op_decrypt: %s: %s\n",
276
	    gpgme_strsource(rc), gpgme_strerror(rc));
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
277
    plaintext_length = -1;
99 by Teddy Hogeborn
* mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify.
278
    if (debug){
279
      gpgme_decrypt_result_t result;
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
280
      result = gpgme_op_decrypt_result(mc->ctx);
99 by Teddy Hogeborn
* mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify.
281
      if (result == NULL){
282
	fprintf(stderr, "gpgme_op_decrypt_result failed\n");
283
      } else {
284
	fprintf(stderr, "Unsupported algorithm: %s\n",
285
		result->unsupported_algorithm);
286
	fprintf(stderr, "Wrong key usage: %u\n",
287
		result->wrong_key_usage);
288
	if(result->file_name != NULL){
289
	  fprintf(stderr, "File name: %s\n", result->file_name);
290
	}
291
	gpgme_recipient_t recipient;
292
	recipient = result->recipients;
293
	if(recipient){
294
	  while(recipient != NULL){
295
	    fprintf(stderr, "Public key algorithm: %s\n",
296
		    gpgme_pubkey_algo_name(recipient->pubkey_algo));
297
	    fprintf(stderr, "Key ID: %s\n", recipient->keyid);
298
	    fprintf(stderr, "Secret key available: %s\n",
299
		    recipient->status == GPG_ERR_NO_SECKEY
300
		    ? "No" : "Yes");
301
	    recipient = recipient->next;
302
	  }
303
	}
304
      }
305
    }
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
306
    goto decrypt_end;
13 by Björn Påhlsson
Added following support:
307
  }
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
308
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
309
  if(debug){
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
310
    fprintf(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
311
  }
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
312
  
13 by Björn Påhlsson
Added following support:
313
  /* Seek back to the beginning of the GPGME plaintext data buffer */
24.1.5 by Björn Påhlsson
plugbasedclient:
314
  if (gpgme_data_seek(dh_plain, (off_t) 0, SEEK_SET) == -1){
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
315
    perror("gpgme_data_seek");
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
316
    plaintext_length = -1;
317
    goto decrypt_end;
24.1.5 by Björn Påhlsson
plugbasedclient:
318
  }
319
  
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
320
  *plaintext = NULL;
13 by Björn Påhlsson
Added following support:
321
  while(true){
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
322
    plaintext_capacity = adjustbuffer(plaintext,
323
				      (size_t)plaintext_length,
24.1.12 by Björn Påhlsson
merge +
324
				      plaintext_capacity);
325
    if (plaintext_capacity == 0){
24.1.10 by Björn Påhlsson
merge commit
326
	perror("adjustbuffer");
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
327
	plaintext_length = -1;
328
	goto decrypt_end;
13 by Björn Påhlsson
Added following support:
329
    }
330
    
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
331
    ret = gpgme_data_read(dh_plain, *plaintext + plaintext_length,
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
332
			  BUFFER_SIZE);
13 by Björn Påhlsson
Added following support:
333
    /* Print the data, if any */
334
    if (ret == 0){
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
335
      /* EOF */
13 by Björn Påhlsson
Added following support:
336
      break;
337
    }
338
    if(ret < 0){
339
      perror("gpgme_data_read");
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
340
      plaintext_length = -1;
341
      goto decrypt_end;
13 by Björn Påhlsson
Added following support:
342
    }
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
343
    plaintext_length += ret;
13 by Björn Påhlsson
Added following support:
344
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
345
  
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
346
  if(debug){
347
    fprintf(stderr, "Decrypted password is: ");
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
348
    for(ssize_t i = 0; i < plaintext_length; i++){
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
349
      fprintf(stderr, "%02hhX ", (*plaintext)[i]);
350
    }
351
    fprintf(stderr, "\n");
352
  }
353
  
354
 decrypt_end:
355
  
356
  /* Delete the GPGME cryptotext data buffer */
357
  gpgme_data_release(dh_crypto);
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
358
  
359
  /* Delete the GPGME plaintext data buffer */
13 by Björn Påhlsson
Added following support:
360
  gpgme_data_release(dh_plain);
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
361
  return plaintext_length;
13 by Björn Påhlsson
Added following support:
362
}
363
364
static const char * safer_gnutls_strerror (int value) {
84 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do
365
  const char *ret = gnutls_strerror (value); /* Spurious warning */
13 by Björn Påhlsson
Added following support:
366
  if (ret == NULL)
367
    ret = "(unknown)";
368
  return ret;
369
}
370
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
371
/* GnuTLS log function callback */
36 by Teddy Hogeborn
* TODO: Converted to org-mode style
372
static void debuggnutls(__attribute__((unused)) int level,
373
			const char* string){
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
374
  fprintf(stderr, "GnuTLS: %s", string);
13 by Björn Påhlsson
Added following support:
375
}
376
24.1.14 by Björn Påhlsson
mandosclient
377
static int init_gnutls_global(mandos_context *mc,
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
378
			      const char *pubkeyfilename,
379
			      const char *seckeyfilename){
13 by Björn Påhlsson
Added following support:
380
  int ret;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
381
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
382
  if(debug){
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
383
    fprintf(stderr, "Initializing GnuTLS\n");
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
384
  }
24.1.29 by Björn Påhlsson
Added more header file comments
385
  
386
  ret = gnutls_global_init();
387
  if (ret != GNUTLS_E_SUCCESS) {
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
388
    fprintf (stderr, "GnuTLS global_init: %s\n",
389
	     safer_gnutls_strerror(ret));
13 by Björn Påhlsson
Added following support:
390
    return -1;
391
  }
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
392
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
393
  if (debug){
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
394
    /* "Use a log level over 10 to enable all debugging options."
395
     * - GnuTLS manual
396
     */
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
397
    gnutls_global_set_log_level(11);
398
    gnutls_global_set_log_function(debuggnutls);
399
  }
400
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
401
  /* OpenPGP credentials */
24.1.29 by Björn Påhlsson
Added more header file comments
402
  gnutls_certificate_allocate_credentials(&mc->cred);
403
  if (ret != GNUTLS_E_SUCCESS){
84 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do
404
    fprintf (stderr, "GnuTLS memory error: %s\n", /* Spurious
405
						     warning */
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
406
	     safer_gnutls_strerror(ret));
24.1.20 by Björn Påhlsson
mandosclient
407
    gnutls_global_deinit ();
13 by Björn Påhlsson
Added following support:
408
    return -1;
409
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
410
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
411
  if(debug){
147 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Improved wording
412
    fprintf(stderr, "Attempting to use OpenPGP public key %s and"
413
	    " secret key %s as GnuTLS credentials\n", pubkeyfilename,
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
414
	    seckeyfilename);
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
415
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
416
  
13 by Björn Påhlsson
Added following support:
417
  ret = gnutls_certificate_set_openpgp_key_file
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
418
    (mc->cred, pubkeyfilename, seckeyfilename,
419
     GNUTLS_OPENPGP_FMT_BASE64);
13 by Björn Påhlsson
Added following support:
420
  if (ret != GNUTLS_E_SUCCESS) {
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
421
    fprintf(stderr,
422
	    "Error[%d] while reading the OpenPGP key pair ('%s',"
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
423
	    " '%s')\n", ret, pubkeyfilename, seckeyfilename);
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
424
    fprintf(stderr, "The GnuTLS error is: %s\n",
13 by Björn Påhlsson
Added following support:
425
	    safer_gnutls_strerror(ret));
24.1.20 by Björn Påhlsson
mandosclient
426
    goto globalfail;
13 by Björn Påhlsson
Added following support:
427
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
428
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
429
  /* GnuTLS server initialization */
24.1.13 by Björn Påhlsson
mandosclient
430
  ret = gnutls_dh_params_init(&mc->dh_params);
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
431
  if (ret != GNUTLS_E_SUCCESS) {
432
    fprintf (stderr, "Error in GnuTLS DH parameter initialization:"
433
	     " %s\n", safer_gnutls_strerror(ret));
24.1.20 by Björn Påhlsson
mandosclient
434
    goto globalfail;
13 by Björn Påhlsson
Added following support:
435
  }
24.1.13 by Björn Påhlsson
mandosclient
436
  ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits);
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
437
  if (ret != GNUTLS_E_SUCCESS) {
438
    fprintf (stderr, "Error in GnuTLS prime generation: %s\n",
13 by Björn Påhlsson
Added following support:
439
	     safer_gnutls_strerror(ret));
24.1.20 by Björn Påhlsson
mandosclient
440
    goto globalfail;
13 by Björn Påhlsson
Added following support:
441
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
442
  
24.1.13 by Björn Påhlsson
mandosclient
443
  gnutls_certificate_set_dh_params(mc->cred, mc->dh_params);
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
444
  
24.1.13 by Björn Påhlsson
mandosclient
445
  return 0;
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
446
  
24.1.20 by Björn Påhlsson
mandosclient
447
 globalfail:
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
448
  
24.1.26 by Björn Påhlsson
tally count of used symbols
449
  gnutls_certificate_free_credentials(mc->cred);
450
  gnutls_global_deinit();
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
451
  gnutls_dh_params_deinit(mc->dh_params);
24.1.20 by Björn Påhlsson
mandosclient
452
  return -1;
24.1.13 by Björn Påhlsson
mandosclient
453
}
454
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
455
static int init_gnutls_session(mandos_context *mc,
456
			       gnutls_session_t *session){
24.1.13 by Björn Påhlsson
mandosclient
457
  int ret;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
458
  /* GnuTLS session creation */
459
  ret = gnutls_init(session, GNUTLS_SERVER);
460
  if (ret != GNUTLS_E_SUCCESS){
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
461
    fprintf(stderr, "Error in GnuTLS session initialization: %s\n",
13 by Björn Påhlsson
Added following support:
462
	    safer_gnutls_strerror(ret));
463
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
464
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
465
  {
466
    const char *err;
467
    ret = gnutls_priority_set_direct(*session, mc->priority, &err);
468
    if (ret != GNUTLS_E_SUCCESS) {
469
      fprintf(stderr, "Syntax error at: %s\n", err);
470
      fprintf(stderr, "GnuTLS error: %s\n",
471
	      safer_gnutls_strerror(ret));
24.1.20 by Björn Påhlsson
mandosclient
472
      gnutls_deinit (*session);
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
473
      return -1;
474
    }
13 by Björn Påhlsson
Added following support:
475
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
476
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
477
  ret = gnutls_credentials_set(*session, GNUTLS_CRD_CERTIFICATE,
478
			       mc->cred);
479
  if (ret != GNUTLS_E_SUCCESS) {
480
    fprintf(stderr, "Error setting GnuTLS credentials: %s\n",
13 by Björn Påhlsson
Added following support:
481
	    safer_gnutls_strerror(ret));
24.1.20 by Björn Påhlsson
mandosclient
482
    gnutls_deinit (*session);
13 by Björn Påhlsson
Added following support:
483
    return -1;
484
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
485
  
13 by Björn Påhlsson
Added following support:
486
  /* ignore client certificate if any. */
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
487
  gnutls_certificate_server_set_request (*session,
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
488
					 GNUTLS_CERT_IGNORE);
13 by Björn Påhlsson
Added following support:
489
  
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
490
  gnutls_dh_set_prime_bits (*session, mc->dh_bits);
13 by Björn Påhlsson
Added following support:
491
  
492
  return 0;
493
}
494
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
495
/* Avahi log function callback */
36 by Teddy Hogeborn
* TODO: Converted to org-mode style
496
static void empty_log(__attribute__((unused)) AvahiLogLevel level,
497
		      __attribute__((unused)) const char *txt){}
13 by Björn Påhlsson
Added following support:
498
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
499
/* Called when a Mandos server is found */
36 by Teddy Hogeborn
* TODO: Converted to org-mode style
500
static int start_mandos_communication(const char *ip, uint16_t port,
24.1.9 by Björn Påhlsson
not working midwork...
501
				      AvahiIfIndex if_index,
502
				      mandos_context *mc){
13 by Björn Påhlsson
Added following support:
503
  int ret, tcp_sd;
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
504
  union { struct sockaddr in; struct sockaddr_in6 in6; } to;
13 by Björn Påhlsson
Added following support:
505
  char *buffer = NULL;
506
  char *decrypted_buffer;
507
  size_t buffer_length = 0;
508
  size_t buffer_capacity = 0;
509
  ssize_t decrypted_buffer_size;
24.1.10 by Björn Påhlsson
merge commit
510
  size_t written;
13 by Björn Påhlsson
Added following support:
511
  int retval = 0;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
512
  char interface[IF_NAMESIZE];
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
513
  gnutls_session_t session;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
514
  
24.1.13 by Björn Påhlsson
mandosclient
515
  ret = init_gnutls_session (mc, &session);
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
516
  if (ret != 0){
517
    return -1;
518
  }
519
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
520
  if(debug){
60 by Teddy Hogeborn
* mandos-client.c (main): Cast pid_t to unsigned int before printing.
521
    fprintf(stderr, "Setting up a tcp connection to %s, port %" PRIu16
522
	    "\n", ip, port);
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
523
  }
13 by Björn Påhlsson
Added following support:
524
  
525
  tcp_sd = socket(PF_INET6, SOCK_STREAM, 0);
526
  if(tcp_sd < 0) {
527
    perror("socket");
528
    return -1;
529
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
530
  
24.1.6 by Björn Påhlsson
plugbasedclient
531
  if(debug){
24.1.7 by Björn Påhlsson
merge
532
    if(if_indextoname((unsigned int)if_index, interface) == NULL){
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
533
      perror("if_indextoname");
24.1.6 by Björn Påhlsson
plugbasedclient
534
      return -1;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
535
    }
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
536
    fprintf(stderr, "Binding to interface %s\n", interface);
537
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
538
  
84 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do
539
  memset(&to, 0, sizeof(to));
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
540
  to.in6.sin6_family = AF_INET6;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
541
  /* It would be nice to have a way to detect if we were passed an
542
     IPv4 address here.   Now we assume an IPv6 address. */
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
543
  ret = inet_pton(AF_INET6, ip, &to.in6.sin6_addr);
13 by Björn Påhlsson
Added following support:
544
  if (ret < 0 ){
545
    perror("inet_pton");
546
    return -1;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
547
  }
13 by Björn Påhlsson
Added following support:
548
  if(ret == 0){
549
    fprintf(stderr, "Bad address: %s\n", ip);
550
    return -1;
551
  }
65 by Teddy Hogeborn
* plugins.d/password-request.c (main): Bug fix: Bring up network
552
  to.in6.sin6_port = htons(port); /* Spurious warning */
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
553
  
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
554
  to.in6.sin6_scope_id = (uint32_t)if_index;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
555
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
556
  if(debug){
60 by Teddy Hogeborn
* mandos-client.c (main): Cast pid_t to unsigned int before printing.
557
    fprintf(stderr, "Connection to: %s, port %" PRIu16 "\n", ip,
558
	    port);
37 by Teddy Hogeborn
Non-tested commit for merge purposes.
559
    char addrstr[INET6_ADDRSTRLEN] = "";
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
560
    if(inet_ntop(to.in6.sin6_family, &(to.in6.sin6_addr), addrstr,
37 by Teddy Hogeborn
Non-tested commit for merge purposes.
561
		 sizeof(addrstr)) == NULL){
562
      perror("inet_ntop");
563
    } else {
564
      if(strcmp(addrstr, ip) != 0){
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
565
	fprintf(stderr, "Canonical address form: %s\n", addrstr);
37 by Teddy Hogeborn
Non-tested commit for merge purposes.
566
      }
567
    }
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
568
  }
13 by Björn Påhlsson
Added following support:
569
  
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
570
  ret = connect(tcp_sd, &to.in, sizeof(to));
13 by Björn Påhlsson
Added following support:
571
  if (ret < 0){
572
    perror("connect");
573
    return -1;
574
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
575
  
24.1.12 by Björn Påhlsson
merge +
576
  const char *out = mandos_protocol_version;
24.1.10 by Björn Påhlsson
merge commit
577
  written = 0;
578
  while (true){
579
    size_t out_size = strlen(out);
580
    ret = TEMP_FAILURE_RETRY(write(tcp_sd, out + written,
581
				   out_size - written));
582
    if (ret == -1){
583
      perror("write");
584
      retval = -1;
24.1.12 by Björn Påhlsson
merge +
585
      goto mandos_end;
24.1.10 by Björn Påhlsson
merge commit
586
    }
24.1.12 by Björn Påhlsson
merge +
587
    written += (size_t)ret;
24.1.10 by Björn Påhlsson
merge commit
588
    if(written < out_size){
589
      continue;
590
    } else {
591
      if (out == mandos_protocol_version){
592
	written = 0;
593
	out = "\r\n";
594
      } else {
595
	break;
596
      }
597
    }
598
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
599
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
600
  if(debug){
601
    fprintf(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
602
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
603
  
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
604
  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) tcp_sd);
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
605
  
24.1.29 by Björn Påhlsson
Added more header file comments
606
  do{
607
    ret = gnutls_handshake (session);
608
  } while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED);
13 by Björn Påhlsson
Added following support:
609
  
610
  if (ret != GNUTLS_E_SUCCESS){
25 by Teddy Hogeborn
* mandos-clients.conf ([DEFAULT]): New section.
611
    if(debug){
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
612
      fprintf(stderr, "*** GnuTLS Handshake failed ***\n");
25 by Teddy Hogeborn
* mandos-clients.conf ([DEFAULT]): New section.
613
      gnutls_perror (ret);
614
    }
13 by Björn Påhlsson
Added following support:
615
    retval = -1;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
616
    goto mandos_end;
13 by Björn Påhlsson
Added following support:
617
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
618
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
619
  /* Read OpenPGP packet that contains the wanted password */
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
620
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
621
  if(debug){
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
622
    fprintf(stderr, "Retrieving pgp encrypted password from %s\n",
623
	    ip);
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
624
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
625
  
13 by Björn Påhlsson
Added following support:
626
  while(true){
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
627
    buffer_capacity = adjustbuffer(&buffer, buffer_length,
628
				   buffer_capacity);
24.1.10 by Björn Påhlsson
merge commit
629
    if (buffer_capacity == 0){
630
      perror("adjustbuffer");
631
      retval = -1;
24.1.12 by Björn Påhlsson
merge +
632
      goto mandos_end;
13 by Björn Påhlsson
Added following support:
633
    }
634
    
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
635
    ret = gnutls_record_recv(session, buffer+buffer_length,
636
			     BUFFER_SIZE);
13 by Björn Påhlsson
Added following support:
637
    if (ret == 0){
638
      break;
639
    }
640
    if (ret < 0){
641
      switch(ret){
642
      case GNUTLS_E_INTERRUPTED:
643
      case GNUTLS_E_AGAIN:
644
	break;
645
      case GNUTLS_E_REHANDSHAKE:
24.1.29 by Björn Påhlsson
Added more header file comments
646
	do{
647
	  ret = gnutls_handshake (session);
648
	} while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED);
13 by Björn Påhlsson
Added following support:
649
	if (ret < 0){
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
650
	  fprintf(stderr, "*** GnuTLS Re-handshake failed ***\n");
13 by Björn Påhlsson
Added following support:
651
	  gnutls_perror (ret);
652
	  retval = -1;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
653
	  goto mandos_end;
13 by Björn Påhlsson
Added following support:
654
	}
655
	break;
656
      default:
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
657
	fprintf(stderr, "Unknown error while reading data from"
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
658
		" encrypted session with Mandos server\n");
13 by Björn Påhlsson
Added following support:
659
	retval = -1;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
660
	gnutls_bye (session, GNUTLS_SHUT_RDWR);
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
661
	goto mandos_end;
13 by Björn Påhlsson
Added following support:
662
      }
663
    } else {
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
664
      buffer_length += (size_t) ret;
13 by Björn Påhlsson
Added following support:
665
    }
666
  }
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
667
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
668
  if(debug){
669
    fprintf(stderr, "Closing TLS session\n");
670
  }
671
  
672
  gnutls_bye (session, GNUTLS_SHUT_RDWR);
673
  
13 by Björn Påhlsson
Added following support:
674
  if (buffer_length > 0){
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
675
    decrypted_buffer_size = pgp_packet_decrypt(mc, buffer,
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
676
					       buffer_length,
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
677
					       &decrypted_buffer);
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
678
    if (decrypted_buffer_size >= 0){
24.1.10 by Björn Påhlsson
merge commit
679
      written = 0;
28 by Teddy Hogeborn
* server.conf: New file.
680
      while(written < (size_t) decrypted_buffer_size){
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
681
	ret = (int)fwrite (decrypted_buffer + written, 1,
682
			   (size_t)decrypted_buffer_size - written,
683
			   stdout);
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
684
	if(ret == 0 and ferror(stdout)){
685
	  if(debug){
686
	    fprintf(stderr, "Error writing encrypted data: %s\n",
687
		    strerror(errno));
688
	  }
689
	  retval = -1;
690
	  break;
691
	}
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
692
	written += (size_t)ret;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
693
      }
13 by Björn Påhlsson
Added following support:
694
      free(decrypted_buffer);
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
695
    } else {
696
      retval = -1;
13 by Björn Påhlsson
Added following support:
697
    }
24.1.63 by Björn Påhlsson
merge + fallback bugg
698
  } else {
699
    retval = -1;
13 by Björn Påhlsson
Added following support:
700
  }
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
701
  
702
  /* Shutdown procedure */
703
  
704
 mandos_end:
13 by Björn Påhlsson
Added following support:
705
  free(buffer);
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
706
  ret = TEMP_FAILURE_RETRY(close(tcp_sd));
707
  if(ret == -1){
708
    perror("close");
709
  }
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
710
  gnutls_deinit (session);
13 by Björn Påhlsson
Added following support:
711
  return retval;
712
}
713
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
714
static void resolve_callback(AvahiSServiceResolver *r,
715
			     AvahiIfIndex interface,
716
			     AVAHI_GCC_UNUSED AvahiProtocol protocol,
717
			     AvahiResolverEvent event,
718
			     const char *name,
719
			     const char *type,
720
			     const char *domain,
721
			     const char *host_name,
722
			     const AvahiAddress *address,
723
			     uint16_t port,
724
			     AVAHI_GCC_UNUSED AvahiStringList *txt,
725
			     AVAHI_GCC_UNUSED AvahiLookupResultFlags
726
			     flags,
727
			     void* userdata) {
24.1.9 by Björn Påhlsson
not working midwork...
728
  mandos_context *mc = userdata;
84 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do
729
  assert(r);
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
730
  
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
731
  /* Called whenever a service has been resolved successfully or
732
     timed out */
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
733
  
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
734
  switch (event) {
735
  default:
736
  case AVAHI_RESOLVER_FAILURE:
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
737
    fprintf(stderr, "(Avahi Resolver) Failed to resolve service '%s'"
738
	    " of type '%s' in domain '%s': %s\n", name, type, domain,
24.1.9 by Björn Påhlsson
not working midwork...
739
	    avahi_strerror(avahi_server_errno(mc->server)));
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
740
    break;
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
741
    
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
742
  case AVAHI_RESOLVER_FOUND:
743
    {
744
      char ip[AVAHI_ADDRESS_STR_MAX];
745
      avahi_address_snprint(ip, sizeof(ip), address);
746
      if(debug){
60 by Teddy Hogeborn
* mandos-client.c (main): Cast pid_t to unsigned int before printing.
747
	fprintf(stderr, "Mandos server \"%s\" found on %s (%s, %"
748
		PRIu16 ") on port %d\n", name, host_name, ip,
749
		interface, port);
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
750
      }
24.1.9 by Björn Påhlsson
not working midwork...
751
      int ret = start_mandos_communication(ip, port, interface, mc);
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
752
      if (ret == 0){
24.1.46 by Björn Påhlsson
mandos-client
753
	avahi_simple_poll_quit(mc->simple_poll);
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
754
      }
13 by Björn Påhlsson
Added following support:
755
    }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
756
  }
757
  avahi_s_service_resolver_free(r);
13 by Björn Påhlsson
Added following support:
758
}
759
24.1.9 by Björn Påhlsson
not working midwork...
760
static void browse_callback( AvahiSServiceBrowser *b,
761
			     AvahiIfIndex interface,
762
			     AvahiProtocol protocol,
763
			     AvahiBrowserEvent event,
764
			     const char *name,
765
			     const char *type,
766
			     const char *domain,
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
767
			     AVAHI_GCC_UNUSED AvahiLookupResultFlags
768
			     flags,
24.1.9 by Björn Påhlsson
not working midwork...
769
			     void* userdata) {
770
  mandos_context *mc = userdata;
84 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do
771
  assert(b);
24.1.9 by Björn Påhlsson
not working midwork...
772
  
773
  /* Called whenever a new services becomes available on the LAN or
774
     is removed from the LAN */
775
  
776
  switch (event) {
777
  default:
778
  case AVAHI_BROWSER_FAILURE:
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
779
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
780
    fprintf(stderr, "(Avahi browser) %s\n",
24.1.9 by Björn Påhlsson
not working midwork...
781
	    avahi_strerror(avahi_server_errno(mc->server)));
782
    avahi_simple_poll_quit(mc->simple_poll);
783
    return;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
784
    
24.1.9 by Björn Påhlsson
not working midwork...
785
  case AVAHI_BROWSER_NEW:
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
786
    /* We ignore the returned Avahi resolver object. In the callback
787
       function we free it. If the Avahi server is terminated before
788
       the callback function is called the Avahi server will free the
789
       resolver for us. */
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
790
    
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
791
    if (!(avahi_s_service_resolver_new(mc->server, interface,
792
				       protocol, name, type, domain,
24.1.9 by Björn Påhlsson
not working midwork...
793
				       AVAHI_PROTO_INET6, 0,
794
				       resolve_callback, mc)))
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
795
      fprintf(stderr, "Avahi: Failed to resolve service '%s': %s\n",
796
	      name, avahi_strerror(avahi_server_errno(mc->server)));
24.1.9 by Björn Påhlsson
not working midwork...
797
    break;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
798
    
24.1.9 by Björn Påhlsson
not working midwork...
799
  case AVAHI_BROWSER_REMOVE:
800
    break;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
801
    
24.1.9 by Björn Påhlsson
not working midwork...
802
  case AVAHI_BROWSER_ALL_FOR_NOW:
803
  case AVAHI_BROWSER_CACHE_EXHAUSTED:
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
804
    if(debug){
805
      fprintf(stderr, "No Mandos server found, still searching...\n");
806
    }
24.1.9 by Björn Påhlsson
not working midwork...
807
    break;
808
  }
13 by Björn Påhlsson
Added following support:
809
}
810
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
811
int main(int argc, char *argv[]){
13 by Björn Påhlsson
Added following support:
812
    AvahiSServiceBrowser *sb = NULL;
813
    int error;
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
814
    int ret;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
815
    int exitcode = EXIT_SUCCESS;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
816
    const char *interface = "eth0";
24.1.6 by Björn Påhlsson
plugbasedclient
817
    struct ifreq network;
818
    int sd;
24.1.13 by Björn Påhlsson
mandosclient
819
    uid_t uid;
820
    gid_t gid;
24.1.7 by Björn Påhlsson
merge
821
    char *connect_to = NULL;
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
822
    char tempdir[] = "/tmp/mandosXXXXXX";
29 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Changed
823
    AvahiIfIndex if_index = AVAHI_IF_UNSPEC;
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
824
    const char *seckey = PATHDIR "/" SECKEY;
825
    const char *pubkey = PATHDIR "/" PUBKEY;
826
    
24.1.9 by Björn Påhlsson
not working midwork...
827
    mandos_context mc = { .simple_poll = NULL, .server = NULL,
142 by Teddy Hogeborn
* plugins.d/password-request.c (main): Change default GnuTLS priority
828
			  .dh_bits = 1024, .priority = "SECURE256"
829
			  ":!CTYPE-X.509:+CTYPE-OPENPGP" };
24.1.20 by Björn Påhlsson
mandosclient
830
    bool gnutls_initalized = false;
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
831
    bool gpgme_initalized = false;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
832
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
833
    {
24.1.14 by Björn Påhlsson
mandosclient
834
      struct argp_option options[] = {
835
	{ .name = "debug", .key = 128,
836
	  .doc = "Debug mode", .group = 3 },
837
	{ .name = "connect", .key = 'c',
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
838
	  .arg = "ADDRESS:PORT",
839
	  .doc = "Connect directly to a specific Mandos server",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
840
	  .group = 1 },
24.1.14 by Björn Påhlsson
mandosclient
841
	{ .name = "interface", .key = 'i',
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
842
	  .arg = "NAME",
843
	  .doc = "Interface that will be used to search for Mandos"
844
	  " servers",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
845
	  .group = 1 },
24.1.14 by Björn Påhlsson
mandosclient
846
	{ .name = "seckey", .key = 's',
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
847
	  .arg = "FILE",
848
	  .doc = "OpenPGP secret key file base name",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
849
	  .group = 1 },
24.1.14 by Björn Påhlsson
mandosclient
850
	{ .name = "pubkey", .key = 'p',
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
851
	  .arg = "FILE",
852
	  .doc = "OpenPGP public key file base name",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
853
	  .group = 2 },
24.1.14 by Björn Påhlsson
mandosclient
854
	{ .name = "dh-bits", .key = 129,
855
	  .arg = "BITS",
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
856
	  .doc = "Bit length of the prime number used in the"
857
	  " Diffie-Hellman key exchange",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
858
	  .group = 2 },
24.1.14 by Björn Påhlsson
mandosclient
859
	{ .name = "priority", .key = 130,
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
860
	  .arg = "STRING",
861
	  .doc = "GnuTLS priority string for the TLS handshake",
862
	  .group = 1 },
24.1.14 by Björn Påhlsson
mandosclient
863
	{ .name = NULL }
864
      };
865
      
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
866
      error_t parse_opt (int key, char *arg,
867
			 struct argp_state *state) {
868
	/* Get the INPUT argument from `argp_parse', which we know is
869
	   a pointer to our plugin list pointer. */
24.1.14 by Björn Påhlsson
mandosclient
870
	switch (key) {
142 by Teddy Hogeborn
* plugins.d/password-request.c (main): Change default GnuTLS priority
871
	case 128:		/* --debug */
24.1.14 by Björn Påhlsson
mandosclient
872
	  debug = true;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
873
	  break;
142 by Teddy Hogeborn
* plugins.d/password-request.c (main): Change default GnuTLS priority
874
	case 'c':		/* --connect */
24.1.14 by Björn Påhlsson
mandosclient
875
	  connect_to = arg;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
876
	  break;
142 by Teddy Hogeborn
* plugins.d/password-request.c (main): Change default GnuTLS priority
877
	case 'i':		/* --interface */
24.1.14 by Björn Påhlsson
mandosclient
878
	  interface = arg;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
879
	  break;
142 by Teddy Hogeborn
* plugins.d/password-request.c (main): Change default GnuTLS priority
880
	case 's':		/* --seckey */
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
881
	  seckey = arg;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
882
	  break;
142 by Teddy Hogeborn
* plugins.d/password-request.c (main): Change default GnuTLS priority
883
	case 'p':		/* --pubkey */
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
884
	  pubkey = arg;
24.1.14 by Björn Påhlsson
mandosclient
885
	  break;
142 by Teddy Hogeborn
* plugins.d/password-request.c (main): Change default GnuTLS priority
886
	case 129:		/* --dh-bits */
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
887
	  errno = 0;
24.1.14 by Björn Påhlsson
mandosclient
888
	  mc.dh_bits = (unsigned int) strtol(arg, NULL, 10);
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
889
	  if (errno){
890
	    perror("strtol");
891
	    exit(EXIT_FAILURE);
892
	  }
893
	  break;
142 by Teddy Hogeborn
* plugins.d/password-request.c (main): Change default GnuTLS priority
894
	case 130:		/* --priority */
24.1.14 by Björn Påhlsson
mandosclient
895
	  mc.priority = arg;
896
	  break;
897
	case ARGP_KEY_ARG:
898
	  argp_usage (state);
24.1.46 by Björn Påhlsson
mandos-client
899
	case ARGP_KEY_END:
24.1.14 by Björn Påhlsson
mandosclient
900
	  break;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
901
	default:
24.1.14 by Björn Påhlsson
mandosclient
902
	  return ARGP_ERR_UNKNOWN;
24.1.9 by Björn Påhlsson
not working midwork...
903
	}
24.1.14 by Björn Påhlsson
mandosclient
904
	return 0;
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
905
      }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
906
      
24.1.14 by Björn Påhlsson
mandosclient
907
      struct argp argp = { .options = options, .parser = parse_opt,
908
			   .args_doc = "",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
909
			   .doc = "Mandos client -- Get and decrypt"
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
910
			   " passwords from a Mandos server" };
24.1.29 by Björn Påhlsson
Added more header file comments
911
      ret = argp_parse (&argp, argc, argv, 0, 0, NULL);
912
      if (ret == ARGP_ERR_UNKNOWN){
24.1.43 by Björn Påhlsson
merge
913
	fprintf(stderr, "Unknown error while parsing arguments\n");
24.1.29 by Björn Påhlsson
Added more header file comments
914
	exitcode = EXIT_FAILURE;
915
	goto end;
916
      }
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
917
    }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
918
    
65 by Teddy Hogeborn
* plugins.d/password-request.c (main): Bug fix: Bring up network
919
    /* If the interface is down, bring it up */
920
    {
921
      sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
922
      if(sd < 0) {
923
	perror("socket");
924
	exitcode = EXIT_FAILURE;
925
	goto end;
926
      }
84 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do
927
      strcpy(network.ifr_name, interface);
65 by Teddy Hogeborn
* plugins.d/password-request.c (main): Bug fix: Bring up network
928
      ret = ioctl(sd, SIOCGIFFLAGS, &network);
929
      if(ret == -1){
930
	perror("ioctl SIOCGIFFLAGS");
931
	exitcode = EXIT_FAILURE;
932
	goto end;
933
      }
934
      if((network.ifr_flags & IFF_UP) == 0){
935
	network.ifr_flags |= IFF_UP;
936
	ret = ioctl(sd, SIOCSIFFLAGS, &network);
937
	if(ret == -1){
938
	  perror("ioctl SIOCSIFFLAGS");
939
	  exitcode = EXIT_FAILURE;
940
	  goto end;
941
	}
942
      }
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
943
      ret = TEMP_FAILURE_RETRY(close(sd));
944
      if(ret == -1){
945
	perror("close");
946
      }
65 by Teddy Hogeborn
* plugins.d/password-request.c (main): Bug fix: Bring up network
947
    }
948
    
24.1.13 by Björn Påhlsson
mandosclient
949
    uid = getuid();
950
    gid = getgid();
65 by Teddy Hogeborn
* plugins.d/password-request.c (main): Bug fix: Bring up network
951
    
24.1.13 by Björn Påhlsson
mandosclient
952
    ret = setuid(uid);
953
    if (ret == -1){
954
      perror("setuid");
955
    }
956
    
957
    setgid(gid);
958
    if (ret == -1){
959
      perror("setgid");
960
    }
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
961
    
167 by Teddy Hogeborn
* plugins.d/password-prompt.c (main): If successful, output an extra
962
    ret = init_gnutls_global(&mc, pubkey, seckey);
963
    if (ret == -1){
964
      fprintf(stderr, "init_gnutls_global failed\n");
965
      exitcode = EXIT_FAILURE;
966
      goto end;
967
    } else {
968
      gnutls_initalized = true;
969
    }
970
    
971
    if(mkdtemp(tempdir) == NULL){
972
      perror("mkdtemp");
973
      tempdir[0] = '\0';
974
      goto end;
975
    }
976
    
977
    if(not init_gpgme(&mc, pubkey, seckey, tempdir)){
176 by Teddy Hogeborn
Merge & resolve.
978
      fprintf(stderr, "gpgme_initalized failed\n");
167 by Teddy Hogeborn
* plugins.d/password-prompt.c (main): If successful, output an extra
979
      exitcode = EXIT_FAILURE;
980
      goto end;
981
    } else {
176 by Teddy Hogeborn
Merge & resolve.
982
      gpgme_initalized = true;
167 by Teddy Hogeborn
* plugins.d/password-prompt.c (main): If successful, output an extra
983
    }
984
    
24.1.7 by Björn Påhlsson
merge
985
    if_index = (AvahiIfIndex) if_nametoindex(interface);
986
    if(if_index == 0){
987
      fprintf(stderr, "No such interface: \"%s\"\n", interface);
988
      exit(EXIT_FAILURE);
28 by Teddy Hogeborn
* server.conf: New file.
989
    }
990
    
991
    if(connect_to != NULL){
992
      /* Connect directly, do not use Zeroconf */
993
      /* (Mainly meant for debugging) */
994
      char *address = strrchr(connect_to, ':');
995
      if(address == NULL){
996
        fprintf(stderr, "No colon in address\n");
24.1.13 by Björn Påhlsson
mandosclient
997
	exitcode = EXIT_FAILURE;
998
	goto end;
28 by Teddy Hogeborn
* server.conf: New file.
999
      }
1000
      errno = 0;
1001
      uint16_t port = (uint16_t) strtol(address+1, NULL, 10);
1002
      if(errno){
1003
	perror("Bad port number");
24.1.13 by Björn Påhlsson
mandosclient
1004
	exitcode = EXIT_FAILURE;
1005
	goto end;
28 by Teddy Hogeborn
* server.conf: New file.
1006
      }
1007
      *address = '\0';
1008
      address = connect_to;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
1009
      ret = start_mandos_communication(address, port, if_index, &mc);
28 by Teddy Hogeborn
* server.conf: New file.
1010
      if(ret < 0){
24.1.13 by Björn Påhlsson
mandosclient
1011
	exitcode = EXIT_FAILURE;
28 by Teddy Hogeborn
* server.conf: New file.
1012
      } else {
24.1.13 by Björn Påhlsson
mandosclient
1013
	exitcode = EXIT_SUCCESS;
28 by Teddy Hogeborn
* server.conf: New file.
1014
      }
24.1.13 by Björn Påhlsson
mandosclient
1015
      goto end;
28 by Teddy Hogeborn
* server.conf: New file.
1016
    }
1017
    
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
1018
    if (not debug){
1019
      avahi_set_log_function(empty_log);
1020
    }
13 by Björn Påhlsson
Added following support:
1021
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1022
    /* Initialize the pseudo-RNG for Avahi */
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1023
    srand((unsigned int) time(NULL));
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1024
    
1025
    /* Allocate main Avahi loop object */
1026
    mc.simple_poll = avahi_simple_poll_new();
1027
    if (mc.simple_poll == NULL) {
1028
        fprintf(stderr, "Avahi: Failed to create simple poll"
1029
		" object.\n");
1030
	exitcode = EXIT_FAILURE;
1031
        goto end;
1032
    }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
1033
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1034
    {
1035
      AvahiServerConfig config;
1036
      /* Do not publish any local Zeroconf records */
1037
      avahi_server_config_init(&config);
1038
      config.publish_hinfo = 0;
1039
      config.publish_addresses = 0;
1040
      config.publish_workstation = 0;
1041
      config.publish_domain = 0;
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
1042
      
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1043
      /* Allocate a new server */
1044
      mc.server = avahi_server_new(avahi_simple_poll_get
1045
				   (mc.simple_poll), &config, NULL,
1046
				   NULL, &error);
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
1047
      
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1048
      /* Free the Avahi configuration data */
1049
      avahi_server_config_free(&config);
1050
    }
1051
    
1052
    /* Check if creating the Avahi server object succeeded */
1053
    if (mc.server == NULL) {
1054
        fprintf(stderr, "Failed to create Avahi server: %s\n",
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1055
		avahi_strerror(error));
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1056
	exitcode = EXIT_FAILURE;
1057
        goto end;
13 by Björn Påhlsson
Added following support:
1058
    }
1059
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1060
    /* Create the Avahi service browser */
24.1.9 by Björn Påhlsson
not working midwork...
1061
    sb = avahi_s_service_browser_new(mc.server, if_index,
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1062
				     AVAHI_PROTO_INET6,
1063
				     "_mandos._tcp", NULL, 0,
24.1.9 by Björn Påhlsson
not working midwork...
1064
				     browse_callback, &mc);
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1065
    if (sb == NULL) {
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1066
        fprintf(stderr, "Failed to create service browser: %s\n",
24.1.9 by Björn Påhlsson
not working midwork...
1067
		avahi_strerror(avahi_server_errno(mc.server)));
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1068
	exitcode = EXIT_FAILURE;
1069
        goto end;
13 by Björn Påhlsson
Added following support:
1070
    }
1071
    
1072
    /* Run the main loop */
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
1073
    
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
1074
    if (debug){
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1075
      fprintf(stderr, "Starting Avahi loop search\n");
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
1076
    }
1077
    
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
1078
    avahi_simple_poll_loop(mc.simple_poll);
13 by Björn Påhlsson
Added following support:
1079
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1080
 end:
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
1081
    
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
1082
    if (debug){
1083
      fprintf(stderr, "%s exiting\n", argv[0]);
1084
    }
13 by Björn Påhlsson
Added following support:
1085
    
1086
    /* Cleanup things */
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1087
    if (sb != NULL)
13 by Björn Påhlsson
Added following support:
1088
        avahi_s_service_browser_free(sb);
1089
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1090
    if (mc.server != NULL)
24.1.9 by Björn Påhlsson
not working midwork...
1091
        avahi_server_free(mc.server);
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
1092
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1093
    if (mc.simple_poll != NULL)
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
1094
        avahi_simple_poll_free(mc.simple_poll);
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
1095
    
24.1.20 by Björn Påhlsson
mandosclient
1096
    if (gnutls_initalized){
24.1.29 by Björn Påhlsson
Added more header file comments
1097
      gnutls_certificate_free_credentials(mc.cred);
24.1.20 by Björn Påhlsson
mandosclient
1098
      gnutls_global_deinit ();
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
1099
      gnutls_dh_params_deinit(mc.dh_params);
24.1.20 by Björn Påhlsson
mandosclient
1100
    }
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
1101
    
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
1102
    if(gpgme_initalized){
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
1103
      gpgme_release(mc.ctx);
1104
    }
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
1105
    
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
1106
    /* Removes the temp directory used by GPGME */
1107
    if(tempdir[0] != '\0'){
1108
      DIR *d;
1109
      struct dirent *direntry;
1110
      d = opendir(tempdir);
1111
      if(d == NULL){
1112
	perror("opendir");
1113
      } else {
1114
	while(true){
1115
	  direntry = readdir(d);
1116
	  if(direntry == NULL){
1117
	    break;
1118
	  }
1119
	  if (direntry->d_type == DT_REG){
1120
	    char *fullname = NULL;
1121
	    ret = asprintf(&fullname, "%s/%s", tempdir,
1122
			   direntry->d_name);
1123
	    if(ret < 0){
1124
	      perror("asprintf");
1125
	      continue;
1126
	    }
1127
	    ret = unlink(fullname);
1128
	    if(ret == -1){
1129
	      fprintf(stderr, "unlink(\"%s\"): %s",
1130
		      fullname, strerror(errno));
1131
	    }
1132
	    free(fullname);
1133
	  }
1134
	}
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
1135
	closedir(d);
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
1136
      }
1137
      ret = rmdir(tempdir);
1138
      if(ret == -1){
1139
	perror("rmdir");
1140
      }
1141
    }
1142
	  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1143
    return exitcode;
13 by Björn Påhlsson
Added following support:
1144
}