To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to plugins.d/mandos-client.c
- browse files at revision 237.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 237.1.1
- Committer: Teddy Hogeborn
- Date: 2008-11-09 06:40:29 UTC
- mto: (24.1.113 mandos)
- mto: This revision was merged to the branch mainline in revision 238.
- Revision ID: teddy@fukt.bsnet.se-20081109064029-df71jpoce308cq3v
First steps of a D-Bus interface to the server.
* mandos: Also import "dbus.service".
(Client): Inherit from "dbus.service.Object", which is a new-style
class, so inheriting from "object" is no longer necessary.
(Client.interface): New temporary variable which only exists during
class definition.
(Client.getName, Client.getFingerprint): New D-Bus getter methods.
(Client.setSecret): New D-Bus setter method.
(Client._set_timeout): Emit D-Bus signal "TimeoutChanged".
(Client.getTimeout): New D-Bus getter method.
(Client.TimeoutChanged): New D-Bus signal.
(Client._set_interval): Emit D-Bus signal "IntervalChanged".
(Client.getInterval): New D-Bus getter method.
(Client.intervalChanged): New D-Bus signal.
(Client.__init__): Also call "dbus.service.Object.__init__".
(Client.started): New boolean attribute.
(Client.start, Client.stop): Update "self.started", and emit D-Bus
signal "StateChanged".
(Client.StateChanged): New D-Bus signal.
(Client.stop): Use "self.started" instead of misusing "self.secret".
Also simplify code by using "getattr" instead of
"hasattr".
(Client.checker_callback): Emit D-Bus signal "CheckerCompleted".
(Client.CheckerCompleted): New D-Bus signal.
(Client.bumpTimeout): D-Bus method name for "bump_timeout".
(Client.start_checker): Emit D-Bus signal "CheckerStarted".
(Client.CheckerStarted): New D-Bus signal.
(Client.checkerIsRunning): New D-Bus method.
(Client.StopChecker): D-Bus method name for "stop_checker".
(Client.still_valid): First check "self.started".
(Client.stillValid): D-Bus method name for "still_valid".
* mandos: Also import "dbus.service".
(Client): Inherit from "dbus.service.Object", which is a new-style
class, so inheriting from "object" is no longer necessary.
(Client.interface): New temporary variable which only exists during
class definition.
(Client.getName, Client.getFingerprint): New D-Bus getter methods.
(Client.setSecret): New D-Bus setter method.
(Client._set_timeout): Emit D-Bus signal "TimeoutChanged".
(Client.getTimeout): New D-Bus getter method.
(Client.TimeoutChanged): New D-Bus signal.
(Client._set_interval): Emit D-Bus signal "IntervalChanged".
(Client.getInterval): New D-Bus getter method.
(Client.intervalChanged): New D-Bus signal.
(Client.__init__): Also call "dbus.service.Object.__init__".
(Client.started): New boolean attribute.
(Client.start, Client.stop): Update "self.started", and emit D-Bus
signal "StateChanged".
(Client.StateChanged): New D-Bus signal.
(Client.stop): Use "self.started" instead of misusing "self.secret".
Also simplify code by using "getattr" instead of
"hasattr".
(Client.checker_callback): Emit D-Bus signal "CheckerCompleted".
(Client.CheckerCompleted): New D-Bus signal.
(Client.bumpTimeout): D-Bus method name for "bump_timeout".
(Client.start_checker): Emit D-Bus signal "CheckerStarted".
(Client.CheckerStarted): New D-Bus signal.
(Client.checkerIsRunning): New D-Bus method.
(Client.StopChecker): D-Bus method name for "stop_checker".
(Client.still_valid): First check "self.started".
(Client.stillValid): D-Bus method name for "still_valid".
- files added:
- debian/mandos-client.config
- files removed:
- debian/watch
- files modified:
- INSTALL
added
removed
plugins.d/mandos-client.c
1
1
/* -*- coding: utf-8 -*- */
2
2
/*
3
* Mandos-client - get and decrypt data from a Mandos server
3
* Mandos client - get and decrypt data from a Mandos server
4
4
*
5
5
* This program is partly derived from an example program for an Avahi
6
6
* service browser, downloaded from
9
9
* "browse_callback", and parts of "main".
10
10
*
11
11
* Everything else is
12
* Copyright © 2008,2009 Teddy Hogeborn
13
* Copyright © 2008,2009 Björn Påhlsson
12
* Copyright © 2008 Teddy Hogeborn & Björn Påhlsson
14
13
*
15
14
* This program is free software: you can redistribute it and/or
16
15
* modify it under the terms of the GNU General Public License as
36
35
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), asprintf() */
37
36
38
37
#include <stdio.h> /* fprintf(), stderr, fwrite(),
39
stdout, ferror(), sscanf(),
40
remove() */
38
stdout, ferror() */
41
39
#include <stdint.h> /* uint16_t, uint32_t */
42
40
#include <stddef.h> /* NULL, size_t, ssize_t */
43
41
#include <stdlib.h> /* free(), EXIT_SUCCESS, EXIT_FAILURE,
49
47
#include <sys/types.h> /* socket(), inet_pton(), sockaddr,
50
48
sockaddr_in6, PF_INET6,
51
49
SOCK_STREAM, INET6_ADDRSTRLEN,
52
uid_t, gid_t, open(), opendir(),
53
DIR */
50
uid_t, gid_t, open(), opendir(), DIR */
54
51
#include <sys/stat.h> /* open() */
55
52
#include <sys/socket.h> /* socket(), struct sockaddr_in6,
56
53
struct in6_addr, inet_pton(),
57
54
connect() */
58
55
#include <fcntl.h> /* open() */
59
#include <dirent.h> /* opendir(), struct dirent, readdir()
60
*/
61
#include <inttypes.h> /* PRIu16, intmax_t, SCNdMAX */
56
#include <dirent.h> /* opendir(), struct dirent, readdir() */
57
#include <inttypes.h> /* PRIu16 */
62
58
#include <assert.h> /* assert() */
63
59
#include <errno.h> /* perror(), errno */
64
#include <time.h> /* nanosleep(), time() */
60
#include <time.h> /* time() */
65
61
#include <net/if.h> /* ioctl, ifreq, SIOCGIFFLAGS, IFF_UP,
66
62
SIOCSIFFLAGS, if_indextoname(),
67
63
if_nametoindex(), IF_NAMESIZE */
70
66
getuid(), getgid(), setuid(),
71
67
setgid() */
72
68
#include <arpa/inet.h> /* inet_pton(), htons */
73
#include <iso646.h> /* not, and, or */
69
#include <iso646.h> /* not, and */
74
70
#include <argp.h> /* struct argp_option, error_t, struct
75
71
argp_state, struct argp,
76
72
argp_parse(), ARGP_KEY_ARG,
77
73
ARGP_KEY_END, ARGP_ERR_UNKNOWN */
78
#include <sys/klog.h> /* klogctl() */
79
74
80
75
/* Avahi */
81
76
/* All Avahi types, constants and functions
94
89
gnutls_*
95
90
init_gnutls_session(),
96
91
GNUTLS_* */
97
#include <gnutls/openpgp.h>
98
/* gnutls_certificate_set_openpgp_key_file(),
92
#include <gnutls/openpgp.h> /* gnutls_certificate_set_openpgp_key_file(),
99
93
GNUTLS_OPENPGP_FMT_BASE64 */
100
94
101
95
/* GPGME */
134
128
*/
135
129
size_t adjustbuffer(char **buffer, size_t buffer_length,
136
130
size_t buffer_capacity){
137
if(buffer_length + BUFFER_SIZE > buffer_capacity){
131
if (buffer_length + BUFFER_SIZE > buffer_capacity){
138
132
*buffer = realloc(*buffer, buffer_capacity + BUFFER_SIZE);
139
if(buffer == NULL){
133
if (buffer == NULL){
140
134
return 0;
141
135
}
142
136
buffer_capacity += BUFFER_SIZE;
155
149
156
150
157
151
/*
158
* Helper function to insert pub and seckey to the engine keyring.
152
* Helper function to insert pub and seckey to the enigne keyring.
159
153
*/
160
154
bool import_key(const char *filename){
161
155
int fd;
162
156
gpgme_data_t pgp_data;
163
157
164
fd = (int)TEMP_FAILURE_RETRY(open(filename, O_RDONLY));
158
fd = TEMP_FAILURE_RETRY(open(filename, O_RDONLY));
165
159
if(fd == -1){
166
160
perror("open");
167
161
return false;
168
162
}
169
163
170
164
rc = gpgme_data_new_from_fd(&pgp_data, fd);
171
if(rc != GPG_ERR_NO_ERROR){
165
if (rc != GPG_ERR_NO_ERROR){
172
166
fprintf(stderr, "bad gpgme_data_new_from_fd: %s: %s\n",
173
167
gpgme_strsource(rc), gpgme_strerror(rc));
174
168
return false;
175
169
}
176
170
177
171
rc = gpgme_op_import(mc->ctx, pgp_data);
178
if(rc != GPG_ERR_NO_ERROR){
172
if (rc != GPG_ERR_NO_ERROR){
179
173
fprintf(stderr, "bad gpgme_op_import: %s: %s\n",
180
174
gpgme_strsource(rc), gpgme_strerror(rc));
181
175
return false;
182
176
}
183
177
184
ret = (int)TEMP_FAILURE_RETRY(close(fd));
178
ret = TEMP_FAILURE_RETRY(close(fd));
185
179
if(ret == -1){
186
180
perror("close");
187
181
}
189
183
return true;
190
184
}
191
185
192
if(debug){
186
if (debug){
193
187
fprintf(stderr, "Initialize gpgme\n");
194
188
}
195
189
196
190
/* Init GPGME */
197
191
gpgme_check_version(NULL);
198
192
rc = gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP);
199
if(rc != GPG_ERR_NO_ERROR){
193
if (rc != GPG_ERR_NO_ERROR){
200
194
fprintf(stderr, "bad gpgme_engine_check_version: %s: %s\n",
201
195
gpgme_strsource(rc), gpgme_strerror(rc));
202
196
return false;
203
197
}
204
198
205
199
/* Set GPGME home directory for the OpenPGP engine only */
206
rc = gpgme_get_engine_info(&engine_info);
207
if(rc != GPG_ERR_NO_ERROR){
200
rc = gpgme_get_engine_info (&engine_info);
201
if (rc != GPG_ERR_NO_ERROR){
208
202
fprintf(stderr, "bad gpgme_get_engine_info: %s: %s\n",
209
203
gpgme_strsource(rc), gpgme_strerror(rc));
210
204
return false;
224
218
225
219
/* Create new GPGME "context" */
226
220
rc = gpgme_new(&(mc->ctx));
227
if(rc != GPG_ERR_NO_ERROR){
221
if (rc != GPG_ERR_NO_ERROR){
228
222
fprintf(stderr, "bad gpgme_new: %s: %s\n",
229
223
gpgme_strsource(rc), gpgme_strerror(rc));
230
224
return false;
231
225
}
232
226
233
if(not import_key(pubkey) or not import_key(seckey)){
227
if (not import_key(pubkey) or not import_key(seckey)){
234
228
return false;
235
229
}
236
230
241
235
* Decrypt OpenPGP data.
242
236
* Returns -1 on error
243
237
*/
244
static ssize_t pgp_packet_decrypt(const mandos_context *mc,
245
const char *cryptotext,
246
size_t crypto_size,
247
char **plaintext){
238
static ssize_t pgp_packet_decrypt (const mandos_context *mc,
239
const char *cryptotext,
240
size_t crypto_size,
241
char **plaintext){
248
242
gpgme_data_t dh_crypto, dh_plain;
249
243
gpgme_error_t rc;
250
244
ssize_t ret;
251
245
size_t plaintext_capacity = 0;
252
246
ssize_t plaintext_length = 0;
253
247
254
if(debug){
248
if (debug){
255
249
fprintf(stderr, "Trying to decrypt OpenPGP data\n");
256
250
}
257
251
258
252
/* Create new GPGME data buffer from memory cryptotext */
259
253
rc = gpgme_data_new_from_mem(&dh_crypto, cryptotext, crypto_size,
260
254
0);
261
if(rc != GPG_ERR_NO_ERROR){
255
if (rc != GPG_ERR_NO_ERROR){
262
256
fprintf(stderr, "bad gpgme_data_new_from_mem: %s: %s\n",
263
257
gpgme_strsource(rc), gpgme_strerror(rc));
264
258
return -1;
266
260
267
261
/* Create new empty GPGME data buffer for the plaintext */
268
262
rc = gpgme_data_new(&dh_plain);
269
if(rc != GPG_ERR_NO_ERROR){
263
if (rc != GPG_ERR_NO_ERROR){
270
264
fprintf(stderr, "bad gpgme_data_new: %s: %s\n",
271
265
gpgme_strsource(rc), gpgme_strerror(rc));
272
266
gpgme_data_release(dh_crypto);
276
270
/* Decrypt data from the cryptotext data buffer to the plaintext
277
271
data buffer */
278
272
rc = gpgme_op_decrypt(mc->ctx, dh_crypto, dh_plain);
279
if(rc != GPG_ERR_NO_ERROR){
273
if (rc != GPG_ERR_NO_ERROR){
280
274
fprintf(stderr, "bad gpgme_op_decrypt: %s: %s\n",
281
275
gpgme_strsource(rc), gpgme_strerror(rc));
282
276
plaintext_length = -1;
283
if(debug){
277
if (debug){
284
278
gpgme_decrypt_result_t result;
285
279
result = gpgme_op_decrypt_result(mc->ctx);
286
if(result == NULL){
280
if (result == NULL){
287
281
fprintf(stderr, "gpgme_op_decrypt_result failed\n");
288
282
} else {
289
283
fprintf(stderr, "Unsupported algorithm: %s\n",
316
310
}
317
311
318
312
/* Seek back to the beginning of the GPGME plaintext data buffer */
319
if(gpgme_data_seek(dh_plain, (off_t)0, SEEK_SET) == -1){
313
if (gpgme_data_seek(dh_plain, (off_t) 0, SEEK_SET) == -1){
320
314
perror("gpgme_data_seek");
321
315
plaintext_length = -1;
322
316
goto decrypt_end;
327
321
plaintext_capacity = adjustbuffer(plaintext,
328
322
(size_t)plaintext_length,
329
323
plaintext_capacity);
330
if(plaintext_capacity == 0){
324
if (plaintext_capacity == 0){
331
325
perror("adjustbuffer");
332
326
plaintext_length = -1;
333
327
goto decrypt_end;
336
330
ret = gpgme_data_read(dh_plain, *plaintext + plaintext_length,
337
331
BUFFER_SIZE);
338
332
/* Print the data, if any */
339
if(ret == 0){
333
if (ret == 0){
340
334
/* EOF */
341
335
break;
342
336
}
366
360
return plaintext_length;
367
361
}
368
362
369
static const char * safer_gnutls_strerror(int value) {
370
const char *ret = gnutls_strerror(value); /* Spurious warning from
371
-Wunreachable-code */
372
if(ret == NULL)
363
static const char * safer_gnutls_strerror (int value) {
364
const char *ret = gnutls_strerror (value); /* Spurious warning */
365
if (ret == NULL)
373
366
ret = "(unknown)";
374
367
return ret;
375
368
}
390
383
}
391
384
392
385
ret = gnutls_global_init();
393
if(ret != GNUTLS_E_SUCCESS) {
394
fprintf(stderr, "GnuTLS global_init: %s\n",
395
safer_gnutls_strerror(ret));
386
if (ret != GNUTLS_E_SUCCESS) {
387
fprintf (stderr, "GnuTLS global_init: %s\n",
388
safer_gnutls_strerror(ret));
396
389
return -1;
397
390
}
398
391
399
if(debug){
392
if (debug){
400
393
/* "Use a log level over 10 to enable all debugging options."
401
394
* - GnuTLS manual
402
395
*/
406
399
407
400
/* OpenPGP credentials */
408
401
gnutls_certificate_allocate_credentials(&mc->cred);
409
if(ret != GNUTLS_E_SUCCESS){
410
fprintf(stderr, "GnuTLS memory error: %s\n", /* Spurious warning
411
* from
412
* -Wunreachable-code
413
*/
414
safer_gnutls_strerror(ret));
415
gnutls_global_deinit();
402
if (ret != GNUTLS_E_SUCCESS){
403
fprintf (stderr, "GnuTLS memory error: %s\n", /* Spurious
404
warning */
405
safer_gnutls_strerror(ret));
406
gnutls_global_deinit ();
416
407
return -1;
417
408
}
418
409
425
416
ret = gnutls_certificate_set_openpgp_key_file
426
417
(mc->cred, pubkeyfilename, seckeyfilename,
427
418
GNUTLS_OPENPGP_FMT_BASE64);
428
if(ret != GNUTLS_E_SUCCESS) {
419
if (ret != GNUTLS_E_SUCCESS) {
429
420
fprintf(stderr,
430
421
"Error[%d] while reading the OpenPGP key pair ('%s',"
431
422
" '%s')\n", ret, pubkeyfilename, seckeyfilename);
436
427
437
428
/* GnuTLS server initialization */
438
429
ret = gnutls_dh_params_init(&mc->dh_params);
439
if(ret != GNUTLS_E_SUCCESS) {
440
fprintf(stderr, "Error in GnuTLS DH parameter initialization:"
441
" %s\n", safer_gnutls_strerror(ret));
430
if (ret != GNUTLS_E_SUCCESS) {
431
fprintf (stderr, "Error in GnuTLS DH parameter initialization:"
432
" %s\n", safer_gnutls_strerror(ret));
442
433
goto globalfail;
443
434
}
444
435
ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits);
445
if(ret != GNUTLS_E_SUCCESS) {
446
fprintf(stderr, "Error in GnuTLS prime generation: %s\n",
447
safer_gnutls_strerror(ret));
436
if (ret != GNUTLS_E_SUCCESS) {
437
fprintf (stderr, "Error in GnuTLS prime generation: %s\n",
438
safer_gnutls_strerror(ret));
448
439
goto globalfail;
449
440
}
450
441
465
456
int ret;
466
457
/* GnuTLS session creation */
467
458
ret = gnutls_init(session, GNUTLS_SERVER);
468
if(ret != GNUTLS_E_SUCCESS){
459
if (ret != GNUTLS_E_SUCCESS){
469
460
fprintf(stderr, "Error in GnuTLS session initialization: %s\n",
470
461
safer_gnutls_strerror(ret));
471
462
}
473
464
{
474
465
const char *err;
475
466
ret = gnutls_priority_set_direct(*session, mc->priority, &err);
476
if(ret != GNUTLS_E_SUCCESS) {
467
if (ret != GNUTLS_E_SUCCESS) {
477
468
fprintf(stderr, "Syntax error at: %s\n", err);
478
469
fprintf(stderr, "GnuTLS error: %s\n",
479
470
safer_gnutls_strerror(ret));
480
gnutls_deinit(*session);
471
gnutls_deinit (*session);
481
472
return -1;
482
473
}
483
474
}
484
475
485
476
ret = gnutls_credentials_set(*session, GNUTLS_CRD_CERTIFICATE,
486
477
mc->cred);
487
if(ret != GNUTLS_E_SUCCESS) {
478
if (ret != GNUTLS_E_SUCCESS) {
488
479
fprintf(stderr, "Error setting GnuTLS credentials: %s\n",
489
480
safer_gnutls_strerror(ret));
490
gnutls_deinit(*session);
481
gnutls_deinit (*session);
491
482
return -1;
492
483
}
493
484
494
485
/* ignore client certificate if any. */
495
gnutls_certificate_server_set_request(*session,
496
GNUTLS_CERT_IGNORE);
486
gnutls_certificate_server_set_request (*session,
487
GNUTLS_CERT_IGNORE);
497
488
498
gnutls_dh_set_prime_bits(*session, mc->dh_bits);
489
gnutls_dh_set_prime_bits (*session, mc->dh_bits);
499
490
500
491
return 0;
501
492
}
509
500
AvahiIfIndex if_index,
510
501
mandos_context *mc){
511
502
int ret, tcp_sd;
512
ssize_t sret;
513
503
union { struct sockaddr in; struct sockaddr_in6 in6; } to;
514
504
char *buffer = NULL;
515
505
char *decrypted_buffer;
521
511
char interface[IF_NAMESIZE];
522
512
gnutls_session_t session;
523
513
524
ret = init_gnutls_session(mc, &session);
525
if(ret != 0){
514
ret = init_gnutls_session (mc, &session);
515
if (ret != 0){
526
516
return -1;
527
517
}
528
518
550
540
/* It would be nice to have a way to detect if we were passed an
551
541
IPv4 address here. Now we assume an IPv6 address. */
552
542
ret = inet_pton(AF_INET6, ip, &to.in6.sin6_addr);
553
if(ret < 0 ){
543
if (ret < 0 ){
554
544
perror("inet_pton");
555
545
return -1;
556
546
}
558
548
fprintf(stderr, "Bad address: %s\n", ip);
559
549
return -1;
560
550
}
561
to.in6.sin6_port = htons(port); /* Spurious warnings from
562
-Wconversion and
563
-Wunreachable-code */
551
to.in6.sin6_port = htons(port); /* Spurious warning */
564
552
565
553
to.in6.sin6_scope_id = (uint32_t)if_index;
566
554
579
567
}
580
568
581
569
ret = connect(tcp_sd, &to.in, sizeof(to));
582
if(ret < 0){
570
if (ret < 0){
583
571
perror("connect");
584
572
return -1;
585
573
}
586
574
587
575
const char *out = mandos_protocol_version;
588
576
written = 0;
589
while(true){
577
while (true){
590
578
size_t out_size = strlen(out);
591
ret = (int)TEMP_FAILURE_RETRY(write(tcp_sd, out + written,
579
ret = TEMP_FAILURE_RETRY(write(tcp_sd, out + written,
592
580
out_size - written));
593
if(ret == -1){
581
if (ret == -1){
594
582
perror("write");
595
583
retval = -1;
596
584
goto mandos_end;
599
587
if(written < out_size){
600
588
continue;
601
589
} else {
602
if(out == mandos_protocol_version){
590
if (out == mandos_protocol_version){
603
591
written = 0;
604
592
out = "\r\n";
605
593
} else {
612
600
fprintf(stderr, "Establishing TLS session with %s\n", ip);
613
601
}
614
602
615
gnutls_transport_set_ptr(session, (gnutls_transport_ptr_t) tcp_sd);
603
gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) tcp_sd);
616
604
617
605
do{
618
ret = gnutls_handshake(session);
606
ret = gnutls_handshake (session);
619
607
} while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED);
620
608
621
if(ret != GNUTLS_E_SUCCESS){
609
if (ret != GNUTLS_E_SUCCESS){
622
610
if(debug){
623
611
fprintf(stderr, "*** GnuTLS Handshake failed ***\n");
624
gnutls_perror(ret);
612
gnutls_perror (ret);
625
613
}
626
614
retval = -1;
627
615
goto mandos_end;
637
625
while(true){
638
626
buffer_capacity = adjustbuffer(&buffer, buffer_length,
639
627
buffer_capacity);
640
if(buffer_capacity == 0){
628
if (buffer_capacity == 0){
641
629
perror("adjustbuffer");
642
630
retval = -1;
643
631
goto mandos_end;
644
632
}
645
633
646
sret = gnutls_record_recv(session, buffer+buffer_length,
647
BUFFER_SIZE);
648
if(sret == 0){
634
ret = gnutls_record_recv(session, buffer+buffer_length,
635
BUFFER_SIZE);
636
if (ret == 0){
649
637
break;
650
638
}
651
if(sret < 0){
652
switch(sret){
639
if (ret < 0){
640
switch(ret){
653
641
case GNUTLS_E_INTERRUPTED:
654
642
case GNUTLS_E_AGAIN:
655
643
break;
656
644
case GNUTLS_E_REHANDSHAKE:
657
645
do{
658
ret = gnutls_handshake(session);
646
ret = gnutls_handshake (session);
659
647
} while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED);
660
if(ret < 0){
648
if (ret < 0){
661
649
fprintf(stderr, "*** GnuTLS Re-handshake failed ***\n");
662
gnutls_perror(ret);
650
gnutls_perror (ret);
663
651
retval = -1;
664
652
goto mandos_end;
665
653
}
668
656
fprintf(stderr, "Unknown error while reading data from"
669
657
" encrypted session with Mandos server\n");
670
658
retval = -1;
671
gnutls_bye(session, GNUTLS_SHUT_RDWR);
659
gnutls_bye (session, GNUTLS_SHUT_RDWR);
672
660
goto mandos_end;
673
661
}
674
662
} else {
675
buffer_length += (size_t) sret;
663
buffer_length += (size_t) ret;
676
664
}
677
665
}
678
666
680
668
fprintf(stderr, "Closing TLS session\n");
681
669
}
682
670
683
gnutls_bye(session, GNUTLS_SHUT_RDWR);
671
gnutls_bye (session, GNUTLS_SHUT_RDWR);
684
672
685
if(buffer_length > 0){
673
if (buffer_length > 0){
686
674
decrypted_buffer_size = pgp_packet_decrypt(mc, buffer,
687
675
buffer_length,
688
676
&decrypted_buffer);
689
if(decrypted_buffer_size >= 0){
677
if (decrypted_buffer_size >= 0){
690
678
written = 0;
691
679
while(written < (size_t) decrypted_buffer_size){
692
ret = (int)fwrite(decrypted_buffer + written, 1,
693
(size_t)decrypted_buffer_size - written,
694
stdout);
680
ret = (int)fwrite (decrypted_buffer + written, 1,
681
(size_t)decrypted_buffer_size - written,
682
stdout);
695
683
if(ret == 0 and ferror(stdout)){
696
684
if(debug){
697
685
fprintf(stderr, "Error writing encrypted data: %s\n",
714
702
715
703
mandos_end:
716
704
free(buffer);
717
ret = (int)TEMP_FAILURE_RETRY(close(tcp_sd));
705
ret = TEMP_FAILURE_RETRY(close(tcp_sd));
718
706
if(ret == -1){
719
707
perror("close");
720
708
}
721
gnutls_deinit(session);
709
gnutls_deinit (session);
722
710
return retval;
723
711
}
724
712
742
730
/* Called whenever a service has been resolved successfully or
743
731
timed out */
744
732
745
switch(event) {
733
switch (event) {
746
734
default:
747
735
case AVAHI_RESOLVER_FAILURE:
748
736
fprintf(stderr, "(Avahi Resolver) Failed to resolve service '%s'"
756
744
avahi_address_snprint(ip, sizeof(ip), address);
757
745
if(debug){
758
746
fprintf(stderr, "Mandos server \"%s\" found on %s (%s, %"
759
PRIdMAX ") on port %" PRIu16 "\n", name, host_name,
760
ip, (intmax_t)interface, port);
747
PRIu16 ") on port %d\n", name, host_name, ip,
748
interface, port);
761
749
}
762
750
int ret = start_mandos_communication(ip, port, interface, mc);
763
if(ret == 0){
751
if (ret == 0){
764
752
avahi_simple_poll_quit(mc->simple_poll);
765
753
}
766
754
}
784
772
/* Called whenever a new services becomes available on the LAN or
785
773
is removed from the LAN */
786
774
787
switch(event) {
775
switch (event) {
788
776
default:
789
777
case AVAHI_BROWSER_FAILURE:
790
778
799
787
the callback function is called the Avahi server will free the
800
788
resolver for us. */
801
789
802
if(!(avahi_s_service_resolver_new(mc->server, interface,
790
if (!(avahi_s_service_resolver_new(mc->server, interface,
803
791
protocol, name, type, domain,
804
792
AVAHI_PROTO_INET6, 0,
805
793
resolve_callback, mc)))
823
811
AvahiSServiceBrowser *sb = NULL;
824
812
int error;
825
813
int ret;
826
intmax_t tmpmax;
827
int numchars;
828
814
int exitcode = EXIT_SUCCESS;
829
815
const char *interface = "eth0";
830
816
struct ifreq network;
833
819
gid_t gid;
834
820
char *connect_to = NULL;
835
821
char tempdir[] = "/tmp/mandosXXXXXX";
836
bool tempdir_created = false;
837
822
AvahiIfIndex if_index = AVAHI_IF_UNSPEC;
838
823
const char *seckey = PATHDIR "/" SECKEY;
839
824
const char *pubkey = PATHDIR "/" PUBKEY;
841
826
mandos_context mc = { .simple_poll = NULL, .server = NULL,
842
827
.dh_bits = 1024, .priority = "SECURE256"
843
828
":!CTYPE-X.509:+CTYPE-OPENPGP" };
844
bool gnutls_initialized = false;
845
bool gpgme_initialized = false;
846
double delay = 2.5;
829
bool gnutls_initalized = false;
830
bool gpgme_initalized = false;
847
831
848
832
{
849
833
struct argp_option options[] = {
875
859
.arg = "STRING",
876
860
.doc = "GnuTLS priority string for the TLS handshake",
877
861
.group = 1 },
878
{ .name = "delay", .key = 131,
879
.arg = "SECONDS",
880
.doc = "Maximum delay to wait for interface startup",
881
.group = 2 },
882
862
{ .name = NULL }
883
863
};
884
864
885
error_t parse_opt(int key, char *arg,
886
struct argp_state *state) {
887
switch(key) {
865
error_t parse_opt (int key, char *arg,
866
struct argp_state *state) {
867
/* Get the INPUT argument from `argp_parse', which we know is
868
a pointer to our plugin list pointer. */
869
switch (key) {
888
870
case 128: /* --debug */
889
871
debug = true;
890
872
break;
901
883
pubkey = arg;
902
884
break;
903
885
case 129: /* --dh-bits */
904
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
905
if(ret < 1 or tmpmax != (typeof(mc.dh_bits))tmpmax
906
or arg[numchars] != '\0'){
907
fprintf(stderr, "Bad number of DH bits\n");
886
errno = 0;
887
mc.dh_bits = (unsigned int) strtol(arg, NULL, 10);
888
if (errno){
889
perror("strtol");
908
890
exit(EXIT_FAILURE);
909
891
}
910
mc.dh_bits = (typeof(mc.dh_bits))tmpmax;
911
892
break;
912
893
case 130: /* --priority */
913
894
mc.priority = arg;
914
895
break;
915
case 131: /* --delay */
916
ret = sscanf(arg, "%lf%n", &delay, &numchars);
917
if(ret < 1 or arg[numchars] != '\0'){
918
fprintf(stderr, "Bad delay\n");
919
exit(EXIT_FAILURE);
920
}
921
break;
922
896
case ARGP_KEY_ARG:
923
argp_usage(state);
897
argp_usage (state);
924
898
case ARGP_KEY_END:
925
899
break;
926
900
default:
933
907
.args_doc = "",
934
908
.doc = "Mandos client -- Get and decrypt"
935
909
" passwords from a Mandos server" };
936
ret = argp_parse(&argp, argc, argv, 0, 0, NULL);
937
if(ret == ARGP_ERR_UNKNOWN){
910
ret = argp_parse (&argp, argc, argv, 0, 0, NULL);
911
if (ret == ARGP_ERR_UNKNOWN){
938
912
fprintf(stderr, "Unknown error while parsing arguments\n");
939
913
exitcode = EXIT_FAILURE;
940
914
goto end;
943
917
944
918
/* If the interface is down, bring it up */
945
919
{
946
/* Lower kernel loglevel to KERN_NOTICE to avoid KERN_INFO
947
messages to mess up the prompt */
948
ret = klogctl(8, NULL, 5);
949
if(ret == -1){
950
perror("klogctl");
951
}
952
953
920
sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
954
921
if(sd < 0) {
955
922
perror("socket");
956
923
exitcode = EXIT_FAILURE;
957
ret = klogctl(7, NULL, 0);
958
if(ret == -1){
959
perror("klogctl");
960
}
961
924
goto end;
962
925
}
963
926
strcpy(network.ifr_name, interface);
964
927
ret = ioctl(sd, SIOCGIFFLAGS, &network);
965
928
if(ret == -1){
966
929
perror("ioctl SIOCGIFFLAGS");
967
ret = klogctl(7, NULL, 0);
968
if(ret == -1){
969
perror("klogctl");
970
}
971
930
exitcode = EXIT_FAILURE;
972
931
goto end;
973
932
}
977
936
if(ret == -1){
978
937
perror("ioctl SIOCSIFFLAGS");
979
938
exitcode = EXIT_FAILURE;
980
ret = klogctl(7, NULL, 0);
981
if(ret == -1){
982
perror("klogctl");
983
}
984
939
goto end;
985
940
}
986
941
}
987
/* sleep checking until interface is running */
988
for(int i=0; i < delay * 4; i++){
989
ret = ioctl(sd, SIOCGIFFLAGS, &network);
990
if(ret == -1){
991
perror("ioctl SIOCGIFFLAGS");
992
} else if(network.ifr_flags & IFF_RUNNING){
993
break;
994
}
995
struct timespec sleeptime = { .tv_nsec = 250000000 };
996
nanosleep(&sleeptime, NULL);
997
}
998
ret = (int)TEMP_FAILURE_RETRY(close(sd));
942
ret = TEMP_FAILURE_RETRY(close(sd));
999
943
if(ret == -1){
1000
944
perror("close");
1001
945
}
1002
/* Restores kernel loglevel to default */
1003
ret = klogctl(7, NULL, 0);
1004
if(ret == -1){
1005
perror("klogctl");
1006
}
1007
946
}
1008
947
1009
948
uid = getuid();
1010
949
gid = getgid();
1011
950
951
ret = setuid(uid);
952
if (ret == -1){
953
perror("setuid");
954
}
955
1012
956
setgid(gid);
1013
if(ret == -1){
957
if (ret == -1){
1014
958
perror("setgid");
1015
959
}
1016
960
1017
ret = setuid(uid);
1018
if(ret == -1){
1019
perror("setuid");
1020
}
1021
1022
961
ret = init_gnutls_global(&mc, pubkey, seckey);
1023
if(ret == -1){
962
if (ret == -1){
1024
963
fprintf(stderr, "init_gnutls_global failed\n");
1025
964
exitcode = EXIT_FAILURE;
1026
965
goto end;
1027
966
} else {
1028
gnutls_initialized = true;
967
gnutls_initalized = true;
1029
968
}
1030
969
1031
970
if(mkdtemp(tempdir) == NULL){
1032
971
perror("mkdtemp");
972
tempdir[0] = '\0';
1033
973
goto end;
1034
974
}
1035
tempdir_created = true;
1036
975
1037
976
if(not init_gpgme(&mc, pubkey, seckey, tempdir)){
1038
fprintf(stderr, "init_gpgme failed\n");
977
fprintf(stderr, "gpgme_initalized failed\n");
1039
978
exitcode = EXIT_FAILURE;
1040
979
goto end;
1041
980
} else {
1042
gpgme_initialized = true;
981
gpgme_initalized = true;
1043
982
}
1044
983
1045
984
if_index = (AvahiIfIndex) if_nametoindex(interface);
1046
985
if(if_index == 0){
1047
986
fprintf(stderr, "No such interface: \"%s\"\n", interface);
1048
exitcode = EXIT_FAILURE;
1049
goto end;
987
exit(EXIT_FAILURE);
1050
988
}
1051
989
1052
990
if(connect_to != NULL){
1058
996
exitcode = EXIT_FAILURE;
1059
997
goto end;
1060
998
}
1061
uint16_t port;
1062
ret = sscanf(address+1, "%" SCNdMAX "%n", &tmpmax, &numchars);
1063
if(ret < 1 or tmpmax != (uint16_t)tmpmax
1064
or address[numchars+1] != '\0'){
1065
fprintf(stderr, "Bad port number\n");
999
errno = 0;
1000
uint16_t port = (uint16_t) strtol(address+1, NULL, 10);
1001
if(errno){
1002
perror("Bad port number");
1066
1003
exitcode = EXIT_FAILURE;
1067
1004
goto end;
1068
1005
}
1069
port = (uint16_t)tmpmax;
1070
1006
*address = '\0';
1071
1007
address = connect_to;
1072
1008
ret = start_mandos_communication(address, port, if_index, &mc);
1078
1014
goto end;
1079
1015
}
1080
1016
1081
if(not debug){
1017
if (not debug){
1082
1018
avahi_set_log_function(empty_log);
1083
1019
}
1084
1020
1087
1023
1088
1024
/* Allocate main Avahi loop object */
1089
1025
mc.simple_poll = avahi_simple_poll_new();
1090
if(mc.simple_poll == NULL) {
1026
if (mc.simple_poll == NULL) {
1091
1027
fprintf(stderr, "Avahi: Failed to create simple poll"
1092
1028
" object.\n");
1093
1029
exitcode = EXIT_FAILURE;
1113
1049
}
1114
1050
1115
1051
/* Check if creating the Avahi server object succeeded */
1116
if(mc.server == NULL) {
1052
if (mc.server == NULL) {
1117
1053
fprintf(stderr, "Failed to create Avahi server: %s\n",
1118
1054
avahi_strerror(error));
1119
1055
exitcode = EXIT_FAILURE;
1125
1061
AVAHI_PROTO_INET6,
1126
1062
"_mandos._tcp", NULL, 0,
1127
1063
browse_callback, &mc);
1128
if(sb == NULL) {
1064
if (sb == NULL) {
1129
1065
fprintf(stderr, "Failed to create service browser: %s\n",
1130
1066
avahi_strerror(avahi_server_errno(mc.server)));
1131
1067
exitcode = EXIT_FAILURE;
1134
1070
1135
1071
/* Run the main loop */
1136
1072
1137
if(debug){
1073
if (debug){
1138
1074
fprintf(stderr, "Starting Avahi loop search\n");
1139
1075
}
1140
1076
1141
1077
avahi_simple_poll_loop(mc.simple_poll);
1142
1078
1143
1079
end:
1144
1080
1145
if(debug){
1081
if (debug){
1146
1082
fprintf(stderr, "%s exiting\n", argv[0]);
1147
1083
}
1148
1084
1149
1085
/* Cleanup things */
1150
if(sb != NULL)
1086
if (sb != NULL)
1151
1087
avahi_s_service_browser_free(sb);
1152
1088
1153
if(mc.server != NULL)
1089
if (mc.server != NULL)
1154
1090
avahi_server_free(mc.server);
1155
1091
1156
if(mc.simple_poll != NULL)
1092
if (mc.simple_poll != NULL)
1157
1093
avahi_simple_poll_free(mc.simple_poll);
1158
1094
1159
if(gnutls_initialized){
1095
if (gnutls_initalized){
1160
1096
gnutls_certificate_free_credentials(mc.cred);
1161
gnutls_global_deinit();
1097
gnutls_global_deinit ();
1162
1098
gnutls_dh_params_deinit(mc.dh_params);
1163
1099
}
1164
1100
1165
if(gpgme_initialized){
1101
if(gpgme_initalized){
1166
1102
gpgme_release(mc.ctx);
1167
1103
}
1168
1104
1169
1105
/* Removes the temp directory used by GPGME */
1170
if(tempdir_created){
1106
if(tempdir[0] != '\0'){
1171
1107
DIR *d;
1172
1108
struct dirent *direntry;
1173
1109
d = opendir(tempdir);
1174
1110
if(d == NULL){
1175
if(errno != ENOENT){
1176
perror("opendir");
1177
}
1111
perror("opendir");
1178
1112
} else {
1179
1113
while(true){
1180
1114
direntry = readdir(d);
1181
1115
if(direntry == NULL){
1182
1116
break;
1183
1117
}
1184
/* Skip "." and ".." */
1185
if(direntry->d_name[0] == '.'
1186
and (direntry->d_name[1] == '\0'
1187
or (direntry->d_name[1] == '.'
1188
and direntry->d_name[2] == '\0'))){
1189
continue;
1190
}
1191
char *fullname = NULL;
1192
ret = asprintf(&fullname, "%s/%s", tempdir,
1193
direntry->d_name);
1194
if(ret < 0){
1195
perror("asprintf");
1196
continue;
1197
}
1198
ret = remove(fullname);
1199
if(ret == -1){
1200
fprintf(stderr, "remove(\"%s\"): %s\n", fullname,
1201
strerror(errno));
1202
}
1203
free(fullname);
1118
if (direntry->d_type == DT_REG){
1119
char *fullname = NULL;
1120
ret = asprintf(&fullname, "%s/%s", tempdir,
1121
direntry->d_name);
1122
if(ret < 0){
1123
perror("asprintf");
1124
continue;
1125
}
1126
ret = unlink(fullname);
1127
if(ret == -1){
1128
fprintf(stderr, "unlink(\"%s\"): %s",
1129
fullname, strerror(errno));
1130
}
1131
free(fullname);
1132
}
1204
1133
}
1205
1134
closedir(d);
1206
1135
}
1207
1136
ret = rmdir(tempdir);
1208
if(ret == -1 and errno != ENOENT){
1137
if(ret == -1){
1209
1138
perror("rmdir");
1210
1139
}
1211
1140
}
1212
1141
1213
1142
return exitcode;
1214
1143
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0