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 672
- compare with another revision
- download diff
- download tarball
- view history from revision 672
- Committer: Teddy Hogeborn
- Date: 2014-03-23 19:24:40 UTC
- Revision ID: teddy@recompile.se-20140323192440-d71iiqxebsxf9u2v
Update GCC warning flags and function attributes to GCC 4.7.
* Makefile (WARN): Update to include almost all warning flags.
* plugin-runner.c (getplugin, add_to_char_array, add_argument,
add_environment, set_cloexec_flag,
print_out_password): Add attribute
"warn_unused_result".
(main/parse_opt): Bug fix: Add error checking to --global-env,
--env-for, --plugin-dir, and --config-file, and
make sure errno does not "leak" from unrelated
functions.
* plugins.d/mandos-client.c
(fprintf_plus, debuggnutls, resolve_callback): Add "nonnull"
attribute.
(incbuffer, add_server, init_gpgme): Add "nonnull" and
"warn_unused_result"
attributes.
(pgp_packet_decrypt, init_gnutls_global): - '' -
(init_gnutls_session start_mandos_communication, get_flags): - '' -
(good_flags, good_interface, interface_is_up): - '' -
(interface_is_running, runnable_hook): - '' -
(avahi_loop_with_timeout, bring_up_interface): : - '' -
(safer_gnutls_strerror): Add "warn_unused_result" attribute.
(notdotentries): Set "nonnull", "pure", and "warn_unused_result"
attributes.
(raise_privileges, raise_privileges_permanently, lower_privileges,
lower_privileges_permanently): Set "warn_unused_result" attribute.
(run_network_hooks): Exit child process if it fails to do anything
it needs to do. Make explicit cast to double
when passing float value to asprintf(). Change
return type to void - all callers changed.
(bring_up_interface): Move variables "sd", "ret_errno", and
"ret_setflags" to innermost scope. Bug fix:
Fail if could not get interface flags also in
non-debug mode, and restore old errno
correctly. Print message if could not raise
(or later lower) privileges.
(take_down_interface): Bug fix: When failing because it could not
get interface flags, restore old errno
correctly. Print message if it could not
raise (or later lower) privileges.
(main): Complain if failed to raise or lower privileges. Only run
network hooks or lower privileges if raising privileges was
successful.
* Makefile (WARN): Update to include almost all warning flags.
* plugin-runner.c (getplugin, add_to_char_array, add_argument,
add_environment, set_cloexec_flag,
print_out_password): Add attribute
"warn_unused_result".
(main/parse_opt): Bug fix: Add error checking to --global-env,
--env-for, --plugin-dir, and --config-file, and
make sure errno does not "leak" from unrelated
functions.
* plugins.d/mandos-client.c
(fprintf_plus, debuggnutls, resolve_callback): Add "nonnull"
attribute.
(incbuffer, add_server, init_gpgme): Add "nonnull" and
"warn_unused_result"
attributes.
(pgp_packet_decrypt, init_gnutls_global): - '' -
(init_gnutls_session start_mandos_communication, get_flags): - '' -
(good_flags, good_interface, interface_is_up): - '' -
(interface_is_running, runnable_hook): - '' -
(avahi_loop_with_timeout, bring_up_interface): : - '' -
(safer_gnutls_strerror): Add "warn_unused_result" attribute.
(notdotentries): Set "nonnull", "pure", and "warn_unused_result"
attributes.
(raise_privileges, raise_privileges_permanently, lower_privileges,
lower_privileges_permanently): Set "warn_unused_result" attribute.
(run_network_hooks): Exit child process if it fails to do anything
it needs to do. Make explicit cast to double
when passing float value to asprintf(). Change
return type to void - all callers changed.
(bring_up_interface): Move variables "sd", "ret_errno", and
"ret_setflags" to innermost scope. Bug fix:
Fail if could not get interface flags also in
non-debug mode, and restore old errno
correctly. Print message if could not raise
(or later lower) privileges.
(take_down_interface): Bug fix: When failing because it could not
get interface flags, restore old errno
correctly. Print message if it could not
raise (or later lower) privileges.
(main): Complain if failed to raise or lower privileges. Only run
network hooks or lower privileges if raising privileges was
successful.
- files added:
- debian/upstream-signing-key.pgp
- files modified:
- INSTALL
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-2012 Teddy Hogeborn
13
* Copyright © 2008-2012 Björn Påhlsson
12
* Copyright © 2008-2013 Teddy Hogeborn
13
* Copyright © 2008-2013 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
55
55
opendir(), DIR */
56
56
#include <sys/stat.h> /* open(), S_ISREG */
57
57
#include <sys/socket.h> /* socket(), struct sockaddr_in6,
58
inet_pton(), connect() */
58
inet_pton(), connect(),
59
getnameinfo() */
59
60
#include <fcntl.h> /* open() */
60
61
#include <dirent.h> /* opendir(), struct dirent, readdir()
61
62
*/
73
74
#include <unistd.h> /* close(), SEEK_SET, off_t, write(),
74
75
getuid(), getgid(), seteuid(),
75
76
setgid(), pause(), _exit() */
76
#include <arpa/inet.h> /* inet_pton(), htons, inet_ntop() */
77
#include <arpa/inet.h> /* inet_pton(), htons() */
77
78
#include <iso646.h> /* not, or, and */
78
79
#include <argp.h> /* struct argp_option, error_t, struct
79
80
argp_state, struct argp,
91
92
argz_delete(), argz_append(),
92
93
argz_stringify(), argz_add(),
93
94
argz_count() */
95
#include <netdb.h> /* getnameinfo(), NI_NUMERICHOST,
96
EAI_SYSTEM, gai_strerror() */
94
97
95
98
#ifdef __linux__
96
99
#include <sys/klog.h> /* klogctl() */
161
164
const char *priority;
162
165
gpgme_ctx_t ctx;
163
166
server *current_server;
167
char *interfaces;
168
size_t interfaces_size;
164
169
} mandos_context;
165
170
166
171
/* global so signal handler can reach it*/
178
183
perror(print_text);
179
184
}
180
185
181
__attribute__((format (gnu_printf, 2, 3)))
186
__attribute__((format (gnu_printf, 2, 3), nonnull))
182
187
int fprintf_plus(FILE *stream, const char *format, ...){
183
188
va_list ap;
184
189
va_start (ap, format);
185
190
186
191
TEMP_FAILURE_RETRY(fprintf(stream, "Mandos plugin %s: ",
187
192
program_invocation_short_name));
188
return TEMP_FAILURE_RETRY(vfprintf(stream, format, ap));
193
return (int)TEMP_FAILURE_RETRY(vfprintf(stream, format, ap));
189
194
}
190
195
191
196
/*
193
198
* bytes. "buffer_capacity" is how much is currently allocated,
194
199
* "buffer_length" is how much is already used.
195
200
*/
201
__attribute__((nonnull, warn_unused_result))
196
202
size_t incbuffer(char **buffer, size_t buffer_length,
197
203
size_t buffer_capacity){
198
204
if(buffer_length + BUFFER_SIZE > buffer_capacity){
199
*buffer = realloc(*buffer, buffer_capacity + BUFFER_SIZE);
200
if(buffer == NULL){
205
char *new_buf = realloc(*buffer, buffer_capacity + BUFFER_SIZE);
206
if(new_buf == NULL){
207
int old_errno = errno;
208
free(*buffer);
209
errno = old_errno;
210
*buffer = NULL;
201
211
return 0;
202
212
}
213
*buffer = new_buf;
203
214
buffer_capacity += BUFFER_SIZE;
204
215
}
205
216
return buffer_capacity;
206
217
}
207
218
208
219
/* Add server to set of servers to retry periodically */
220
__attribute__((nonnull, warn_unused_result))
209
221
bool add_server(const char *ip, in_port_t port, AvahiIfIndex if_index,
210
222
int af, server **current_server){
211
223
int ret;
222
234
perror_plus("strdup");
223
235
return false;
224
236
}
237
ret = clock_gettime(CLOCK_MONOTONIC, &(new_server->last_seen));
238
if(ret == -1){
239
perror_plus("clock_gettime");
240
return false;
241
}
225
242
/* Special case of first server */
226
243
if(*current_server == NULL){
227
244
new_server->next = new_server;
228
245
new_server->prev = new_server;
229
246
*current_server = new_server;
230
/* Place the new server last in the list */
231
247
} else {
248
/* Place the new server last in the list */
232
249
new_server->next = *current_server;
233
250
new_server->prev = (*current_server)->prev;
234
251
new_server->prev->next = new_server;
235
252
(*current_server)->prev = new_server;
236
253
}
237
ret = clock_gettime(CLOCK_MONOTONIC, &(*current_server)->last_seen);
238
if(ret == -1){
239
perror_plus("clock_gettime");
240
return false;
241
}
242
254
return true;
243
255
}
244
256
245
257
/*
246
258
* Initialize GPGME.
247
259
*/
260
__attribute__((nonnull, warn_unused_result))
248
261
static bool init_gpgme(const char *seckey, const char *pubkey,
249
262
const char *tempdir, mandos_context *mc){
250
263
gpgme_error_t rc;
340
353
* Decrypt OpenPGP data.
341
354
* Returns -1 on error
342
355
*/
356
__attribute__((nonnull, warn_unused_result))
343
357
static ssize_t pgp_packet_decrypt(const char *cryptotext,
344
358
size_t crypto_size,
345
359
char **plaintext,
465
479
return plaintext_length;
466
480
}
467
481
468
static const char * safer_gnutls_strerror(int value){
482
__attribute__((warn_unused_result))
483
static const char *safer_gnutls_strerror(int value){
469
484
const char *ret = gnutls_strerror(value);
470
485
if(ret == NULL)
471
486
ret = "(unknown)";
473
488
}
474
489
475
490
/* GnuTLS log function callback */
491
__attribute__((nonnull))
476
492
static void debuggnutls(__attribute__((unused)) int level,
477
493
const char* string){
478
494
fprintf_plus(stderr, "GnuTLS: %s", string);
479
495
}
480
496
497
__attribute__((nonnull, warn_unused_result))
481
498
static int init_gnutls_global(const char *pubkeyfilename,
482
499
const char *seckeyfilename,
483
500
mandos_context *mc){
557
574
return -1;
558
575
}
559
576
577
__attribute__((nonnull, warn_unused_result))
560
578
static int init_gnutls_session(gnutls_session_t *session,
561
579
mandos_context *mc){
562
580
int ret;
619
637
__attribute__((unused)) const char *txt){}
620
638
621
639
/* Called when a Mandos server is found */
640
__attribute__((nonnull, warn_unused_result))
622
641
static int start_mandos_communication(const char *ip, in_port_t port,
623
642
AvahiIfIndex if_index,
624
643
int af, mandos_context *mc){
625
644
int ret, tcp_sd = -1;
626
645
ssize_t sret;
627
union {
628
struct sockaddr_in in;
629
struct sockaddr_in6 in6;
630
} to;
646
struct sockaddr_storage to;
631
647
char *buffer = NULL;
632
648
char *decrypted_buffer = NULL;
633
649
size_t buffer_length = 0;
657
673
return -1;
658
674
}
659
675
676
/* If the interface is specified and we have a list of interfaces */
677
if(if_index != AVAHI_IF_UNSPEC and mc->interfaces != NULL){
678
/* Check if the interface is one of the interfaces we are using */
679
bool match = false;
680
{
681
char *interface = NULL;
682
while((interface=argz_next(mc->interfaces, mc->interfaces_size,
683
interface))){
684
if(if_nametoindex(interface) == (unsigned int)if_index){
685
match = true;
686
break;
687
}
688
}
689
}
690
if(not match){
691
/* This interface does not match any in the list, so we don't
692
connect to the server */
693
if(debug){
694
char interface[IF_NAMESIZE];
695
if(if_indextoname((unsigned int)if_index, interface) == NULL){
696
perror_plus("if_indextoname");
697
} else {
698
fprintf_plus(stderr, "Skipping server on non-used interface"
699
" \"%s\"\n",
700
if_indextoname((unsigned int)if_index,
701
interface));
702
}
703
}
704
return -1;
705
}
706
}
707
660
708
ret = init_gnutls_session(&session, mc);
661
709
if(ret != 0){
662
710
return -1;
682
730
683
731
memset(&to, 0, sizeof(to));
684
732
if(af == AF_INET6){
685
to.in6.sin6_family = (sa_family_t)af;
686
ret = inet_pton(af, ip, &to.in6.sin6_addr);
733
((struct sockaddr_in6 *)&to)->sin6_family = (sa_family_t)af;
734
ret = inet_pton(af, ip, &((struct sockaddr_in6 *)&to)->sin6_addr);
687
735
} else { /* IPv4 */
688
to.in.sin_family = (sa_family_t)af;
689
ret = inet_pton(af, ip, &to.in.sin_addr);
736
((struct sockaddr_in *)&to)->sin_family = (sa_family_t)af;
737
ret = inet_pton(af, ip, &((struct sockaddr_in *)&to)->sin_addr);
690
738
}
691
739
if(ret < 0 ){
692
740
int e = errno;
701
749
goto mandos_end;
702
750
}
703
751
if(af == AF_INET6){
704
to.in6.sin6_port = htons(port);
705
if(IN6_IS_ADDR_LINKLOCAL /* Spurious warnings from */
706
(&to.in6.sin6_addr)){ /* -Wstrict-aliasing=2 or lower and
707
-Wunreachable-code*/
752
((struct sockaddr_in6 *)&to)->sin6_port = htons(port);
753
if(IN6_IS_ADDR_LINKLOCAL
754
(&((struct sockaddr_in6 *)&to)->sin6_addr)){
708
755
if(if_index == AVAHI_IF_UNSPEC){
709
756
fprintf_plus(stderr, "An IPv6 link-local address is"
710
757
" incomplete without a network interface\n");
712
759
goto mandos_end;
713
760
}
714
761
/* Set the network interface number as scope */
715
to.in6.sin6_scope_id = (uint32_t)if_index;
762
((struct sockaddr_in6 *)&to)->sin6_scope_id = (uint32_t)if_index;
716
763
}
717
764
} else {
718
to.in.sin_port = htons(port); /* Spurious warnings from
719
-Wconversion and
720
-Wunreachable-code */
765
((struct sockaddr_in *)&to)->sin_port = htons(port);
721
766
}
722
767
723
768
if(quit_now){
740
785
}
741
786
char addrstr[(INET_ADDRSTRLEN > INET6_ADDRSTRLEN) ?
742
787
INET_ADDRSTRLEN : INET6_ADDRSTRLEN] = "";
743
const char *pcret;
744
788
if(af == AF_INET6){
745
pcret = inet_ntop(af, &(to.in6.sin6_addr), addrstr,
746
sizeof(addrstr));
789
ret = getnameinfo((struct sockaddr *)&to,
790
sizeof(struct sockaddr_in6),
791
addrstr, sizeof(addrstr), NULL, 0,
792
NI_NUMERICHOST);
747
793
} else {
748
pcret = inet_ntop(af, &(to.in.sin_addr), addrstr,
749
sizeof(addrstr));
794
ret = getnameinfo((struct sockaddr *)&to,
795
sizeof(struct sockaddr_in),
796
addrstr, sizeof(addrstr), NULL, 0,
797
NI_NUMERICHOST);
750
798
}
751
if(pcret == NULL){
752
perror_plus("inet_ntop");
753
} else {
754
if(strcmp(addrstr, ip) != 0){
755
fprintf_plus(stderr, "Canonical address form: %s\n", addrstr);
756
}
799
if(ret == EAI_SYSTEM){
800
perror_plus("getnameinfo");
801
} else if(ret != 0) {
802
fprintf_plus(stderr, "getnameinfo: %s", gai_strerror(ret));
803
} else if(strcmp(addrstr, ip) != 0){
804
fprintf_plus(stderr, "Canonical address form: %s\n", addrstr);
757
805
}
758
806
}
759
807
763
811
}
764
812
765
813
if(af == AF_INET6){
766
ret = connect(tcp_sd, &to.in6, sizeof(to));
814
ret = connect(tcp_sd, (struct sockaddr *)&to,
815
sizeof(struct sockaddr_in6));
767
816
} else {
768
ret = connect(tcp_sd, &to.in, sizeof(to)); /* IPv4 */
817
ret = connect(tcp_sd, (struct sockaddr *)&to, /* IPv4 */
818
sizeof(struct sockaddr_in));
769
819
}
770
820
if(ret < 0){
771
if ((errno != ECONNREFUSED and errno != ENETUNREACH) or debug){
821
if((errno != ECONNREFUSED and errno != ENETUNREACH) or debug){
772
822
int e = errno;
773
823
perror_plus("connect");
774
824
errno = e;
989
1039
return retval;
990
1040
}
991
1041
1042
__attribute__((nonnull))
992
1043
static void resolve_callback(AvahiSServiceResolver *r,
993
1044
AvahiIfIndex interface,
994
1045
AvahiProtocol proto,
1002
1053
AVAHI_GCC_UNUSED AvahiStringList *txt,
1003
1054
AVAHI_GCC_UNUSED AvahiLookupResultFlags
1004
1055
flags,
1005
void* mc){
1056
void *mc){
1006
1057
if(r == NULL){
1007
1058
return;
1008
1059
}
1061
1112
const char *domain,
1062
1113
AVAHI_GCC_UNUSED AvahiLookupResultFlags
1063
1114
flags,
1064
void* mc){
1115
void *mc){
1065
1116
if(b == NULL){
1066
1117
return;
1067
1118
}
1127
1178
errno = old_errno;
1128
1179
}
1129
1180
1181
__attribute__((nonnull, warn_unused_result))
1130
1182
bool get_flags(const char *ifname, struct ifreq *ifr){
1131
1183
int ret;
1132
1184
error_t ret_errno;
1151
1203
return true;
1152
1204
}
1153
1205
1206
__attribute__((nonnull, warn_unused_result))
1154
1207
bool good_flags(const char *ifname, const struct ifreq *ifr){
1155
1208
1156
1209
/* Reject the loopback device */
1198
1251
* corresponds to an acceptable network device.
1199
1252
* (This function is passed to scandir(3) as a filter function.)
1200
1253
*/
1254
__attribute__((nonnull, warn_unused_result))
1201
1255
int good_interface(const struct dirent *if_entry){
1202
1256
if(if_entry->d_name[0] == '.'){
1203
1257
return 0;
1221
1275
/*
1222
1276
* This function determines if a network interface is up.
1223
1277
*/
1278
__attribute__((nonnull, warn_unused_result))
1224
1279
bool interface_is_up(const char *interface){
1225
1280
struct ifreq ifr;
1226
1281
if(not get_flags(interface, &ifr)){
1237
1292
/*
1238
1293
* This function determines if a network interface is running
1239
1294
*/
1295
__attribute__((nonnull, warn_unused_result))
1240
1296
bool interface_is_running(const char *interface){
1241
1297
struct ifreq ifr;
1242
1298
if(not get_flags(interface, &ifr)){
1250
1306
return (bool)(ifr.ifr_flags & IFF_RUNNING);
1251
1307
}
1252
1308
1309
__attribute__((nonnull, pure, warn_unused_result))
1253
1310
int notdotentries(const struct dirent *direntry){
1254
1311
/* Skip "." and ".." */
1255
1312
if(direntry->d_name[0] == '.'
1262
1319
}
1263
1320
1264
1321
/* Is this directory entry a runnable program? */
1322
__attribute__((nonnull, warn_unused_result))
1265
1323
int runnable_hook(const struct dirent *direntry){
1266
1324
int ret;
1267
1325
size_t sret;
1322
1380
return 1;
1323
1381
}
1324
1382
1383
__attribute__((nonnull, warn_unused_result))
1325
1384
int avahi_loop_with_timeout(AvahiSimplePoll *s, int retry_interval,
1326
1385
mandos_context *mc){
1327
1386
int ret;
1331
1390
1332
1391
while(true){
1333
1392
if(mc->current_server == NULL){
1334
if (debug){
1393
if(debug){
1335
1394
fprintf_plus(stderr, "Wait until first server is found."
1336
1395
" No timeout!\n");
1337
1396
}
1338
1397
ret = avahi_simple_poll_iterate(s, -1);
1339
1398
} else {
1340
if (debug){
1399
if(debug){
1341
1400
fprintf_plus(stderr, "Check current_server if we should run"
1342
1401
" it, or wait\n");
1343
1402
}
1360
1419
- ((intmax_t)waited_time.tv_sec * 1000))
1361
1420
- ((intmax_t)waited_time.tv_nsec / 1000000));
1362
1421
1363
if (debug){
1422
if(debug){
1364
1423
fprintf_plus(stderr, "Blocking for %" PRIdMAX " ms\n",
1365
1424
block_time);
1366
1425
}
1388
1447
ret = avahi_simple_poll_iterate(s, (int)block_time);
1389
1448
}
1390
1449
if(ret != 0){
1391
if (ret > 0 or errno != EINTR){
1450
if(ret > 0 or errno != EINTR){
1392
1451
return (ret != 1) ? ret : 0;
1393
1452
}
1394
1453
}
1396
1455
}
1397
1456
1398
1457
/* Set effective uid to 0, return errno */
1458
__attribute__((warn_unused_result))
1399
1459
error_t raise_privileges(void){
1400
1460
error_t old_errno = errno;
1401
1461
error_t ret_errno = 0;
1408
1468
}
1409
1469
1410
1470
/* Set effective and real user ID to 0. Return errno. */
1471
__attribute__((warn_unused_result))
1411
1472
error_t raise_privileges_permanently(void){
1412
1473
error_t old_errno = errno;
1413
1474
error_t ret_errno = raise_privileges();
1424
1485
}
1425
1486
1426
1487
/* Set effective user ID to unprivileged saved user ID */
1488
__attribute__((warn_unused_result))
1427
1489
error_t lower_privileges(void){
1428
1490
error_t old_errno = errno;
1429
1491
error_t ret_errno = 0;
1436
1498
}
1437
1499
1438
1500
/* Lower privileges permanently */
1501
__attribute__((warn_unused_result))
1439
1502
error_t lower_privileges_permanently(void){
1440
1503
error_t old_errno = errno;
1441
1504
error_t ret_errno = 0;
1447
1510
return ret_errno;
1448
1511
}
1449
1512
1450
bool run_network_hooks(const char *mode, const char *interface,
1513
__attribute__((nonnull))
1514
void run_network_hooks(const char *mode, const char *interface,
1451
1515
const float delay){
1452
1516
struct dirent **direntries;
1453
struct dirent *direntry;
1454
int ret;
1455
1517
int numhooks = scandir(hookdir, &direntries, runnable_hook,
1456
1518
alphasort);
1457
1519
if(numhooks == -1){
1464
1526
perror_plus("scandir");
1465
1527
}
1466
1528
} else {
1529
struct dirent *direntry;
1530
int ret;
1467
1531
int devnull = open("/dev/null", O_RDONLY);
1468
1532
for(int i = 0; i < numhooks; i++){
1469
1533
direntry = direntries[i];
1481
1545
if(hook_pid == 0){
1482
1546
/* Child */
1483
1547
/* Raise privileges */
1484
raise_privileges_permanently();
1548
if(raise_privileges_permanently() != 0){
1549
perror_plus("Failed to raise privileges");
1550
_exit(EX_NOPERM);
1551
}
1485
1552
/* Set group */
1486
1553
errno = 0;
1487
1554
ret = setgid(0);
1488
1555
if(ret == -1){
1489
1556
perror_plus("setgid");
1557
_exit(EX_NOPERM);
1490
1558
}
1491
1559
/* Reset supplementary groups */
1492
1560
errno = 0;
1493
1561
ret = setgroups(0, NULL);
1494
1562
if(ret == -1){
1495
1563
perror_plus("setgroups");
1496
}
1497
dup2(devnull, STDIN_FILENO);
1498
close(devnull);
1499
dup2(STDERR_FILENO, STDOUT_FILENO);
1564
_exit(EX_NOPERM);
1565
}
1566
ret = dup2(devnull, STDIN_FILENO);
1567
if(ret == -1){
1568
perror_plus("dup2(devnull, STDIN_FILENO)");
1569
_exit(EX_OSERR);
1570
}
1571
ret = close(devnull);
1572
if(ret == -1){
1573
perror_plus("close");
1574
_exit(EX_OSERR);
1575
}
1576
ret = dup2(STDERR_FILENO, STDOUT_FILENO);
1577
if(ret == -1){
1578
perror_plus("dup2(STDERR_FILENO, STDOUT_FILENO)");
1579
_exit(EX_OSERR);
1580
}
1500
1581
ret = setenv("MANDOSNETHOOKDIR", hookdir, 1);
1501
1582
if(ret == -1){
1502
1583
perror_plus("setenv");
1518
1599
_exit(EX_OSERR);
1519
1600
}
1520
1601
char *delaystring;
1521
ret = asprintf(&delaystring, "%f", delay);
1602
ret = asprintf(&delaystring, "%f", (double)delay);
1522
1603
if(ret == -1){
1523
1604
perror_plus("asprintf");
1524
1605
_exit(EX_OSERR);
1577
1658
}
1578
1659
close(devnull);
1579
1660
}
1580
return true;
1581
1661
}
1582
1662
1663
__attribute__((nonnull, warn_unused_result))
1583
1664
error_t bring_up_interface(const char *const interface,
1584
1665
const float delay){
1585
int sd = -1;
1586
1666
error_t old_errno = errno;
1587
error_t ret_errno = 0;
1588
int ret, ret_setflags;
1667
int ret;
1589
1668
struct ifreq network;
1590
1669
unsigned int if_index = if_nametoindex(interface);
1591
1670
if(if_index == 0){
1600
1679
}
1601
1680
1602
1681
if(not interface_is_up(interface)){
1603
if(not get_flags(interface, &network) and debug){
1682
error_t ret_errno = 0, ioctl_errno = 0;
1683
if(not get_flags(interface, &network)){
1604
1684
ret_errno = errno;
1605
1685
fprintf_plus(stderr, "Failed to get flags for interface "
1606
1686
"\"%s\"\n", interface);
1687
errno = old_errno;
1607
1688
return ret_errno;
1608
1689
}
1609
network.ifr_flags |= IFF_UP;
1690
network.ifr_flags |= IFF_UP; /* set flag */
1610
1691
1611
sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
1612
if(sd < 0){
1692
int sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
1693
if(sd == -1){
1613
1694
ret_errno = errno;
1614
1695
perror_plus("socket");
1615
1696
errno = old_errno;
1616
1697
return ret_errno;
1617
1698
}
1618
1699
1619
1700
if(quit_now){
1620
close(sd);
1701
ret = (int)TEMP_FAILURE_RETRY(close(sd));
1702
if(ret == -1){
1703
perror_plus("close");
1704
}
1621
1705
errno = old_errno;
1622
1706
return EINTR;
1623
1707
}
1627
1711
interface);
1628
1712
}
1629
1713
1630
/* Raise priviliges */
1631
raise_privileges();
1632
1714
/* Raise privileges */
1715
ret_errno = raise_privileges();
1716
bool restore_loglevel = false;
1717
if(ret_errno != 0){
1718
perror_plus("Failed to raise privileges");
1719
}
1633
1720
#ifdef __linux__
1634
/* Lower kernel loglevel to KERN_NOTICE to avoid KERN_INFO
1635
messages about the network interface to mess up the prompt */
1636
int ret_linux = klogctl(8, NULL, 5);
1637
bool restore_loglevel = true;
1638
if(ret_linux == -1){
1639
restore_loglevel = false;
1640
perror_plus("klogctl");
1721
int ret_linux;
1722
if(ret_errno == 0){
1723
/* Lower kernel loglevel to KERN_NOTICE to avoid KERN_INFO
1724
messages about the network interface to mess up the prompt */
1725
ret_linux = klogctl(8, NULL, 5);
1726
if(ret_linux == -1){
1727
perror_plus("klogctl");
1728
} else {
1729
restore_loglevel = true;
1730
}
1641
1731
}
1642
1732
#endif /* __linux__ */
1643
ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network);
1644
ret_errno = errno;
1733
int ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network);
1734
ioctl_errno = errno;
1645
1735
#ifdef __linux__
1646
1736
if(restore_loglevel){
1647
1737
ret_linux = klogctl(7, NULL, 0);
1651
1741
}
1652
1742
#endif /* __linux__ */
1653
1743
1654
/* Lower privileges */
1655
lower_privileges();
1744
/* If raise_privileges() succeeded above */
1745
if(ret_errno == 0){
1746
/* Lower privileges */
1747
ret_errno = lower_privileges();
1748
if(ret_errno != 0){
1749
errno = ret_errno;
1750
perror_plus("Failed to lower privileges");
1751
}
1752
}
1656
1753
1657
1754
/* Close the socket */
1658
1755
ret = (int)TEMP_FAILURE_RETRY(close(sd));
1661
1758
}
1662
1759
1663
1760
if(ret_setflags == -1){
1664
errno = ret_errno;
1761
errno = ioctl_errno;
1665
1762
perror_plus("ioctl SIOCSIFFLAGS +IFF_UP");
1666
1763
errno = old_errno;
1667
return ret_errno;
1764
return ioctl_errno;
1668
1765
}
1669
1766
} else if(debug){
1670
1767
fprintf_plus(stderr, "Interface \"%s\" is already up; good\n",
1688
1785
return 0;
1689
1786
}
1690
1787
1788
__attribute__((nonnull, warn_unused_result))
1691
1789
error_t take_down_interface(const char *const interface){
1692
int sd = -1;
1693
1790
error_t old_errno = errno;
1694
error_t ret_errno = 0;
1695
int ret, ret_setflags;
1696
1791
struct ifreq network;
1697
1792
unsigned int if_index = if_nametoindex(interface);
1698
1793
if(if_index == 0){
1701
1796
return ENXIO;
1702
1797
}
1703
1798
if(interface_is_up(interface)){
1799
error_t ret_errno = 0, ioctl_errno = 0;
1704
1800
if(not get_flags(interface, &network) and debug){
1705
1801
ret_errno = errno;
1706
1802
fprintf_plus(stderr, "Failed to get flags for interface "
1707
1803
"\"%s\"\n", interface);
1804
errno = old_errno;
1708
1805
return ret_errno;
1709
1806
}
1710
1807
network.ifr_flags &= ~(short)IFF_UP; /* clear flag */
1711
1808
1712
sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
1713
if(sd < 0){
1809
int sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
1810
if(sd == -1){
1714
1811
ret_errno = errno;
1715
1812
perror_plus("socket");
1716
1813
errno = old_errno;
1722
1819
interface);
1723
1820
}
1724
1821
1725
/* Raise priviliges */
1726
raise_privileges();
1727
1728
ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network);
1729
ret_errno = errno;
1730
1731
/* Lower privileges */
1732
lower_privileges();
1822
/* Raise privileges */
1823
ret_errno = raise_privileges();
1824
if(ret_errno != 0){
1825
perror_plus("Failed to raise privileges");
1826
}
1827
int ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network);
1828
ioctl_errno = errno;
1829
1830
/* If raise_privileges() succeeded above */
1831
if(ret_errno == 0){
1832
/* Lower privileges */
1833
ret_errno = lower_privileges();
1834
if(ret_errno != 0){
1835
errno = ret_errno;
1836
perror_plus("Failed to lower privileges");
1837
}
1838
}
1733
1839
1734
1840
/* Close the socket */
1735
ret = (int)TEMP_FAILURE_RETRY(close(sd));
1841
int ret = (int)TEMP_FAILURE_RETRY(close(sd));
1736
1842
if(ret == -1){
1737
1843
perror_plus("close");
1738
1844
}
1739
1845
1740
1846
if(ret_setflags == -1){
1741
errno = ret_errno;
1847
errno = ioctl_errno;
1742
1848
perror_plus("ioctl SIOCSIFFLAGS -IFF_UP");
1743
1849
errno = old_errno;
1744
return ret_errno;
1850
return ioctl_errno;
1745
1851
}
1746
1852
} else if(debug){
1747
1853
fprintf_plus(stderr, "Interface \"%s\" is already down; odd\n",
1755
1861
int main(int argc, char *argv[]){
1756
1862
mandos_context mc = { .server = NULL, .dh_bits = 1024,
1757
1863
.priority = "SECURE256:!CTYPE-X.509:"
1758
"+CTYPE-OPENPGP", .current_server = NULL };
1864
"+CTYPE-OPENPGP", .current_server = NULL,
1865
.interfaces = NULL, .interfaces_size = 0 };
1759
1866
AvahiSServiceBrowser *sb = NULL;
1760
1867
error_t ret_errno;
1761
1868
int ret;
1762
1869
intmax_t tmpmax;
1763
1870
char *tmp;
1764
1871
int exitcode = EXIT_SUCCESS;
1765
char *interfaces = NULL;
1766
size_t interfaces_size = 0;
1767
1872
char *interfaces_to_take_down = NULL;
1768
1873
size_t interfaces_to_take_down_size = 0;
1769
1874
char tempdir[] = "/tmp/mandosXXXXXX";
1772
1877
const char *seckey = PATHDIR "/" SECKEY;
1773
1878
const char *pubkey = PATHDIR "/" PUBKEY;
1774
1879
char *interfaces_hooks = NULL;
1775
size_t interfaces_hooks_size = 0;
1776
1880
1777
1881
bool gnutls_initialized = false;
1778
1882
bool gpgme_initialized = false;
1869
1973
connect_to = arg;
1870
1974
break;
1871
1975
case 'i': /* --interface */
1872
ret_errno = argz_add_sep(&interfaces, &interfaces_size, arg,
1873
(int)',');
1976
ret_errno = argz_add_sep(&mc.interfaces, &mc.interfaces_size,
1977
arg, (int)',');
1874
1978
if(ret_errno != 0){
1875
1979
argp_error(state, "%s", strerror(ret_errno));
1876
1980
}
1956
2060
/* Work around Debian bug #633582:
1957
2061
<http://bugs.debian.org/633582> */
1958
2062
1959
/* Re-raise priviliges */
1960
if(raise_privileges() == 0){
2063
/* Re-raise privileges */
2064
ret_errno = raise_privileges();
2065
if(ret_errno != 0){
2066
errno = ret_errno;
2067
perror_plus("Failed to raise privileges");
2068
} else {
1961
2069
struct stat st;
1962
2070
1963
2071
if(strcmp(seckey, PATHDIR "/" SECKEY) == 0){
2003
2111
}
2004
2112
2005
2113
/* Lower privileges */
2006
errno = 0;
2007
ret = seteuid(uid);
2008
if(ret == -1){
2009
perror_plus("seteuid");
2114
ret_errno = lower_privileges();
2115
if(ret_errno != 0){
2116
errno = ret_errno;
2117
perror_plus("Failed to lower privileges");
2010
2118
}
2011
2119
}
2012
2120
}
2013
2121
2014
/* Remove empty interface names */
2122
/* Remove invalid interface names (except "none") */
2015
2123
{
2016
2124
char *interface = NULL;
2017
while((interface = argz_next(interfaces, interfaces_size,
2125
while((interface = argz_next(mc.interfaces, mc.interfaces_size,
2018
2126
interface))){
2019
if(if_nametoindex(interface) == 0){
2020
if(interface[0] != '\0' and strcmp(interface, "none") != 0){
2127
if(strcmp(interface, "none") != 0
2128
and if_nametoindex(interface) == 0){
2129
if(interface[0] != '\0'){
2021
2130
fprintf_plus(stderr, "Not using nonexisting interface"
2022
2131
" \"%s\"\n", interface);
2023
2132
}
2024
argz_delete(&interfaces, &interfaces_size, interface);
2133
argz_delete(&mc.interfaces, &mc.interfaces_size, interface);
2025
2134
interface = NULL;
2026
2135
}
2027
2136
}
2029
2138
2030
2139
/* Run network hooks */
2031
2140
{
2032
2033
if(interfaces != NULL){
2034
interfaces_hooks = malloc(interfaces_size);
2141
if(mc.interfaces != NULL){
2142
interfaces_hooks = malloc(mc.interfaces_size);
2035
2143
if(interfaces_hooks == NULL){
2036
2144
perror_plus("malloc");
2037
2145
goto end;
2038
2146
}
2039
memcpy(interfaces_hooks, interfaces, interfaces_size);
2040
interfaces_hooks_size = interfaces_size;
2041
argz_stringify(interfaces_hooks, interfaces_hooks_size,
2042
(int)',');
2043
}
2044
if(not run_network_hooks("start", interfaces_hooks != NULL ?
2045
interfaces_hooks : "", delay)){
2046
goto end;
2047
}
2147
memcpy(interfaces_hooks, mc.interfaces, mc.interfaces_size);
2148
argz_stringify(interfaces_hooks, mc.interfaces_size, (int)',');
2149
}
2150
run_network_hooks("start", interfaces_hooks != NULL ?
2151
interfaces_hooks : "", delay);
2048
2152
}
2049
2153
2050
2154
if(not debug){
2127
2231
}
2128
2232
2129
2233
/* If no interfaces were specified, make a list */
2130
if(interfaces == NULL){
2234
if(mc.interfaces == NULL){
2131
2235
struct dirent **direntries;
2132
2236
/* Look for any good interfaces */
2133
2237
ret = scandir(sys_class_net, &direntries, good_interface,
2135
2239
if(ret >= 1){
2136
2240
/* Add all found interfaces to interfaces list */
2137
2241
for(int i = 0; i < ret; ++i){
2138
ret_errno = argz_add(&interfaces, &interfaces_size,
2242
ret_errno = argz_add(&mc.interfaces, &mc.interfaces_size,
2139
2243
direntries[i]->d_name);
2140
2244
if(ret_errno != 0){
2245
errno = ret_errno;
2141
2246
perror_plus("argz_add");
2142
2247
continue;
2143
2248
}
2155
2260
}
2156
2261
}
2157
2262
2158
/* If we only got one interface, explicitly use only that one */
2159
if(argz_count(interfaces, interfaces_size) == 1){
2160
if(debug){
2161
fprintf_plus(stderr, "Using only interface \"%s\"\n",
2162
interfaces);
2163
}
2164
if_index = (AvahiIfIndex)if_nametoindex(interfaces);
2165
}
2166
2167
/* Bring up interfaces which are down */
2168
if(not (argz_count(interfaces, interfaces_size) == 1
2169
and strcmp(interfaces, "none") == 0)){
2263
/* Bring up interfaces which are down, and remove any "none"s */
2264
{
2170
2265
char *interface = NULL;
2171
while((interface = argz_next(interfaces, interfaces_size,
2266
while((interface = argz_next(mc.interfaces, mc.interfaces_size,
2172
2267
interface))){
2268
/* If interface name is "none", stop bringing up interfaces.
2269
Also remove all instances of "none" from the list */
2270
if(strcmp(interface, "none") == 0){
2271
argz_delete(&mc.interfaces, &mc.interfaces_size,
2272
interface);
2273
interface = NULL;
2274
while((interface = argz_next(mc.interfaces,
2275
mc.interfaces_size, interface))){
2276
if(strcmp(interface, "none") == 0){
2277
argz_delete(&mc.interfaces, &mc.interfaces_size,
2278
interface);
2279
interface = NULL;
2280
}
2281
}
2282
break;
2283
}
2173
2284
bool interface_was_up = interface_is_up(interface);
2174
ret = bring_up_interface(interface, delay);
2285
errno = bring_up_interface(interface, delay);
2175
2286
if(not interface_was_up){
2176
if(ret != 0){
2177
errno = ret;
2287
if(errno != 0){
2178
2288
perror_plus("Failed to bring up interface");
2179
2289
} else {
2180
ret_errno = argz_add(&interfaces_to_take_down,
2181
&interfaces_to_take_down_size,
2182
interface);
2290
errno = argz_add(&interfaces_to_take_down,
2291
&interfaces_to_take_down_size,
2292
interface);
2293
if(errno != 0){
2294
perror_plus("argz_add");
2295
}
2183
2296
}
2184
2297
}
2185
2298
}
2186
free(interfaces);
2187
interfaces = NULL;
2188
interfaces_size = 0;
2189
2299
if(debug and (interfaces_to_take_down == NULL)){
2190
2300
fprintf_plus(stderr, "No interfaces were brought up\n");
2191
2301
}
2192
2302
}
2193
2303
2304
/* If we only got one interface, explicitly use only that one */
2305
if(argz_count(mc.interfaces, mc.interfaces_size) == 1){
2306
if(debug){
2307
fprintf_plus(stderr, "Using only interface \"%s\"\n",
2308
mc.interfaces);
2309
}
2310
if_index = (AvahiIfIndex)if_nametoindex(mc.interfaces);
2311
}
2312
2194
2313
if(quit_now){
2195
2314
goto end;
2196
2315
}
2254
2373
exitcode = EX_USAGE;
2255
2374
goto end;
2256
2375
}
2257
2376
2258
2377
if(quit_now){
2259
2378
goto end;
2260
2379
}
2290
2409
fprintf_plus(stderr, "Retrying in %d seconds\n",
2291
2410
(int)retry_interval);
2292
2411
}
2293
sleep((int)retry_interval);
2412
sleep((unsigned int)retry_interval);
2294
2413
}
2295
2414
2296
if (not quit_now){
2415
if(not quit_now){
2297
2416
exitcode = EXIT_SUCCESS;
2298
2417
}
2299
2418
2369
2488
}
2370
2489
2371
2490
/* Cleanup things */
2491
free(mc.interfaces);
2492
2372
2493
if(sb != NULL)
2373
2494
avahi_s_service_browser_free(sb);
2374
2495
2399
2520
}
2400
2521
}
2401
2522
2402
/* Re-raise priviliges */
2523
/* Re-raise privileges */
2403
2524
{
2404
raise_privileges();
2405
2406
/* Run network hooks */
2407
run_network_hooks("stop", interfaces_hooks != NULL ?
2408
interfaces_hooks : "", delay);
2409
2410
/* Take down the network interfaces which were brought up */
2411
{
2412
char *interface = NULL;
2413
while((interface=argz_next(interfaces_to_take_down,
2414
interfaces_to_take_down_size,
2415
interface))){
2416
ret_errno = take_down_interface(interface);
2417
if(ret_errno != 0){
2418
errno = ret_errno;
2419
perror_plus("Failed to take down interface");
2420
}
2421
}
2422
if(debug and (interfaces_to_take_down == NULL)){
2423
fprintf_plus(stderr, "No interfaces needed to be taken"
2424
" down\n");
2425
}
2426
}
2427
2428
lower_privileges_permanently();
2525
ret_errno = raise_privileges();
2526
if(ret_errno != 0){
2527
perror_plus("Failed to raise privileges");
2528
} else {
2529
2530
/* Run network hooks */
2531
run_network_hooks("stop", interfaces_hooks != NULL ?
2532
interfaces_hooks : "", delay);
2533
2534
/* Take down the network interfaces which were brought up */
2535
{
2536
char *interface = NULL;
2537
while((interface=argz_next(interfaces_to_take_down,
2538
interfaces_to_take_down_size,
2539
interface))){
2540
ret_errno = take_down_interface(interface);
2541
if(ret_errno != 0){
2542
errno = ret_errno;
2543
perror_plus("Failed to take down interface");
2544
}
2545
}
2546
if(debug and (interfaces_to_take_down == NULL)){
2547
fprintf_plus(stderr, "No interfaces needed to be taken"
2548
" down\n");
2549
}
2550
}
2551
}
2552
ret_errno = lower_privileges_permanently();
2553
if(ret_errno != 0){
2554
perror_plus("Failed to lower privileges permanently");
2555
}
2429
2556
}
2430
2557
2431
2558
free(interfaces_to_take_down);
2437
2564
struct dirent *direntry = NULL;
2438
2565
int numentries = scandir(tempdir, &direntries, notdotentries,
2439
2566
alphasort);
2440
if (numentries > 0){
2567
if(numentries > 0){
2441
2568
for(int i = 0; i < numentries; i++){
2442
2569
direntry = direntries[i];
2443
2570
char *fullname = NULL;
2458
2585
2459
2586
/* need to clean even if 0 because man page doesn't specify */
2460
2587
free(direntries);
2461
if (numentries == -1){
2588
if(numentries == -1){
2462
2589
perror_plus("scandir");
2463
2590
}
2464
2591
ret = rmdir(tempdir);
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0