/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;
217
    goto decrypt_end;
13 by Björn Påhlsson
Added following support:
218
  }
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
219
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
220
  if(debug){
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
221
    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
222
  }
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
223
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
224
  if (debug){
225
    gpgme_decrypt_result_t result;
226
    result = gpgme_op_decrypt_result(ctx);
227
    if (result == NULL){
228
      fprintf(stderr, "gpgme_op_decrypt_result failed\n");
229
    } else {
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
230
      fprintf(stderr, "Unsupported algorithm: %s\n",
231
	      result->unsupported_algorithm);
60 by Teddy Hogeborn
* mandos-client.c (main): Cast pid_t to unsigned int before printing.
232
      fprintf(stderr, "Wrong key usage: %u\n",
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
233
	      result->wrong_key_usage);
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
234
      if(result->file_name != NULL){
235
	fprintf(stderr, "File name: %s\n", result->file_name);
236
      }
237
      gpgme_recipient_t recipient;
238
      recipient = result->recipients;
239
      if(recipient){
240
	while(recipient != NULL){
241
	  fprintf(stderr, "Public key algorithm: %s\n",
242
		  gpgme_pubkey_algo_name(recipient->pubkey_algo));
243
	  fprintf(stderr, "Key ID: %s\n", recipient->keyid);
244
	  fprintf(stderr, "Secret key available: %s\n",
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
245
		  recipient->status == GPG_ERR_NO_SECKEY
246
		  ? "No" : "Yes");
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
247
	  recipient = recipient->next;
248
	}
249
      }
250
    }
251
  }
13 by Björn Påhlsson
Added following support:
252
  
253
  /* Seek back to the beginning of the GPGME plaintext data buffer */
24.1.5 by Björn Påhlsson
plugbasedclient:
254
  if (gpgme_data_seek(dh_plain, (off_t) 0, SEEK_SET) == -1){
255
    perror("pgpme_data_seek");
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
256
    plaintext_length = -1;
257
    goto decrypt_end;
24.1.5 by Björn Påhlsson
plugbasedclient:
258
  }
259
  
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
260
  *plaintext = NULL;
13 by Björn Påhlsson
Added following support:
261
  while(true){
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
262
    plaintext_capacity = adjustbuffer(plaintext,
263
				      (size_t)plaintext_length,
24.1.12 by Björn Påhlsson
merge +
264
				      plaintext_capacity);
265
    if (plaintext_capacity == 0){
24.1.10 by Björn Påhlsson
merge commit
266
	perror("adjustbuffer");
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
267
	plaintext_length = -1;
268
	goto decrypt_end;
13 by Björn Påhlsson
Added following support:
269
    }
270
    
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
271
    ret = gpgme_data_read(dh_plain, *plaintext + plaintext_length,
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
272
			  BUFFER_SIZE);
13 by Björn Påhlsson
Added following support:
273
    /* Print the data, if any */
274
    if (ret == 0){
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
275
      /* EOF */
13 by Björn Påhlsson
Added following support:
276
      break;
277
    }
278
    if(ret < 0){
279
      perror("gpgme_data_read");
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
280
      plaintext_length = -1;
281
      goto decrypt_end;
13 by Björn Påhlsson
Added following support:
282
    }
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
283
    plaintext_length += ret;
13 by Björn Påhlsson
Added following support:
284
  }
285
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
286
  if(debug){
287
    fprintf(stderr, "Decrypted password is: ");
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
288
    for(ssize_t i = 0; i < plaintext_length; i++){
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
289
      fprintf(stderr, "%02hhX ", (*plaintext)[i]);
290
    }
291
    fprintf(stderr, "\n");
292
  }
293
  
294
 decrypt_end:
295
  
296
  /* Delete the GPGME cryptotext data buffer */
297
  gpgme_data_release(dh_crypto);
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
298
  
299
  /* Delete the GPGME plaintext data buffer */
13 by Björn Påhlsson
Added following support:
300
  gpgme_data_release(dh_plain);
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
301
  return plaintext_length;
13 by Björn Påhlsson
Added following support:
302
}
303
304
static const char * safer_gnutls_strerror (int value) {
305
  const char *ret = gnutls_strerror (value);
306
  if (ret == NULL)
307
    ret = "(unknown)";
308
  return ret;
309
}
310
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
311
/* GnuTLS log function callback */
36 by Teddy Hogeborn
* TODO: Converted to org-mode style
312
static void debuggnutls(__attribute__((unused)) int level,
313
			const char* string){
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
314
  fprintf(stderr, "GnuTLS: %s", string);
13 by Björn Påhlsson
Added following support:
315
}
316
24.1.14 by Björn Påhlsson
mandosclient
317
static int init_gnutls_global(mandos_context *mc,
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
318
			      const char *pubkeyfilename,
319
			      const char *seckeyfilename){
13 by Björn Påhlsson
Added following support:
320
  int ret;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
321
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
322
  if(debug){
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
323
    fprintf(stderr, "Initializing GnuTLS\n");
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
324
  }
24.1.29 by Björn Påhlsson
Added more header file comments
325
  
326
  ret = gnutls_global_init();
327
  if (ret != GNUTLS_E_SUCCESS) {
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
328
    fprintf (stderr, "GnuTLS global_init: %s\n",
329
	     safer_gnutls_strerror(ret));
13 by Björn Påhlsson
Added following support:
330
    return -1;
331
  }
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
332
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
333
  if (debug){
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
334
    /* "Use a log level over 10 to enable all debugging options."
335
     * - GnuTLS manual
336
     */
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
337
    gnutls_global_set_log_level(11);
338
    gnutls_global_set_log_function(debuggnutls);
339
  }
340
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
341
  /* OpenPGP credentials */
24.1.29 by Björn Påhlsson
Added more header file comments
342
  gnutls_certificate_allocate_credentials(&mc->cred);
343
  if (ret != GNUTLS_E_SUCCESS){
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
344
    fprintf (stderr, "GnuTLS memory error: %s\n",
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
  
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
478
  memset(&to, 0, sizeof(to));	/* Spurious warning */
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
    }
638
  }
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
639
  
640
  /* Shutdown procedure */
641
  
642
 mandos_end:
13 by Björn Påhlsson
Added following support:
643
  free(buffer);
644
  close(tcp_sd);
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
645
  gnutls_deinit (session);
13 by Björn Påhlsson
Added following support:
646
  return retval;
647
}
648
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
649
static void resolve_callback(AvahiSServiceResolver *r,
650
			     AvahiIfIndex interface,
651
			     AVAHI_GCC_UNUSED AvahiProtocol protocol,
652
			     AvahiResolverEvent event,
653
			     const char *name,
654
			     const char *type,
655
			     const char *domain,
656
			     const char *host_name,
657
			     const AvahiAddress *address,
658
			     uint16_t port,
659
			     AVAHI_GCC_UNUSED AvahiStringList *txt,
660
			     AVAHI_GCC_UNUSED AvahiLookupResultFlags
661
			     flags,
662
			     void* userdata) {
24.1.9 by Björn Påhlsson
not working midwork...
663
  mandos_context *mc = userdata;
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
664
  assert(r);			/* Spurious warning */
665
  
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
666
  /* Called whenever a service has been resolved successfully or
667
     timed out */
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
668
  
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
669
  switch (event) {
670
  default:
671
  case AVAHI_RESOLVER_FAILURE:
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
672
    fprintf(stderr, "(Avahi Resolver) Failed to resolve service '%s'"
673
	    " of type '%s' in domain '%s': %s\n", name, type, domain,
24.1.9 by Björn Påhlsson
not working midwork...
674
	    avahi_strerror(avahi_server_errno(mc->server)));
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
675
    break;
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
676
    
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
677
  case AVAHI_RESOLVER_FOUND:
678
    {
679
      char ip[AVAHI_ADDRESS_STR_MAX];
680
      avahi_address_snprint(ip, sizeof(ip), address);
681
      if(debug){
60 by Teddy Hogeborn
* mandos-client.c (main): Cast pid_t to unsigned int before printing.
682
	fprintf(stderr, "Mandos server \"%s\" found on %s (%s, %"
683
		PRIu16 ") on port %d\n", name, host_name, ip,
684
		interface, port);
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
685
      }
24.1.9 by Björn Påhlsson
not working midwork...
686
      int ret = start_mandos_communication(ip, port, interface, mc);
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
687
      if (ret == 0){
24.1.46 by Björn Påhlsson
mandos-client
688
	avahi_simple_poll_quit(mc->simple_poll);
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
689
      }
13 by Björn Påhlsson
Added following support:
690
    }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
691
  }
692
  avahi_s_service_resolver_free(r);
13 by Björn Påhlsson
Added following support:
693
}
694
24.1.9 by Björn Påhlsson
not working midwork...
695
static void browse_callback( AvahiSServiceBrowser *b,
696
			     AvahiIfIndex interface,
697
			     AvahiProtocol protocol,
698
			     AvahiBrowserEvent event,
699
			     const char *name,
700
			     const char *type,
701
			     const char *domain,
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
702
			     AVAHI_GCC_UNUSED AvahiLookupResultFlags
703
			     flags,
24.1.9 by Björn Påhlsson
not working midwork...
704
			     void* userdata) {
705
  mandos_context *mc = userdata;
706
  assert(b);			/* Spurious warning */
707
  
708
  /* Called whenever a new services becomes available on the LAN or
709
     is removed from the LAN */
710
  
711
  switch (event) {
712
  default:
713
  case AVAHI_BROWSER_FAILURE:
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
714
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
715
    fprintf(stderr, "(Avahi browser) %s\n",
24.1.9 by Björn Påhlsson
not working midwork...
716
	    avahi_strerror(avahi_server_errno(mc->server)));
717
    avahi_simple_poll_quit(mc->simple_poll);
718
    return;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
719
    
24.1.9 by Björn Påhlsson
not working midwork...
720
  case AVAHI_BROWSER_NEW:
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
721
    /* We ignore the returned Avahi resolver object. In the callback
722
       function we free it. If the Avahi server is terminated before
723
       the callback function is called the Avahi server will free the
724
       resolver for us. */
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
725
    
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
726
    if (!(avahi_s_service_resolver_new(mc->server, interface,
727
				       protocol, name, type, domain,
24.1.9 by Björn Påhlsson
not working midwork...
728
				       AVAHI_PROTO_INET6, 0,
729
				       resolve_callback, mc)))
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
730
      fprintf(stderr, "Avahi: Failed to resolve service '%s': %s\n",
731
	      name, avahi_strerror(avahi_server_errno(mc->server)));
24.1.9 by Björn Påhlsson
not working midwork...
732
    break;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
733
    
24.1.9 by Björn Påhlsson
not working midwork...
734
  case AVAHI_BROWSER_REMOVE:
735
    break;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
736
    
24.1.9 by Björn Påhlsson
not working midwork...
737
  case AVAHI_BROWSER_ALL_FOR_NOW:
738
  case AVAHI_BROWSER_CACHE_EXHAUSTED:
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
739
    if(debug){
740
      fprintf(stderr, "No Mandos server found, still searching...\n");
741
    }
24.1.9 by Björn Påhlsson
not working midwork...
742
    break;
743
  }
13 by Björn Påhlsson
Added following support:
744
}
745
36 by Teddy Hogeborn
* TODO: Converted to org-mode style
746
/* Combines file name and path and returns the malloced new
747
   string. some sane checks could/should be added */
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
748
static char *combinepath(const char *first, const char *second){
749
  char *tmp;
750
  int ret = asprintf(&tmp, "%s/%s", first, second);
751
  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.
752
    return NULL;
753
  }
754
  return tmp;
755
}
756
757
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
758
int main(int argc, char *argv[]){
13 by Björn Påhlsson
Added following support:
759
    AvahiSServiceBrowser *sb = NULL;
760
    int error;
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
761
    int ret;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
762
    int exitcode = EXIT_SUCCESS;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
763
    const char *interface = "eth0";
24.1.6 by Björn Påhlsson
plugbasedclient
764
    struct ifreq network;
765
    int sd;
24.1.13 by Björn Påhlsson
mandosclient
766
    uid_t uid;
767
    gid_t gid;
24.1.7 by Björn Påhlsson
merge
768
    char *connect_to = NULL;
29 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Changed
769
    AvahiIfIndex if_index = AVAHI_IF_UNSPEC;
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
770
    char *pubkeyfilename = NULL;
771
    char *seckeyfilename = NULL;
772
    const char *pubkeyname = "pubkey.txt";
773
    const char *seckeyname = "seckey.txt";
24.1.9 by Björn Påhlsson
not working midwork...
774
    mandos_context mc = { .simple_poll = NULL, .server = NULL,
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
775
			  .dh_bits = 1024, .priority = "SECURE256"};
24.1.20 by Björn Påhlsson
mandosclient
776
    bool gnutls_initalized = false;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
777
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
778
    {
24.1.14 by Björn Påhlsson
mandosclient
779
      struct argp_option options[] = {
780
	{ .name = "debug", .key = 128,
781
	  .doc = "Debug mode", .group = 3 },
782
	{ .name = "connect", .key = 'c',
783
	  .arg = "IP",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
784
	  .doc = "Connect directly to a sepcified mandos server",
785
	  .group = 1 },
24.1.14 by Björn Påhlsson
mandosclient
786
	{ .name = "interface", .key = 'i',
787
	  .arg = "INTERFACE",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
788
	  .doc = "Interface that Avahi will conntect through",
789
	  .group = 1 },
24.1.14 by Björn Påhlsson
mandosclient
790
	{ .name = "keydir", .key = 'd',
791
	  .arg = "KEYDIR",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
792
	  .doc = "Directory where the openpgp keyring is",
793
	  .group = 1 },
24.1.14 by Björn Påhlsson
mandosclient
794
	{ .name = "seckey", .key = 's',
795
	  .arg = "SECKEY",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
796
	  .doc = "Secret openpgp key for gnutls authentication",
797
	  .group = 1 },
24.1.14 by Björn Påhlsson
mandosclient
798
	{ .name = "pubkey", .key = 'p',
799
	  .arg = "PUBKEY",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
800
	  .doc = "Public openpgp key for gnutls authentication",
801
	  .group = 2 },
24.1.14 by Björn Påhlsson
mandosclient
802
	{ .name = "dh-bits", .key = 129,
803
	  .arg = "BITS",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
804
	  .doc = "dh-bits to use in gnutls communication",
805
	  .group = 2 },
24.1.14 by Björn Påhlsson
mandosclient
806
	{ .name = "priority", .key = 130,
807
	  .arg = "PRIORITY",
808
	  .doc = "GNUTLS priority", .group = 1 },
809
	{ .name = NULL }
810
      };
811
812
      
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
813
      error_t parse_opt (int key, char *arg,
814
			 struct argp_state *state) {
815
	/* Get the INPUT argument from `argp_parse', which we know is
816
	   a pointer to our plugin list pointer. */
24.1.14 by Björn Påhlsson
mandosclient
817
	switch (key) {
818
	case 128:
819
	  debug = true;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
820
	  break;
24.1.14 by Björn Påhlsson
mandosclient
821
	case 'c':
822
	  connect_to = arg;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
823
	  break;
824
	case 'i':
24.1.14 by Björn Påhlsson
mandosclient
825
	  interface = arg;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
826
	  break;
827
	case 'd':
24.1.14 by Björn Påhlsson
mandosclient
828
	  keydir = arg;
829
	  break;
830
	case 's':
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
831
	  seckeyname = arg;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
832
	  break;
833
	case 'p':
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
834
	  pubkeyname = arg;
24.1.14 by Björn Påhlsson
mandosclient
835
	  break;
836
	case 129:
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
837
	  errno = 0;
24.1.14 by Björn Påhlsson
mandosclient
838
	  mc.dh_bits = (unsigned int) strtol(arg, NULL, 10);
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
839
	  if (errno){
840
	    perror("strtol");
841
	    exit(EXIT_FAILURE);
842
	  }
843
	  break;
24.1.14 by Björn Påhlsson
mandosclient
844
	case 130:
845
	  mc.priority = arg;
846
	  break;
847
	case ARGP_KEY_ARG:
848
	  argp_usage (state);
24.1.46 by Björn Påhlsson
mandos-client
849
	case ARGP_KEY_END:
24.1.14 by Björn Påhlsson
mandosclient
850
	  break;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
851
	default:
24.1.14 by Björn Påhlsson
mandosclient
852
	  return ARGP_ERR_UNKNOWN;
24.1.9 by Björn Påhlsson
not working midwork...
853
	}
24.1.14 by Björn Påhlsson
mandosclient
854
	return 0;
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
855
      }
24.1.14 by Björn Påhlsson
mandosclient
856
857
      struct argp argp = { .options = options, .parser = parse_opt,
858
			   .args_doc = "",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
859
			   .doc = "Mandos client -- Get and decrypt"
860
			   " passwords from mandos server" };
24.1.29 by Björn Påhlsson
Added more header file comments
861
      ret = argp_parse (&argp, argc, argv, 0, 0, NULL);
862
      if (ret == ARGP_ERR_UNKNOWN){
24.1.43 by Björn Påhlsson
merge
863
	fprintf(stderr, "Unknown error while parsing arguments\n");
24.1.29 by Björn Påhlsson
Added more header file comments
864
	exitcode = EXIT_FAILURE;
865
	goto end;
866
      }
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
867
    }
24.1.14 by Björn Påhlsson
mandosclient
868
      
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
869
    pubkeyfilename = combinepath(keydir, pubkeyname);
870
    if (pubkeyfilename == NULL){
36 by Teddy Hogeborn
* TODO: Converted to org-mode style
871
      perror("combinepath");
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
872
      exitcode = EXIT_FAILURE;
873
      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.
874
    }
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
875
    
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
876
    seckeyfilename = combinepath(keydir, seckeyname);
877
    if (seckeyfilename == NULL){
24.1.7 by Björn Påhlsson
merge
878
      perror("combinepath");
24.1.45 by Björn Påhlsson
Fixed fallback on error in mandos-client
879
      exitcode = EXIT_FAILURE;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
880
      goto end;
24.1.6 by Björn Påhlsson
plugbasedclient
881
    }
24.1.13 by Björn Påhlsson
mandosclient
882
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
883
    ret = init_gnutls_global(&mc, pubkeyfilename, seckeyfilename);
24.1.13 by Björn Påhlsson
mandosclient
884
    if (ret == -1){
24.1.45 by Björn Påhlsson
Fixed fallback on error in mandos-client
885
      fprintf(stderr, "init_gnutls_global failed\n");
886
      exitcode = EXIT_FAILURE;
24.1.13 by Björn Påhlsson
mandosclient
887
      goto end;
24.1.20 by Björn Påhlsson
mandosclient
888
    } else {
889
      gnutls_initalized = true;
24.1.13 by Björn Påhlsson
mandosclient
890
    }
65 by Teddy Hogeborn
* plugins.d/password-request.c (main): Bug fix: Bring up network
891
    
892
    /* If the interface is down, bring it up */
893
    {
894
      sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
895
      if(sd < 0) {
896
	perror("socket");
897
	exitcode = EXIT_FAILURE;
898
	goto end;
899
      }
900
      strcpy(network.ifr_name, interface); /* Spurious warning */
901
      ret = ioctl(sd, SIOCGIFFLAGS, &network);
902
      if(ret == -1){
903
	perror("ioctl SIOCGIFFLAGS");
904
	exitcode = EXIT_FAILURE;
905
	goto end;
906
      }
907
      if((network.ifr_flags & IFF_UP) == 0){
908
	network.ifr_flags |= IFF_UP;
909
	ret = ioctl(sd, SIOCSIFFLAGS, &network);
910
	if(ret == -1){
911
	  perror("ioctl SIOCSIFFLAGS");
912
	  exitcode = EXIT_FAILURE;
913
	  goto end;
914
	}
915
      }
916
      close(sd);
917
    }
918
    
24.1.13 by Björn Påhlsson
mandosclient
919
    uid = getuid();
920
    gid = getgid();
65 by Teddy Hogeborn
* plugins.d/password-request.c (main): Bug fix: Bring up network
921
    
24.1.13 by Björn Påhlsson
mandosclient
922
    ret = setuid(uid);
923
    if (ret == -1){
924
      perror("setuid");
925
    }
926
    
927
    setgid(gid);
928
    if (ret == -1){
929
      perror("setgid");
930
    }
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
931
    
24.1.7 by Björn Påhlsson
merge
932
    if_index = (AvahiIfIndex) if_nametoindex(interface);
933
    if(if_index == 0){
934
      fprintf(stderr, "No such interface: \"%s\"\n", interface);
935
      exit(EXIT_FAILURE);
28 by Teddy Hogeborn
* server.conf: New file.
936
    }
937
    
938
    if(connect_to != NULL){
939
      /* Connect directly, do not use Zeroconf */
940
      /* (Mainly meant for debugging) */
941
      char *address = strrchr(connect_to, ':');
942
      if(address == NULL){
943
        fprintf(stderr, "No colon in address\n");
24.1.13 by Björn Påhlsson
mandosclient
944
	exitcode = EXIT_FAILURE;
945
	goto end;
28 by Teddy Hogeborn
* server.conf: New file.
946
      }
947
      errno = 0;
948
      uint16_t port = (uint16_t) strtol(address+1, NULL, 10);
949
      if(errno){
950
	perror("Bad port number");
24.1.13 by Björn Påhlsson
mandosclient
951
	exitcode = EXIT_FAILURE;
952
	goto end;
28 by Teddy Hogeborn
* server.conf: New file.
953
      }
954
      *address = '\0';
955
      address = connect_to;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
956
      ret = start_mandos_communication(address, port, if_index, &mc);
28 by Teddy Hogeborn
* server.conf: New file.
957
      if(ret < 0){
24.1.13 by Björn Påhlsson
mandosclient
958
	exitcode = EXIT_FAILURE;
28 by Teddy Hogeborn
* server.conf: New file.
959
      } else {
24.1.13 by Björn Påhlsson
mandosclient
960
	exitcode = EXIT_SUCCESS;
28 by Teddy Hogeborn
* server.conf: New file.
961
      }
24.1.13 by Björn Påhlsson
mandosclient
962
      goto end;
28 by Teddy Hogeborn
* server.conf: New file.
963
    }
964
    
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
965
    if (not debug){
966
      avahi_set_log_function(empty_log);
967
    }
13 by Björn Påhlsson
Added following support:
968
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
969
    /* Initialize the pseudo-RNG for Avahi */
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
970
    srand((unsigned int) time(NULL));
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
971
    
972
    /* Allocate main Avahi loop object */
973
    mc.simple_poll = avahi_simple_poll_new();
974
    if (mc.simple_poll == NULL) {
975
        fprintf(stderr, "Avahi: Failed to create simple poll"
976
		" object.\n");
977
	exitcode = EXIT_FAILURE;
978
        goto end;
979
    }
980
981
    {
982
      AvahiServerConfig config;
983
      /* Do not publish any local Zeroconf records */
984
      avahi_server_config_init(&config);
985
      config.publish_hinfo = 0;
986
      config.publish_addresses = 0;
987
      config.publish_workstation = 0;
988
      config.publish_domain = 0;
989
990
      /* Allocate a new server */
991
      mc.server = avahi_server_new(avahi_simple_poll_get
992
				   (mc.simple_poll), &config, NULL,
993
				   NULL, &error);
994
    
995
      /* Free the Avahi configuration data */
996
      avahi_server_config_free(&config);
997
    }
998
    
999
    /* Check if creating the Avahi server object succeeded */
1000
    if (mc.server == NULL) {
1001
        fprintf(stderr, "Failed to create Avahi server: %s\n",
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1002
		avahi_strerror(error));
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1003
	exitcode = EXIT_FAILURE;
1004
        goto end;
13 by Björn Påhlsson
Added following support:
1005
    }
1006
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1007
    /* Create the Avahi service browser */
24.1.9 by Björn Påhlsson
not working midwork...
1008
    sb = avahi_s_service_browser_new(mc.server, if_index,
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1009
				     AVAHI_PROTO_INET6,
1010
				     "_mandos._tcp", NULL, 0,
24.1.9 by Björn Påhlsson
not working midwork...
1011
				     browse_callback, &mc);
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1012
    if (sb == NULL) {
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1013
        fprintf(stderr, "Failed to create service browser: %s\n",
24.1.9 by Björn Påhlsson
not working midwork...
1014
		avahi_strerror(avahi_server_errno(mc.server)));
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1015
	exitcode = EXIT_FAILURE;
1016
        goto end;
13 by Björn Påhlsson
Added following support:
1017
    }
1018
    
1019
    /* Run the main loop */
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
1020
1021
    if (debug){
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1022
      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
1023
    }
1024
    
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
1025
    avahi_simple_poll_loop(mc.simple_poll);
13 by Björn Påhlsson
Added following support:
1026
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1027
 end:
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
1028
1029
    if (debug){
1030
      fprintf(stderr, "%s exiting\n", argv[0]);
1031
    }
13 by Björn Påhlsson
Added following support:
1032
    
1033
    /* Cleanup things */
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1034
    if (sb != NULL)
13 by Björn Påhlsson
Added following support:
1035
        avahi_s_service_browser_free(sb);
1036
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1037
    if (mc.server != NULL)
24.1.9 by Björn Påhlsson
not working midwork...
1038
        avahi_server_free(mc.server);
13 by Björn Påhlsson
Added following support:
1039
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1040
    if (mc.simple_poll != NULL)
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
1041
        avahi_simple_poll_free(mc.simple_poll);
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
1042
    free(pubkeyfilename);
1043
    free(seckeyfilename);
24.1.20 by Björn Påhlsson
mandosclient
1044
1045
    if (gnutls_initalized){
24.1.29 by Björn Påhlsson
Added more header file comments
1046
      gnutls_certificate_free_credentials(mc.cred);
24.1.20 by Björn Påhlsson
mandosclient
1047
      gnutls_global_deinit ();
1048
    }
24.1.5 by Björn Påhlsson
plugbasedclient:
1049
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1050
    return exitcode;
13 by Björn Påhlsson
Added following support:
1051
}