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 759
- compare with another revision
- download diff
- download tarball
- view history from revision 759
- Committer: Teddy Hogeborn
- Date: 2015-07-06 20:29:34 UTC
- mfrom: (738.1.6 route-external)
- Revision ID: teddy@recompile.se-20150706202934-09j06jm2fiw1bn80
Merge change to add local route when network is "unreachable".
- files modified:
- Makefile
added
removed
plugins.d/mandos-client.c
46
46
#include <stdlib.h> /* free(), EXIT_SUCCESS, srand(),
47
47
strtof(), abort() */
48
48
#include <stdbool.h> /* bool, false, true */
49
#include <string.h> /* strcmp(), strlen(), strerror(),
50
asprintf(), strcpy() */
49
#include <string.h> /* memset(), strcmp(), strlen(),
50
strerror(), asprintf(), strcpy() */
51
51
#include <sys/ioctl.h> /* ioctl */
52
52
#include <sys/types.h> /* socket(), inet_pton(), sockaddr,
53
53
sockaddr_in6, PF_INET6,
305
305
return false;
306
306
}
307
307
308
ret = close(fd);
308
ret = (int)TEMP_FAILURE_RETRY(close(fd));
309
309
if(ret == -1){
310
310
perror_plus("close");
311
311
}
516
516
__attribute__((nonnull, warn_unused_result))
517
517
static int init_gnutls_global(const char *pubkeyfilename,
518
518
const char *seckeyfilename,
519
const char *dhparamsfilename,
520
519
mandos_context *mc){
521
520
int ret;
522
521
unsigned int uret;
576
575
safer_gnutls_strerror(ret));
577
576
goto globalfail;
578
577
}
579
/* If a Diffie-Hellman parameters file was given, try to use it */
580
if(dhparamsfilename != NULL){
581
gnutls_datum_t params = { .data = NULL, .size = 0 };
582
do {
583
int dhpfile = open(dhparamsfilename, O_RDONLY);
584
if(dhpfile == -1){
585
perror_plus("open");
586
dhparamsfilename = NULL;
587
break;
588
}
589
size_t params_capacity = 0;
578
if(mc->dh_bits == 0){
579
/* Find out the optimal number of DH bits */
580
/* Try to read the private key file */
581
gnutls_datum_t buffer = { .data = NULL, .size = 0 };
582
{
583
int secfile = open(seckeyfilename, O_RDONLY);
584
size_t buffer_capacity = 0;
590
585
while(true){
591
params_capacity = incbuffer((char **)¶ms.data,
592
(size_t)params.size,
593
(size_t)params_capacity);
594
if(params_capacity == 0){
586
buffer_capacity = incbuffer((char **)&buffer.data,
587
(size_t)buffer.size,
588
(size_t)buffer_capacity);
589
if(buffer_capacity == 0){
595
590
perror_plus("incbuffer");
596
free(params.data);
597
params.data = NULL;
598
dhparamsfilename = NULL;
591
free(buffer.data);
592
buffer.data = NULL;
599
593
break;
600
594
}
601
ssize_t bytes_read = read(dhpfile,
602
params.data + params.size,
595
ssize_t bytes_read = read(secfile, buffer.data + buffer.size,
603
596
BUFFER_SIZE);
604
597
/* EOF */
605
598
if(bytes_read == 0){
608
601
/* check bytes_read for failure */
609
602
if(bytes_read < 0){
610
603
perror_plus("read");
611
free(params.data);
612
params.data = NULL;
613
dhparamsfilename = NULL;
614
break;
615
}
616
params.size += (unsigned int)bytes_read;
617
}
618
if(params.data == NULL){
619
dhparamsfilename = NULL;
620
}
621
if(dhparamsfilename == NULL){
622
break;
623
}
624
ret = gnutls_dh_params_import_pkcs3(mc->dh_params, ¶ms,
625
GNUTLS_X509_FMT_PEM);
626
if(ret != GNUTLS_E_SUCCESS){
627
fprintf_plus(stderr, "Failed to parse DH parameters in file"
628
" \"%s\": %s\n", dhparamsfilename,
629
safer_gnutls_strerror(ret));
630
dhparamsfilename = NULL;
631
}
632
} while(false);
633
}
634
if(dhparamsfilename == NULL){
635
if(mc->dh_bits == 0){
636
/* Find out the optimal number of DH bits */
637
/* Try to read the private key file */
638
gnutls_datum_t buffer = { .data = NULL, .size = 0 };
639
do {
640
int secfile = open(seckeyfilename, O_RDONLY);
641
if(secfile == -1){
642
perror_plus("open");
643
break;
644
}
645
size_t buffer_capacity = 0;
646
while(true){
647
buffer_capacity = incbuffer((char **)&buffer.data,
648
(size_t)buffer.size,
649
(size_t)buffer_capacity);
650
if(buffer_capacity == 0){
651
perror_plus("incbuffer");
652
free(buffer.data);
653
buffer.data = NULL;
654
break;
655
}
656
ssize_t bytes_read = read(secfile,
657
buffer.data + buffer.size,
658
BUFFER_SIZE);
659
/* EOF */
660
if(bytes_read == 0){
661
break;
662
}
663
/* check bytes_read for failure */
664
if(bytes_read < 0){
665
perror_plus("read");
666
free(buffer.data);
667
buffer.data = NULL;
668
break;
669
}
670
buffer.size += (unsigned int)bytes_read;
671
}
672
close(secfile);
673
} while(false);
674
/* If successful, use buffer to parse private key */
675
gnutls_sec_param_t sec_param = GNUTLS_SEC_PARAM_ULTRA;
676
if(buffer.data != NULL){
677
{
678
gnutls_openpgp_privkey_t privkey = NULL;
679
ret = gnutls_openpgp_privkey_init(&privkey);
604
free(buffer.data);
605
buffer.data = NULL;
606
break;
607
}
608
buffer.size += (unsigned int)bytes_read;
609
}
610
close(secfile);
611
}
612
/* If successful, use buffer to parse private key */
613
gnutls_sec_param_t sec_param = GNUTLS_SEC_PARAM_ULTRA;
614
if(buffer.data != NULL){
615
{
616
gnutls_openpgp_privkey_t privkey = NULL;
617
ret = gnutls_openpgp_privkey_init(&privkey);
618
if(ret != GNUTLS_E_SUCCESS){
619
fprintf_plus(stderr, "Error initializing OpenPGP key"
620
" structure: %s", safer_gnutls_strerror(ret));
621
free(buffer.data);
622
buffer.data = NULL;
623
} else {
624
ret = gnutls_openpgp_privkey_import(privkey, &buffer,
625
GNUTLS_OPENPGP_FMT_BASE64,
626
"", 0);
680
627
if(ret != GNUTLS_E_SUCCESS){
681
fprintf_plus(stderr, "Error initializing OpenPGP key"
682
" structure: %s",
628
fprintf_plus(stderr, "Error importing OpenPGP key : %s",
683
629
safer_gnutls_strerror(ret));
684
free(buffer.data);
685
buffer.data = NULL;
686
} else {
687
ret = gnutls_openpgp_privkey_import
688
(privkey, &buffer, GNUTLS_OPENPGP_FMT_BASE64, "", 0);
689
if(ret != GNUTLS_E_SUCCESS){
690
fprintf_plus(stderr, "Error importing OpenPGP key : %s",
691
safer_gnutls_strerror(ret));
692
privkey = NULL;
693
}
694
free(buffer.data);
695
buffer.data = NULL;
696
if(privkey != NULL){
697
/* Use private key to suggest an appropriate
698
sec_param */
699
sec_param = gnutls_openpgp_privkey_sec_param(privkey);
700
gnutls_openpgp_privkey_deinit(privkey);
701
if(debug){
702
fprintf_plus(stderr, "This OpenPGP key implies using"
703
" a GnuTLS security parameter \"%s\".\n",
704
safe_string(gnutls_sec_param_get_name
705
(sec_param)));
706
}
707
}
630
privkey = NULL;
708
631
}
709
}
710
if(sec_param == GNUTLS_SEC_PARAM_UNKNOWN){
711
/* Err on the side of caution */
712
sec_param = GNUTLS_SEC_PARAM_ULTRA;
713
if(debug){
714
fprintf_plus(stderr, "Falling back to security parameter"
715
" \"%s\"\n",
716
safe_string(gnutls_sec_param_get_name
717
(sec_param)));
632
free(buffer.data);
633
buffer.data = NULL;
634
if(privkey != NULL){
635
/* Use private key to suggest an appropriate sec_param */
636
sec_param = gnutls_openpgp_privkey_sec_param(privkey);
637
gnutls_openpgp_privkey_deinit(privkey);
638
if(debug){
639
fprintf_plus(stderr, "This OpenPGP key implies using a"
640
" GnuTLS security parameter \"%s\".\n",
641
safe_string(gnutls_sec_param_get_name
642
(sec_param)));
643
}
718
644
}
719
645
}
720
646
}
721
uret = gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH, sec_param);
722
if(uret != 0){
723
mc->dh_bits = uret;
647
if(sec_param == GNUTLS_SEC_PARAM_UNKNOWN){
648
/* Err on the side of caution */
649
sec_param = GNUTLS_SEC_PARAM_ULTRA;
724
650
if(debug){
725
fprintf_plus(stderr, "A \"%s\" GnuTLS security parameter"
726
" implies %u DH bits; using that.\n",
651
fprintf_plus(stderr, "Falling back to security parameter"
652
" \"%s\"\n",
727
653
safe_string(gnutls_sec_param_get_name
728
(sec_param)),
729
mc->dh_bits);
654
(sec_param)));
730
655
}
731
} else {
732
fprintf_plus(stderr, "Failed to get implied number of DH"
733
" bits for security parameter \"%s\"): %s\n",
656
}
657
}
658
uret = gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH, sec_param);
659
if(uret != 0){
660
mc->dh_bits = uret;
661
if(debug){
662
fprintf_plus(stderr, "A \"%s\" GnuTLS security parameter"
663
" implies %u DH bits; using that.\n",
734
664
safe_string(gnutls_sec_param_get_name
735
665
(sec_param)),
736
safer_gnutls_strerror(ret));
737
goto globalfail;
666
mc->dh_bits);
738
667
}
739
} else if(debug){
740
fprintf_plus(stderr, "DH bits explicitly set to %u\n",
741
mc->dh_bits);
742
}
743
ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits);
744
if(ret != GNUTLS_E_SUCCESS){
745
fprintf_plus(stderr, "Error in GnuTLS prime generation (%u"
746
" bits): %s\n", mc->dh_bits,
668
} else {
669
fprintf_plus(stderr, "Failed to get implied number of DH"
670
" bits for security parameter \"%s\"): %s\n",
671
safe_string(gnutls_sec_param_get_name(sec_param)),
747
672
safer_gnutls_strerror(ret));
748
673
goto globalfail;
749
674
}
750
}
675
} else if(debug){
676
fprintf_plus(stderr, "DH bits explicitly set to %u\n",
677
mc->dh_bits);
678
}
679
ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits);
680
if(ret != GNUTLS_E_SUCCESS){
681
fprintf_plus(stderr, "Error in GnuTLS prime generation (%u bits):"
682
" %s\n", mc->dh_bits, safer_gnutls_strerror(ret));
683
goto globalfail;
684
}
685
751
686
gnutls_certificate_set_dh_params(mc->cred, mc->dh_params);
752
687
753
688
return 0;
813
748
/* ignore client certificate if any. */
814
749
gnutls_certificate_server_set_request(*session, GNUTLS_CERT_IGNORE);
815
750
751
gnutls_dh_set_prime_bits(*session, mc->dh_bits);
752
816
753
return 0;
817
754
}
818
755
931
868
perror_plus("dup2(devnull, STDIN_FILENO)");
932
869
_exit(EX_OSERR);
933
870
}
934
ret = close(devnull);
871
ret = (int)TEMP_FAILURE_RETRY(close(devnull));
935
872
if(ret == -1){
936
873
perror_plus("close");
937
874
_exit(EX_OSERR);
954
891
helper, O_RDONLY));
955
892
if(helper_fd == -1){
956
893
perror_plus("openat");
957
close(helperdir_fd);
958
894
_exit(EX_UNAVAILABLE);
959
895
}
960
close(helperdir_fd);
896
TEMP_FAILURE_RETRY(close(helperdir_fd));
961
897
#ifdef __GNUC__
962
898
#pragma GCC diagnostic push
963
899
#pragma GCC diagnostic ignored "-Wcast-qual"
1131
1067
goto mandos_end;
1132
1068
}
1133
1069
1070
memset(&to, 0, sizeof(to));
1134
1071
if(af == AF_INET6){
1135
struct sockaddr_in6 *to6 = (struct sockaddr_in6 *)&to;
1136
*to6 = (struct sockaddr_in6){ .sin6_family = (sa_family_t)af };
1137
ret = inet_pton(af, ip, &to6->sin6_addr);
1072
((struct sockaddr_in6 *)&to)->sin6_family = (sa_family_t)af;
1073
ret = inet_pton(af, ip, &((struct sockaddr_in6 *)&to)->sin6_addr);
1138
1074
} else { /* IPv4 */
1139
struct sockaddr_in *to4 = (struct sockaddr_in *)&to;
1140
*to4 = (struct sockaddr_in){ .sin_family = (sa_family_t)af };
1141
ret = inet_pton(af, ip, &to4->sin_addr);
1075
((struct sockaddr_in *)&to)->sin_family = (sa_family_t)af;
1076
ret = inet_pton(af, ip, &((struct sockaddr_in *)&to)->sin_addr);
1142
1077
}
1143
1078
if(ret < 0 ){
1144
1079
int e = errno;
1467
1402
free(decrypted_buffer);
1468
1403
free(buffer);
1469
1404
if(tcp_sd >= 0){
1470
ret = close(tcp_sd);
1405
ret = (int)TEMP_FAILURE_RETRY(close(tcp_sd));
1471
1406
}
1472
1407
if(ret == -1){
1473
1408
if(e == 0){
2012
1947
perror_plus("openat");
2013
1948
_exit(EXIT_FAILURE);
2014
1949
}
2015
if(close(hookdir_fd) == -1){
1950
if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){
2016
1951
perror_plus("close");
2017
1952
_exit(EXIT_FAILURE);
2018
1953
}
2021
1956
perror_plus("dup2(devnull, STDIN_FILENO)");
2022
1957
_exit(EX_OSERR);
2023
1958
}
2024
ret = close(devnull);
1959
ret = (int)TEMP_FAILURE_RETRY(close(devnull));
2025
1960
if(ret == -1){
2026
1961
perror_plus("close");
2027
1962
_exit(EX_OSERR);
2076
2011
free(direntry);
2077
2012
}
2078
2013
free(direntries);
2079
if(close(hookdir_fd) == -1){
2014
if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){
2080
2015
perror_plus("close");
2081
2016
} else {
2082
2017
hookdir_fd = -1;
2122
2057
}
2123
2058
2124
2059
if(quit_now){
2125
ret = close(sd);
2060
ret = (int)TEMP_FAILURE_RETRY(close(sd));
2126
2061
if(ret == -1){
2127
2062
perror_plus("close");
2128
2063
}
2178
2113
}
2179
2114
2180
2115
/* Close the socket */
2181
ret = close(sd);
2116
ret = (int)TEMP_FAILURE_RETRY(close(sd));
2182
2117
if(ret == -1){
2183
2118
perror_plus("close");
2184
2119
}
2266
2201
}
2267
2202
2268
2203
/* Close the socket */
2269
int ret = close(sd);
2204
int ret = (int)TEMP_FAILURE_RETRY(close(sd));
2270
2205
if(ret == -1){
2271
2206
perror_plus("close");
2272
2207
}
2288
2223
2289
2224
int main(int argc, char *argv[]){
2290
2225
mandos_context mc = { .server = NULL, .dh_bits = 0,
2291
.priority = "SECURE256:!CTYPE-X.509"
2292
":+CTYPE-OPENPGP:!RSA:+SIGN-DSA-SHA256",
2293
.current_server = NULL, .interfaces = NULL,
2294
.interfaces_size = 0 };
2226
.priority = "SECURE256:!CTYPE-X.509:"
2227
"+CTYPE-OPENPGP:!RSA", .current_server = NULL,
2228
.interfaces = NULL, .interfaces_size = 0 };
2295
2229
AvahiSServiceBrowser *sb = NULL;
2296
2230
error_t ret_errno;
2297
2231
int ret;
2306
2240
AvahiIfIndex if_index = AVAHI_IF_UNSPEC;
2307
2241
const char *seckey = PATHDIR "/" SECKEY;
2308
2242
const char *pubkey = PATHDIR "/" PUBKEY;
2309
const char *dh_params_file = NULL;
2310
2243
char *interfaces_hooks = NULL;
2311
2244
2312
2245
bool gnutls_initialized = false;
2365
2298
.doc = "Bit length of the prime number used in the"
2366
2299
" Diffie-Hellman key exchange",
2367
2300
.group = 2 },
2368
{ .name = "dh-params", .key = 134,
2369
.arg = "FILE",
2370
.doc = "PEM-encoded PKCS#3 file with pre-generated parameters"
2371
" for the Diffie-Hellman key exchange",
2372
.group = 2 },
2373
2301
{ .name = "priority", .key = 130,
2374
2302
.arg = "STRING",
2375
2303
.doc = "GnuTLS priority string for the TLS handshake",
2430
2358
}
2431
2359
mc.dh_bits = (typeof(mc.dh_bits))tmpmax;
2432
2360
break;
2433
case 134: /* --dh-params */
2434
dh_params_file = arg;
2435
break;
2436
2361
case 130: /* --priority */
2437
2362
mc.priority = arg;
2438
2363
break;
2524
2449
}
2525
2450
}
2526
2451
}
2527
close(seckey_fd);
2452
TEMP_FAILURE_RETRY(close(seckey_fd));
2528
2453
}
2529
2454
}
2530
2455
2545
2470
}
2546
2471
}
2547
2472
}
2548
close(pubkey_fd);
2549
}
2550
}
2551
2552
if(dh_params_file != NULL
2553
and strcmp(dh_params_file, PATHDIR "/dhparams.pem" ) == 0){
2554
int dhparams_fd = open(dh_params_file, O_RDONLY);
2555
if(dhparams_fd == -1){
2556
perror_plus("open");
2557
} else {
2558
ret = (int)TEMP_FAILURE_RETRY(fstat(dhparams_fd, &st));
2559
if(ret == -1){
2560
perror_plus("fstat");
2561
} else {
2562
if(S_ISREG(st.st_mode)
2563
and st.st_uid == 0 and st.st_gid == 0){
2564
ret = fchown(dhparams_fd, uid, gid);
2565
if(ret == -1){
2566
perror_plus("fchown");
2567
}
2568
}
2569
}
2570
close(dhparams_fd);
2473
TEMP_FAILURE_RETRY(close(pubkey_fd));
2571
2474
}
2572
2475
}
2573
2476
2750
2653
errno = bring_up_interface(interface, delay);
2751
2654
if(not interface_was_up){
2752
2655
if(errno != 0){
2753
fprintf_plus(stderr, "Failed to bring up interface \"%s\":"
2754
" %s\n", interface, strerror(errno));
2656
perror_plus("Failed to bring up interface");
2755
2657
} else {
2756
2658
errno = argz_add(&interfaces_to_take_down,
2757
2659
&interfaces_to_take_down_size,
2780
2682
goto end;
2781
2683
}
2782
2684
2783
ret = init_gnutls_global(pubkey, seckey, dh_params_file, &mc);
2685
ret = init_gnutls_global(pubkey, seckey, &mc);
2784
2686
if(ret == -1){
2785
2687
fprintf_plus(stderr, "init_gnutls_global failed\n");
2786
2688
exitcode = EX_UNAVAILABLE;
3086
2988
perror_plus("rmdir");
3087
2989
}
3088
2990
}
3089
close(tempdir_fd);
2991
TEMP_FAILURE_RETRY(close(tempdir_fd));
3090
2992
}
3091
2993
}
3092
2994
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0