/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
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
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){
147 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Improved wording
351
    fprintf(stderr, "Attempting to use OpenPGP public key %s and"
352
	    " secret key %s as GnuTLS credentials\n", pubkeyfilename,
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
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);
147 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Improved wording
363
    fprintf(stderr, "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);
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
383
  
24.1.13 by Björn Påhlsson
mandosclient
384
  return 0;
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
385
  
24.1.20 by Björn Påhlsson
mandosclient
386
 globalfail:
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
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;
24.1.13 by Björn Påhlsson
mandosclient
391
}
392
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
393
static int init_gnutls_session(mandos_context *mc,
394
			       gnutls_session_t *session){
24.1.13 by Björn Påhlsson
mandosclient
395
  int ret;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
396
  /* GnuTLS session creation */
397
  ret = gnutls_init(session, GNUTLS_SERVER);
398
  if (ret != GNUTLS_E_SUCCESS){
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
399
    fprintf(stderr, "Error in GnuTLS session initialization: %s\n",
13 by Björn Påhlsson
Added following support:
400
	    safer_gnutls_strerror(ret));
401
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
402
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
403
  {
404
    const char *err;
405
    ret = gnutls_priority_set_direct(*session, mc->priority, &err);
406
    if (ret != GNUTLS_E_SUCCESS) {
407
      fprintf(stderr, "Syntax error at: %s\n", err);
408
      fprintf(stderr, "GnuTLS error: %s\n",
409
	      safer_gnutls_strerror(ret));
24.1.20 by Björn Påhlsson
mandosclient
410
      gnutls_deinit (*session);
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
411
      return -1;
412
    }
13 by Björn Påhlsson
Added following support:
413
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
414
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
415
  ret = gnutls_credentials_set(*session, GNUTLS_CRD_CERTIFICATE,
416
			       mc->cred);
417
  if (ret != GNUTLS_E_SUCCESS) {
418
    fprintf(stderr, "Error setting GnuTLS credentials: %s\n",
13 by Björn Påhlsson
Added following support:
419
	    safer_gnutls_strerror(ret));
24.1.20 by Björn Påhlsson
mandosclient
420
    gnutls_deinit (*session);
13 by Björn Påhlsson
Added following support:
421
    return -1;
422
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
423
  
13 by Björn Påhlsson
Added following support:
424
  /* ignore client certificate if any. */
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
425
  gnutls_certificate_server_set_request (*session,
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
426
					 GNUTLS_CERT_IGNORE);
13 by Björn Påhlsson
Added following support:
427
  
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
428
  gnutls_dh_set_prime_bits (*session, mc->dh_bits);
13 by Björn Påhlsson
Added following support:
429
  
430
  return 0;
431
}
432
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
433
/* Avahi log function callback */
36 by Teddy Hogeborn
* TODO: Converted to org-mode style
434
static void empty_log(__attribute__((unused)) AvahiLogLevel level,
435
		      __attribute__((unused)) const char *txt){}
13 by Björn Påhlsson
Added following support:
436
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
437
/* Called when a Mandos server is found */
36 by Teddy Hogeborn
* TODO: Converted to org-mode style
438
static int start_mandos_communication(const char *ip, uint16_t port,
24.1.9 by Björn Påhlsson
not working midwork...
439
				      AvahiIfIndex if_index,
440
				      mandos_context *mc){
13 by Björn Påhlsson
Added following support:
441
  int ret, tcp_sd;
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
442
  union { struct sockaddr in; struct sockaddr_in6 in6; } to;
13 by Björn Påhlsson
Added following support:
443
  char *buffer = NULL;
444
  char *decrypted_buffer;
445
  size_t buffer_length = 0;
446
  size_t buffer_capacity = 0;
447
  ssize_t decrypted_buffer_size;
24.1.10 by Björn Påhlsson
merge commit
448
  size_t written;
13 by Björn Påhlsson
Added following support:
449
  int retval = 0;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
450
  char interface[IF_NAMESIZE];
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
451
  gnutls_session_t session;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
452
  
24.1.13 by Björn Påhlsson
mandosclient
453
  ret = init_gnutls_session (mc, &session);
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
454
  if (ret != 0){
455
    return -1;
456
  }
457
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
458
  if(debug){
60 by Teddy Hogeborn
* mandos-client.c (main): Cast pid_t to unsigned int before printing.
459
    fprintf(stderr, "Setting up a tcp connection to %s, port %" PRIu16
460
	    "\n", ip, port);
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
461
  }
13 by Björn Påhlsson
Added following support:
462
  
463
  tcp_sd = socket(PF_INET6, SOCK_STREAM, 0);
464
  if(tcp_sd < 0) {
465
    perror("socket");
466
    return -1;
467
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
468
  
24.1.6 by Björn Påhlsson
plugbasedclient
469
  if(debug){
24.1.7 by Björn Påhlsson
merge
470
    if(if_indextoname((unsigned int)if_index, interface) == NULL){
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
471
      perror("if_indextoname");
24.1.6 by Björn Påhlsson
plugbasedclient
472
      return -1;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
473
    }
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
474
    fprintf(stderr, "Binding to interface %s\n", interface);
475
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
476
  
84 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do
477
  memset(&to, 0, sizeof(to));
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
478
  to.in6.sin6_family = AF_INET6;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
479
  /* It would be nice to have a way to detect if we were passed an
480
     IPv4 address here.   Now we assume an IPv6 address. */
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
481
  ret = inet_pton(AF_INET6, ip, &to.in6.sin6_addr);
13 by Björn Påhlsson
Added following support:
482
  if (ret < 0 ){
483
    perror("inet_pton");
484
    return -1;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
485
  }
13 by Björn Påhlsson
Added following support:
486
  if(ret == 0){
487
    fprintf(stderr, "Bad address: %s\n", ip);
488
    return -1;
489
  }
65 by Teddy Hogeborn
* plugins.d/password-request.c (main): Bug fix: Bring up network
490
  to.in6.sin6_port = htons(port); /* Spurious warning */
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
491
  
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
492
  to.in6.sin6_scope_id = (uint32_t)if_index;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
493
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
494
  if(debug){
60 by Teddy Hogeborn
* mandos-client.c (main): Cast pid_t to unsigned int before printing.
495
    fprintf(stderr, "Connection to: %s, port %" PRIu16 "\n", ip,
496
	    port);
37 by Teddy Hogeborn
Non-tested commit for merge purposes.
497
    char addrstr[INET6_ADDRSTRLEN] = "";
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
498
    if(inet_ntop(to.in6.sin6_family, &(to.in6.sin6_addr), addrstr,
37 by Teddy Hogeborn
Non-tested commit for merge purposes.
499
		 sizeof(addrstr)) == NULL){
500
      perror("inet_ntop");
501
    } else {
502
      if(strcmp(addrstr, ip) != 0){
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
503
	fprintf(stderr, "Canonical address form: %s\n", addrstr);
37 by Teddy Hogeborn
Non-tested commit for merge purposes.
504
      }
505
    }
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
506
  }
13 by Björn Påhlsson
Added following support:
507
  
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
508
  ret = connect(tcp_sd, &to.in, sizeof(to));
13 by Björn Påhlsson
Added following support:
509
  if (ret < 0){
510
    perror("connect");
511
    return -1;
512
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
513
  
24.1.12 by Björn Påhlsson
merge +
514
  const char *out = mandos_protocol_version;
24.1.10 by Björn Påhlsson
merge commit
515
  written = 0;
516
  while (true){
517
    size_t out_size = strlen(out);
518
    ret = TEMP_FAILURE_RETRY(write(tcp_sd, out + written,
519
				   out_size - written));
520
    if (ret == -1){
521
      perror("write");
522
      retval = -1;
24.1.12 by Björn Påhlsson
merge +
523
      goto mandos_end;
24.1.10 by Björn Påhlsson
merge commit
524
    }
24.1.12 by Björn Påhlsson
merge +
525
    written += (size_t)ret;
24.1.10 by Björn Påhlsson
merge commit
526
    if(written < out_size){
527
      continue;
528
    } else {
529
      if (out == mandos_protocol_version){
530
	written = 0;
531
	out = "\r\n";
532
      } else {
533
	break;
534
      }
535
    }
536
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
537
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
538
  if(debug){
539
    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
540
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
541
  
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
542
  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) tcp_sd);
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
543
  
24.1.29 by Björn Påhlsson
Added more header file comments
544
  do{
545
    ret = gnutls_handshake (session);
546
  } while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED);
13 by Björn Påhlsson
Added following support:
547
  
548
  if (ret != GNUTLS_E_SUCCESS){
25 by Teddy Hogeborn
* mandos-clients.conf ([DEFAULT]): New section.
549
    if(debug){
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
550
      fprintf(stderr, "*** GnuTLS Handshake failed ***\n");
25 by Teddy Hogeborn
* mandos-clients.conf ([DEFAULT]): New section.
551
      gnutls_perror (ret);
552
    }
13 by Björn Påhlsson
Added following support:
553
    retval = -1;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
554
    goto mandos_end;
13 by Björn Påhlsson
Added following support:
555
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
556
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
557
  /* Read OpenPGP packet that contains the wanted password */
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
558
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
559
  if(debug){
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
560
    fprintf(stderr, "Retrieving pgp encrypted password from %s\n",
561
	    ip);
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
562
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
563
  
13 by Björn Påhlsson
Added following support:
564
  while(true){
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
565
    buffer_capacity = adjustbuffer(&buffer, buffer_length,
566
				   buffer_capacity);
24.1.10 by Björn Påhlsson
merge commit
567
    if (buffer_capacity == 0){
568
      perror("adjustbuffer");
569
      retval = -1;
24.1.12 by Björn Påhlsson
merge +
570
      goto mandos_end;
13 by Björn Påhlsson
Added following support:
571
    }
572
    
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
573
    ret = gnutls_record_recv(session, buffer+buffer_length,
574
			     BUFFER_SIZE);
13 by Björn Påhlsson
Added following support:
575
    if (ret == 0){
576
      break;
577
    }
578
    if (ret < 0){
579
      switch(ret){
580
      case GNUTLS_E_INTERRUPTED:
581
      case GNUTLS_E_AGAIN:
582
	break;
583
      case GNUTLS_E_REHANDSHAKE:
24.1.29 by Björn Påhlsson
Added more header file comments
584
	do{
585
	  ret = gnutls_handshake (session);
586
	} while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED);
13 by Björn Påhlsson
Added following support:
587
	if (ret < 0){
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
588
	  fprintf(stderr, "*** GnuTLS Re-handshake failed ***\n");
13 by Björn Påhlsson
Added following support:
589
	  gnutls_perror (ret);
590
	  retval = -1;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
591
	  goto mandos_end;
13 by Björn Påhlsson
Added following support:
592
	}
593
	break;
594
      default:
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
595
	fprintf(stderr, "Unknown error while reading data from"
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
596
		" encrypted session with Mandos server\n");
13 by Björn Påhlsson
Added following support:
597
	retval = -1;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
598
	gnutls_bye (session, GNUTLS_SHUT_RDWR);
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
599
	goto mandos_end;
13 by Björn Påhlsson
Added following support:
600
      }
601
    } else {
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
602
      buffer_length += (size_t) ret;
13 by Björn Påhlsson
Added following support:
603
    }
604
  }
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
605
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
606
  if(debug){
607
    fprintf(stderr, "Closing TLS session\n");
608
  }
609
  
610
  gnutls_bye (session, GNUTLS_SHUT_RDWR);
611
  
13 by Björn Påhlsson
Added following support:
612
  if (buffer_length > 0){
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
613
    decrypted_buffer_size = pgp_packet_decrypt(buffer,
614
					       buffer_length,
615
					       &decrypted_buffer,
37 by Teddy Hogeborn
Non-tested commit for merge purposes.
616
					       keydir);
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
617
    if (decrypted_buffer_size >= 0){
24.1.10 by Björn Påhlsson
merge commit
618
      written = 0;
28 by Teddy Hogeborn
* server.conf: New file.
619
      while(written < (size_t) decrypted_buffer_size){
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
620
	ret = (int)fwrite (decrypted_buffer + written, 1,
621
			   (size_t)decrypted_buffer_size - written,
622
			   stdout);
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
623
	if(ret == 0 and ferror(stdout)){
624
	  if(debug){
625
	    fprintf(stderr, "Error writing encrypted data: %s\n",
626
		    strerror(errno));
627
	  }
628
	  retval = -1;
629
	  break;
630
	}
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
631
	written += (size_t)ret;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
632
      }
13 by Björn Påhlsson
Added following support:
633
      free(decrypted_buffer);
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
634
    } else {
635
      retval = -1;
13 by Björn Påhlsson
Added following support:
636
    }
24.1.63 by Björn Påhlsson
merge + fallback bugg
637
  } else {
638
    retval = -1;
13 by Björn Påhlsson
Added following support:
639
  }
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
640
  
641
  /* Shutdown procedure */
642
  
643
 mandos_end:
13 by Björn Påhlsson
Added following support:
644
  free(buffer);
645
  close(tcp_sd);
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
646
  gnutls_deinit (session);
13 by Björn Påhlsson
Added following support:
647
  return retval;
648
}
649
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
650
static void resolve_callback(AvahiSServiceResolver *r,
651
			     AvahiIfIndex interface,
652
			     AVAHI_GCC_UNUSED AvahiProtocol protocol,
653
			     AvahiResolverEvent event,
654
			     const char *name,
655
			     const char *type,
656
			     const char *domain,
657
			     const char *host_name,
658
			     const AvahiAddress *address,
659
			     uint16_t port,
660
			     AVAHI_GCC_UNUSED AvahiStringList *txt,
661
			     AVAHI_GCC_UNUSED AvahiLookupResultFlags
662
			     flags,
663
			     void* userdata) {
24.1.9 by Björn Påhlsson
not working midwork...
664
  mandos_context *mc = userdata;
84 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do
665
  assert(r);
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
666
  
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
667
  /* Called whenever a service has been resolved successfully or
668
     timed out */
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
669
  
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
670
  switch (event) {
671
  default:
672
  case AVAHI_RESOLVER_FAILURE:
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
673
    fprintf(stderr, "(Avahi Resolver) Failed to resolve service '%s'"
674
	    " of type '%s' in domain '%s': %s\n", name, type, domain,
24.1.9 by Björn Påhlsson
not working midwork...
675
	    avahi_strerror(avahi_server_errno(mc->server)));
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
676
    break;
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
677
    
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
678
  case AVAHI_RESOLVER_FOUND:
679
    {
680
      char ip[AVAHI_ADDRESS_STR_MAX];
681
      avahi_address_snprint(ip, sizeof(ip), address);
682
      if(debug){
60 by Teddy Hogeborn
* mandos-client.c (main): Cast pid_t to unsigned int before printing.
683
	fprintf(stderr, "Mandos server \"%s\" found on %s (%s, %"
684
		PRIu16 ") on port %d\n", name, host_name, ip,
685
		interface, port);
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
686
      }
24.1.9 by Björn Påhlsson
not working midwork...
687
      int ret = start_mandos_communication(ip, port, interface, mc);
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
688
      if (ret == 0){
24.1.46 by Björn Påhlsson
mandos-client
689
	avahi_simple_poll_quit(mc->simple_poll);
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
690
      }
13 by Björn Påhlsson
Added following support:
691
    }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
692
  }
693
  avahi_s_service_resolver_free(r);
13 by Björn Påhlsson
Added following support:
694
}
695
24.1.9 by Björn Påhlsson
not working midwork...
696
static void browse_callback( AvahiSServiceBrowser *b,
697
			     AvahiIfIndex interface,
698
			     AvahiProtocol protocol,
699
			     AvahiBrowserEvent event,
700
			     const char *name,
701
			     const char *type,
702
			     const char *domain,
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
703
			     AVAHI_GCC_UNUSED AvahiLookupResultFlags
704
			     flags,
24.1.9 by Björn Påhlsson
not working midwork...
705
			     void* userdata) {
706
  mandos_context *mc = userdata;
84 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do
707
  assert(b);
24.1.9 by Björn Påhlsson
not working midwork...
708
  
709
  /* Called whenever a new services becomes available on the LAN or
710
     is removed from the LAN */
711
  
712
  switch (event) {
713
  default:
714
  case AVAHI_BROWSER_FAILURE:
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
715
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
716
    fprintf(stderr, "(Avahi browser) %s\n",
24.1.9 by Björn Påhlsson
not working midwork...
717
	    avahi_strerror(avahi_server_errno(mc->server)));
718
    avahi_simple_poll_quit(mc->simple_poll);
719
    return;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
720
    
24.1.9 by Björn Påhlsson
not working midwork...
721
  case AVAHI_BROWSER_NEW:
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
722
    /* We ignore the returned Avahi resolver object. In the callback
723
       function we free it. If the Avahi server is terminated before
724
       the callback function is called the Avahi server will free the
725
       resolver for us. */
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
726
    
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
727
    if (!(avahi_s_service_resolver_new(mc->server, interface,
728
				       protocol, name, type, domain,
24.1.9 by Björn Påhlsson
not working midwork...
729
				       AVAHI_PROTO_INET6, 0,
730
				       resolve_callback, mc)))
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
731
      fprintf(stderr, "Avahi: Failed to resolve service '%s': %s\n",
732
	      name, avahi_strerror(avahi_server_errno(mc->server)));
24.1.9 by Björn Påhlsson
not working midwork...
733
    break;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
734
    
24.1.9 by Björn Påhlsson
not working midwork...
735
  case AVAHI_BROWSER_REMOVE:
736
    break;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
737
    
24.1.9 by Björn Påhlsson
not working midwork...
738
  case AVAHI_BROWSER_ALL_FOR_NOW:
739
  case AVAHI_BROWSER_CACHE_EXHAUSTED:
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
740
    if(debug){
741
      fprintf(stderr, "No Mandos server found, still searching...\n");
742
    }
24.1.9 by Björn Påhlsson
not working midwork...
743
    break;
744
  }
13 by Björn Påhlsson
Added following support:
745
}
746
36 by Teddy Hogeborn
* TODO: Converted to org-mode style
747
/* Combines file name and path and returns the malloced new
748
   string. some sane checks could/should be added */
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
749
static char *combinepath(const char *first, const char *second){
750
  char *tmp;
751
  int ret = asprintf(&tmp, "%s/%s", first, second);
752
  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.
753
    return NULL;
754
  }
755
  return tmp;
756
}
757
758
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
759
int main(int argc, char *argv[]){
13 by Björn Påhlsson
Added following support:
760
    AvahiSServiceBrowser *sb = NULL;
761
    int error;
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
762
    int ret;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
763
    int exitcode = EXIT_SUCCESS;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
764
    const char *interface = "eth0";
24.1.6 by Björn Påhlsson
plugbasedclient
765
    struct ifreq network;
766
    int sd;
24.1.13 by Björn Påhlsson
mandosclient
767
    uid_t uid;
768
    gid_t gid;
24.1.7 by Björn Påhlsson
merge
769
    char *connect_to = NULL;
29 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Changed
770
    AvahiIfIndex if_index = AVAHI_IF_UNSPEC;
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
771
    char *pubkeyfilename = NULL;
772
    char *seckeyfilename = NULL;
773
    const char *pubkeyname = "pubkey.txt";
774
    const char *seckeyname = "seckey.txt";
24.1.9 by Björn Påhlsson
not working midwork...
775
    mandos_context mc = { .simple_poll = NULL, .server = NULL,
142 by Teddy Hogeborn
* plugins.d/password-request.c (main): Change default GnuTLS priority
776
			  .dh_bits = 1024, .priority = "SECURE256"
777
			  ":!CTYPE-X.509:+CTYPE-OPENPGP" };
24.1.20 by Björn Påhlsson
mandosclient
778
    bool gnutls_initalized = false;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
779
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
780
    {
24.1.14 by Björn Påhlsson
mandosclient
781
      struct argp_option options[] = {
782
	{ .name = "debug", .key = 128,
783
	  .doc = "Debug mode", .group = 3 },
784
	{ .name = "connect", .key = 'c',
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
785
	  .arg = "ADDRESS:PORT",
786
	  .doc = "Connect directly to a specific Mandos server",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
787
	  .group = 1 },
24.1.14 by Björn Påhlsson
mandosclient
788
	{ .name = "interface", .key = 'i',
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
789
	  .arg = "NAME",
790
	  .doc = "Interface that will be used to search for Mandos"
791
	  " servers",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
792
	  .group = 1 },
24.1.14 by Björn Påhlsson
mandosclient
793
	{ .name = "keydir", .key = 'd',
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
794
	  .arg = "DIRECTORY",
795
	  .doc = "Directory to read the OpenPGP key files from",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
796
	  .group = 1 },
24.1.14 by Björn Påhlsson
mandosclient
797
	{ .name = "seckey", .key = 's',
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
798
	  .arg = "FILE",
799
	  .doc = "OpenPGP secret key file base name",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
800
	  .group = 1 },
24.1.14 by Björn Påhlsson
mandosclient
801
	{ .name = "pubkey", .key = 'p',
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
802
	  .arg = "FILE",
803
	  .doc = "OpenPGP public key file base name",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
804
	  .group = 2 },
24.1.14 by Björn Påhlsson
mandosclient
805
	{ .name = "dh-bits", .key = 129,
806
	  .arg = "BITS",
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
807
	  .doc = "Bit length of the prime number used in the"
808
	  " Diffie-Hellman key exchange",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
809
	  .group = 2 },
24.1.14 by Björn Påhlsson
mandosclient
810
	{ .name = "priority", .key = 130,
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
811
	  .arg = "STRING",
812
	  .doc = "GnuTLS priority string for the TLS handshake",
813
	  .group = 1 },
24.1.14 by Björn Påhlsson
mandosclient
814
	{ .name = NULL }
815
      };
816
      
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
817
      error_t parse_opt (int key, char *arg,
818
			 struct argp_state *state) {
819
	/* Get the INPUT argument from `argp_parse', which we know is
820
	   a pointer to our plugin list pointer. */
24.1.14 by Björn Påhlsson
mandosclient
821
	switch (key) {
142 by Teddy Hogeborn
* plugins.d/password-request.c (main): Change default GnuTLS priority
822
	case 128:		/* --debug */
24.1.14 by Björn Påhlsson
mandosclient
823
	  debug = true;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
824
	  break;
142 by Teddy Hogeborn
* plugins.d/password-request.c (main): Change default GnuTLS priority
825
	case 'c':		/* --connect */
24.1.14 by Björn Påhlsson
mandosclient
826
	  connect_to = arg;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
827
	  break;
142 by Teddy Hogeborn
* plugins.d/password-request.c (main): Change default GnuTLS priority
828
	case 'i':		/* --interface */
24.1.14 by Björn Påhlsson
mandosclient
829
	  interface = arg;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
830
	  break;
142 by Teddy Hogeborn
* plugins.d/password-request.c (main): Change default GnuTLS priority
831
	case 'd':		/* --keydir */
24.1.14 by Björn Påhlsson
mandosclient
832
	  keydir = arg;
833
	  break;
142 by Teddy Hogeborn
* plugins.d/password-request.c (main): Change default GnuTLS priority
834
	case 's':		/* --seckey */
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
835
	  seckeyname = arg;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
836
	  break;
142 by Teddy Hogeborn
* plugins.d/password-request.c (main): Change default GnuTLS priority
837
	case 'p':		/* --pubkey */
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
838
	  pubkeyname = arg;
24.1.14 by Björn Påhlsson
mandosclient
839
	  break;
142 by Teddy Hogeborn
* plugins.d/password-request.c (main): Change default GnuTLS priority
840
	case 129:		/* --dh-bits */
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
841
	  errno = 0;
24.1.14 by Björn Påhlsson
mandosclient
842
	  mc.dh_bits = (unsigned int) strtol(arg, NULL, 10);
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
843
	  if (errno){
844
	    perror("strtol");
845
	    exit(EXIT_FAILURE);
846
	  }
847
	  break;
142 by Teddy Hogeborn
* plugins.d/password-request.c (main): Change default GnuTLS priority
848
	case 130:		/* --priority */
24.1.14 by Björn Påhlsson
mandosclient
849
	  mc.priority = arg;
850
	  break;
851
	case ARGP_KEY_ARG:
852
	  argp_usage (state);
24.1.46 by Björn Påhlsson
mandos-client
853
	case ARGP_KEY_END:
24.1.14 by Björn Påhlsson
mandosclient
854
	  break;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
855
	default:
24.1.14 by Björn Påhlsson
mandosclient
856
	  return ARGP_ERR_UNKNOWN;
24.1.9 by Björn Påhlsson
not working midwork...
857
	}
24.1.14 by Björn Påhlsson
mandosclient
858
	return 0;
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
859
      }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
860
      
24.1.14 by Björn Påhlsson
mandosclient
861
      struct argp argp = { .options = options, .parser = parse_opt,
862
			   .args_doc = "",
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
863
			   .doc = "Mandos client -- Get and decrypt"
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
864
			   " passwords from a Mandos server" };
24.1.29 by Björn Påhlsson
Added more header file comments
865
      ret = argp_parse (&argp, argc, argv, 0, 0, NULL);
866
      if (ret == ARGP_ERR_UNKNOWN){
24.1.43 by Björn Påhlsson
merge
867
	fprintf(stderr, "Unknown error while parsing arguments\n");
24.1.29 by Björn Påhlsson
Added more header file comments
868
	exitcode = EXIT_FAILURE;
869
	goto end;
870
      }
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
871
    }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
872
    
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
873
    pubkeyfilename = combinepath(keydir, pubkeyname);
874
    if (pubkeyfilename == NULL){
36 by Teddy Hogeborn
* TODO: Converted to org-mode style
875
      perror("combinepath");
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
876
      exitcode = EXIT_FAILURE;
877
      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.
878
    }
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
879
    
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
880
    seckeyfilename = combinepath(keydir, seckeyname);
881
    if (seckeyfilename == NULL){
24.1.7 by Björn Påhlsson
merge
882
      perror("combinepath");
24.1.45 by Björn Påhlsson
Fixed fallback on error in mandos-client
883
      exitcode = EXIT_FAILURE;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
884
      goto end;
24.1.6 by Björn Påhlsson
plugbasedclient
885
    }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
886
    
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
887
    ret = init_gnutls_global(&mc, pubkeyfilename, seckeyfilename);
24.1.13 by Björn Påhlsson
mandosclient
888
    if (ret == -1){
24.1.45 by Björn Påhlsson
Fixed fallback on error in mandos-client
889
      fprintf(stderr, "init_gnutls_global failed\n");
890
      exitcode = EXIT_FAILURE;
24.1.13 by Björn Påhlsson
mandosclient
891
      goto end;
24.1.20 by Björn Påhlsson
mandosclient
892
    } else {
893
      gnutls_initalized = true;
24.1.13 by Björn Påhlsson
mandosclient
894
    }
65 by Teddy Hogeborn
* plugins.d/password-request.c (main): Bug fix: Bring up network
895
    
896
    /* If the interface is down, bring it up */
897
    {
898
      sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
899
      if(sd < 0) {
900
	perror("socket");
901
	exitcode = EXIT_FAILURE;
902
	goto end;
903
      }
84 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do
904
      strcpy(network.ifr_name, interface);
65 by Teddy Hogeborn
* plugins.d/password-request.c (main): Bug fix: Bring up network
905
      ret = ioctl(sd, SIOCGIFFLAGS, &network);
906
      if(ret == -1){
907
	perror("ioctl SIOCGIFFLAGS");
908
	exitcode = EXIT_FAILURE;
909
	goto end;
910
      }
911
      if((network.ifr_flags & IFF_UP) == 0){
912
	network.ifr_flags |= IFF_UP;
913
	ret = ioctl(sd, SIOCSIFFLAGS, &network);
914
	if(ret == -1){
915
	  perror("ioctl SIOCSIFFLAGS");
916
	  exitcode = EXIT_FAILURE;
917
	  goto end;
918
	}
919
      }
920
      close(sd);
921
    }
922
    
24.1.13 by Björn Påhlsson
mandosclient
923
    uid = getuid();
924
    gid = getgid();
65 by Teddy Hogeborn
* plugins.d/password-request.c (main): Bug fix: Bring up network
925
    
24.1.13 by Björn Påhlsson
mandosclient
926
    ret = setuid(uid);
927
    if (ret == -1){
928
      perror("setuid");
929
    }
930
    
931
    setgid(gid);
932
    if (ret == -1){
933
      perror("setgid");
934
    }
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
935
    
24.1.7 by Björn Påhlsson
merge
936
    if_index = (AvahiIfIndex) if_nametoindex(interface);
937
    if(if_index == 0){
938
      fprintf(stderr, "No such interface: \"%s\"\n", interface);
939
      exit(EXIT_FAILURE);
28 by Teddy Hogeborn
* server.conf: New file.
940
    }
941
    
942
    if(connect_to != NULL){
943
      /* Connect directly, do not use Zeroconf */
944
      /* (Mainly meant for debugging) */
945
      char *address = strrchr(connect_to, ':');
946
      if(address == NULL){
947
        fprintf(stderr, "No colon in address\n");
24.1.13 by Björn Påhlsson
mandosclient
948
	exitcode = EXIT_FAILURE;
949
	goto end;
28 by Teddy Hogeborn
* server.conf: New file.
950
      }
951
      errno = 0;
952
      uint16_t port = (uint16_t) strtol(address+1, NULL, 10);
953
      if(errno){
954
	perror("Bad port number");
24.1.13 by Björn Påhlsson
mandosclient
955
	exitcode = EXIT_FAILURE;
956
	goto end;
28 by Teddy Hogeborn
* server.conf: New file.
957
      }
958
      *address = '\0';
959
      address = connect_to;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
960
      ret = start_mandos_communication(address, port, if_index, &mc);
28 by Teddy Hogeborn
* server.conf: New file.
961
      if(ret < 0){
24.1.13 by Björn Påhlsson
mandosclient
962
	exitcode = EXIT_FAILURE;
28 by Teddy Hogeborn
* server.conf: New file.
963
      } else {
24.1.13 by Björn Påhlsson
mandosclient
964
	exitcode = EXIT_SUCCESS;
28 by Teddy Hogeborn
* server.conf: New file.
965
      }
24.1.13 by Björn Påhlsson
mandosclient
966
      goto end;
28 by Teddy Hogeborn
* server.conf: New file.
967
    }
968
    
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
969
    if (not debug){
970
      avahi_set_log_function(empty_log);
971
    }
13 by Björn Påhlsson
Added following support:
972
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
973
    /* Initialize the pseudo-RNG for Avahi */
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
974
    srand((unsigned int) time(NULL));
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
975
    
976
    /* Allocate main Avahi loop object */
977
    mc.simple_poll = avahi_simple_poll_new();
978
    if (mc.simple_poll == NULL) {
979
        fprintf(stderr, "Avahi: Failed to create simple poll"
980
		" object.\n");
981
	exitcode = EXIT_FAILURE;
982
        goto end;
983
    }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
984
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
985
    {
986
      AvahiServerConfig config;
987
      /* Do not publish any local Zeroconf records */
988
      avahi_server_config_init(&config);
989
      config.publish_hinfo = 0;
990
      config.publish_addresses = 0;
991
      config.publish_workstation = 0;
992
      config.publish_domain = 0;
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
993
      
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
994
      /* Allocate a new server */
995
      mc.server = avahi_server_new(avahi_simple_poll_get
996
				   (mc.simple_poll), &config, NULL,
997
				   NULL, &error);
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
998
      
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
999
      /* Free the Avahi configuration data */
1000
      avahi_server_config_free(&config);
1001
    }
1002
    
1003
    /* Check if creating the Avahi server object succeeded */
1004
    if (mc.server == NULL) {
1005
        fprintf(stderr, "Failed to create Avahi server: %s\n",
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1006
		avahi_strerror(error));
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1007
	exitcode = EXIT_FAILURE;
1008
        goto end;
13 by Björn Påhlsson
Added following support:
1009
    }
1010
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1011
    /* Create the Avahi service browser */
24.1.9 by Björn Påhlsson
not working midwork...
1012
    sb = avahi_s_service_browser_new(mc.server, if_index,
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1013
				     AVAHI_PROTO_INET6,
1014
				     "_mandos._tcp", NULL, 0,
24.1.9 by Björn Påhlsson
not working midwork...
1015
				     browse_callback, &mc);
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1016
    if (sb == NULL) {
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1017
        fprintf(stderr, "Failed to create service browser: %s\n",
24.1.9 by Björn Påhlsson
not working midwork...
1018
		avahi_strerror(avahi_server_errno(mc.server)));
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1019
	exitcode = EXIT_FAILURE;
1020
        goto end;
13 by Björn Påhlsson
Added following support:
1021
    }
1022
    
1023
    /* Run the main loop */
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
1024
    
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
1025
    if (debug){
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1026
      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
1027
    }
1028
    
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
1029
    avahi_simple_poll_loop(mc.simple_poll);
13 by Björn Påhlsson
Added following support:
1030
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1031
 end:
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
1032
    
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
1033
    if (debug){
1034
      fprintf(stderr, "%s exiting\n", argv[0]);
1035
    }
13 by Björn Påhlsson
Added following support:
1036
    
1037
    /* Cleanup things */
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1038
    if (sb != NULL)
13 by Björn Påhlsson
Added following support:
1039
        avahi_s_service_browser_free(sb);
1040
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1041
    if (mc.server != NULL)
24.1.9 by Björn Påhlsson
not working midwork...
1042
        avahi_server_free(mc.server);
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
1043
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1044
    if (mc.simple_poll != NULL)
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
1045
        avahi_simple_poll_free(mc.simple_poll);
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
1046
    free(pubkeyfilename);
1047
    free(seckeyfilename);
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
1048
    
24.1.20 by Björn Påhlsson
mandosclient
1049
    if (gnutls_initalized){
24.1.29 by Björn Påhlsson
Added more header file comments
1050
      gnutls_certificate_free_credentials(mc.cred);
24.1.20 by Björn Påhlsson
mandosclient
1051
      gnutls_global_deinit ();
1052
    }
24.1.5 by Björn Påhlsson
plugbasedclient:
1053
    
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1054
    return exitcode;
13 by Björn Påhlsson
Added following support:
1055
}