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 744
- compare with another revision
- download diff
- download tarball
- view history from revision 744
- Committer: Teddy Hogeborn
- Date: 2015-04-02 18:59:29 UTC
- Revision ID: teddy@recompile.se-20150402185929-1q1rf1zelbpzzn74
Add "!RSA" also to examples/documentation.
* mandos.conf (priority): Add "!RSA" to default commented-out value.
* mandos.conf.xml (EXAMPLE): Add "!RSA" to example priority setting.
* mandos.conf (priority): Add "!RSA" to default commented-out value.
* mandos.conf.xml (EXAMPLE): Add "!RSA" to example priority setting.
- files removed:
- 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-2015 Teddy Hogeborn
13
* Copyright © 2008-2015 Björn Påhlsson
12
* Copyright © 2008-2014 Teddy Hogeborn
13
* Copyright © 2008-2014 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
757
757
static void empty_log(__attribute__((unused)) AvahiLogLevel level,
758
758
__attribute__((unused)) const char *txt){}
759
759
760
/* Set effective uid to 0, return errno */
761
__attribute__((warn_unused_result))
762
error_t raise_privileges(void){
763
error_t old_errno = errno;
764
error_t ret_errno = 0;
765
if(seteuid(0) == -1){
766
ret_errno = errno;
767
}
768
errno = old_errno;
769
return ret_errno;
770
}
771
772
/* Set effective and real user ID to 0. Return errno. */
773
__attribute__((warn_unused_result))
774
error_t raise_privileges_permanently(void){
775
error_t old_errno = errno;
776
error_t ret_errno = raise_privileges();
777
if(ret_errno != 0){
778
errno = old_errno;
779
return ret_errno;
780
}
781
if(setuid(0) == -1){
782
ret_errno = errno;
783
}
784
errno = old_errno;
785
return ret_errno;
786
}
787
788
/* Set effective user ID to unprivileged saved user ID */
789
__attribute__((warn_unused_result))
790
error_t lower_privileges(void){
791
error_t old_errno = errno;
792
error_t ret_errno = 0;
793
if(seteuid(uid) == -1){
794
ret_errno = errno;
795
}
796
errno = old_errno;
797
return ret_errno;
798
}
799
800
/* Lower privileges permanently */
801
__attribute__((warn_unused_result))
802
error_t lower_privileges_permanently(void){
803
error_t old_errno = errno;
804
error_t ret_errno = 0;
805
if(setuid(uid) == -1){
806
ret_errno = errno;
807
}
808
errno = old_errno;
809
return ret_errno;
810
}
811
812
/* Helper function to add_local_route() and delete_local_route() */
813
__attribute__((nonnull, warn_unused_result))
814
static bool add_delete_local_route(const bool add,
815
const char *address,
816
AvahiIfIndex if_index){
817
int ret;
818
char helper[] = "mandos-client-iprouteadddel";
819
char add_arg[] = "add";
820
char delete_arg[] = "delete";
821
char debug_flag[] = "--debug";
822
char *pluginhelperdir = getenv("MANDOSPLUGINHELPERDIR");
823
if(pluginhelperdir == NULL){
824
if(debug){
825
fprintf_plus(stderr, "MANDOSPLUGINHELPERDIR environment"
826
" variable not set; cannot run helper\n");
827
}
828
return false;
829
}
830
831
char interface[IF_NAMESIZE];
832
if(if_indextoname((unsigned int)if_index, interface) == NULL){
833
perror_plus("if_indextoname");
834
return false;
835
}
836
837
int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
838
if(devnull == -1){
839
perror_plus("open(\"/dev/null\", O_RDONLY)");
840
return false;
841
}
842
pid_t pid = fork();
843
if(pid == 0){
844
/* Child */
845
/* Raise privileges */
846
errno = raise_privileges_permanently();
847
if(errno != 0){
848
perror_plus("Failed to raise privileges");
849
/* _exit(EX_NOPERM); */
850
} else {
851
/* Set group */
852
errno = 0;
853
ret = setgid(0);
854
if(ret == -1){
855
perror_plus("setgid");
856
_exit(EX_NOPERM);
857
}
858
/* Reset supplementary groups */
859
errno = 0;
860
ret = setgroups(0, NULL);
861
if(ret == -1){
862
perror_plus("setgroups");
863
_exit(EX_NOPERM);
864
}
865
}
866
ret = dup2(devnull, STDIN_FILENO);
867
if(ret == -1){
868
perror_plus("dup2(devnull, STDIN_FILENO)");
869
_exit(EX_OSERR);
870
}
871
ret = (int)TEMP_FAILURE_RETRY(close(devnull));
872
if(ret == -1){
873
perror_plus("close");
874
_exit(EX_OSERR);
875
}
876
ret = dup2(STDERR_FILENO, STDOUT_FILENO);
877
if(ret == -1){
878
perror_plus("dup2(STDERR_FILENO, STDOUT_FILENO)");
879
_exit(EX_OSERR);
880
}
881
int helperdir_fd = (int)TEMP_FAILURE_RETRY(open(pluginhelperdir,
882
O_RDONLY
883
| O_DIRECTORY
884
| O_PATH
885
| O_CLOEXEC));
886
if(helperdir_fd == -1){
887
perror_plus("open");
888
_exit(EX_UNAVAILABLE);
889
}
890
int helper_fd = (int)TEMP_FAILURE_RETRY(openat(helperdir_fd,
891
helper, O_RDONLY));
892
if(helper_fd == -1){
893
perror_plus("openat");
894
_exit(EX_UNAVAILABLE);
895
}
896
TEMP_FAILURE_RETRY(close(helperdir_fd));
897
#ifdef __GNUC__
898
#pragma GCC diagnostic push
899
#pragma GCC diagnostic ignored "-Wcast-qual"
900
#endif
901
if(fexecve(helper_fd, (char *const [])
902
{ helper, add ? add_arg : delete_arg, (char *)address,
903
interface, debug ? debug_flag : NULL, NULL },
904
environ) == -1){
905
#ifdef __GNUC__
906
#pragma GCC diagnostic pop
907
#endif
908
perror_plus("fexecve");
909
_exit(EXIT_FAILURE);
910
}
911
}
912
if(pid == -1){
913
perror_plus("fork");
914
return false;
915
}
916
int status;
917
pid_t pret = -1;
918
errno = 0;
919
do {
920
pret = waitpid(pid, &status, 0);
921
if(pret == -1 and errno == EINTR and quit_now){
922
int errno_raising = 0;
923
if((errno = raise_privileges()) != 0){
924
errno_raising = errno;
925
perror_plus("Failed to raise privileges in order to"
926
" kill helper program");
927
}
928
if(kill(pid, SIGTERM) == -1){
929
perror_plus("kill");
930
}
931
if((errno_raising == 0) and (errno = lower_privileges()) != 0){
932
perror_plus("Failed to lower privileges after killing"
933
" helper program");
934
}
935
return false;
936
}
937
} while(pret == -1 and errno == EINTR);
938
if(pret == -1){
939
perror_plus("waitpid");
940
return false;
941
}
942
if(WIFEXITED(status)){
943
if(WEXITSTATUS(status) != 0){
944
fprintf_plus(stderr, "Error: iprouteadddel exited"
945
" with status %d\n", WEXITSTATUS(status));
946
return false;
947
}
948
return true;
949
}
950
if(WIFSIGNALED(status)){
951
fprintf_plus(stderr, "Error: iprouteadddel died by"
952
" signal %d\n", WTERMSIG(status));
953
return false;
954
}
955
fprintf_plus(stderr, "Error: iprouteadddel crashed\n");
956
return false;
957
}
958
959
__attribute__((nonnull, warn_unused_result))
960
static bool add_local_route(const char *address,
961
AvahiIfIndex if_index){
962
if(debug){
963
fprintf_plus(stderr, "Adding route to %s\n", address);
964
}
965
return add_delete_local_route(true, address, if_index);
966
}
967
968
__attribute__((nonnull, warn_unused_result))
969
static bool delete_local_route(const char *address,
970
AvahiIfIndex if_index){
971
if(debug){
972
fprintf_plus(stderr, "Removing route to %s\n", address);
973
}
974
return add_delete_local_route(false, address, if_index);
975
}
976
977
760
/* Called when a Mandos server is found */
978
761
__attribute__((nonnull, warn_unused_result))
979
762
static int start_mandos_communication(const char *ip, in_port_t port,
990
773
int retval = -1;
991
774
gnutls_session_t session;
992
775
int pf; /* Protocol family */
993
bool route_added = false;
994
776
995
777
errno = 0;
996
778
1054
836
PRIuMAX "\n", ip, (uintmax_t)port);
1055
837
}
1056
838
1057
tcp_sd = socket(pf, SOCK_STREAM | SOCK_CLOEXEC, 0);
839
tcp_sd = socket(pf, SOCK_STREAM, 0);
1058
840
if(tcp_sd < 0){
1059
841
int e = errno;
1060
842
perror_plus("socket");
1149
931
goto mandos_end;
1150
932
}
1151
933
1152
while(true){
1153
if(af == AF_INET6){
1154
ret = connect(tcp_sd, (struct sockaddr *)&to,
1155
sizeof(struct sockaddr_in6));
1156
} else {
1157
ret = connect(tcp_sd, (struct sockaddr *)&to, /* IPv4 */
1158
sizeof(struct sockaddr_in));
1159
}
1160
if(ret < 0){
1161
if(errno == ENETUNREACH
1162
and if_index != AVAHI_IF_UNSPEC
1163
and connect_to == NULL
1164
and not route_added and
1165
((af == AF_INET6 and not
1166
IN6_IS_ADDR_LINKLOCAL(&(((struct sockaddr_in6 *)
1167
&to)->sin6_addr)))
1168
or (af == AF_INET and
1169
/* Not a a IPv4LL address */
1170
(ntohl(((struct sockaddr_in *)&to)->sin_addr.s_addr)
1171
& 0xFFFF0000L) != 0xA9FE0000L))){
1172
/* Work around Avahi bug - Avahi does not announce link-local
1173
addresses if it has a global address, so local hosts with
1174
*only* a link-local address (e.g. Mandos clients) cannot
1175
connect to a Mandos server announced by Avahi on a server
1176
host with a global address. Work around this by retrying
1177
with an explicit route added with the server's address.
1178
1179
Avahi bug reference:
1180
http://lists.freedesktop.org/archives/avahi/2010-February/001833.html
1181
https://bugs.debian.org/587961
1182
*/
1183
if(debug){
1184
fprintf_plus(stderr, "Mandos server unreachable, trying"
1185
" direct route\n");
1186
}
1187
int e = errno;
1188
route_added = add_local_route(ip, if_index);
1189
if(route_added){
1190
continue;
1191
}
1192
errno = e;
1193
}
1194
if(errno != ECONNREFUSED or debug){
1195
int e = errno;
1196
perror_plus("connect");
1197
errno = e;
1198
}
1199
goto mandos_end;
1200
}
1201
1202
if(quit_now){
1203
errno = EINTR;
1204
goto mandos_end;
1205
}
1206
break;
934
if(af == AF_INET6){
935
ret = connect(tcp_sd, (struct sockaddr *)&to,
936
sizeof(struct sockaddr_in6));
937
} else {
938
ret = connect(tcp_sd, (struct sockaddr *)&to, /* IPv4 */
939
sizeof(struct sockaddr_in));
940
}
941
if(ret < 0){
942
if((errno != ECONNREFUSED and errno != ENETUNREACH) or debug){
943
int e = errno;
944
perror_plus("connect");
945
errno = e;
946
}
947
goto mandos_end;
948
}
949
950
if(quit_now){
951
errno = EINTR;
952
goto mandos_end;
1207
953
}
1208
954
1209
955
const char *out = mandos_protocol_version;
1392
1138
1393
1139
mandos_end:
1394
1140
{
1395
if(route_added){
1396
if(not delete_local_route(ip, if_index)){
1397
fprintf_plus(stderr, "Failed to delete local route to %s on"
1398
" interface %d", ip, if_index);
1399
}
1400
}
1401
1141
int e = errno;
1402
1142
free(decrypted_buffer);
1403
1143
free(buffer);
1829
1569
}
1830
1570
}
1831
1571
1572
/* Set effective uid to 0, return errno */
1573
__attribute__((warn_unused_result))
1574
error_t raise_privileges(void){
1575
error_t old_errno = errno;
1576
error_t ret_errno = 0;
1577
if(seteuid(0) == -1){
1578
ret_errno = errno;
1579
}
1580
errno = old_errno;
1581
return ret_errno;
1582
}
1583
1584
/* Set effective and real user ID to 0. Return errno. */
1585
__attribute__((warn_unused_result))
1586
error_t raise_privileges_permanently(void){
1587
error_t old_errno = errno;
1588
error_t ret_errno = raise_privileges();
1589
if(ret_errno != 0){
1590
errno = old_errno;
1591
return ret_errno;
1592
}
1593
if(setuid(0) == -1){
1594
ret_errno = errno;
1595
}
1596
errno = old_errno;
1597
return ret_errno;
1598
}
1599
1600
/* Set effective user ID to unprivileged saved user ID */
1601
__attribute__((warn_unused_result))
1602
error_t lower_privileges(void){
1603
error_t old_errno = errno;
1604
error_t ret_errno = 0;
1605
if(seteuid(uid) == -1){
1606
ret_errno = errno;
1607
}
1608
errno = old_errno;
1609
return ret_errno;
1610
}
1611
1612
/* Lower privileges permanently */
1613
__attribute__((warn_unused_result))
1614
error_t lower_privileges_permanently(void){
1615
error_t old_errno = errno;
1616
error_t ret_errno = 0;
1617
if(setuid(uid) == -1){
1618
ret_errno = errno;
1619
}
1620
errno = old_errno;
1621
return ret_errno;
1622
}
1623
1832
1624
__attribute__((nonnull))
1833
1625
void run_network_hooks(const char *mode, const char *interface,
1834
1626
const float delay){
1835
1627
struct dirent **direntries = NULL;
1836
1628
if(hookdir_fd == -1){
1837
hookdir_fd = open(hookdir, O_RDONLY | O_DIRECTORY | O_PATH
1838
| O_CLOEXEC);
1629
hookdir_fd = open(hookdir, O_RDONLY);
1839
1630
if(hookdir_fd == -1){
1840
1631
if(errno == ENOENT){
1841
1632
if(debug){
1866
1657
}
1867
1658
struct dirent *direntry;
1868
1659
int ret;
1869
int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
1870
if(devnull == -1){
1871
perror_plus("open(\"/dev/null\", O_RDONLY)");
1872
return;
1873
}
1660
int devnull = open("/dev/null", O_RDONLY);
1874
1661
for(int i = 0; i < numhooks; i++){
1875
1662
direntry = direntries[i];
1876
1663
if(debug){
1900
1687
perror_plus("setgroups");
1901
1688
_exit(EX_NOPERM);
1902
1689
}
1690
ret = dup2(devnull, STDIN_FILENO);
1691
if(ret == -1){
1692
perror_plus("dup2(devnull, STDIN_FILENO)");
1693
_exit(EX_OSERR);
1694
}
1695
ret = close(devnull);
1696
if(ret == -1){
1697
perror_plus("close");
1698
_exit(EX_OSERR);
1699
}
1700
ret = dup2(STDERR_FILENO, STDOUT_FILENO);
1701
if(ret == -1){
1702
perror_plus("dup2(STDERR_FILENO, STDOUT_FILENO)");
1703
_exit(EX_OSERR);
1704
}
1903
1705
ret = setenv("MANDOSNETHOOKDIR", hookdir, 1);
1904
1706
if(ret == -1){
1905
1707
perror_plus("setenv");
1940
1742
_exit(EX_OSERR);
1941
1743
}
1942
1744
}
1943
int hook_fd = (int)TEMP_FAILURE_RETRY(openat(hookdir_fd,
1944
direntry->d_name,
1945
O_RDONLY));
1745
int hook_fd = openat(hookdir_fd, direntry->d_name, O_RDONLY);
1946
1746
if(hook_fd == -1){
1947
1747
perror_plus("openat");
1948
1748
_exit(EXIT_FAILURE);
1951
1751
perror_plus("close");
1952
1752
_exit(EXIT_FAILURE);
1953
1753
}
1954
ret = dup2(devnull, STDIN_FILENO);
1955
if(ret == -1){
1956
perror_plus("dup2(devnull, STDIN_FILENO)");
1957
_exit(EX_OSERR);
1958
}
1959
ret = (int)TEMP_FAILURE_RETRY(close(devnull));
1960
if(ret == -1){
1961
perror_plus("close");
1962
_exit(EX_OSERR);
1963
}
1964
ret = dup2(STDERR_FILENO, STDOUT_FILENO);
1965
if(ret == -1){
1966
perror_plus("dup2(STDERR_FILENO, STDOUT_FILENO)");
1967
_exit(EX_OSERR);
1968
}
1969
1754
if(fexecve(hook_fd, (char *const []){ direntry->d_name, NULL },
1970
1755
environ) == -1){
1971
1756
perror_plus("fexecve");
2419
2204
goto end;
2420
2205
}
2421
2206
}
2422
2207
2423
2208
{
2424
2209
/* Work around Debian bug #633582:
2425
2210
<http://bugs.debian.org/633582> */
2452
2237
TEMP_FAILURE_RETRY(close(seckey_fd));
2453
2238
}
2454
2239
}
2455
2240
2456
2241
if(strcmp(pubkey, PATHDIR "/" PUBKEY) == 0){
2457
2242
int pubkey_fd = open(pubkey, O_RDONLY);
2458
2243
if(pubkey_fd == -1){
2473
2258
TEMP_FAILURE_RETRY(close(pubkey_fd));
2474
2259
}
2475
2260
}
2476
2261
2477
2262
/* Lower privileges */
2478
2263
ret_errno = lower_privileges();
2479
2264
if(ret_errno != 0){
2948
2733
/* Removes the GPGME temp directory and all files inside */
2949
2734
if(tempdir != NULL){
2950
2735
struct dirent **direntries = NULL;
2951
int tempdir_fd = (int)TEMP_FAILURE_RETRY(open(tempdir, O_RDONLY
2952
| O_NOFOLLOW
2953
| O_DIRECTORY
2954
| O_PATH));
2736
int tempdir_fd = (int)TEMP_FAILURE_RETRY(open(tempdir, O_RDONLY |
2737
O_NOFOLLOW));
2955
2738
if(tempdir_fd == -1){
2956
2739
perror_plus("open");
2957
2740
} else {
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0