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 897
- compare with another revision
- download diff
- download tarball
- view history from revision 897
- Committer: Teddy Hogeborn
- Date: 2017-02-21 22:15:43 UTC
- Revision ID: teddy@recompile.se-20170221221543-kkh15uag0luiyz4y
Remove useless code (and use "read -r") in initramfs-tools-hook
* initramfs-tools-hook: When reading module names from network hooks
given the "modules" argument, use "read -r" and ignore ${target}
variable (left over from code above it).
* initramfs-tools-hook: When reading module names from network hooks
given the "modules" argument, use "read -r" and ignore ${target}
variable (left over from code above it).
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-2016 Teddy Hogeborn
13
* Copyright © 2008-2016 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
47
47
strtof(), abort() */
48
48
#include <stdbool.h> /* bool, false, true */
49
49
#include <string.h> /* strcmp(), strlen(), strerror(),
50
asprintf(), strcpy() */
50
asprintf(), strncpy(), strsignal()
51
*/
51
52
#include <sys/ioctl.h> /* ioctl */
52
53
#include <sys/types.h> /* socket(), inet_pton(), sockaddr,
53
54
sockaddr_in6, PF_INET6,
57
58
#include <sys/socket.h> /* socket(), struct sockaddr_in6,
58
59
inet_pton(), connect(),
59
60
getnameinfo() */
60
#include <fcntl.h> /* open(), unlinkat() */
61
#include <fcntl.h> /* open(), unlinkat(), AT_REMOVEDIR */
61
62
#include <dirent.h> /* opendir(), struct dirent, readdir()
62
63
*/
63
64
#include <inttypes.h> /* PRIu16, PRIdMAX, intmax_t,
64
65
strtoimax() */
65
#include <errno.h> /* perror(), errno,
66
#include <errno.h> /* perror(), errno, EINTR, EINVAL,
67
EAI_SYSTEM, ENETUNREACH,
68
EHOSTUNREACH, ECONNREFUSED, EPROTO,
69
EIO, ENOENT, ENXIO, ENOMEM, EISDIR,
70
ENOTEMPTY,
66
71
program_invocation_short_name */
67
72
#include <time.h> /* nanosleep(), time(), sleep() */
68
73
#include <net/if.h> /* ioctl, ifreq, SIOCGIFFLAGS, IFF_UP,
513
518
fprintf_plus(stderr, "GnuTLS: %s", string);
514
519
}
515
520
516
__attribute__((nonnull, warn_unused_result))
521
__attribute__((nonnull(1, 2, 4), warn_unused_result))
517
522
static int init_gnutls_global(const char *pubkeyfilename,
518
523
const char *seckeyfilename,
519
524
const char *dhparamsfilename,
525
530
fprintf_plus(stderr, "Initializing GnuTLS\n");
526
531
}
527
532
528
ret = gnutls_global_init();
529
if(ret != GNUTLS_E_SUCCESS){
530
fprintf_plus(stderr, "GnuTLS global_init: %s\n",
531
safer_gnutls_strerror(ret));
532
return -1;
533
}
534
535
533
if(debug){
536
534
/* "Use a log level over 10 to enable all debugging options."
537
535
* - GnuTLS manual
545
543
if(ret != GNUTLS_E_SUCCESS){
546
544
fprintf_plus(stderr, "GnuTLS memory error: %s\n",
547
545
safer_gnutls_strerror(ret));
548
gnutls_global_deinit();
549
546
return -1;
550
547
}
551
548
629
626
safer_gnutls_strerror(ret));
630
627
dhparamsfilename = NULL;
631
628
}
629
free(params.data);
632
630
} while(false);
633
631
}
634
632
if(dhparamsfilename == NULL){
755
753
globalfail:
756
754
757
755
gnutls_certificate_free_credentials(mc->cred);
758
gnutls_global_deinit();
759
756
gnutls_dh_params_deinit(mc->dh_params);
760
757
return -1;
761
758
}
822
819
823
820
/* Set effective uid to 0, return errno */
824
821
__attribute__((warn_unused_result))
825
error_t raise_privileges(void){
826
error_t old_errno = errno;
827
error_t ret_errno = 0;
822
int raise_privileges(void){
823
int old_errno = errno;
824
int ret = 0;
828
825
if(seteuid(0) == -1){
829
ret_errno = errno;
826
ret = errno;
830
827
}
831
828
errno = old_errno;
832
return ret_errno;
829
return ret;
833
830
}
834
831
835
832
/* Set effective and real user ID to 0. Return errno. */
836
833
__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){
834
int raise_privileges_permanently(void){
835
int old_errno = errno;
836
int ret = raise_privileges();
837
if(ret != 0){
841
838
errno = old_errno;
842
return ret_errno;
839
return ret;
843
840
}
844
841
if(setuid(0) == -1){
845
ret_errno = errno;
842
ret = errno;
846
843
}
847
844
errno = old_errno;
848
return ret_errno;
845
return ret;
849
846
}
850
847
851
848
/* Set effective user ID to unprivileged saved user ID */
852
849
__attribute__((warn_unused_result))
853
error_t lower_privileges(void){
854
error_t old_errno = errno;
855
error_t ret_errno = 0;
850
int lower_privileges(void){
851
int old_errno = errno;
852
int ret = 0;
856
853
if(seteuid(uid) == -1){
857
ret_errno = errno;
854
ret = errno;
858
855
}
859
856
errno = old_errno;
860
return ret_errno;
857
return ret;
861
858
}
862
859
863
860
/* Lower privileges permanently */
864
861
__attribute__((warn_unused_result))
865
error_t lower_privileges_permanently(void){
866
error_t old_errno = errno;
867
error_t ret_errno = 0;
862
int lower_privileges_permanently(void){
863
int old_errno = errno;
864
int ret = 0;
868
865
if(setuid(uid) == -1){
869
ret_errno = errno;
866
ret = errno;
870
867
}
871
868
errno = old_errno;
872
return ret_errno;
869
return ret;
873
870
}
874
871
875
872
/* Helper function to add_local_route() and delete_local_route() */
1082
1079
bool match = false;
1083
1080
{
1084
1081
char *interface = NULL;
1085
while((interface=argz_next(mc->interfaces, mc->interfaces_size,
1086
interface))){
1082
while((interface = argz_next(mc->interfaces,
1083
mc->interfaces_size,
1084
interface))){
1087
1085
if(if_nametoindex(interface) == (unsigned int)if_index){
1088
1086
match = true;
1089
1087
break;
1223
1221
sizeof(struct sockaddr_in));
1224
1222
}
1225
1223
if(ret < 0){
1226
if(errno == ENETUNREACH
1224
if(((errno == ENETUNREACH) or (errno == EHOSTUNREACH))
1227
1225
and if_index != AVAHI_IF_UNSPEC
1228
1226
and connect_to == NULL
1229
1227
and not route_added and
1242
1240
with an explicit route added with the server's address.
1243
1241
1244
1242
Avahi bug reference:
1245
http://lists.freedesktop.org/archives/avahi/2010-February/001833.html
1243
https://lists.freedesktop.org/archives/avahi/2010-February/001833.html
1246
1244
https://bugs.debian.org/587961
1247
1245
*/
1248
1246
if(debug){
1428
1426
&decrypted_buffer, mc);
1429
1427
if(decrypted_buffer_size >= 0){
1430
1428
1429
clearerr(stdout);
1431
1430
written = 0;
1432
1431
while(written < (size_t) decrypted_buffer_size){
1433
1432
if(quit_now){
1449
1448
}
1450
1449
written += (size_t)ret;
1451
1450
}
1451
ret = fflush(stdout);
1452
if(ret != 0){
1453
int e = errno;
1454
if(debug){
1455
fprintf_plus(stderr, "Error writing encrypted data: %s\n",
1456
strerror(errno));
1457
}
1458
errno = e;
1459
goto mandos_end;
1460
}
1452
1461
retval = 0;
1453
1462
}
1454
1463
}
1485
1494
return retval;
1486
1495
}
1487
1496
1488
__attribute__((nonnull))
1489
1497
static void resolve_callback(AvahiSServiceResolver *r,
1490
1498
AvahiIfIndex interface,
1491
1499
AvahiProtocol proto,
1628
1636
__attribute__((nonnull, warn_unused_result))
1629
1637
bool get_flags(const char *ifname, struct ifreq *ifr){
1630
1638
int ret;
1631
error_t ret_errno;
1639
int old_errno;
1632
1640
1633
1641
int s = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
1634
1642
if(s < 0){
1635
ret_errno = errno;
1643
old_errno = errno;
1636
1644
perror_plus("socket");
1637
errno = ret_errno;
1645
errno = old_errno;
1638
1646
return false;
1639
1647
}
1640
strcpy(ifr->ifr_name, ifname);
1648
strncpy(ifr->ifr_name, ifname, IF_NAMESIZE);
1649
ifr->ifr_name[IF_NAMESIZE-1] = '\0'; /* NUL terminate */
1641
1650
ret = ioctl(s, SIOCGIFFLAGS, ifr);
1642
1651
if(ret == -1){
1643
1652
if(debug){
1644
ret_errno = errno;
1653
old_errno = errno;
1645
1654
perror_plus("ioctl SIOCGIFFLAGS");
1646
errno = ret_errno;
1655
errno = old_errno;
1647
1656
}
1648
1657
return false;
1649
1658
}
1913
1922
return;
1914
1923
}
1915
1924
}
1916
#ifdef __GLIBC__
1917
#if __GLIBC_PREREQ(2, 15)
1918
1925
int numhooks = scandirat(hookdir_fd, ".", &direntries,
1919
1926
runnable_hook, alphasort);
1920
#else /* not __GLIBC_PREREQ(2, 15) */
1921
int numhooks = scandir(hookdir, &direntries, runnable_hook,
1922
alphasort);
1923
#endif /* not __GLIBC_PREREQ(2, 15) */
1924
#else /* not __GLIBC__ */
1925
int numhooks = scandir(hookdir, &direntries, runnable_hook,
1926
alphasort);
1927
#endif /* not __GLIBC__ */
1928
1927
if(numhooks == -1){
1929
1928
perror_plus("scandir");
1930
1929
return;
2085
2084
}
2086
2085
2087
2086
__attribute__((nonnull, warn_unused_result))
2088
error_t bring_up_interface(const char *const interface,
2089
const float delay){
2090
error_t old_errno = errno;
2087
int bring_up_interface(const char *const interface,
2088
const float delay){
2089
int old_errno = errno;
2091
2090
int ret;
2092
2091
struct ifreq network;
2093
2092
unsigned int if_index = if_nametoindex(interface);
2103
2102
}
2104
2103
2105
2104
if(not interface_is_up(interface)){
2106
error_t ret_errno = 0, ioctl_errno = 0;
2105
int ret_errno = 0;
2106
int ioctl_errno = 0;
2107
2107
if(not get_flags(interface, &network)){
2108
2108
ret_errno = errno;
2109
2109
fprintf_plus(stderr, "Failed to get flags for interface "
2196
2196
2197
2197
/* Sleep checking until interface is running.
2198
2198
Check every 0.25s, up to total time of delay */
2199
for(int i=0; i < delay * 4; i++){
2199
for(int i = 0; i < delay * 4; i++){
2200
2200
if(interface_is_running(interface)){
2201
2201
break;
2202
2202
}
2212
2212
}
2213
2213
2214
2214
__attribute__((nonnull, warn_unused_result))
2215
error_t take_down_interface(const char *const interface){
2216
error_t old_errno = errno;
2215
int take_down_interface(const char *const interface){
2216
int old_errno = errno;
2217
2217
struct ifreq network;
2218
2218
unsigned int if_index = if_nametoindex(interface);
2219
2219
if(if_index == 0){
2222
2222
return ENXIO;
2223
2223
}
2224
2224
if(interface_is_up(interface)){
2225
error_t ret_errno = 0, ioctl_errno = 0;
2225
int ret_errno = 0;
2226
int ioctl_errno = 0;
2226
2227
if(not get_flags(interface, &network) and debug){
2227
2228
ret_errno = errno;
2228
2229
fprintf_plus(stderr, "Failed to get flags for interface "
2478
2479
.args_doc = "",
2479
2480
.doc = "Mandos client -- Get and decrypt"
2480
2481
" passwords from a Mandos server" };
2481
ret = argp_parse(&argp, argc, argv,
2482
ARGP_IN_ORDER | ARGP_NO_HELP, 0, NULL);
2483
switch(ret){
2482
ret_errno = argp_parse(&argp, argc, argv,
2483
ARGP_IN_ORDER | ARGP_NO_HELP, 0, NULL);
2484
switch(ret_errno){
2484
2485
case 0:
2485
2486
break;
2486
2487
case ENOMEM:
2487
2488
default:
2488
errno = ret;
2489
errno = ret_errno;
2489
2490
perror_plus("argp_parse");
2490
2491
exitcode = EX_OSERR;
2491
2492
goto end;
2497
2498
2498
2499
{
2499
2500
/* Work around Debian bug #633582:
2500
<http://bugs.debian.org/633582> */
2501
<https://bugs.debian.org/633582> */
2501
2502
2502
2503
/* Re-raise privileges */
2503
ret_errno = raise_privileges();
2504
if(ret_errno != 0){
2505
errno = ret_errno;
2504
ret = raise_privileges();
2505
if(ret != 0){
2506
errno = ret;
2506
2507
perror_plus("Failed to raise privileges");
2507
2508
} else {
2508
2509
struct stat st;
2572
2573
}
2573
2574
2574
2575
/* Lower privileges */
2575
ret_errno = lower_privileges();
2576
if(ret_errno != 0){
2577
errno = ret_errno;
2576
ret = lower_privileges();
2577
if(ret != 0){
2578
errno = ret;
2578
2579
perror_plus("Failed to lower privileges");
2579
2580
}
2580
2581
}
2908
2909
2909
2910
/* Allocate a new server */
2910
2911
mc.server = avahi_server_new(avahi_simple_poll_get(simple_poll),
2911
&config, NULL, NULL, &ret_errno);
2912
&config, NULL, NULL, &ret);
2912
2913
2913
2914
/* Free the Avahi configuration data */
2914
2915
avahi_server_config_free(&config);
2917
2918
/* Check if creating the Avahi server object succeeded */
2918
2919
if(mc.server == NULL){
2919
2920
fprintf_plus(stderr, "Failed to create Avahi server: %s\n",
2920
avahi_strerror(ret_errno));
2921
avahi_strerror(ret));
2921
2922
exitcode = EX_UNAVAILABLE;
2922
2923
goto end;
2923
2924
}
2958
2959
end:
2959
2960
2960
2961
if(debug){
2961
fprintf_plus(stderr, "%s exiting\n", argv[0]);
2962
if(signal_received){
2963
fprintf_plus(stderr, "%s exiting due to signal %d: %s\n",
2964
argv[0], signal_received,
2965
strsignal(signal_received));
2966
} else {
2967
fprintf_plus(stderr, "%s exiting\n", argv[0]);
2968
}
2962
2969
}
2963
2970
2964
2971
/* Cleanup things */
2975
2982
2976
2983
if(gnutls_initialized){
2977
2984
gnutls_certificate_free_credentials(mc.cred);
2978
gnutls_global_deinit();
2979
2985
gnutls_dh_params_deinit(mc.dh_params);
2980
2986
}
2981
2987
3004
3010
3005
3011
/* Re-raise privileges */
3006
3012
{
3007
ret_errno = raise_privileges();
3008
if(ret_errno != 0){
3009
errno = ret_errno;
3013
ret = raise_privileges();
3014
if(ret != 0){
3015
errno = ret;
3010
3016
perror_plus("Failed to raise privileges");
3011
3017
} else {
3012
3018
3017
3023
/* Take down the network interfaces which were brought up */
3018
3024
{
3019
3025
char *interface = NULL;
3020
while((interface=argz_next(interfaces_to_take_down,
3021
interfaces_to_take_down_size,
3022
interface))){
3023
ret_errno = take_down_interface(interface);
3024
if(ret_errno != 0){
3025
errno = ret_errno;
3026
while((interface = argz_next(interfaces_to_take_down,
3027
interfaces_to_take_down_size,
3028
interface))){
3029
ret = take_down_interface(interface);
3030
if(ret != 0){
3031
errno = ret;
3026
3032
perror_plus("Failed to take down interface");
3027
3033
}
3028
3034
}
3033
3039
}
3034
3040
}
3035
3041
3036
ret_errno = lower_privileges_permanently();
3037
if(ret_errno != 0){
3038
errno = ret_errno;
3042
ret = lower_privileges_permanently();
3043
if(ret != 0){
3044
errno = ret;
3039
3045
perror_plus("Failed to lower privileges permanently");
3040
3046
}
3041
3047
}
3043
3049
free(interfaces_to_take_down);
3044
3050
free(interfaces_hooks);
3045
3051
3052
void clean_dir_at(int base, const char * const dirname,
3053
uintmax_t level){
3054
struct dirent **direntries = NULL;
3055
int dret;
3056
int dir_fd = (int)TEMP_FAILURE_RETRY(openat(base, dirname,
3057
O_RDONLY
3058
| O_NOFOLLOW
3059
| O_DIRECTORY
3060
| O_PATH));
3061
if(dir_fd == -1){
3062
perror_plus("open");
3063
}
3064
int numentries = scandirat(dir_fd, ".", &direntries,
3065
notdotentries, alphasort);
3066
if(numentries >= 0){
3067
for(int i = 0; i < numentries; i++){
3068
if(debug){
3069
fprintf_plus(stderr, "Unlinking \"%s/%s\"\n",
3070
dirname, direntries[i]->d_name);
3071
}
3072
dret = unlinkat(dir_fd, direntries[i]->d_name, 0);
3073
if(dret == -1){
3074
if(errno == EISDIR){
3075
dret = unlinkat(dir_fd, direntries[i]->d_name,
3076
AT_REMOVEDIR);
3077
}
3078
if((dret == -1) and (errno == ENOTEMPTY)
3079
and (strcmp(direntries[i]->d_name, "private-keys-v1.d")
3080
== 0) and (level == 0)){
3081
/* Recurse only in this special case */
3082
clean_dir_at(dir_fd, direntries[i]->d_name, level+1);
3083
dret = 0;
3084
}
3085
if(dret == -1){
3086
fprintf_plus(stderr, "unlink(\"%s/%s\"): %s\n", dirname,
3087
direntries[i]->d_name, strerror(errno));
3088
}
3089
}
3090
free(direntries[i]);
3091
}
3092
3093
/* need to clean even if 0 because man page doesn't specify */
3094
free(direntries);
3095
if(numentries == -1){
3096
perror_plus("scandirat");
3097
}
3098
dret = unlinkat(base, dirname, AT_REMOVEDIR);
3099
if(dret == -1 and errno != ENOENT){
3100
perror_plus("rmdir");
3101
}
3102
} else {
3103
perror_plus("scandirat");
3104
}
3105
close(dir_fd);
3106
}
3107
3046
3108
/* Removes the GPGME temp directory and all files inside */
3047
3109
if(tempdir != NULL){
3048
struct dirent **direntries = NULL;
3049
int tempdir_fd = (int)TEMP_FAILURE_RETRY(open(tempdir, O_RDONLY
3050
| O_NOFOLLOW
3051
| O_DIRECTORY
3052
| O_PATH));
3053
if(tempdir_fd == -1){
3054
perror_plus("open");
3055
} else {
3056
#ifdef __GLIBC__
3057
#if __GLIBC_PREREQ(2, 15)
3058
int numentries = scandirat(tempdir_fd, ".", &direntries,
3059
notdotentries, alphasort);
3060
#else /* not __GLIBC_PREREQ(2, 15) */
3061
int numentries = scandir(tempdir, &direntries, notdotentries,
3062
alphasort);
3063
#endif /* not __GLIBC_PREREQ(2, 15) */
3064
#else /* not __GLIBC__ */
3065
int numentries = scandir(tempdir, &direntries, notdotentries,
3066
alphasort);
3067
#endif /* not __GLIBC__ */
3068
if(numentries >= 0){
3069
for(int i = 0; i < numentries; i++){
3070
ret = unlinkat(tempdir_fd, direntries[i]->d_name, 0);
3071
if(ret == -1){
3072
fprintf_plus(stderr, "unlinkat(open(\"%s\", O_RDONLY),"
3073
" \"%s\", 0): %s\n", tempdir,
3074
direntries[i]->d_name, strerror(errno));
3075
}
3076
free(direntries[i]);
3077
}
3078
3079
/* need to clean even if 0 because man page doesn't specify */
3080
free(direntries);
3081
if(numentries == -1){
3082
perror_plus("scandir");
3083
}
3084
ret = rmdir(tempdir);
3085
if(ret == -1 and errno != ENOENT){
3086
perror_plus("rmdir");
3087
}
3088
}
3089
close(tempdir_fd);
3090
}
3110
clean_dir_at(-1, tempdir, 0);
3091
3111
}
3092
3112
3093
3113
if(quit_now){
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0