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 689
- compare with another revision
- download diff
- download tarball
- view history from revision 689
- Committer: Teddy Hogeborn
- Date: 2014-06-07 20:28:32 UTC
- Revision ID: teddy@recompile.se-20140607202832-02pucp4xd5nm646q
Minor bug fix in mandos-client: Remove memory leak for network hooks.
* plugins.d/mandos-client.c (runnable_hook): Call free() on full file
name of network hook.
* plugins.d/mandos-client.c (runnable_hook): Call free() on full file
name of network hook.
- files modified:
- TODO
added
removed
plugins.d/mandos-client.c
32
32
/* Needed by GPGME, specifically gpgme_data_seek() */
33
33
#ifndef _LARGEFILE_SOURCE
34
34
#define _LARGEFILE_SOURCE
35
#endif /* not _LARGEFILE_SOURCE */
35
#endif
36
36
#ifndef _FILE_OFFSET_BITS
37
37
#define _FILE_OFFSET_BITS 64
38
#endif /* not _FILE_OFFSET_BITS */
38
#endif
39
39
40
40
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), asprintf() */
41
41
42
42
#include <stdio.h> /* fprintf(), stderr, fwrite(),
43
stdout, ferror() */
43
stdout, ferror(), remove() */
44
44
#include <stdint.h> /* uint16_t, uint32_t, intptr_t */
45
45
#include <stddef.h> /* NULL, size_t, ssize_t */
46
46
#include <stdlib.h> /* free(), EXIT_SUCCESS, srand(),
57
57
#include <sys/socket.h> /* socket(), struct sockaddr_in6,
58
58
inet_pton(), connect(),
59
59
getnameinfo() */
60
#include <fcntl.h> /* open(), unlinkat() */
60
#include <fcntl.h> /* open() */
61
61
#include <dirent.h> /* opendir(), struct dirent, readdir()
62
62
*/
63
63
#include <inttypes.h> /* PRIu16, PRIdMAX, intmax_t,
73
73
*/
74
74
#include <unistd.h> /* close(), SEEK_SET, off_t, write(),
75
75
getuid(), getgid(), seteuid(),
76
setgid(), pause(), _exit(),
77
unlinkat() */
76
setgid(), pause(), _exit() */
78
77
#include <arpa/inet.h> /* inet_pton(), htons() */
79
78
#include <iso646.h> /* not, or, and */
80
79
#include <argp.h> /* struct argp_option, error_t, struct
142
141
static const char sys_class_net[] = "/sys/class/net";
143
142
char *connect_to = NULL;
144
143
const char *hookdir = HOOKDIR;
145
int hookdir_fd = -1;
146
144
uid_t uid = 65534;
147
145
gid_t gid = 65534;
148
146
1347
1345
return 0;
1348
1346
}
1349
1347
1350
ret = fstatat(hookdir_fd, direntry->d_name, &st, 0);
1348
char *fullname = NULL;
1349
ret = asprintf(&fullname, "%s/%s", hookdir, direntry->d_name);
1350
if(ret < 0){
1351
perror_plus("asprintf");
1352
return 0;
1353
}
1354
1355
ret = stat(fullname, &st);
1351
1356
if(ret == -1){
1352
1357
if(debug){
1353
1358
perror_plus("Could not stat hook");
1354
1359
}
1355
1360
return 0;
1356
1361
}
1362
free(fullname);
1357
1363
if(not (S_ISREG(st.st_mode))){
1358
1364
/* Not a regular file */
1359
1365
if(debug){
1511
1517
void run_network_hooks(const char *mode, const char *interface,
1512
1518
const float delay){
1513
1519
struct dirent **direntries;
1514
if(hookdir_fd == -1){
1515
hookdir_fd = open(hookdir, O_RDONLY);
1516
if(hookdir_fd == -1){
1517
if(errno == ENOENT){
1518
if(debug){
1519
fprintf_plus(stderr, "Network hook directory \"%s\" not"
1520
" found\n", hookdir);
1521
}
1522
} else {
1523
perror_plus("open");
1524
}
1525
return;
1526
}
1527
}
1528
#ifdef __GLIBC__
1529
#if __GLIBC_PREREQ(2, 15)
1530
int numhooks = scandirat(hookdir_fd, ".", &direntries,
1531
runnable_hook, alphasort);
1532
#else /* not __GLIBC_PREREQ(2, 15) */
1533
int numhooks = scandir(hookdir, &direntries, runnable_hook,
1534
alphasort);
1535
#endif /* not __GLIBC_PREREQ(2, 15) */
1536
#else /* not __GLIBC__ */
1537
int numhooks = scandir(hookdir, &direntries, runnable_hook,
1538
alphasort);
1539
#endif /* not __GLIBC__ */
1520
int numhooks = scandir(hookdir, &direntries, runnable_hook,
1521
alphasort);
1540
1522
if(numhooks == -1){
1541
perror_plus("scandir");
1542
return;
1543
}
1544
struct dirent *direntry;
1545
int ret;
1546
int devnull = open("/dev/null", O_RDONLY);
1547
for(int i = 0; i < numhooks; i++){
1548
direntry = direntries[i];
1549
if(debug){
1550
fprintf_plus(stderr, "Running network hook \"%s\"\n",
1551
direntry->d_name);
1523
if(errno == ENOENT){
1524
if(debug){
1525
fprintf_plus(stderr, "Network hook directory \"%s\" not"
1526
" found\n", hookdir);
1527
}
1528
} else {
1529
perror_plus("scandir");
1552
1530
}
1553
pid_t hook_pid = fork();
1554
if(hook_pid == 0){
1555
/* Child */
1556
/* Raise privileges */
1557
if(raise_privileges_permanently() != 0){
1558
perror_plus("Failed to raise privileges");
1559
_exit(EX_NOPERM);
1560
}
1561
/* Set group */
1562
errno = 0;
1563
ret = setgid(0);
1564
if(ret == -1){
1565
perror_plus("setgid");
1566
_exit(EX_NOPERM);
1567
}
1568
/* Reset supplementary groups */
1569
errno = 0;
1570
ret = setgroups(0, NULL);
1571
if(ret == -1){
1572
perror_plus("setgroups");
1573
_exit(EX_NOPERM);
1574
}
1575
ret = dup2(devnull, STDIN_FILENO);
1576
if(ret == -1){
1577
perror_plus("dup2(devnull, STDIN_FILENO)");
1578
_exit(EX_OSERR);
1579
}
1580
ret = close(devnull);
1581
if(ret == -1){
1582
perror_plus("close");
1583
_exit(EX_OSERR);
1584
}
1585
ret = dup2(STDERR_FILENO, STDOUT_FILENO);
1586
if(ret == -1){
1587
perror_plus("dup2(STDERR_FILENO, STDOUT_FILENO)");
1588
_exit(EX_OSERR);
1589
}
1590
ret = setenv("MANDOSNETHOOKDIR", hookdir, 1);
1591
if(ret == -1){
1592
perror_plus("setenv");
1593
_exit(EX_OSERR);
1594
}
1595
ret = setenv("DEVICE", interface, 1);
1596
if(ret == -1){
1597
perror_plus("setenv");
1598
_exit(EX_OSERR);
1599
}
1600
ret = setenv("VERBOSITY", debug ? "1" : "0", 1);
1601
if(ret == -1){
1602
perror_plus("setenv");
1603
_exit(EX_OSERR);
1604
}
1605
ret = setenv("MODE", mode, 1);
1606
if(ret == -1){
1607
perror_plus("setenv");
1608
_exit(EX_OSERR);
1609
}
1610
char *delaystring;
1611
ret = asprintf(&delaystring, "%f", (double)delay);
1612
if(ret == -1){
1531
} else {
1532
struct dirent *direntry;
1533
int ret;
1534
int devnull = open("/dev/null", O_RDONLY);
1535
for(int i = 0; i < numhooks; i++){
1536
direntry = direntries[i];
1537
char *fullname = NULL;
1538
ret = asprintf(&fullname, "%s/%s", hookdir, direntry->d_name);
1539
if(ret < 0){
1613
1540
perror_plus("asprintf");
1614
_exit(EX_OSERR);
1615
}
1616
ret = setenv("DELAY", delaystring, 1);
1617
if(ret == -1){
1541
continue;
1542
}
1543
if(debug){
1544
fprintf_plus(stderr, "Running network hook \"%s\"\n",
1545
direntry->d_name);
1546
}
1547
pid_t hook_pid = fork();
1548
if(hook_pid == 0){
1549
/* Child */
1550
/* Raise privileges */
1551
if(raise_privileges_permanently() != 0){
1552
perror_plus("Failed to raise privileges");
1553
_exit(EX_NOPERM);
1554
}
1555
/* Set group */
1556
errno = 0;
1557
ret = setgid(0);
1558
if(ret == -1){
1559
perror_plus("setgid");
1560
_exit(EX_NOPERM);
1561
}
1562
/* Reset supplementary groups */
1563
errno = 0;
1564
ret = setgroups(0, NULL);
1565
if(ret == -1){
1566
perror_plus("setgroups");
1567
_exit(EX_NOPERM);
1568
}
1569
ret = dup2(devnull, STDIN_FILENO);
1570
if(ret == -1){
1571
perror_plus("dup2(devnull, STDIN_FILENO)");
1572
_exit(EX_OSERR);
1573
}
1574
ret = close(devnull);
1575
if(ret == -1){
1576
perror_plus("close");
1577
_exit(EX_OSERR);
1578
}
1579
ret = dup2(STDERR_FILENO, STDOUT_FILENO);
1580
if(ret == -1){
1581
perror_plus("dup2(STDERR_FILENO, STDOUT_FILENO)");
1582
_exit(EX_OSERR);
1583
}
1584
ret = setenv("MANDOSNETHOOKDIR", hookdir, 1);
1585
if(ret == -1){
1586
perror_plus("setenv");
1587
_exit(EX_OSERR);
1588
}
1589
ret = setenv("DEVICE", interface, 1);
1590
if(ret == -1){
1591
perror_plus("setenv");
1592
_exit(EX_OSERR);
1593
}
1594
ret = setenv("VERBOSITY", debug ? "1" : "0", 1);
1595
if(ret == -1){
1596
perror_plus("setenv");
1597
_exit(EX_OSERR);
1598
}
1599
ret = setenv("MODE", mode, 1);
1600
if(ret == -1){
1601
perror_plus("setenv");
1602
_exit(EX_OSERR);
1603
}
1604
char *delaystring;
1605
ret = asprintf(&delaystring, "%f", (double)delay);
1606
if(ret == -1){
1607
perror_plus("asprintf");
1608
_exit(EX_OSERR);
1609
}
1610
ret = setenv("DELAY", delaystring, 1);
1611
if(ret == -1){
1612
free(delaystring);
1613
perror_plus("setenv");
1614
_exit(EX_OSERR);
1615
}
1618
1616
free(delaystring);
1619
perror_plus("setenv");
1620
_exit(EX_OSERR);
1621
}
1622
free(delaystring);
1623
if(connect_to != NULL){
1624
ret = setenv("CONNECT", connect_to, 1);
1625
if(ret == -1){
1626
perror_plus("setenv");
1627
_exit(EX_OSERR);
1628
}
1629
}
1630
int hook_fd = openat(hookdir_fd, direntry->d_name, O_RDONLY);
1631
if(hook_fd == -1){
1632
perror_plus("openat");
1633
_exit(EXIT_FAILURE);
1634
}
1635
if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){
1636
perror_plus("close");
1637
_exit(EXIT_FAILURE);
1638
}
1639
if(fexecve(hook_fd, (char *const []){ direntry->d_name, NULL },
1640
environ) == -1){
1641
perror_plus("fexecve");
1642
_exit(EXIT_FAILURE);
1643
}
1644
} else {
1645
int status;
1646
if(TEMP_FAILURE_RETRY(waitpid(hook_pid, &status, 0)) == -1){
1647
perror_plus("waitpid");
1648
continue;
1649
}
1650
if(WIFEXITED(status)){
1651
if(WEXITSTATUS(status) != 0){
1652
fprintf_plus(stderr, "Warning: network hook \"%s\" exited"
1653
" with status %d\n", direntry->d_name,
1654
WEXITSTATUS(status));
1655
continue;
1656
}
1657
} else if(WIFSIGNALED(status)){
1658
fprintf_plus(stderr, "Warning: network hook \"%s\" died by"
1659
" signal %d\n", direntry->d_name,
1660
WTERMSIG(status));
1661
continue;
1617
if(connect_to != NULL){
1618
ret = setenv("CONNECT", connect_to, 1);
1619
if(ret == -1){
1620
perror_plus("setenv");
1621
_exit(EX_OSERR);
1622
}
1623
}
1624
if(execl(fullname, direntry->d_name, mode, NULL) == -1){
1625
perror_plus("execl");
1626
_exit(EXIT_FAILURE);
1627
}
1662
1628
} else {
1663
fprintf_plus(stderr, "Warning: network hook \"%s\""
1664
" crashed\n", direntry->d_name);
1665
continue;
1666
}
1667
}
1668
if(debug){
1669
fprintf_plus(stderr, "Network hook \"%s\" ran successfully\n",
1670
direntry->d_name);
1671
}
1672
}
1673
if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){
1674
perror_plus("close");
1675
} else {
1676
hookdir_fd = -1;
1677
}
1678
close(devnull);
1629
int status;
1630
if(TEMP_FAILURE_RETRY(waitpid(hook_pid, &status, 0)) == -1){
1631
perror_plus("waitpid");
1632
free(fullname);
1633
continue;
1634
}
1635
if(WIFEXITED(status)){
1636
if(WEXITSTATUS(status) != 0){
1637
fprintf_plus(stderr, "Warning: network hook \"%s\" exited"
1638
" with status %d\n", direntry->d_name,
1639
WEXITSTATUS(status));
1640
free(fullname);
1641
continue;
1642
}
1643
} else if(WIFSIGNALED(status)){
1644
fprintf_plus(stderr, "Warning: network hook \"%s\" died by"
1645
" signal %d\n", direntry->d_name,
1646
WTERMSIG(status));
1647
free(fullname);
1648
continue;
1649
} else {
1650
fprintf_plus(stderr, "Warning: network hook \"%s\""
1651
" crashed\n", direntry->d_name);
1652
free(fullname);
1653
continue;
1654
}
1655
}
1656
free(fullname);
1657
if(debug){
1658
fprintf_plus(stderr, "Network hook \"%s\" ran successfully\n",
1659
direntry->d_name);
1660
}
1661
}
1662
close(devnull);
1663
}
1679
1664
}
1680
1665
1681
1666
__attribute__((nonnull, warn_unused_result))
2253
2238
2254
2239
/* If no interfaces were specified, make a list */
2255
2240
if(mc.interfaces == NULL){
2256
struct dirent **direntries = NULL;
2241
struct dirent **direntries;
2257
2242
/* Look for any good interfaces */
2258
2243
ret = scandir(sys_class_net, &direntries, good_interface,
2259
2244
alphasort);
2591
2576
/* Removes the GPGME temp directory and all files inside */
2592
2577
if(tempdir != NULL){
2593
2578
struct dirent **direntries = NULL;
2594
int tempdir_fd = (int)TEMP_FAILURE_RETRY(open(tempdir, O_RDONLY |
2595
O_NOFOLLOW));
2596
if(tempdir_fd == -1){
2597
perror_plus("open");
2598
} else {
2599
#ifdef __GLIBC__
2600
#if __GLIBC_PREREQ(2, 15)
2601
int numentries = scandirat(tempdir_fd, ".", &direntries,
2602
notdotentries, alphasort);
2603
#else /* not __GLIBC_PREREQ(2, 15) */
2604
int numentries = scandir(tempdir, &direntries, notdotentries,
2605
alphasort);
2606
#endif /* not __GLIBC_PREREQ(2, 15) */
2607
#else /* not __GLIBC__ */
2608
int numentries = scandir(tempdir, &direntries, notdotentries,
2609
alphasort);
2610
#endif /* not __GLIBC__ */
2611
if(numentries > 0){
2612
for(int i = 0; i < numentries; i++){
2613
ret = unlinkat(tempdir_fd, direntries[i]->d_name, 0);
2614
if(ret == -1){
2615
fprintf_plus(stderr, "unlinkat(open(\"%s\", O_RDONLY),"
2616
" \"%s\", 0): %s\n", tempdir,
2617
direntries[i]->d_name, strerror(errno));
2618
}
2619
}
2620
2621
/* need to clean even if 0 because man page doesn't specify */
2622
free(direntries);
2623
if(numentries == -1){
2624
perror_plus("scandir");
2625
}
2626
ret = rmdir(tempdir);
2627
if(ret == -1 and errno != ENOENT){
2628
perror_plus("rmdir");
2629
}
2579
struct dirent *direntry = NULL;
2580
int numentries = scandir(tempdir, &direntries, notdotentries,
2581
alphasort);
2582
if(numentries > 0){
2583
for(int i = 0; i < numentries; i++){
2584
direntry = direntries[i];
2585
char *fullname = NULL;
2586
ret = asprintf(&fullname, "%s/%s", tempdir,
2587
direntry->d_name);
2588
if(ret < 0){
2589
perror_plus("asprintf");
2590
continue;
2591
}
2592
ret = remove(fullname);
2593
if(ret == -1){
2594
fprintf_plus(stderr, "remove(\"%s\"): %s\n", fullname,
2595
strerror(errno));
2596
}
2597
free(fullname);
2630
2598
}
2631
TEMP_FAILURE_RETRY(close(tempdir_fd));
2599
}
2600
2601
/* need to clean even if 0 because man page doesn't specify */
2602
free(direntries);
2603
if(numentries == -1){
2604
perror_plus("scandir");
2605
}
2606
ret = rmdir(tempdir);
2607
if(ret == -1 and errno != ENOENT){
2608
perror_plus("rmdir");
2632
2609
}
2633
2610
}
2634
2611
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0