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 738.1.5
- compare with another revision
- download diff
- download tarball
- view history from revision 738.1.5
- Committer: Teddy Hogeborn
- Date: 2015-07-05 21:38:01 UTC
- mto: This revision was merged to the branch mainline in revision 759.
- Revision ID: teddy@recompile.se-20150705213801-pi8vk0ovlumuj826
plugin-helpers/mandos-client-iprouteadddel.c: Fix #include lines.
(main): Fix minor typo in error message.
(main): Fix minor typo in error message.
- files modified:
- DBUS-API
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
}
493
493
return plaintext_length;
494
494
}
495
495
496
__attribute__((warn_unused_result, const))
497
static const char *safe_string(const char *str){
498
if(str == NULL)
499
return "(unknown)";
500
return str;
501
}
502
503
496
__attribute__((warn_unused_result))
504
497
static const char *safer_gnutls_strerror(int value){
505
498
const char *ret = gnutls_strerror(value);
506
return safe_string(ret);
499
if(ret == NULL)
500
ret = "(unknown)";
501
return ret;
507
502
}
508
503
509
504
/* GnuTLS log function callback */
516
511
__attribute__((nonnull, warn_unused_result))
517
512
static int init_gnutls_global(const char *pubkeyfilename,
518
513
const char *seckeyfilename,
519
const char *dhparamsfilename,
520
514
mandos_context *mc){
521
515
int ret;
522
unsigned int uret;
523
516
524
517
if(debug){
525
518
fprintf_plus(stderr, "Initializing GnuTLS\n");
576
569
safer_gnutls_strerror(ret));
577
570
goto globalfail;
578
571
}
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;
590
while(true){
591
params_capacity = incbuffer((char **)¶ms.data,
592
(size_t)params.size,
593
(size_t)params_capacity);
594
if(params_capacity == 0){
595
perror_plus("incbuffer");
596
free(params.data);
597
params.data = NULL;
598
dhparamsfilename = NULL;
599
break;
600
}
601
ssize_t bytes_read = read(dhpfile,
602
params.data + params.size,
603
BUFFER_SIZE);
604
/* EOF */
605
if(bytes_read == 0){
606
break;
607
}
608
/* check bytes_read for failure */
609
if(bytes_read < 0){
610
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);
680
if(ret != GNUTLS_E_SUCCESS){
681
fprintf_plus(stderr, "Error initializing OpenPGP key"
682
" structure: %s",
683
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
}
708
}
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)));
718
}
719
}
720
}
721
uret = gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH, sec_param);
722
if(uret != 0){
723
mc->dh_bits = uret;
724
if(debug){
725
fprintf_plus(stderr, "A \"%s\" GnuTLS security parameter"
726
" implies %u DH bits; using that.\n",
727
safe_string(gnutls_sec_param_get_name
728
(sec_param)),
729
mc->dh_bits);
730
}
731
} else {
732
fprintf_plus(stderr, "Failed to get implied number of DH"
733
" bits for security parameter \"%s\"): %s\n",
734
safe_string(gnutls_sec_param_get_name
735
(sec_param)),
736
safer_gnutls_strerror(ret));
737
goto globalfail;
738
}
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,
747
safer_gnutls_strerror(ret));
748
goto globalfail;
749
}
750
}
572
ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits);
573
if(ret != GNUTLS_E_SUCCESS){
574
fprintf_plus(stderr, "Error in GnuTLS prime generation: %s\n",
575
safer_gnutls_strerror(ret));
576
goto globalfail;
577
}
578
751
579
gnutls_certificate_set_dh_params(mc->cred, mc->dh_params);
752
580
753
581
return 0;
813
641
/* ignore client certificate if any. */
814
642
gnutls_certificate_server_set_request(*session, GNUTLS_CERT_IGNORE);
815
643
644
gnutls_dh_set_prime_bits(*session, mc->dh_bits);
645
816
646
return 0;
817
647
}
818
648
872
702
return ret_errno;
873
703
}
874
704
875
/* Helper function to add_local_route() and delete_local_route() */
705
/* Helper function to add_local_route() and remove_local_route() */
876
706
__attribute__((nonnull, warn_unused_result))
877
static bool add_delete_local_route(const bool add,
707
static bool add_remove_local_route(const bool add,
878
708
const char *address,
879
709
AvahiIfIndex if_index){
880
710
int ret;
881
711
char helper[] = "mandos-client-iprouteadddel";
882
712
char add_arg[] = "add";
883
713
char delete_arg[] = "delete";
884
char debug_flag[] = "--debug";
885
714
char *pluginhelperdir = getenv("MANDOSPLUGINHELPERDIR");
886
715
if(pluginhelperdir == NULL){
887
716
if(debug){
931
760
perror_plus("dup2(devnull, STDIN_FILENO)");
932
761
_exit(EX_OSERR);
933
762
}
934
ret = close(devnull);
763
ret = (int)TEMP_FAILURE_RETRY(close(devnull));
935
764
if(ret == -1){
936
765
perror_plus("close");
937
766
_exit(EX_OSERR);
954
783
helper, O_RDONLY));
955
784
if(helper_fd == -1){
956
785
perror_plus("openat");
957
close(helperdir_fd);
958
786
_exit(EX_UNAVAILABLE);
959
787
}
960
close(helperdir_fd);
788
TEMP_FAILURE_RETRY(close(helperdir_fd));
961
789
#ifdef __GNUC__
962
790
#pragma GCC diagnostic push
963
791
#pragma GCC diagnostic ignored "-Wcast-qual"
964
792
#endif
965
793
if(fexecve(helper_fd, (char *const [])
966
794
{ helper, add ? add_arg : delete_arg, (char *)address,
967
interface, debug ? debug_flag : NULL, NULL },
968
environ) == -1){
795
interface, NULL }, environ) == -1){
969
796
#ifdef __GNUC__
970
797
#pragma GCC diagnostic pop
971
798
#endif
1023
850
__attribute__((nonnull, warn_unused_result))
1024
851
static bool add_local_route(const char *address,
1025
852
AvahiIfIndex if_index){
1026
if(debug){
1027
fprintf_plus(stderr, "Adding route to %s\n", address);
1028
}
1029
return add_delete_local_route(true, address, if_index);
853
return add_remove_local_route(true, address, if_index);
1030
854
}
1031
855
1032
856
__attribute__((nonnull, warn_unused_result))
1033
static bool delete_local_route(const char *address,
857
static bool remove_local_route(const char *address,
1034
858
AvahiIfIndex if_index){
1035
if(debug){
1036
fprintf_plus(stderr, "Removing route to %s\n", address);
1037
}
1038
return add_delete_local_route(false, address, if_index);
859
return add_remove_local_route(false, address, if_index);
1039
860
}
1040
861
1041
862
/* Called when a Mandos server is found */
1131
952
goto mandos_end;
1132
953
}
1133
954
955
memset(&to, 0, sizeof(to));
1134
956
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);
957
((struct sockaddr_in6 *)&to)->sin6_family = (sa_family_t)af;
958
ret = inet_pton(af, ip, &((struct sockaddr_in6 *)&to)->sin6_addr);
1138
959
} 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);
960
((struct sockaddr_in *)&to)->sin_family = (sa_family_t)af;
961
ret = inet_pton(af, ip, &((struct sockaddr_in *)&to)->sin_addr);
1142
962
}
1143
963
if(ret < 0 ){
1144
964
int e = errno;
1223
1043
sizeof(struct sockaddr_in));
1224
1044
}
1225
1045
if(ret < 0){
1226
if(((errno == ENETUNREACH) or (errno == EHOSTUNREACH))
1046
if(errno == ENETUNREACH
1227
1047
and if_index != AVAHI_IF_UNSPEC
1228
1048
and connect_to == NULL
1229
1049
and not route_added and
1245
1065
http://lists.freedesktop.org/archives/avahi/2010-February/001833.html
1246
1066
https://bugs.debian.org/587961
1247
1067
*/
1248
if(debug){
1249
fprintf_plus(stderr, "Mandos server unreachable, trying"
1250
" direct route\n");
1251
}
1252
1068
int e = errno;
1253
1069
route_added = add_local_route(ip, if_index);
1254
1070
if(route_added){
1458
1274
mandos_end:
1459
1275
{
1460
1276
if(route_added){
1461
if(not delete_local_route(ip, if_index)){
1462
fprintf_plus(stderr, "Failed to delete local route to %s on"
1277
if(not remove_local_route(ip, if_index)){
1278
fprintf_plus(stderr, "Failed to remove local route to %s on"
1463
1279
" interface %d", ip, if_index);
1464
1280
}
1465
1281
}
1467
1283
free(decrypted_buffer);
1468
1284
free(buffer);
1469
1285
if(tcp_sd >= 0){
1470
ret = close(tcp_sd);
1286
ret = (int)TEMP_FAILURE_RETRY(close(tcp_sd));
1471
1287
}
1472
1288
if(ret == -1){
1473
1289
if(e == 0){
2012
1828
perror_plus("openat");
2013
1829
_exit(EXIT_FAILURE);
2014
1830
}
2015
if(close(hookdir_fd) == -1){
1831
if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){
2016
1832
perror_plus("close");
2017
1833
_exit(EXIT_FAILURE);
2018
1834
}
2021
1837
perror_plus("dup2(devnull, STDIN_FILENO)");
2022
1838
_exit(EX_OSERR);
2023
1839
}
2024
ret = close(devnull);
1840
ret = (int)TEMP_FAILURE_RETRY(close(devnull));
2025
1841
if(ret == -1){
2026
1842
perror_plus("close");
2027
1843
_exit(EX_OSERR);
2076
1892
free(direntry);
2077
1893
}
2078
1894
free(direntries);
2079
if(close(hookdir_fd) == -1){
1895
if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){
2080
1896
perror_plus("close");
2081
1897
} else {
2082
1898
hookdir_fd = -1;
2122
1938
}
2123
1939
2124
1940
if(quit_now){
2125
ret = close(sd);
1941
ret = (int)TEMP_FAILURE_RETRY(close(sd));
2126
1942
if(ret == -1){
2127
1943
perror_plus("close");
2128
1944
}
2178
1994
}
2179
1995
2180
1996
/* Close the socket */
2181
ret = close(sd);
1997
ret = (int)TEMP_FAILURE_RETRY(close(sd));
2182
1998
if(ret == -1){
2183
1999
perror_plus("close");
2184
2000
}
2266
2082
}
2267
2083
2268
2084
/* Close the socket */
2269
int ret = close(sd);
2085
int ret = (int)TEMP_FAILURE_RETRY(close(sd));
2270
2086
if(ret == -1){
2271
2087
perror_plus("close");
2272
2088
}
2287
2103
}
2288
2104
2289
2105
int main(int argc, char *argv[]){
2290
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 };
2106
mandos_context mc = { .server = NULL, .dh_bits = 1024,
2107
.priority = "SECURE256:!CTYPE-X.509:"
2108
"+CTYPE-OPENPGP", .current_server = NULL,
2109
.interfaces = NULL, .interfaces_size = 0 };
2295
2110
AvahiSServiceBrowser *sb = NULL;
2296
2111
error_t ret_errno;
2297
2112
int ret;
2306
2121
AvahiIfIndex if_index = AVAHI_IF_UNSPEC;
2307
2122
const char *seckey = PATHDIR "/" SECKEY;
2308
2123
const char *pubkey = PATHDIR "/" PUBKEY;
2309
const char *dh_params_file = NULL;
2310
2124
char *interfaces_hooks = NULL;
2311
2125
2312
2126
bool gnutls_initialized = false;
2365
2179
.doc = "Bit length of the prime number used in the"
2366
2180
" Diffie-Hellman key exchange",
2367
2181
.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
2182
{ .name = "priority", .key = 130,
2374
2183
.arg = "STRING",
2375
2184
.doc = "GnuTLS priority string for the TLS handshake",
2430
2239
}
2431
2240
mc.dh_bits = (typeof(mc.dh_bits))tmpmax;
2432
2241
break;
2433
case 134: /* --dh-params */
2434
dh_params_file = arg;
2435
break;
2436
2242
case 130: /* --priority */
2437
2243
mc.priority = arg;
2438
2244
break;
2524
2330
}
2525
2331
}
2526
2332
}
2527
close(seckey_fd);
2333
TEMP_FAILURE_RETRY(close(seckey_fd));
2528
2334
}
2529
2335
}
2530
2336
2545
2351
}
2546
2352
}
2547
2353
}
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);
2354
TEMP_FAILURE_RETRY(close(pubkey_fd));
2571
2355
}
2572
2356
}
2573
2357
2750
2534
errno = bring_up_interface(interface, delay);
2751
2535
if(not interface_was_up){
2752
2536
if(errno != 0){
2753
fprintf_plus(stderr, "Failed to bring up interface \"%s\":"
2754
" %s\n", interface, strerror(errno));
2537
perror_plus("Failed to bring up interface");
2755
2538
} else {
2756
2539
errno = argz_add(&interfaces_to_take_down,
2757
2540
&interfaces_to_take_down_size,
2780
2563
goto end;
2781
2564
}
2782
2565
2783
ret = init_gnutls_global(pubkey, seckey, dh_params_file, &mc);
2566
ret = init_gnutls_global(pubkey, seckey, &mc);
2784
2567
if(ret == -1){
2785
2568
fprintf_plus(stderr, "init_gnutls_global failed\n");
2786
2569
exitcode = EX_UNAVAILABLE;
3086
2869
perror_plus("rmdir");
3087
2870
}
3088
2871
}
3089
close(tempdir_fd);
2872
TEMP_FAILURE_RETRY(close(tempdir_fd));
3090
2873
}
3091
2874
}
3092
2875
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0