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 785
- compare with another revision
- download diff
- download tarball
- view history from revision 785
- Committer: Teddy Hogeborn
- Date: 2015-08-10 09:00:23 UTC
- Revision ID: teddy@recompile.se-20150810090023-fz6vjqr7zf33e2tf
Support the standard org.freedesktop.DBus.ObjectManager interface.
Now that the D-Bus standard has an interface to keep track of new and
removed objects, use that instead of our own methods. This deprecates
our D-Bus methods "GetAllClients" and "GetAllClientsWithProperties"
and the signals "ClientAdded" and "ClientRemoved", all on the server
interface "se.recompile.Mandos".
* DBUS-API: Removed references to deprecated methods and signals;
insert reference to the org.freedesktop.DBus.ObjectManager
interface.
* mandos (DBusObjectWithProperties._get_all_interface_names): New.
(dbus.OBJECT_MANAGER_IFACE): If not present, monkey patch.
(DBusObjectWithObjectManager): New.
(main/MandosDBusService): Inherit from DBusObjectWithObjectManager.
(main/MandosDBusService.ClientRemoved): Annotate as deprecated.
(main/MandosDBusService.GetAllClients): - '' -
(main/MandosDBusService.GetAllClientsWithProperties): Annotate as
deprecated.
Also only
return
properties on
client
interface.
(main/MandosDBusService.RemoveClient): Call client_removed_signal
instead of ClientRemoved.
(main/MandosDBusService.GetManagedObjects): New.
(main/MandosDBusService.client_added_signal): New.
(main/MandosDBusService.client_removed_signal): - '' -
(main/cleanup): Call "client_removed_signal" instead of sending
"ClientRemoved" signal directly.
(main): Call "client_added_signal" instead of sending "ClientAdded"
signal directly.
* mandos-ctl: Use GetManagedObjects instead of
GetAllClientsWithProperties. Also, show better error
message in case of failure to connect to the D-Bus
* mandos-monitor (MandosClientPropertyCache.properties_changed):
Bug fix; only update properties on client interface.
(UserInterface.find_and_remove_client): Change to accept arguments
from InterfacesRemoved
signal. Also, bug fix:
working error message when
removing unknown client.
(UserInterface.add_new_client): Change to accept arguments from
InterfacesRemoved signal. Pass
properties to MandosClientWidget
constructor.
(UserInterface.run): Connect find_and_remove_client method to
InterfacesRemoved signal and the add_new_client
method to the InterfacesAdded signal.
Now that the D-Bus standard has an interface to keep track of new and
removed objects, use that instead of our own methods. This deprecates
our D-Bus methods "GetAllClients" and "GetAllClientsWithProperties"
and the signals "ClientAdded" and "ClientRemoved", all on the server
interface "se.recompile.Mandos".
* DBUS-API: Removed references to deprecated methods and signals;
insert reference to the org.freedesktop.DBus.ObjectManager
interface.
* mandos (DBusObjectWithProperties._get_all_interface_names): New.
(dbus.OBJECT_MANAGER_IFACE): If not present, monkey patch.
(DBusObjectWithObjectManager): New.
(main/MandosDBusService): Inherit from DBusObjectWithObjectManager.
(main/MandosDBusService.ClientRemoved): Annotate as deprecated.
(main/MandosDBusService.GetAllClients): - '' -
(main/MandosDBusService.GetAllClientsWithProperties): Annotate as
deprecated.
Also only
return
properties on
client
interface.
(main/MandosDBusService.RemoveClient): Call client_removed_signal
instead of ClientRemoved.
(main/MandosDBusService.GetManagedObjects): New.
(main/MandosDBusService.client_added_signal): New.
(main/MandosDBusService.client_removed_signal): - '' -
(main/cleanup): Call "client_removed_signal" instead of sending
"ClientRemoved" signal directly.
(main): Call "client_added_signal" instead of sending "ClientAdded"
signal directly.
* mandos-ctl: Use GetManagedObjects instead of
GetAllClientsWithProperties. Also, show better error
message in case of failure to connect to the D-Bus
* mandos-monitor (MandosClientPropertyCache.properties_changed):
Bug fix; only update properties on client interface.
(UserInterface.find_and_remove_client): Change to accept arguments
from InterfacesRemoved
signal. Also, bug fix:
working error message when
removing unknown client.
(UserInterface.add_new_client): Change to accept arguments from
InterfacesRemoved signal. Pass
properties to MandosClientWidget
constructor.
(UserInterface.run): Connect find_and_remove_client method to
InterfacesRemoved signal and the add_new_client
method to the InterfacesAdded signal.
- files added:
- plugin-helpers
- files modified:
- DBUS-API
added
removed
plugins.d/mandos-client.c
9
9
* "browse_callback", and parts of "main".
10
10
*
11
11
* Everything else is
12
* Copyright © 2008-2014 Teddy Hogeborn
13
* Copyright © 2008-2014 Björn Påhlsson
12
* Copyright © 2008-2015 Teddy Hogeborn
13
* Copyright © 2008-2015 Björn Påhlsson
14
14
*
15
15
* This program is free software: you can redistribute it and/or
16
16
* modify it under the terms of the GNU General Public License as
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> /* memset(), strcmp(), strlen(),
50
strerror(), asprintf(), strcpy() */
49
#include <string.h> /* strcmp(), strlen(), strerror(),
50
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,
234
234
.af = af };
235
235
if(new_server->ip == NULL){
236
236
perror_plus("strdup");
237
free(new_server);
237
238
return false;
238
239
}
239
240
ret = clock_gettime(CLOCK_MONOTONIC, &(new_server->last_seen));
240
241
if(ret == -1){
241
242
perror_plus("clock_gettime");
243
#ifdef __GNUC__
244
#pragma GCC diagnostic push
245
#pragma GCC diagnostic ignored "-Wcast-qual"
246
#endif
247
free((char *)(new_server->ip));
248
#ifdef __GNUC__
249
#pragma GCC diagnostic pop
250
#endif
251
free(new_server);
242
252
return false;
243
253
}
244
254
/* Special case of first server */
295
305
return false;
296
306
}
297
307
298
ret = (int)TEMP_FAILURE_RETRY(close(fd));
308
ret = close(fd);
299
309
if(ret == -1){
300
310
perror_plus("close");
301
311
}
483
493
return plaintext_length;
484
494
}
485
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
486
503
__attribute__((warn_unused_result))
487
504
static const char *safer_gnutls_strerror(int value){
488
505
const char *ret = gnutls_strerror(value);
489
if(ret == NULL)
490
ret = "(unknown)";
491
return ret;
506
return safe_string(ret);
492
507
}
493
508
494
509
/* GnuTLS log function callback */
501
516
__attribute__((nonnull, warn_unused_result))
502
517
static int init_gnutls_global(const char *pubkeyfilename,
503
518
const char *seckeyfilename,
519
const char *dhparamsfilename,
504
520
mandos_context *mc){
505
521
int ret;
522
unsigned int uret;
506
523
507
524
if(debug){
508
525
fprintf_plus(stderr, "Initializing GnuTLS\n");
559
576
safer_gnutls_strerror(ret));
560
577
goto globalfail;
561
578
}
562
ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits);
563
if(ret != GNUTLS_E_SUCCESS){
564
fprintf_plus(stderr, "Error in GnuTLS prime generation: %s\n",
565
safer_gnutls_strerror(ret));
566
goto globalfail;
567
}
568
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
}
569
751
gnutls_certificate_set_dh_params(mc->cred, mc->dh_params);
570
752
571
753
return 0;
631
813
/* ignore client certificate if any. */
632
814
gnutls_certificate_server_set_request(*session, GNUTLS_CERT_IGNORE);
633
815
634
gnutls_dh_set_prime_bits(*session, mc->dh_bits);
635
636
816
return 0;
637
817
}
638
818
640
820
static void empty_log(__attribute__((unused)) AvahiLogLevel level,
641
821
__attribute__((unused)) const char *txt){}
642
822
823
/* Set effective uid to 0, return errno */
824
__attribute__((warn_unused_result))
825
error_t raise_privileges(void){
826
error_t old_errno = errno;
827
error_t ret_errno = 0;
828
if(seteuid(0) == -1){
829
ret_errno = errno;
830
}
831
errno = old_errno;
832
return ret_errno;
833
}
834
835
/* Set effective and real user ID to 0. Return errno. */
836
__attribute__((warn_unused_result))
837
error_t raise_privileges_permanently(void){
838
error_t old_errno = errno;
839
error_t ret_errno = raise_privileges();
840
if(ret_errno != 0){
841
errno = old_errno;
842
return ret_errno;
843
}
844
if(setuid(0) == -1){
845
ret_errno = errno;
846
}
847
errno = old_errno;
848
return ret_errno;
849
}
850
851
/* Set effective user ID to unprivileged saved user ID */
852
__attribute__((warn_unused_result))
853
error_t lower_privileges(void){
854
error_t old_errno = errno;
855
error_t ret_errno = 0;
856
if(seteuid(uid) == -1){
857
ret_errno = errno;
858
}
859
errno = old_errno;
860
return ret_errno;
861
}
862
863
/* Lower privileges permanently */
864
__attribute__((warn_unused_result))
865
error_t lower_privileges_permanently(void){
866
error_t old_errno = errno;
867
error_t ret_errno = 0;
868
if(setuid(uid) == -1){
869
ret_errno = errno;
870
}
871
errno = old_errno;
872
return ret_errno;
873
}
874
875
/* Helper function to add_local_route() and delete_local_route() */
876
__attribute__((nonnull, warn_unused_result))
877
static bool add_delete_local_route(const bool add,
878
const char *address,
879
AvahiIfIndex if_index){
880
int ret;
881
char helper[] = "mandos-client-iprouteadddel";
882
char add_arg[] = "add";
883
char delete_arg[] = "delete";
884
char debug_flag[] = "--debug";
885
char *pluginhelperdir = getenv("MANDOSPLUGINHELPERDIR");
886
if(pluginhelperdir == NULL){
887
if(debug){
888
fprintf_plus(stderr, "MANDOSPLUGINHELPERDIR environment"
889
" variable not set; cannot run helper\n");
890
}
891
return false;
892
}
893
894
char interface[IF_NAMESIZE];
895
if(if_indextoname((unsigned int)if_index, interface) == NULL){
896
perror_plus("if_indextoname");
897
return false;
898
}
899
900
int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
901
if(devnull == -1){
902
perror_plus("open(\"/dev/null\", O_RDONLY)");
903
return false;
904
}
905
pid_t pid = fork();
906
if(pid == 0){
907
/* Child */
908
/* Raise privileges */
909
errno = raise_privileges_permanently();
910
if(errno != 0){
911
perror_plus("Failed to raise privileges");
912
/* _exit(EX_NOPERM); */
913
} else {
914
/* Set group */
915
errno = 0;
916
ret = setgid(0);
917
if(ret == -1){
918
perror_plus("setgid");
919
_exit(EX_NOPERM);
920
}
921
/* Reset supplementary groups */
922
errno = 0;
923
ret = setgroups(0, NULL);
924
if(ret == -1){
925
perror_plus("setgroups");
926
_exit(EX_NOPERM);
927
}
928
}
929
ret = dup2(devnull, STDIN_FILENO);
930
if(ret == -1){
931
perror_plus("dup2(devnull, STDIN_FILENO)");
932
_exit(EX_OSERR);
933
}
934
ret = close(devnull);
935
if(ret == -1){
936
perror_plus("close");
937
_exit(EX_OSERR);
938
}
939
ret = dup2(STDERR_FILENO, STDOUT_FILENO);
940
if(ret == -1){
941
perror_plus("dup2(STDERR_FILENO, STDOUT_FILENO)");
942
_exit(EX_OSERR);
943
}
944
int helperdir_fd = (int)TEMP_FAILURE_RETRY(open(pluginhelperdir,
945
O_RDONLY
946
| O_DIRECTORY
947
| O_PATH
948
| O_CLOEXEC));
949
if(helperdir_fd == -1){
950
perror_plus("open");
951
_exit(EX_UNAVAILABLE);
952
}
953
int helper_fd = (int)TEMP_FAILURE_RETRY(openat(helperdir_fd,
954
helper, O_RDONLY));
955
if(helper_fd == -1){
956
perror_plus("openat");
957
close(helperdir_fd);
958
_exit(EX_UNAVAILABLE);
959
}
960
close(helperdir_fd);
961
#ifdef __GNUC__
962
#pragma GCC diagnostic push
963
#pragma GCC diagnostic ignored "-Wcast-qual"
964
#endif
965
if(fexecve(helper_fd, (char *const [])
966
{ helper, add ? add_arg : delete_arg, (char *)address,
967
interface, debug ? debug_flag : NULL, NULL },
968
environ) == -1){
969
#ifdef __GNUC__
970
#pragma GCC diagnostic pop
971
#endif
972
perror_plus("fexecve");
973
_exit(EXIT_FAILURE);
974
}
975
}
976
if(pid == -1){
977
perror_plus("fork");
978
return false;
979
}
980
int status;
981
pid_t pret = -1;
982
errno = 0;
983
do {
984
pret = waitpid(pid, &status, 0);
985
if(pret == -1 and errno == EINTR and quit_now){
986
int errno_raising = 0;
987
if((errno = raise_privileges()) != 0){
988
errno_raising = errno;
989
perror_plus("Failed to raise privileges in order to"
990
" kill helper program");
991
}
992
if(kill(pid, SIGTERM) == -1){
993
perror_plus("kill");
994
}
995
if((errno_raising == 0) and (errno = lower_privileges()) != 0){
996
perror_plus("Failed to lower privileges after killing"
997
" helper program");
998
}
999
return false;
1000
}
1001
} while(pret == -1 and errno == EINTR);
1002
if(pret == -1){
1003
perror_plus("waitpid");
1004
return false;
1005
}
1006
if(WIFEXITED(status)){
1007
if(WEXITSTATUS(status) != 0){
1008
fprintf_plus(stderr, "Error: iprouteadddel exited"
1009
" with status %d\n", WEXITSTATUS(status));
1010
return false;
1011
}
1012
return true;
1013
}
1014
if(WIFSIGNALED(status)){
1015
fprintf_plus(stderr, "Error: iprouteadddel died by"
1016
" signal %d\n", WTERMSIG(status));
1017
return false;
1018
}
1019
fprintf_plus(stderr, "Error: iprouteadddel crashed\n");
1020
return false;
1021
}
1022
1023
__attribute__((nonnull, warn_unused_result))
1024
static bool add_local_route(const char *address,
1025
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);
1030
}
1031
1032
__attribute__((nonnull, warn_unused_result))
1033
static bool delete_local_route(const char *address,
1034
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);
1039
}
1040
643
1041
/* Called when a Mandos server is found */
644
1042
__attribute__((nonnull, warn_unused_result))
645
1043
static int start_mandos_communication(const char *ip, in_port_t port,
656
1054
int retval = -1;
657
1055
gnutls_session_t session;
658
1056
int pf; /* Protocol family */
1057
bool route_added = false;
659
1058
660
1059
errno = 0;
661
1060
719
1118
PRIuMAX "\n", ip, (uintmax_t)port);
720
1119
}
721
1120
722
tcp_sd = socket(pf, SOCK_STREAM, 0);
1121
tcp_sd = socket(pf, SOCK_STREAM | SOCK_CLOEXEC, 0);
723
1122
if(tcp_sd < 0){
724
1123
int e = errno;
725
1124
perror_plus("socket");
732
1131
goto mandos_end;
733
1132
}
734
1133
735
memset(&to, 0, sizeof(to));
736
1134
if(af == AF_INET6){
737
((struct sockaddr_in6 *)&to)->sin6_family = (sa_family_t)af;
738
ret = inet_pton(af, ip, &((struct sockaddr_in6 *)&to)->sin6_addr);
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);
739
1138
} else { /* IPv4 */
740
((struct sockaddr_in *)&to)->sin_family = (sa_family_t)af;
741
ret = inet_pton(af, ip, &((struct sockaddr_in *)&to)->sin_addr);
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);
742
1142
}
743
1143
if(ret < 0 ){
744
1144
int e = errno;
814
1214
goto mandos_end;
815
1215
}
816
1216
817
if(af == AF_INET6){
818
ret = connect(tcp_sd, (struct sockaddr *)&to,
819
sizeof(struct sockaddr_in6));
820
} else {
821
ret = connect(tcp_sd, (struct sockaddr *)&to, /* IPv4 */
822
sizeof(struct sockaddr_in));
823
}
824
if(ret < 0){
825
if((errno != ECONNREFUSED and errno != ENETUNREACH) or debug){
826
int e = errno;
827
perror_plus("connect");
828
errno = e;
829
}
830
goto mandos_end;
831
}
832
833
if(quit_now){
834
errno = EINTR;
835
goto mandos_end;
1217
while(true){
1218
if(af == AF_INET6){
1219
ret = connect(tcp_sd, (struct sockaddr *)&to,
1220
sizeof(struct sockaddr_in6));
1221
} else {
1222
ret = connect(tcp_sd, (struct sockaddr *)&to, /* IPv4 */
1223
sizeof(struct sockaddr_in));
1224
}
1225
if(ret < 0){
1226
if(errno == ENETUNREACH
1227
and if_index != AVAHI_IF_UNSPEC
1228
and connect_to == NULL
1229
and not route_added and
1230
((af == AF_INET6 and not
1231
IN6_IS_ADDR_LINKLOCAL(&(((struct sockaddr_in6 *)
1232
&to)->sin6_addr)))
1233
or (af == AF_INET and
1234
/* Not a a IPv4LL address */
1235
(ntohl(((struct sockaddr_in *)&to)->sin_addr.s_addr)
1236
& 0xFFFF0000L) != 0xA9FE0000L))){
1237
/* Work around Avahi bug - Avahi does not announce link-local
1238
addresses if it has a global address, so local hosts with
1239
*only* a link-local address (e.g. Mandos clients) cannot
1240
connect to a Mandos server announced by Avahi on a server
1241
host with a global address. Work around this by retrying
1242
with an explicit route added with the server's address.
1243
1244
Avahi bug reference:
1245
http://lists.freedesktop.org/archives/avahi/2010-February/001833.html
1246
https://bugs.debian.org/587961
1247
*/
1248
if(debug){
1249
fprintf_plus(stderr, "Mandos server unreachable, trying"
1250
" direct route\n");
1251
}
1252
int e = errno;
1253
route_added = add_local_route(ip, if_index);
1254
if(route_added){
1255
continue;
1256
}
1257
errno = e;
1258
}
1259
if(errno != ECONNREFUSED or debug){
1260
int e = errno;
1261
perror_plus("connect");
1262
errno = e;
1263
}
1264
goto mandos_end;
1265
}
1266
1267
if(quit_now){
1268
errno = EINTR;
1269
goto mandos_end;
1270
}
1271
break;
836
1272
}
837
1273
838
1274
const char *out = mandos_protocol_version;
1021
1457
1022
1458
mandos_end:
1023
1459
{
1460
if(route_added){
1461
if(not delete_local_route(ip, if_index)){
1462
fprintf_plus(stderr, "Failed to delete local route to %s on"
1463
" interface %d", ip, if_index);
1464
}
1465
}
1024
1466
int e = errno;
1025
1467
free(decrypted_buffer);
1026
1468
free(buffer);
1027
1469
if(tcp_sd >= 0){
1028
ret = (int)TEMP_FAILURE_RETRY(close(tcp_sd));
1470
ret = close(tcp_sd);
1029
1471
}
1030
1472
if(ret == -1){
1031
1473
if(e == 0){
1066
1508
timed out */
1067
1509
1068
1510
if(quit_now){
1511
avahi_s_service_resolver_free(r);
1069
1512
return;
1070
1513
}
1071
1514
1451
1894
}
1452
1895
}
1453
1896
1454
/* Set effective uid to 0, return errno */
1455
__attribute__((warn_unused_result))
1456
error_t raise_privileges(void){
1457
error_t old_errno = errno;
1458
error_t ret_errno = 0;
1459
if(seteuid(0) == -1){
1460
ret_errno = errno;
1461
perror_plus("seteuid");
1462
}
1463
errno = old_errno;
1464
return ret_errno;
1465
}
1466
1467
/* Set effective and real user ID to 0. Return errno. */
1468
__attribute__((warn_unused_result))
1469
error_t raise_privileges_permanently(void){
1470
error_t old_errno = errno;
1471
error_t ret_errno = raise_privileges();
1472
if(ret_errno != 0){
1473
errno = old_errno;
1474
return ret_errno;
1475
}
1476
if(setuid(0) == -1){
1477
ret_errno = errno;
1478
perror_plus("seteuid");
1479
}
1480
errno = old_errno;
1481
return ret_errno;
1482
}
1483
1484
/* Set effective user ID to unprivileged saved user ID */
1485
__attribute__((warn_unused_result))
1486
error_t lower_privileges(void){
1487
error_t old_errno = errno;
1488
error_t ret_errno = 0;
1489
if(seteuid(uid) == -1){
1490
ret_errno = errno;
1491
perror_plus("seteuid");
1492
}
1493
errno = old_errno;
1494
return ret_errno;
1495
}
1496
1497
/* Lower privileges permanently */
1498
__attribute__((warn_unused_result))
1499
error_t lower_privileges_permanently(void){
1500
error_t old_errno = errno;
1501
error_t ret_errno = 0;
1502
if(setuid(uid) == -1){
1503
ret_errno = errno;
1504
perror_plus("setuid");
1505
}
1506
errno = old_errno;
1507
return ret_errno;
1508
}
1509
1510
#ifndef O_CLOEXEC
1511
/*
1512
* Based on the example in the GNU LibC manual chapter 13.13 "File
1513
* Descriptor Flags".
1514
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
1515
*/
1516
__attribute__((warn_unused_result))
1517
static int set_cloexec_flag(int fd){
1518
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
1519
/* If reading the flags failed, return error indication now. */
1520
if(ret < 0){
1521
return ret;
1522
}
1523
/* Store modified flag word in the descriptor. */
1524
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
1525
ret | FD_CLOEXEC));
1526
}
1527
#endif /* not O_CLOEXEC */
1528
1529
1897
__attribute__((nonnull))
1530
1898
void run_network_hooks(const char *mode, const char *interface,
1531
1899
const float delay){
1532
struct dirent **direntries;
1900
struct dirent **direntries = NULL;
1533
1901
if(hookdir_fd == -1){
1534
hookdir_fd = open(hookdir, O_RDONLY |
1535
#ifdef O_CLOEXEC
1536
O_CLOEXEC
1537
#else /* not O_CLOEXEC */
1538
0
1539
#endif /* not O_CLOEXEC */
1540
);
1902
hookdir_fd = open(hookdir, O_RDONLY | O_DIRECTORY | O_PATH
1903
| O_CLOEXEC);
1541
1904
if(hookdir_fd == -1){
1542
1905
if(errno == ENOENT){
1543
1906
if(debug){
1549
1912
}
1550
1913
return;
1551
1914
}
1552
#ifndef O_CLOEXEC
1553
if(set_cloexec_flag(hookdir_fd) < 0){
1554
perror_plus("set_cloexec_flag");
1555
if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){
1556
perror_plus("close");
1557
} else {
1558
hookdir_fd = -1;
1559
}
1560
return;
1561
}
1562
#endif /* not O_CLOEXEC */
1563
1915
}
1564
1916
#ifdef __GLIBC__
1565
1917
#if __GLIBC_PREREQ(2, 15)
1579
1931
}
1580
1932
struct dirent *direntry;
1581
1933
int ret;
1582
int devnull = open("/dev/null", O_RDONLY);
1934
int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
1935
if(devnull == -1){
1936
perror_plus("open(\"/dev/null\", O_RDONLY)");
1937
return;
1938
}
1583
1939
for(int i = 0; i < numhooks; i++){
1584
1940
direntry = direntries[i];
1585
1941
if(debug){
1590
1946
if(hook_pid == 0){
1591
1947
/* Child */
1592
1948
/* Raise privileges */
1593
if(raise_privileges_permanently() != 0){
1949
errno = raise_privileges_permanently();
1950
if(errno != 0){
1594
1951
perror_plus("Failed to raise privileges");
1595
1952
_exit(EX_NOPERM);
1596
1953
}
1608
1965
perror_plus("setgroups");
1609
1966
_exit(EX_NOPERM);
1610
1967
}
1611
ret = dup2(devnull, STDIN_FILENO);
1612
if(ret == -1){
1613
perror_plus("dup2(devnull, STDIN_FILENO)");
1614
_exit(EX_OSERR);
1615
}
1616
ret = close(devnull);
1617
if(ret == -1){
1618
perror_plus("close");
1619
_exit(EX_OSERR);
1620
}
1621
ret = dup2(STDERR_FILENO, STDOUT_FILENO);
1622
if(ret == -1){
1623
perror_plus("dup2(STDERR_FILENO, STDOUT_FILENO)");
1624
_exit(EX_OSERR);
1625
}
1626
1968
ret = setenv("MANDOSNETHOOKDIR", hookdir, 1);
1627
1969
if(ret == -1){
1628
1970
perror_plus("setenv");
1663
2005
_exit(EX_OSERR);
1664
2006
}
1665
2007
}
1666
if(fexecve(hookdir_fd, (char *const [])
1667
{ direntry->d_name, NULL }, environ) == -1){
2008
int hook_fd = (int)TEMP_FAILURE_RETRY(openat(hookdir_fd,
2009
direntry->d_name,
2010
O_RDONLY));
2011
if(hook_fd == -1){
2012
perror_plus("openat");
2013
_exit(EXIT_FAILURE);
2014
}
2015
if(close(hookdir_fd) == -1){
2016
perror_plus("close");
2017
_exit(EXIT_FAILURE);
2018
}
2019
ret = dup2(devnull, STDIN_FILENO);
2020
if(ret == -1){
2021
perror_plus("dup2(devnull, STDIN_FILENO)");
2022
_exit(EX_OSERR);
2023
}
2024
ret = close(devnull);
2025
if(ret == -1){
2026
perror_plus("close");
2027
_exit(EX_OSERR);
2028
}
2029
ret = dup2(STDERR_FILENO, STDOUT_FILENO);
2030
if(ret == -1){
2031
perror_plus("dup2(STDERR_FILENO, STDOUT_FILENO)");
2032
_exit(EX_OSERR);
2033
}
2034
if(fexecve(hook_fd, (char *const []){ direntry->d_name, NULL },
2035
environ) == -1){
1668
2036
perror_plus("fexecve");
1669
2037
_exit(EXIT_FAILURE);
1670
2038
}
1671
2039
} else {
2040
if(hook_pid == -1){
2041
perror_plus("fork");
2042
free(direntry);
2043
continue;
2044
}
1672
2045
int status;
1673
2046
if(TEMP_FAILURE_RETRY(waitpid(hook_pid, &status, 0)) == -1){
1674
2047
perror_plus("waitpid");
2048
free(direntry);
1675
2049
continue;
1676
2050
}
1677
2051
if(WIFEXITED(status)){
1679
2053
fprintf_plus(stderr, "Warning: network hook \"%s\" exited"
1680
2054
" with status %d\n", direntry->d_name,
1681
2055
WEXITSTATUS(status));
2056
free(direntry);
1682
2057
continue;
1683
2058
}
1684
2059
} else if(WIFSIGNALED(status)){
1685
2060
fprintf_plus(stderr, "Warning: network hook \"%s\" died by"
1686
2061
" signal %d\n", direntry->d_name,
1687
2062
WTERMSIG(status));
2063
free(direntry);
1688
2064
continue;
1689
2065
} else {
1690
2066
fprintf_plus(stderr, "Warning: network hook \"%s\""
1691
2067
" crashed\n", direntry->d_name);
2068
free(direntry);
1692
2069
continue;
1693
2070
}
1694
2071
}
1696
2073
fprintf_plus(stderr, "Network hook \"%s\" ran successfully\n",
1697
2074
direntry->d_name);
1698
2075
}
2076
free(direntry);
1699
2077
}
1700
if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){
2078
free(direntries);
2079
if(close(hookdir_fd) == -1){
1701
2080
perror_plus("close");
1702
2081
} else {
1703
2082
hookdir_fd = -1;
1743
2122
}
1744
2123
1745
2124
if(quit_now){
1746
ret = (int)TEMP_FAILURE_RETRY(close(sd));
2125
ret = close(sd);
1747
2126
if(ret == -1){
1748
2127
perror_plus("close");
1749
2128
}
1759
2138
/* Raise privileges */
1760
2139
ret_errno = raise_privileges();
1761
2140
if(ret_errno != 0){
2141
errno = ret_errno;
1762
2142
perror_plus("Failed to raise privileges");
1763
2143
}
1764
2144
1798
2178
}
1799
2179
1800
2180
/* Close the socket */
1801
ret = (int)TEMP_FAILURE_RETRY(close(sd));
2181
ret = close(sd);
1802
2182
if(ret == -1){
1803
2183
perror_plus("close");
1804
2184
}
1868
2248
/* Raise privileges */
1869
2249
ret_errno = raise_privileges();
1870
2250
if(ret_errno != 0){
2251
errno = ret_errno;
1871
2252
perror_plus("Failed to raise privileges");
1872
2253
}
1873
2254
1885
2266
}
1886
2267
1887
2268
/* Close the socket */
1888
int ret = (int)TEMP_FAILURE_RETRY(close(sd));
2269
int ret = close(sd);
1889
2270
if(ret == -1){
1890
2271
perror_plus("close");
1891
2272
}
1906
2287
}
1907
2288
1908
2289
int main(int argc, char *argv[]){
1909
mandos_context mc = { .server = NULL, .dh_bits = 1024,
1910
.priority = "SECURE256:!CTYPE-X.509:"
1911
"+CTYPE-OPENPGP", .current_server = NULL,
1912
.interfaces = NULL, .interfaces_size = 0 };
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 };
1913
2295
AvahiSServiceBrowser *sb = NULL;
1914
2296
error_t ret_errno;
1915
2297
int ret;
1924
2306
AvahiIfIndex if_index = AVAHI_IF_UNSPEC;
1925
2307
const char *seckey = PATHDIR "/" SECKEY;
1926
2308
const char *pubkey = PATHDIR "/" PUBKEY;
2309
const char *dh_params_file = NULL;
1927
2310
char *interfaces_hooks = NULL;
1928
2311
1929
2312
bool gnutls_initialized = false;
1982
2365
.doc = "Bit length of the prime number used in the"
1983
2366
" Diffie-Hellman key exchange",
1984
2367
.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 },
1985
2373
{ .name = "priority", .key = 130,
1986
2374
.arg = "STRING",
1987
2375
.doc = "GnuTLS priority string for the TLS handshake",
2042
2430
}
2043
2431
mc.dh_bits = (typeof(mc.dh_bits))tmpmax;
2044
2432
break;
2433
case 134: /* --dh-params */
2434
dh_params_file = arg;
2435
break;
2045
2436
case 130: /* --priority */
2046
2437
mc.priority = arg;
2047
2438
break;
2103
2494
goto end;
2104
2495
}
2105
2496
}
2106
2497
2107
2498
{
2108
2499
/* Work around Debian bug #633582:
2109
2500
<http://bugs.debian.org/633582> */
2133
2524
}
2134
2525
}
2135
2526
}
2136
TEMP_FAILURE_RETRY(close(seckey_fd));
2527
close(seckey_fd);
2137
2528
}
2138
2529
}
2139
2530
2140
2531
if(strcmp(pubkey, PATHDIR "/" PUBKEY) == 0){
2141
2532
int pubkey_fd = open(pubkey, O_RDONLY);
2142
2533
if(pubkey_fd == -1){
2154
2545
}
2155
2546
}
2156
2547
}
2157
TEMP_FAILURE_RETRY(close(pubkey_fd));
2158
}
2159
}
2160
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);
2571
}
2572
}
2573
2161
2574
/* Lower privileges */
2162
2575
ret_errno = lower_privileges();
2163
2576
if(ret_errno != 0){
2280
2693
2281
2694
/* If no interfaces were specified, make a list */
2282
2695
if(mc.interfaces == NULL){
2283
struct dirent **direntries;
2696
struct dirent **direntries = NULL;
2284
2697
/* Look for any good interfaces */
2285
2698
ret = scandir(sys_class_net, &direntries, good_interface,
2286
2699
alphasort);
2292
2705
if(ret_errno != 0){
2293
2706
errno = ret_errno;
2294
2707
perror_plus("argz_add");
2708
free(direntries[i]);
2295
2709
continue;
2296
2710
}
2297
2711
if(debug){
2298
2712
fprintf_plus(stderr, "Will use interface \"%s\"\n",
2299
2713
direntries[i]->d_name);
2300
2714
}
2715
free(direntries[i]);
2301
2716
}
2302
2717
free(direntries);
2303
2718
} else {
2304
free(direntries);
2719
if(ret == 0){
2720
free(direntries);
2721
}
2305
2722
fprintf_plus(stderr, "Could not find a network interface\n");
2306
2723
exitcode = EXIT_FAILURE;
2307
2724
goto end;
2333
2750
errno = bring_up_interface(interface, delay);
2334
2751
if(not interface_was_up){
2335
2752
if(errno != 0){
2336
perror_plus("Failed to bring up interface");
2753
fprintf_plus(stderr, "Failed to bring up interface \"%s\":"
2754
" %s\n", interface, strerror(errno));
2337
2755
} else {
2338
2756
errno = argz_add(&interfaces_to_take_down,
2339
2757
&interfaces_to_take_down_size,
2362
2780
goto end;
2363
2781
}
2364
2782
2365
ret = init_gnutls_global(pubkey, seckey, &mc);
2783
ret = init_gnutls_global(pubkey, seckey, dh_params_file, &mc);
2366
2784
if(ret == -1){
2367
2785
fprintf_plus(stderr, "init_gnutls_global failed\n");
2368
2786
exitcode = EX_UNAVAILABLE;
2571
2989
mc.current_server->prev->next = NULL;
2572
2990
while(mc.current_server != NULL){
2573
2991
server *next = mc.current_server->next;
2992
#ifdef __GNUC__
2993
#pragma GCC diagnostic push
2994
#pragma GCC diagnostic ignored "-Wcast-qual"
2995
#endif
2996
free((char *)(mc.current_server->ip));
2997
#ifdef __GNUC__
2998
#pragma GCC diagnostic pop
2999
#endif
2574
3000
free(mc.current_server);
2575
3001
mc.current_server = next;
2576
3002
}
2580
3006
{
2581
3007
ret_errno = raise_privileges();
2582
3008
if(ret_errno != 0){
3009
errno = ret_errno;
2583
3010
perror_plus("Failed to raise privileges");
2584
3011
} else {
2585
3012
2608
3035
2609
3036
ret_errno = lower_privileges_permanently();
2610
3037
if(ret_errno != 0){
3038
errno = ret_errno;
2611
3039
perror_plus("Failed to lower privileges permanently");
2612
3040
}
2613
3041
}
2618
3046
/* Removes the GPGME temp directory and all files inside */
2619
3047
if(tempdir != NULL){
2620
3048
struct dirent **direntries = NULL;
2621
int tempdir_fd = (int)TEMP_FAILURE_RETRY(open(tempdir, O_RDONLY));
3049
int tempdir_fd = (int)TEMP_FAILURE_RETRY(open(tempdir, O_RDONLY
3050
| O_NOFOLLOW
3051
| O_DIRECTORY
3052
| O_PATH));
2622
3053
if(tempdir_fd == -1){
2623
3054
perror_plus("open");
2624
3055
} else {
2634
3065
int numentries = scandir(tempdir, &direntries, notdotentries,
2635
3066
alphasort);
2636
3067
#endif /* not __GLIBC__ */
2637
if(numentries > 0){
3068
if(numentries >= 0){
2638
3069
for(int i = 0; i < numentries; i++){
2639
3070
ret = unlinkat(tempdir_fd, direntries[i]->d_name, 0);
2640
3071
if(ret == -1){
2642
3073
" \"%s\", 0): %s\n", tempdir,
2643
3074
direntries[i]->d_name, strerror(errno));
2644
3075
}
3076
free(direntries[i]);
2645
3077
}
2646
3078
2647
3079
/* need to clean even if 0 because man page doesn't specify */
2654
3086
perror_plus("rmdir");
2655
3087
}
2656
3088
}
2657
TEMP_FAILURE_RETRY(close(tempdir_fd));
3089
close(tempdir_fd);
2658
3090
}
2659
3091
}
2660
3092
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0