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 798
- compare with another revision
- download diff
- download tarball
- view history from revision 798
- Committer: Teddy Hogeborn
- Date: 2016-02-21 12:55:39 UTC
- Revision ID: teddy@recompile.se-20160221125539-wi1n8ci0ldbdxrar
plugins.d/mandos-client.c (get_flags): Use strncpy(), not strcpy().
* plugins.d/mandos-client.c (get_flags): Use strncpy() instead of
strcpy(). Note that as the code works currently, this is never a
problem in practice, since only interface names which were valid
existing interface names (and therefore had names with lengths below
IF_NAMESIZE) is ever passed to the get_flags() function. But it
doesn't hurt to check, anyway.
* plugins.d/mandos-client.c (get_flags): Use strncpy() instead of
strcpy(). Note that as the code works currently, this is never a
problem in practice, since only interface names which were valid
existing interface names (and therefore had names with lengths below
IF_NAMESIZE) is ever passed to the get_flags() function. But it
doesn't hurt to check, anyway.
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-2016 Teddy Hogeborn
13
* Copyright © 2008-2016 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
57
57
#include <sys/socket.h> /* socket(), struct sockaddr_in6,
58
58
inet_pton(), connect(),
59
59
getnameinfo() */
60
#include <fcntl.h> /* open(), unlinkat(), AT_REMOVEDIR */
60
#include <fcntl.h> /* open(), unlinkat() */
61
61
#include <dirent.h> /* opendir(), struct dirent, readdir()
62
62
*/
63
63
#include <inttypes.h> /* PRIu16, PRIdMAX, intmax_t,
64
64
strtoimax() */
65
#include <errno.h> /* perror(), errno, EINTR, EINVAL,
66
EAI_SYSTEM, ENETUNREACH,
67
EHOSTUNREACH, ECONNREFUSED, EPROTO,
68
EIO, ENOENT, ENXIO, ENOMEM, EISDIR,
69
ENOTEMPTY,
65
#include <errno.h> /* perror(), errno,
70
66
program_invocation_short_name */
71
67
#include <time.h> /* nanosleep(), time(), sleep() */
72
68
#include <net/if.h> /* ioctl, ifreq, SIOCGIFFLAGS, IFF_UP,
517
513
fprintf_plus(stderr, "GnuTLS: %s", string);
518
514
}
519
515
520
__attribute__((nonnull(1, 2, 4), warn_unused_result))
516
__attribute__((nonnull, warn_unused_result))
521
517
static int init_gnutls_global(const char *pubkeyfilename,
522
518
const char *seckeyfilename,
523
519
const char *dhparamsfilename,
529
525
fprintf_plus(stderr, "Initializing GnuTLS\n");
530
526
}
531
527
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
532
535
if(debug){
533
536
/* "Use a log level over 10 to enable all debugging options."
534
537
* - GnuTLS manual
542
545
if(ret != GNUTLS_E_SUCCESS){
543
546
fprintf_plus(stderr, "GnuTLS memory error: %s\n",
544
547
safer_gnutls_strerror(ret));
548
gnutls_global_deinit();
545
549
return -1;
546
550
}
547
551
751
755
globalfail:
752
756
753
757
gnutls_certificate_free_credentials(mc->cred);
758
gnutls_global_deinit();
754
759
gnutls_dh_params_deinit(mc->dh_params);
755
760
return -1;
756
761
}
817
822
818
823
/* Set effective uid to 0, return errno */
819
824
__attribute__((warn_unused_result))
820
int raise_privileges(void){
821
int old_errno = errno;
822
int ret = 0;
825
error_t raise_privileges(void){
826
error_t old_errno = errno;
827
error_t ret_errno = 0;
823
828
if(seteuid(0) == -1){
824
ret = errno;
829
ret_errno = errno;
825
830
}
826
831
errno = old_errno;
827
return ret;
832
return ret_errno;
828
833
}
829
834
830
835
/* Set effective and real user ID to 0. Return errno. */
831
836
__attribute__((warn_unused_result))
832
int raise_privileges_permanently(void){
833
int old_errno = errno;
834
int ret = raise_privileges();
835
if(ret != 0){
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){
836
841
errno = old_errno;
837
return ret;
842
return ret_errno;
838
843
}
839
844
if(setuid(0) == -1){
840
ret = errno;
845
ret_errno = errno;
841
846
}
842
847
errno = old_errno;
843
return ret;
848
return ret_errno;
844
849
}
845
850
846
851
/* Set effective user ID to unprivileged saved user ID */
847
852
__attribute__((warn_unused_result))
848
int lower_privileges(void){
849
int old_errno = errno;
850
int ret = 0;
853
error_t lower_privileges(void){
854
error_t old_errno = errno;
855
error_t ret_errno = 0;
851
856
if(seteuid(uid) == -1){
852
ret = errno;
857
ret_errno = errno;
853
858
}
854
859
errno = old_errno;
855
return ret;
860
return ret_errno;
856
861
}
857
862
858
863
/* Lower privileges permanently */
859
864
__attribute__((warn_unused_result))
860
int lower_privileges_permanently(void){
861
int old_errno = errno;
862
int ret = 0;
865
error_t lower_privileges_permanently(void){
866
error_t old_errno = errno;
867
error_t ret_errno = 0;
863
868
if(setuid(uid) == -1){
864
ret = errno;
869
ret_errno = errno;
865
870
}
866
871
errno = old_errno;
867
return ret;
872
return ret_errno;
868
873
}
869
874
870
875
/* Helper function to add_local_route() and delete_local_route() */
1623
1628
__attribute__((nonnull, warn_unused_result))
1624
1629
bool get_flags(const char *ifname, struct ifreq *ifr){
1625
1630
int ret;
1626
int old_errno;
1631
error_t ret_errno;
1627
1632
1628
1633
int s = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
1629
1634
if(s < 0){
1630
old_errno = errno;
1635
ret_errno = errno;
1631
1636
perror_plus("socket");
1632
errno = old_errno;
1637
errno = ret_errno;
1633
1638
return false;
1634
1639
}
1635
1640
strncpy(ifr->ifr_name, ifname, IF_NAMESIZE);
1637
1642
ret = ioctl(s, SIOCGIFFLAGS, ifr);
1638
1643
if(ret == -1){
1639
1644
if(debug){
1640
old_errno = errno;
1645
ret_errno = errno;
1641
1646
perror_plus("ioctl SIOCGIFFLAGS");
1642
errno = old_errno;
1647
errno = ret_errno;
1643
1648
}
1644
1649
return false;
1645
1650
}
1909
1914
return;
1910
1915
}
1911
1916
}
1917
#ifdef __GLIBC__
1918
#if __GLIBC_PREREQ(2, 15)
1912
1919
int numhooks = scandirat(hookdir_fd, ".", &direntries,
1913
1920
runnable_hook, alphasort);
1921
#else /* not __GLIBC_PREREQ(2, 15) */
1922
int numhooks = scandir(hookdir, &direntries, runnable_hook,
1923
alphasort);
1924
#endif /* not __GLIBC_PREREQ(2, 15) */
1925
#else /* not __GLIBC__ */
1926
int numhooks = scandir(hookdir, &direntries, runnable_hook,
1927
alphasort);
1928
#endif /* not __GLIBC__ */
1914
1929
if(numhooks == -1){
1915
1930
perror_plus("scandir");
1916
1931
return;
2071
2086
}
2072
2087
2073
2088
__attribute__((nonnull, warn_unused_result))
2074
int bring_up_interface(const char *const interface,
2075
const float delay){
2076
int old_errno = errno;
2089
error_t bring_up_interface(const char *const interface,
2090
const float delay){
2091
error_t old_errno = errno;
2077
2092
int ret;
2078
2093
struct ifreq network;
2079
2094
unsigned int if_index = if_nametoindex(interface);
2089
2104
}
2090
2105
2091
2106
if(not interface_is_up(interface)){
2092
int ret_errno = 0;
2093
int ioctl_errno = 0;
2107
error_t ret_errno = 0, ioctl_errno = 0;
2094
2108
if(not get_flags(interface, &network)){
2095
2109
ret_errno = errno;
2096
2110
fprintf_plus(stderr, "Failed to get flags for interface "
2199
2213
}
2200
2214
2201
2215
__attribute__((nonnull, warn_unused_result))
2202
int take_down_interface(const char *const interface){
2203
int old_errno = errno;
2216
error_t take_down_interface(const char *const interface){
2217
error_t old_errno = errno;
2204
2218
struct ifreq network;
2205
2219
unsigned int if_index = if_nametoindex(interface);
2206
2220
if(if_index == 0){
2209
2223
return ENXIO;
2210
2224
}
2211
2225
if(interface_is_up(interface)){
2212
int ret_errno = 0;
2213
int ioctl_errno = 0;
2226
error_t ret_errno = 0, ioctl_errno = 0;
2214
2227
if(not get_flags(interface, &network) and debug){
2215
2228
ret_errno = errno;
2216
2229
fprintf_plus(stderr, "Failed to get flags for interface "
2466
2479
.args_doc = "",
2467
2480
.doc = "Mandos client -- Get and decrypt"
2468
2481
" passwords from a Mandos server" };
2469
ret_errno = argp_parse(&argp, argc, argv,
2470
ARGP_IN_ORDER | ARGP_NO_HELP, 0, NULL);
2471
switch(ret_errno){
2482
ret = argp_parse(&argp, argc, argv,
2483
ARGP_IN_ORDER | ARGP_NO_HELP, 0, NULL);
2484
switch(ret){
2472
2485
case 0:
2473
2486
break;
2474
2487
case ENOMEM:
2475
2488
default:
2476
errno = ret_errno;
2489
errno = ret;
2477
2490
perror_plus("argp_parse");
2478
2491
exitcode = EX_OSERR;
2479
2492
goto end;
2488
2501
<http://bugs.debian.org/633582> */
2489
2502
2490
2503
/* Re-raise privileges */
2491
ret = raise_privileges();
2492
if(ret != 0){
2493
errno = ret;
2504
ret_errno = raise_privileges();
2505
if(ret_errno != 0){
2506
errno = ret_errno;
2494
2507
perror_plus("Failed to raise privileges");
2495
2508
} else {
2496
2509
struct stat st;
2560
2573
}
2561
2574
2562
2575
/* Lower privileges */
2563
ret = lower_privileges();
2564
if(ret != 0){
2565
errno = ret;
2576
ret_errno = lower_privileges();
2577
if(ret_errno != 0){
2578
errno = ret_errno;
2566
2579
perror_plus("Failed to lower privileges");
2567
2580
}
2568
2581
}
2896
2909
2897
2910
/* Allocate a new server */
2898
2911
mc.server = avahi_server_new(avahi_simple_poll_get(simple_poll),
2899
&config, NULL, NULL, &ret);
2912
&config, NULL, NULL, &ret_errno);
2900
2913
2901
2914
/* Free the Avahi configuration data */
2902
2915
avahi_server_config_free(&config);
2905
2918
/* Check if creating the Avahi server object succeeded */
2906
2919
if(mc.server == NULL){
2907
2920
fprintf_plus(stderr, "Failed to create Avahi server: %s\n",
2908
avahi_strerror(ret));
2921
avahi_strerror(ret_errno));
2909
2922
exitcode = EX_UNAVAILABLE;
2910
2923
goto end;
2911
2924
}
2963
2976
2964
2977
if(gnutls_initialized){
2965
2978
gnutls_certificate_free_credentials(mc.cred);
2979
gnutls_global_deinit();
2966
2980
gnutls_dh_params_deinit(mc.dh_params);
2967
2981
}
2968
2982
2991
3005
2992
3006
/* Re-raise privileges */
2993
3007
{
2994
ret = raise_privileges();
2995
if(ret != 0){
2996
errno = ret;
3008
ret_errno = raise_privileges();
3009
if(ret_errno != 0){
3010
errno = ret_errno;
2997
3011
perror_plus("Failed to raise privileges");
2998
3012
} else {
2999
3013
3007
3021
while((interface=argz_next(interfaces_to_take_down,
3008
3022
interfaces_to_take_down_size,
3009
3023
interface))){
3010
ret = take_down_interface(interface);
3011
if(ret != 0){
3012
errno = ret;
3024
ret_errno = take_down_interface(interface);
3025
if(ret_errno != 0){
3026
errno = ret_errno;
3013
3027
perror_plus("Failed to take down interface");
3014
3028
}
3015
3029
}
3020
3034
}
3021
3035
}
3022
3036
3023
ret = lower_privileges_permanently();
3024
if(ret != 0){
3025
errno = ret;
3037
ret_errno = lower_privileges_permanently();
3038
if(ret_errno != 0){
3039
errno = ret_errno;
3026
3040
perror_plus("Failed to lower privileges permanently");
3027
3041
}
3028
3042
}
3030
3044
free(interfaces_to_take_down);
3031
3045
free(interfaces_hooks);
3032
3046
3033
void clean_dir_at(int base, const char * const dirname,
3034
uintmax_t level){
3035
struct dirent **direntries = NULL;
3036
int dret;
3037
int dir_fd = (int)TEMP_FAILURE_RETRY(openat(base, dirname,
3038
O_RDONLY
3039
| O_NOFOLLOW
3040
| O_DIRECTORY
3041
| O_PATH));
3042
if(dir_fd == -1){
3043
perror_plus("open");
3044
}
3045
int numentries = scandirat(dir_fd, ".", &direntries,
3046
notdotentries, alphasort);
3047
if(numentries >= 0){
3048
for(int i = 0; i < numentries; i++){
3049
if(debug){
3050
fprintf_plus(stderr, "Unlinking \"%s/%s\"\n",
3051
dirname, direntries[i]->d_name);
3052
}
3053
dret = unlinkat(dir_fd, direntries[i]->d_name, 0);
3054
if(dret == -1){
3055
if(errno == EISDIR){
3056
dret = unlinkat(dir_fd, direntries[i]->d_name,
3057
AT_REMOVEDIR);
3058
}
3059
if((dret == -1) and (errno == ENOTEMPTY)
3060
and (strcmp(direntries[i]->d_name, "private-keys-v1.d")
3061
== 0) and (level == 0)){
3062
/* Recurse only in this special case */
3063
clean_dir_at(dir_fd, direntries[i]->d_name, level+1);
3064
dret = 0;
3065
}
3066
if(dret == -1){
3067
fprintf_plus(stderr, "unlink(\"%s/%s\"): %s\n", dirname,
3068
direntries[i]->d_name, strerror(errno));
3069
}
3070
}
3071
free(direntries[i]);
3072
}
3073
3074
/* need to clean even if 0 because man page doesn't specify */
3075
free(direntries);
3076
if(numentries == -1){
3077
perror_plus("scandirat");
3078
}
3079
dret = unlinkat(base, dirname, AT_REMOVEDIR);
3080
if(dret == -1 and errno != ENOENT){
3081
perror_plus("rmdir");
3082
}
3083
} else {
3084
perror_plus("scandirat");
3085
}
3086
close(dir_fd);
3087
}
3088
3089
3047
/* Removes the GPGME temp directory and all files inside */
3090
3048
if(tempdir != NULL){
3091
clean_dir_at(-1, tempdir, 0);
3049
struct dirent **direntries = NULL;
3050
int tempdir_fd = (int)TEMP_FAILURE_RETRY(open(tempdir, O_RDONLY
3051
| O_NOFOLLOW
3052
| O_DIRECTORY
3053
| O_PATH));
3054
if(tempdir_fd == -1){
3055
perror_plus("open");
3056
} else {
3057
#ifdef __GLIBC__
3058
#if __GLIBC_PREREQ(2, 15)
3059
int numentries = scandirat(tempdir_fd, ".", &direntries,
3060
notdotentries, alphasort);
3061
#else /* not __GLIBC_PREREQ(2, 15) */
3062
int numentries = scandir(tempdir, &direntries, notdotentries,
3063
alphasort);
3064
#endif /* not __GLIBC_PREREQ(2, 15) */
3065
#else /* not __GLIBC__ */
3066
int numentries = scandir(tempdir, &direntries, notdotentries,
3067
alphasort);
3068
#endif /* not __GLIBC__ */
3069
if(numentries >= 0){
3070
for(int i = 0; i < numentries; i++){
3071
ret = unlinkat(tempdir_fd, direntries[i]->d_name, 0);
3072
if(ret == -1){
3073
fprintf_plus(stderr, "unlinkat(open(\"%s\", O_RDONLY),"
3074
" \"%s\", 0): %s\n", tempdir,
3075
direntries[i]->d_name, strerror(errno));
3076
}
3077
free(direntries[i]);
3078
}
3079
3080
/* need to clean even if 0 because man page doesn't specify */
3081
free(direntries);
3082
if(numentries == -1){
3083
perror_plus("scandir");
3084
}
3085
ret = rmdir(tempdir);
3086
if(ret == -1 and errno != ENOENT){
3087
perror_plus("rmdir");
3088
}
3089
}
3090
close(tempdir_fd);
3091
}
3092
3092
}
3093
3093
3094
3094
if(quit_now){
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0