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 695
- compare with another revision
- download diff
- download tarball
- view history from revision 695
- Committer: Teddy Hogeborn
- Date: 2014-06-08 00:44:52 UTC
- Revision ID: teddy@recompile.se-20140608004452-6p928psyr1gbcawn
Make mandos-client use more scandirat().
* plugins.d/mandos-client.d (main): Use scandirat() when removing
GPGME temp directory.
* plugins.d/mandos-client.d (main): Use scandirat() when removing
GPGME temp directory.
- files modified:
- debian/mandos.postinst
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
35
#endif /* not _LARGEFILE_SOURCE */
36
36
#ifndef _FILE_OFFSET_BITS
37
37
#define _FILE_OFFSET_BITS 64
38
#endif
38
#endif /* not _FILE_OFFSET_BITS */
39
39
40
40
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), asprintf() */
41
41
42
42
#include <stdio.h> /* fprintf(), stderr, fwrite(),
43
stdout, ferror(), remove() */
43
stdout, ferror() */
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() */
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,
73
73
*/
74
74
#include <unistd.h> /* close(), SEEK_SET, off_t, write(),
75
75
getuid(), getgid(), seteuid(),
76
setgid(), pause(), _exit() */
76
setgid(), pause(), _exit(),
77
unlinkat() */
77
78
#include <arpa/inet.h> /* inet_pton(), htons() */
78
79
#include <iso646.h> /* not, or, and */
79
80
#include <argp.h> /* struct argp_option, error_t, struct
141
142
static const char sys_class_net[] = "/sys/class/net";
142
143
char *connect_to = NULL;
143
144
const char *hookdir = HOOKDIR;
145
int hookdir_fd = -1;
144
146
uid_t uid = 65534;
145
147
gid_t gid = 65534;
146
148
1345
1347
return 0;
1346
1348
}
1347
1349
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);
1350
ret = fstatat(hookdir_fd, direntry->d_name, &st, 0);
1356
1351
if(ret == -1){
1357
1352
if(debug){
1358
1353
perror_plus("Could not stat hook");
1359
1354
}
1360
1355
return 0;
1361
1356
}
1362
free(fullname);
1363
1357
if(not (S_ISREG(st.st_mode))){
1364
1358
/* Not a regular file */
1365
1359
if(debug){
1513
1507
return ret_errno;
1514
1508
}
1515
1509
1510
#ifndef O_CLOEXEC
1511
/*
1512
* Based on the example in the GNU LibC manual chapter 13.13 "File
1513
* Descriptor Flags".
1514
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
1515
*/
1516
__attribute__((warn_unused_result))
1517
static int set_cloexec_flag(int fd){
1518
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
1519
/* If reading the flags failed, return error indication now. */
1520
if(ret < 0){
1521
return ret;
1522
}
1523
/* Store modified flag word in the descriptor. */
1524
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
1525
ret | FD_CLOEXEC));
1526
}
1527
#endif /* not O_CLOEXEC */
1528
1516
1529
__attribute__((nonnull))
1517
1530
void run_network_hooks(const char *mode, const char *interface,
1518
1531
const float delay){
1519
1532
struct dirent **direntries;
1520
int numhooks = scandir(hookdir, &direntries, runnable_hook,
1521
alphasort);
1533
if(hookdir_fd == -1){
1534
hookdir_fd = open(hookdir, O_RDONLY |
1535
#ifdef O_CLOEXEC
1536
O_CLOEXEC
1537
#else /* not O_CLOEXEC */
1538
0
1539
#endif /* not O_CLOEXEC */
1540
);
1541
if(hookdir_fd == -1){
1542
if(errno == ENOENT){
1543
if(debug){
1544
fprintf_plus(stderr, "Network hook directory \"%s\" not"
1545
" found\n", hookdir);
1546
}
1547
} else {
1548
perror_plus("open");
1549
}
1550
return;
1551
}
1552
#ifndef O_CLOEXEC
1553
if(set_cloexec_flag(hookdir_fd) < 0){
1554
perror_plus("set_cloexec_flag");
1555
if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){
1556
perror_plus("close");
1557
} else {
1558
hookdir_fd = -1;
1559
}
1560
return;
1561
}
1562
#endif /* not O_CLOEXEC */
1563
}
1564
#ifdef __GLIBC__
1565
#if __GLIBC_PREREQ(2, 15)
1566
int numhooks = scandirat(hookdir_fd, ".", &direntries,
1567
runnable_hook, alphasort);
1568
#else /* not __GLIBC_PREREQ(2, 15) */
1569
int numhooks = scandir(hookdir, &direntries, runnable_hook,
1570
alphasort);
1571
#endif /* not __GLIBC_PREREQ(2, 15) */
1572
#else /* not __GLIBC__ */
1573
int numhooks = scandir(hookdir, &direntries, runnable_hook,
1574
alphasort);
1575
#endif /* not __GLIBC__ */
1522
1576
if(numhooks == -1){
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");
1577
perror_plus("scandir");
1578
return;
1579
}
1580
struct dirent *direntry;
1581
int ret;
1582
int devnull = open("/dev/null", O_RDONLY);
1583
for(int i = 0; i < numhooks; i++){
1584
direntry = direntries[i];
1585
if(debug){
1586
fprintf_plus(stderr, "Running network hook \"%s\"\n",
1587
direntry->d_name);
1530
1588
}
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){
1589
pid_t hook_pid = fork();
1590
if(hook_pid == 0){
1591
/* Child */
1592
/* Raise privileges */
1593
if(raise_privileges_permanently() != 0){
1594
perror_plus("Failed to raise privileges");
1595
_exit(EX_NOPERM);
1596
}
1597
/* Set group */
1598
errno = 0;
1599
ret = setgid(0);
1600
if(ret == -1){
1601
perror_plus("setgid");
1602
_exit(EX_NOPERM);
1603
}
1604
/* Reset supplementary groups */
1605
errno = 0;
1606
ret = setgroups(0, NULL);
1607
if(ret == -1){
1608
perror_plus("setgroups");
1609
_exit(EX_NOPERM);
1610
}
1611
ret = dup2(devnull, STDIN_FILENO);
1612
if(ret == -1){
1613
perror_plus("dup2(devnull, STDIN_FILENO)");
1614
_exit(EX_OSERR);
1615
}
1616
ret = close(devnull);
1617
if(ret == -1){
1618
perror_plus("close");
1619
_exit(EX_OSERR);
1620
}
1621
ret = dup2(STDERR_FILENO, STDOUT_FILENO);
1622
if(ret == -1){
1623
perror_plus("dup2(STDERR_FILENO, STDOUT_FILENO)");
1624
_exit(EX_OSERR);
1625
}
1626
ret = setenv("MANDOSNETHOOKDIR", hookdir, 1);
1627
if(ret == -1){
1628
perror_plus("setenv");
1629
_exit(EX_OSERR);
1630
}
1631
ret = setenv("DEVICE", interface, 1);
1632
if(ret == -1){
1633
perror_plus("setenv");
1634
_exit(EX_OSERR);
1635
}
1636
ret = setenv("VERBOSITY", debug ? "1" : "0", 1);
1637
if(ret == -1){
1638
perror_plus("setenv");
1639
_exit(EX_OSERR);
1640
}
1641
ret = setenv("MODE", mode, 1);
1642
if(ret == -1){
1643
perror_plus("setenv");
1644
_exit(EX_OSERR);
1645
}
1646
char *delaystring;
1647
ret = asprintf(&delaystring, "%f", (double)delay);
1648
if(ret == -1){
1540
1649
perror_plus("asprintf");
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
}
1650
_exit(EX_OSERR);
1651
}
1652
ret = setenv("DELAY", delaystring, 1);
1653
if(ret == -1){
1616
1654
free(delaystring);
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
}
1655
perror_plus("setenv");
1656
_exit(EX_OSERR);
1657
}
1658
free(delaystring);
1659
if(connect_to != NULL){
1660
ret = setenv("CONNECT", connect_to, 1);
1661
if(ret == -1){
1662
perror_plus("setenv");
1663
_exit(EX_OSERR);
1664
}
1665
}
1666
if(fexecve(hookdir_fd, (char *const [])
1667
{ direntry->d_name, NULL }, environ) == -1){
1668
perror_plus("fexecve");
1669
_exit(EXIT_FAILURE);
1670
}
1671
} else {
1672
int status;
1673
if(TEMP_FAILURE_RETRY(waitpid(hook_pid, &status, 0)) == -1){
1674
perror_plus("waitpid");
1675
continue;
1676
}
1677
if(WIFEXITED(status)){
1678
if(WEXITSTATUS(status) != 0){
1679
fprintf_plus(stderr, "Warning: network hook \"%s\" exited"
1680
" with status %d\n", direntry->d_name,
1681
WEXITSTATUS(status));
1682
continue;
1683
}
1684
} else if(WIFSIGNALED(status)){
1685
fprintf_plus(stderr, "Warning: network hook \"%s\" died by"
1686
" signal %d\n", direntry->d_name,
1687
WTERMSIG(status));
1688
continue;
1628
1689
} else {
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
}
1690
fprintf_plus(stderr, "Warning: network hook \"%s\""
1691
" crashed\n", direntry->d_name);
1692
continue;
1693
}
1694
}
1695
if(debug){
1696
fprintf_plus(stderr, "Network hook \"%s\" ran successfully\n",
1697
direntry->d_name);
1698
}
1699
}
1700
if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){
1701
perror_plus("close");
1702
} else {
1703
hookdir_fd = -1;
1704
}
1705
close(devnull);
1664
1706
}
1665
1707
1666
1708
__attribute__((nonnull, warn_unused_result))
2576
2618
/* Removes the GPGME temp directory and all files inside */
2577
2619
if(tempdir != NULL){
2578
2620
struct dirent **direntries = NULL;
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);
2621
int tempdir_fd = (int)TEMP_FAILURE_RETRY(open(tempdir, O_RDONLY));
2622
if(tempdir_fd == -1){
2623
perror_plus("open");
2624
} else {
2625
#ifdef __GLIBC__
2626
#if __GLIBC_PREREQ(2, 15)
2627
int numentries = scandirat(tempdir_fd, ".", &direntries,
2628
notdotentries, alphasort);
2629
#else /* not __GLIBC_PREREQ(2, 15) */
2630
int numentries = scandir(tempdir, &direntries, notdotentries,
2631
alphasort);
2632
#endif /* not __GLIBC_PREREQ(2, 15) */
2633
#else /* not __GLIBC__ */
2634
int numentries = scandir(tempdir, &direntries, notdotentries,
2635
alphasort);
2636
#endif /* not __GLIBC__ */
2637
if(numentries > 0){
2638
for(int i = 0; i < numentries; i++){
2639
ret = unlinkat(tempdir_fd, direntries[i]->d_name, 0);
2640
if(ret == -1){
2641
fprintf_plus(stderr, "unlinkat(open(\"%s\", O_RDONLY),"
2642
" \"%s\", 0): %s\n", tempdir,
2643
direntries[i]->d_name, strerror(errno));
2644
}
2645
}
2646
2647
/* need to clean even if 0 because man page doesn't specify */
2648
free(direntries);
2649
if(numentries == -1){
2650
perror_plus("scandir");
2651
}
2652
ret = rmdir(tempdir);
2653
if(ret == -1 and errno != ENOENT){
2654
perror_plus("rmdir");
2655
}
2598
2656
}
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");
2657
TEMP_FAILURE_RETRY(close(tempdir_fd));
2609
2658
}
2610
2659
}
2611
2660
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0