/mandos/release

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