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.
added
removed
plugins.d/mandos-client.c
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() */
180
183
perror(print_text);
181
184
}
182
185
183
__attribute__((format (gnu_printf, 2, 3)))
186
__attribute__((format (gnu_printf, 2, 3), nonnull))
184
187
int fprintf_plus(FILE *stream, const char *format, ...){
185
188
va_list ap;
186
189
va_start (ap, format);
195
198
* bytes. "buffer_capacity" is how much is currently allocated,
196
199
* "buffer_length" is how much is already used.
197
200
*/
201
__attribute__((nonnull, warn_unused_result))
198
202
size_t incbuffer(char **buffer, size_t buffer_length,
199
203
size_t buffer_capacity){
200
204
if(buffer_length + BUFFER_SIZE > buffer_capacity){
213
217
}
214
218
215
219
/* Add server to set of servers to retry periodically */
220
__attribute__((nonnull, warn_unused_result))
216
221
bool add_server(const char *ip, in_port_t port, AvahiIfIndex if_index,
217
222
int af, server **current_server){
218
223
int ret;
229
234
perror_plus("strdup");
230
235
return false;
231
236
}
237
ret = clock_gettime(CLOCK_MONOTONIC, &(new_server->last_seen));
238
if(ret == -1){
239
perror_plus("clock_gettime");
240
return false;
241
}
232
242
/* Special case of first server */
233
243
if(*current_server == NULL){
234
244
new_server->next = new_server;
235
245
new_server->prev = new_server;
236
246
*current_server = new_server;
237
/* Place the new server last in the list */
238
247
} else {
248
/* Place the new server last in the list */
239
249
new_server->next = *current_server;
240
250
new_server->prev = (*current_server)->prev;
241
251
new_server->prev->next = new_server;
242
252
(*current_server)->prev = new_server;
243
253
}
244
ret = clock_gettime(CLOCK_MONOTONIC, &(*current_server)->last_seen);
245
if(ret == -1){
246
perror_plus("clock_gettime");
247
return false;
248
}
249
254
return true;
250
255
}
251
256
252
257
/*
253
258
* Initialize GPGME.
254
259
*/
260
__attribute__((nonnull, warn_unused_result))
255
261
static bool init_gpgme(const char *seckey, const char *pubkey,
256
262
const char *tempdir, mandos_context *mc){
257
263
gpgme_error_t rc;
347
353
* Decrypt OpenPGP data.
348
354
* Returns -1 on error
349
355
*/
356
__attribute__((nonnull, warn_unused_result))
350
357
static ssize_t pgp_packet_decrypt(const char *cryptotext,
351
358
size_t crypto_size,
352
359
char **plaintext,
472
479
return plaintext_length;
473
480
}
474
481
475
static const char * safer_gnutls_strerror(int value){
482
__attribute__((warn_unused_result))
483
static const char *safer_gnutls_strerror(int value){
476
484
const char *ret = gnutls_strerror(value);
477
485
if(ret == NULL)
478
486
ret = "(unknown)";
480
488
}
481
489
482
490
/* GnuTLS log function callback */
491
__attribute__((nonnull))
483
492
static void debuggnutls(__attribute__((unused)) int level,
484
493
const char* string){
485
494
fprintf_plus(stderr, "GnuTLS: %s", string);
486
495
}
487
496
497
__attribute__((nonnull, warn_unused_result))
488
498
static int init_gnutls_global(const char *pubkeyfilename,
489
499
const char *seckeyfilename,
490
500
mandos_context *mc){
564
574
return -1;
565
575
}
566
576
577
__attribute__((nonnull, warn_unused_result))
567
578
static int init_gnutls_session(gnutls_session_t *session,
568
579
mandos_context *mc){
569
580
int ret;
626
637
__attribute__((unused)) const char *txt){}
627
638
628
639
/* Called when a Mandos server is found */
640
__attribute__((nonnull, warn_unused_result))
629
641
static int start_mandos_communication(const char *ip, in_port_t port,
630
642
AvahiIfIndex if_index,
631
643
int af, mandos_context *mc){
632
644
int ret, tcp_sd = -1;
633
645
ssize_t sret;
634
union {
635
struct sockaddr_in in;
636
struct sockaddr_in6 in6;
637
} to;
646
struct sockaddr_storage to;
638
647
char *buffer = NULL;
639
648
char *decrypted_buffer = NULL;
640
649
size_t buffer_length = 0;
721
730
722
731
memset(&to, 0, sizeof(to));
723
732
if(af == AF_INET6){
724
to.in6.sin6_family = (sa_family_t)af;
725
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);
726
735
} else { /* IPv4 */
727
to.in.sin_family = (sa_family_t)af;
728
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);
729
738
}
730
739
if(ret < 0 ){
731
740
int e = errno;
740
749
goto mandos_end;
741
750
}
742
751
if(af == AF_INET6){
743
to.in6.sin6_port = htons(port);
744
#ifdef __GNUC__
745
#pragma GCC diagnostic push
746
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
747
#endif
748
if(IN6_IS_ADDR_LINKLOCAL /* Spurious warnings from */
749
(&to.in6.sin6_addr)){ /* -Wstrict-aliasing=2 or lower */
750
#ifdef __GNUC__
751
#pragma GCC diagnostic pop
752
#endif
752
((struct sockaddr_in6 *)&to)->sin6_port = htons(port);
753
if(IN6_IS_ADDR_LINKLOCAL
754
(&((struct sockaddr_in6 *)&to)->sin6_addr)){
753
755
if(if_index == AVAHI_IF_UNSPEC){
754
756
fprintf_plus(stderr, "An IPv6 link-local address is"
755
757
" incomplete without a network interface\n");
757
759
goto mandos_end;
758
760
}
759
761
/* Set the network interface number as scope */
760
to.in6.sin6_scope_id = (uint32_t)if_index;
762
((struct sockaddr_in6 *)&to)->sin6_scope_id = (uint32_t)if_index;
761
763
}
762
764
} else {
763
to.in.sin_port = htons(port);
765
((struct sockaddr_in *)&to)->sin_port = htons(port);
764
766
}
765
767
766
768
if(quit_now){
783
785
}
784
786
char addrstr[(INET_ADDRSTRLEN > INET6_ADDRSTRLEN) ?
785
787
INET_ADDRSTRLEN : INET6_ADDRSTRLEN] = "";
786
const char *pcret;
787
788
if(af == AF_INET6){
788
pcret = inet_ntop(af, &(to.in6.sin6_addr), addrstr,
789
sizeof(addrstr));
789
ret = getnameinfo((struct sockaddr *)&to,
790
sizeof(struct sockaddr_in6),
791
addrstr, sizeof(addrstr), NULL, 0,
792
NI_NUMERICHOST);
790
793
} else {
791
pcret = inet_ntop(af, &(to.in.sin_addr), addrstr,
792
sizeof(addrstr));
794
ret = getnameinfo((struct sockaddr *)&to,
795
sizeof(struct sockaddr_in),
796
addrstr, sizeof(addrstr), NULL, 0,
797
NI_NUMERICHOST);
793
798
}
794
if(pcret == NULL){
795
perror_plus("inet_ntop");
796
} else {
797
if(strcmp(addrstr, ip) != 0){
798
fprintf_plus(stderr, "Canonical address form: %s\n", addrstr);
799
}
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);
800
805
}
801
806
}
802
807
806
811
}
807
812
808
813
if(af == AF_INET6){
809
ret = connect(tcp_sd, &to.in6, sizeof(to));
814
ret = connect(tcp_sd, (struct sockaddr *)&to,
815
sizeof(struct sockaddr_in6));
810
816
} else {
811
ret = connect(tcp_sd, &to.in, sizeof(to)); /* IPv4 */
817
ret = connect(tcp_sd, (struct sockaddr *)&to, /* IPv4 */
818
sizeof(struct sockaddr_in));
812
819
}
813
820
if(ret < 0){
814
if ((errno != ECONNREFUSED and errno != ENETUNREACH) or debug){
821
if((errno != ECONNREFUSED and errno != ENETUNREACH) or debug){
815
822
int e = errno;
816
823
perror_plus("connect");
817
824
errno = e;
1032
1039
return retval;
1033
1040
}
1034
1041
1042
__attribute__((nonnull))
1035
1043
static void resolve_callback(AvahiSServiceResolver *r,
1036
1044
AvahiIfIndex interface,
1037
1045
AvahiProtocol proto,
1045
1053
AVAHI_GCC_UNUSED AvahiStringList *txt,
1046
1054
AVAHI_GCC_UNUSED AvahiLookupResultFlags
1047
1055
flags,
1048
void* mc){
1056
void *mc){
1049
1057
if(r == NULL){
1050
1058
return;
1051
1059
}
1104
1112
const char *domain,
1105
1113
AVAHI_GCC_UNUSED AvahiLookupResultFlags
1106
1114
flags,
1107
void* mc){
1115
void *mc){
1108
1116
if(b == NULL){
1109
1117
return;
1110
1118
}
1170
1178
errno = old_errno;
1171
1179
}
1172
1180
1181
__attribute__((nonnull, warn_unused_result))
1173
1182
bool get_flags(const char *ifname, struct ifreq *ifr){
1174
1183
int ret;
1175
1184
error_t ret_errno;
1194
1203
return true;
1195
1204
}
1196
1205
1206
__attribute__((nonnull, warn_unused_result))
1197
1207
bool good_flags(const char *ifname, const struct ifreq *ifr){
1198
1208
1199
1209
/* Reject the loopback device */
1241
1251
* corresponds to an acceptable network device.
1242
1252
* (This function is passed to scandir(3) as a filter function.)
1243
1253
*/
1254
__attribute__((nonnull, warn_unused_result))
1244
1255
int good_interface(const struct dirent *if_entry){
1245
1256
if(if_entry->d_name[0] == '.'){
1246
1257
return 0;
1264
1275
/*
1265
1276
* This function determines if a network interface is up.
1266
1277
*/
1278
__attribute__((nonnull, warn_unused_result))
1267
1279
bool interface_is_up(const char *interface){
1268
1280
struct ifreq ifr;
1269
1281
if(not get_flags(interface, &ifr)){
1280
1292
/*
1281
1293
* This function determines if a network interface is running
1282
1294
*/
1295
__attribute__((nonnull, warn_unused_result))
1283
1296
bool interface_is_running(const char *interface){
1284
1297
struct ifreq ifr;
1285
1298
if(not get_flags(interface, &ifr)){
1293
1306
return (bool)(ifr.ifr_flags & IFF_RUNNING);
1294
1307
}
1295
1308
1309
__attribute__((nonnull, pure, warn_unused_result))
1296
1310
int notdotentries(const struct dirent *direntry){
1297
1311
/* Skip "." and ".." */
1298
1312
if(direntry->d_name[0] == '.'
1305
1319
}
1306
1320
1307
1321
/* Is this directory entry a runnable program? */
1322
__attribute__((nonnull, warn_unused_result))
1308
1323
int runnable_hook(const struct dirent *direntry){
1309
1324
int ret;
1310
1325
size_t sret;
1365
1380
return 1;
1366
1381
}
1367
1382
1383
__attribute__((nonnull, warn_unused_result))
1368
1384
int avahi_loop_with_timeout(AvahiSimplePoll *s, int retry_interval,
1369
1385
mandos_context *mc){
1370
1386
int ret;
1374
1390
1375
1391
while(true){
1376
1392
if(mc->current_server == NULL){
1377
if (debug){
1393
if(debug){
1378
1394
fprintf_plus(stderr, "Wait until first server is found."
1379
1395
" No timeout!\n");
1380
1396
}
1381
1397
ret = avahi_simple_poll_iterate(s, -1);
1382
1398
} else {
1383
if (debug){
1399
if(debug){
1384
1400
fprintf_plus(stderr, "Check current_server if we should run"
1385
1401
" it, or wait\n");
1386
1402
}
1403
1419
- ((intmax_t)waited_time.tv_sec * 1000))
1404
1420
- ((intmax_t)waited_time.tv_nsec / 1000000));
1405
1421
1406
if (debug){
1422
if(debug){
1407
1423
fprintf_plus(stderr, "Blocking for %" PRIdMAX " ms\n",
1408
1424
block_time);
1409
1425
}
1431
1447
ret = avahi_simple_poll_iterate(s, (int)block_time);
1432
1448
}
1433
1449
if(ret != 0){
1434
if (ret > 0 or errno != EINTR){
1450
if(ret > 0 or errno != EINTR){
1435
1451
return (ret != 1) ? ret : 0;
1436
1452
}
1437
1453
}
1439
1455
}
1440
1456
1441
1457
/* Set effective uid to 0, return errno */
1458
__attribute__((warn_unused_result))
1442
1459
error_t raise_privileges(void){
1443
1460
error_t old_errno = errno;
1444
1461
error_t ret_errno = 0;
1451
1468
}
1452
1469
1453
1470
/* Set effective and real user ID to 0. Return errno. */
1471
__attribute__((warn_unused_result))
1454
1472
error_t raise_privileges_permanently(void){
1455
1473
error_t old_errno = errno;
1456
1474
error_t ret_errno = raise_privileges();
1467
1485
}
1468
1486
1469
1487
/* Set effective user ID to unprivileged saved user ID */
1488
__attribute__((warn_unused_result))
1470
1489
error_t lower_privileges(void){
1471
1490
error_t old_errno = errno;
1472
1491
error_t ret_errno = 0;
1479
1498
}
1480
1499
1481
1500
/* Lower privileges permanently */
1501
__attribute__((warn_unused_result))
1482
1502
error_t lower_privileges_permanently(void){
1483
1503
error_t old_errno = errno;
1484
1504
error_t ret_errno = 0;
1490
1510
return ret_errno;
1491
1511
}
1492
1512
1493
bool run_network_hooks(const char *mode, const char *interface,
1513
__attribute__((nonnull))
1514
void run_network_hooks(const char *mode, const char *interface,
1494
1515
const float delay){
1495
1516
struct dirent **direntries;
1496
1517
int numhooks = scandir(hookdir, &direntries, runnable_hook,
1524
1545
if(hook_pid == 0){
1525
1546
/* Child */
1526
1547
/* Raise privileges */
1527
raise_privileges_permanently();
1548
if(raise_privileges_permanently() != 0){
1549
perror_plus("Failed to raise privileges");
1550
_exit(EX_NOPERM);
1551
}
1528
1552
/* Set group */
1529
1553
errno = 0;
1530
1554
ret = setgid(0);
1531
1555
if(ret == -1){
1532
1556
perror_plus("setgid");
1557
_exit(EX_NOPERM);
1533
1558
}
1534
1559
/* Reset supplementary groups */
1535
1560
errno = 0;
1536
1561
ret = setgroups(0, NULL);
1537
1562
if(ret == -1){
1538
1563
perror_plus("setgroups");
1539
}
1540
dup2(devnull, STDIN_FILENO);
1541
close(devnull);
1542
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
}
1543
1581
ret = setenv("MANDOSNETHOOKDIR", hookdir, 1);
1544
1582
if(ret == -1){
1545
1583
perror_plus("setenv");
1561
1599
_exit(EX_OSERR);
1562
1600
}
1563
1601
char *delaystring;
1564
ret = asprintf(&delaystring, "%f", delay);
1602
ret = asprintf(&delaystring, "%f", (double)delay);
1565
1603
if(ret == -1){
1566
1604
perror_plus("asprintf");
1567
1605
_exit(EX_OSERR);
1620
1658
}
1621
1659
close(devnull);
1622
1660
}
1623
return true;
1624
1661
}
1625
1662
1663
__attribute__((nonnull, warn_unused_result))
1626
1664
error_t bring_up_interface(const char *const interface,
1627
1665
const float delay){
1628
int sd = -1;
1629
1666
error_t old_errno = errno;
1630
error_t ret_errno = 0;
1631
int ret, ret_setflags;
1667
int ret;
1632
1668
struct ifreq network;
1633
1669
unsigned int if_index = if_nametoindex(interface);
1634
1670
if(if_index == 0){
1643
1679
}
1644
1680
1645
1681
if(not interface_is_up(interface)){
1646
if(not get_flags(interface, &network) and debug){
1682
error_t ret_errno = 0, ioctl_errno = 0;
1683
if(not get_flags(interface, &network)){
1647
1684
ret_errno = errno;
1648
1685
fprintf_plus(stderr, "Failed to get flags for interface "
1649
1686
"\"%s\"\n", interface);
1687
errno = old_errno;
1650
1688
return ret_errno;
1651
1689
}
1652
network.ifr_flags |= IFF_UP;
1690
network.ifr_flags |= IFF_UP; /* set flag */
1653
1691
1654
sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
1655
if(sd < 0){
1692
int sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
1693
if(sd == -1){
1656
1694
ret_errno = errno;
1657
1695
perror_plus("socket");
1658
1696
errno = old_errno;
1659
1697
return ret_errno;
1660
1698
}
1661
1699
1662
1700
if(quit_now){
1663
close(sd);
1701
ret = (int)TEMP_FAILURE_RETRY(close(sd));
1702
if(ret == -1){
1703
perror_plus("close");
1704
}
1664
1705
errno = old_errno;
1665
1706
return EINTR;
1666
1707
}
1670
1711
interface);
1671
1712
}
1672
1713
1673
/* Raise priviliges */
1674
raise_privileges();
1675
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
}
1676
1720
#ifdef __linux__
1677
/* Lower kernel loglevel to KERN_NOTICE to avoid KERN_INFO
1678
messages about the network interface to mess up the prompt */
1679
int ret_linux = klogctl(8, NULL, 5);
1680
bool restore_loglevel = true;
1681
if(ret_linux == -1){
1682
restore_loglevel = false;
1683
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
}
1684
1731
}
1685
1732
#endif /* __linux__ */
1686
ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network);
1687
ret_errno = errno;
1733
int ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network);
1734
ioctl_errno = errno;
1688
1735
#ifdef __linux__
1689
1736
if(restore_loglevel){
1690
1737
ret_linux = klogctl(7, NULL, 0);
1694
1741
}
1695
1742
#endif /* __linux__ */
1696
1743
1697
/* Lower privileges */
1698
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
}
1699
1753
1700
1754
/* Close the socket */
1701
1755
ret = (int)TEMP_FAILURE_RETRY(close(sd));
1704
1758
}
1705
1759
1706
1760
if(ret_setflags == -1){
1707
errno = ret_errno;
1761
errno = ioctl_errno;
1708
1762
perror_plus("ioctl SIOCSIFFLAGS +IFF_UP");
1709
1763
errno = old_errno;
1710
return ret_errno;
1764
return ioctl_errno;
1711
1765
}
1712
1766
} else if(debug){
1713
1767
fprintf_plus(stderr, "Interface \"%s\" is already up; good\n",
1731
1785
return 0;
1732
1786
}
1733
1787
1788
__attribute__((nonnull, warn_unused_result))
1734
1789
error_t take_down_interface(const char *const interface){
1735
1790
error_t old_errno = errno;
1736
1791
struct ifreq network;
1741
1796
return ENXIO;
1742
1797
}
1743
1798
if(interface_is_up(interface)){
1744
error_t ret_errno = 0;
1799
error_t ret_errno = 0, ioctl_errno = 0;
1745
1800
if(not get_flags(interface, &network) and debug){
1746
1801
ret_errno = errno;
1747
1802
fprintf_plus(stderr, "Failed to get flags for interface "
1748
1803
"\"%s\"\n", interface);
1804
errno = old_errno;
1749
1805
return ret_errno;
1750
1806
}
1751
1807
network.ifr_flags &= ~(short)IFF_UP; /* clear flag */
1752
1808
1753
1809
int sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
1754
if(sd < 0){
1810
if(sd == -1){
1755
1811
ret_errno = errno;
1756
1812
perror_plus("socket");
1757
1813
errno = old_errno;
1763
1819
interface);
1764
1820
}
1765
1821
1766
/* Raise priviliges */
1767
raise_privileges();
1768
1822
/* Raise privileges */
1823
ret_errno = raise_privileges();
1824
if(ret_errno != 0){
1825
perror_plus("Failed to raise privileges");
1826
}
1769
1827
int ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network);
1770
ret_errno = errno;
1828
ioctl_errno = errno;
1771
1829
1772
/* Lower privileges */
1773
lower_privileges();
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
}
1774
1839
1775
1840
/* Close the socket */
1776
1841
int ret = (int)TEMP_FAILURE_RETRY(close(sd));
1779
1844
}
1780
1845
1781
1846
if(ret_setflags == -1){
1782
errno = ret_errno;
1847
errno = ioctl_errno;
1783
1848
perror_plus("ioctl SIOCSIFFLAGS -IFF_UP");
1784
1849
errno = old_errno;
1785
return ret_errno;
1850
return ioctl_errno;
1786
1851
}
1787
1852
} else if(debug){
1788
1853
fprintf_plus(stderr, "Interface \"%s\" is already down; odd\n",
1796
1861
int main(int argc, char *argv[]){
1797
1862
mandos_context mc = { .server = NULL, .dh_bits = 1024,
1798
1863
.priority = "SECURE256:!CTYPE-X.509:"
1799
"+CTYPE-OPENPGP", .current_server = NULL,
1864
"+CTYPE-OPENPGP", .current_server = NULL,
1800
1865
.interfaces = NULL, .interfaces_size = 0 };
1801
1866
AvahiSServiceBrowser *sb = NULL;
1802
1867
error_t ret_errno;
1995
2060
/* Work around Debian bug #633582:
1996
2061
<http://bugs.debian.org/633582> */
1997
2062
1998
/* Re-raise priviliges */
1999
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 {
2000
2069
struct stat st;
2001
2070
2002
2071
if(strcmp(seckey, PATHDIR "/" SECKEY) == 0){
2042
2111
}
2043
2112
2044
2113
/* Lower privileges */
2045
lower_privileges();
2114
ret_errno = lower_privileges();
2115
if(ret_errno != 0){
2116
errno = ret_errno;
2117
perror_plus("Failed to lower privileges");
2118
}
2046
2119
}
2047
2120
}
2048
2121
2074
2147
memcpy(interfaces_hooks, mc.interfaces, mc.interfaces_size);
2075
2148
argz_stringify(interfaces_hooks, mc.interfaces_size, (int)',');
2076
2149
}
2077
if(not run_network_hooks("start", interfaces_hooks != NULL ?
2078
interfaces_hooks : "", delay)){
2079
goto end;
2080
}
2150
run_network_hooks("start", interfaces_hooks != NULL ?
2151
interfaces_hooks : "", delay);
2081
2152
}
2082
2153
2083
2154
if(not debug){
2211
2282
break;
2212
2283
}
2213
2284
bool interface_was_up = interface_is_up(interface);
2214
ret = bring_up_interface(interface, delay);
2285
errno = bring_up_interface(interface, delay);
2215
2286
if(not interface_was_up){
2216
if(ret != 0){
2217
errno = ret;
2287
if(errno != 0){
2218
2288
perror_plus("Failed to bring up interface");
2219
2289
} else {
2220
ret_errno = argz_add(&interfaces_to_take_down,
2221
&interfaces_to_take_down_size,
2222
interface);
2223
if(ret_errno != 0){
2224
errno = ret_errno;
2290
errno = argz_add(&interfaces_to_take_down,
2291
&interfaces_to_take_down_size,
2292
interface);
2293
if(errno != 0){
2225
2294
perror_plus("argz_add");
2226
2295
}
2227
2296
}
2343
2412
sleep((unsigned int)retry_interval);
2344
2413
}
2345
2414
2346
if (not quit_now){
2415
if(not quit_now){
2347
2416
exitcode = EXIT_SUCCESS;
2348
2417
}
2349
2418
2451
2520
}
2452
2521
}
2453
2522
2454
/* Re-raise priviliges */
2523
/* Re-raise privileges */
2455
2524
{
2456
raise_privileges();
2457
2458
/* Run network hooks */
2459
run_network_hooks("stop", interfaces_hooks != NULL ?
2460
interfaces_hooks : "", delay);
2461
2462
/* Take down the network interfaces which were brought up */
2463
{
2464
char *interface = NULL;
2465
while((interface=argz_next(interfaces_to_take_down,
2466
interfaces_to_take_down_size,
2467
interface))){
2468
ret_errno = take_down_interface(interface);
2469
if(ret_errno != 0){
2470
errno = ret_errno;
2471
perror_plus("Failed to take down interface");
2472
}
2473
}
2474
if(debug and (interfaces_to_take_down == NULL)){
2475
fprintf_plus(stderr, "No interfaces needed to be taken"
2476
" down\n");
2477
}
2478
}
2479
2480
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
}
2481
2556
}
2482
2557
2483
2558
free(interfaces_to_take_down);
2489
2564
struct dirent *direntry = NULL;
2490
2565
int numentries = scandir(tempdir, &direntries, notdotentries,
2491
2566
alphasort);
2492
if (numentries > 0){
2567
if(numentries > 0){
2493
2568
for(int i = 0; i < numentries; i++){
2494
2569
direntry = direntries[i];
2495
2570
char *fullname = NULL;
2510
2585
2511
2586
/* need to clean even if 0 because man page doesn't specify */
2512
2587
free(direntries);
2513
if (numentries == -1){
2588
if(numentries == -1){
2514
2589
perror_plus("scandir");
2515
2590
}
2516
2591
ret = rmdir(tempdir);
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0