mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-07-05 02:38:31 +00:00
Make more fixes and improvements
- Remove PAGESIZE constant
- Fix realloc() documentation
- Fix ttyname_r() error reporting
- Make forking more reliable on Windows
- Make execvp() a few microseconds faster
- Make system() a few microseconds faster
- Tighten up the socket-related magic numbers
- Loosen restrictions on mmap() offset alignment
- Improve GetProgramExecutableName() with getenv("_")
- Use mkstemp() as basis for mktemp(), tmpfile(), tmpfd()
- Fix flakes in pthread_cancel_test, unix_test, fork_test
- Fix recently introduced futex stack overflow regression
- Let sockets be passed as stdio to subprocesses on Windows
- Improve security of bind() on Windows w/ SO_EXCLUSIVEADDRUSE
This commit is contained in:
Justine Tunney
parent
140a8a52e5
commit
18bb5888e1
311 changed files with 1239 additions and 2622 deletions
|
|
@ -18,6 +18,7 @@
|
|||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/errno.h"
|
||||
#include "libc/intrin/kprintf.h"
|
||||
#include "libc/intrin/strace.internal.h"
|
||||
#include "libc/runtime/runtime.h"
|
||||
#include "libc/runtime/syslib.internal.h"
|
||||
|
|
@ -106,8 +107,9 @@ TEST(O_NONBLOCK, canBeTunedWithFcntl_toMakeReadNonBlocking) {
|
|||
PARENT();
|
||||
EXPECT_SYS(0, 0, close(3));
|
||||
ASSERT_SYS(0, 3, socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
|
||||
ASSERT_SYS(0, O_RDWR, fcntl(3, F_GETFL));
|
||||
ASSERT_SYS(0, 0, connect(3, (struct sockaddr *)&addr, sizeof(addr)));
|
||||
ASSERT_SYS(0, 0, fcntl(3, F_SETFL, O_NONBLOCK));
|
||||
ASSERT_SYS(0, 0, fcntl(3, F_SETFL, O_RDWR | O_NONBLOCK));
|
||||
ASSERT_SYS(EAGAIN, -1, read(3, buf, 16));
|
||||
EXPECT_EQ(0, pthread_spin_unlock(phaser + 0));
|
||||
TryAgain:
|
||||
|
|
|
|||
|
|
@ -17,6 +17,11 @@
|
|||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/calls/internal.h"
|
||||
#include "libc/calls/struct/fd.internal.h"
|
||||
#include "libc/dce.h"
|
||||
#include "libc/nt/winsock.h"
|
||||
#include "libc/runtime/runtime.h"
|
||||
#include "libc/sock/sock.h"
|
||||
#include "libc/sock/struct/sockaddr.h"
|
||||
#include "libc/sock/struct/sockaddr6.h"
|
||||
|
|
@ -25,6 +30,7 @@
|
|||
#include "libc/sysv/consts/ipproto.h"
|
||||
#include "libc/sysv/consts/limits.h"
|
||||
#include "libc/sysv/consts/sock.h"
|
||||
#include "libc/testlib/subprocess.h"
|
||||
#include "libc/testlib/testlib.h"
|
||||
|
||||
TEST(ipv4, test) {
|
||||
|
|
@ -40,27 +46,20 @@ TEST(ipv4, test) {
|
|||
ASSERT_SYS(0, 0, bind(3, (struct sockaddr *)&addr, sizeof(addr)));
|
||||
ASSERT_SYS(0, 0, getsockname(3, (struct sockaddr *)&addr, &addrsize));
|
||||
ASSERT_SYS(0, 0, listen(3, SOMAXCONN));
|
||||
ASSERT_NE(-1, (pid = fork()));
|
||||
if (!pid) {
|
||||
ASSERT_SYS(0, 4, accept(3, (struct sockaddr *)&addr, &addrsize));
|
||||
ASSERT_SYS(0, 5, send(4, "hello", 5, 0));
|
||||
ASSERT_SYS(0, 0, close(4));
|
||||
ASSERT_SYS(0, 0, close(3));
|
||||
_Exit(0);
|
||||
}
|
||||
SPAWN(fork);
|
||||
ASSERT_SYS(0, 4, accept(3, (struct sockaddr *)&addr, &addrsize));
|
||||
ASSERT_SYS(0, 5, send(4, "hello", 5, 0));
|
||||
PARENT();
|
||||
EXPECT_SYS(0, 0, close(3));
|
||||
EXPECT_SYS(0, 3, socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
|
||||
EXPECT_SYS(0, 0, connect(3, (struct sockaddr *)&addr, sizeof(addr)));
|
||||
EXPECT_SYS(0, 5, read(3, buf, 16));
|
||||
EXPECT_STREQ("hello", buf);
|
||||
EXPECT_SYS(0, 0, close(3));
|
||||
EXPECT_NE(-1, wait(&ws));
|
||||
ASSERT_TRUE(WIFEXITED(ws));
|
||||
ASSERT_EQ(0, WEXITSTATUS(ws));
|
||||
WAIT(exit, 0);
|
||||
}
|
||||
|
||||
TEST(ipv6, test) {
|
||||
int ws, pid;
|
||||
char buf[16] = {0};
|
||||
int64_t inoffset;
|
||||
uint32_t addrsize = sizeof(struct sockaddr_in6);
|
||||
|
|
@ -74,23 +73,19 @@ TEST(ipv6, test) {
|
|||
ASSERT_EQ(AF_INET6, addr.sin6_family);
|
||||
ASSERT_NE(0, addr.sin6_port);
|
||||
ASSERT_SYS(0, 0, listen(3, SOMAXCONN));
|
||||
ASSERT_NE(-1, (pid = fork()));
|
||||
if (!pid) {
|
||||
ASSERT_SYS(0, 4, accept(3, (struct sockaddr *)&addr, &addrsize));
|
||||
ASSERT_SYS(0, 5, send(4, "hello", 5, 0));
|
||||
ASSERT_SYS(0, 0, close(4));
|
||||
ASSERT_SYS(0, 0, close(3));
|
||||
_Exit(0);
|
||||
}
|
||||
SPAWN(fork);
|
||||
ASSERT_SYS(0, 4, accept(3, (struct sockaddr *)&addr, &addrsize));
|
||||
ASSERT_SYS(0, 5, send(4, "hello", 5, 0));
|
||||
ASSERT_SYS(0, 0, close(4));
|
||||
ASSERT_SYS(0, 0, close(3));
|
||||
PARENT();
|
||||
EXPECT_SYS(0, 0, close(3));
|
||||
EXPECT_SYS(0, 3, socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP));
|
||||
EXPECT_SYS(0, 0, connect(3, (struct sockaddr *)&addr, sizeof(addr)));
|
||||
EXPECT_SYS(0, 5, read(3, buf, 16));
|
||||
EXPECT_STREQ("hello", buf);
|
||||
EXPECT_SYS(0, 0, close(3));
|
||||
EXPECT_NE(-1, wait(&ws));
|
||||
ASSERT_TRUE(WIFEXITED(ws));
|
||||
ASSERT_EQ(0, WEXITSTATUS(ws));
|
||||
WAIT(exit, 0);
|
||||
}
|
||||
|
||||
TEST(getsockname, defaultsToZero) {
|
||||
|
|
@ -118,3 +113,76 @@ TEST(getsockname, copiesSafely_givesFullSize) {
|
|||
ASSERT_EQ(0xffff, addr.sin_port);
|
||||
EXPECT_SYS(0, 0, close(3));
|
||||
}
|
||||
|
||||
TEST(socket, canBeInheritedByForkedWorker) {
|
||||
char buf[16] = {0};
|
||||
int64_t inoffset;
|
||||
uint32_t addrsize = sizeof(struct sockaddr_in);
|
||||
struct sockaddr_in addr = {
|
||||
.sin_family = AF_INET,
|
||||
.sin_addr.s_addr = htonl(0x7f000001),
|
||||
};
|
||||
ASSERT_SYS(0, 3, socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
|
||||
ASSERT_SYS(0, 0, bind(3, (struct sockaddr *)&addr, sizeof(addr)));
|
||||
ASSERT_SYS(0, 0, getsockname(3, (struct sockaddr *)&addr, &addrsize));
|
||||
ASSERT_SYS(0, 0, listen(3, SOMAXCONN));
|
||||
SPAWN(fork);
|
||||
ASSERT_SYS(0, 4, accept(3, (struct sockaddr *)&addr, &addrsize));
|
||||
ASSERT_SYS(0, 0, close(3));
|
||||
SPAWN(fork);
|
||||
ASSERT_SYS(0, 5, write(4, "hello", 5));
|
||||
PARENT();
|
||||
ASSERT_SYS(0, 0, close(4));
|
||||
WAIT(exit, 0);
|
||||
PARENT();
|
||||
EXPECT_SYS(0, 0, close(3));
|
||||
EXPECT_SYS(0, 3, socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
|
||||
EXPECT_SYS(0, 0, connect(3, (struct sockaddr *)&addr, sizeof(addr)));
|
||||
EXPECT_SYS(0, 5, read(3, buf, 16));
|
||||
EXPECT_STREQ("hello", buf);
|
||||
EXPECT_SYS(0, 0, close(3));
|
||||
WAIT(exit, 0);
|
||||
}
|
||||
|
||||
__attribute__((__constructor__)) static void StdioPro(int argc, char *argv[]) {
|
||||
if (argc >= 2 && !strcmp(argv[1], "StdioProg")) {
|
||||
ASSERT_EQ(NULL, getenv("__STDIO_SOCKETS"));
|
||||
ASSERT_EQ(5, write(1, "hello", 5));
|
||||
exit(0);
|
||||
}
|
||||
}
|
||||
|
||||
TEST(socket, canBeUsedAsExecutedStdio) {
|
||||
char buf[16] = {0};
|
||||
int64_t inoffset;
|
||||
const char *prog;
|
||||
uint32_t addrsize = sizeof(struct sockaddr_in);
|
||||
struct sockaddr_in addr = {
|
||||
.sin_family = AF_INET,
|
||||
.sin_addr.s_addr = htonl(0x7f000001),
|
||||
};
|
||||
prog = GetProgramExecutableName();
|
||||
ASSERT_SYS(0, 3, socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP));
|
||||
ASSERT_SYS(0, 0, bind(3, (struct sockaddr *)&addr, sizeof(addr)));
|
||||
ASSERT_SYS(0, 0, getsockname(3, (struct sockaddr *)&addr, &addrsize));
|
||||
ASSERT_SYS(0, 0, listen(3, SOMAXCONN));
|
||||
SPAWN(fork);
|
||||
ASSERT_SYS(0, 4,
|
||||
accept4(3, (struct sockaddr *)&addr, &addrsize, SOCK_CLOEXEC));
|
||||
ASSERT_SYS(0, 1, dup2(4, 1));
|
||||
SPAWN(vfork);
|
||||
execve(prog, (char *[]){prog, "StdioProg", 0}, (char *[]){0});
|
||||
abort();
|
||||
PARENT();
|
||||
ASSERT_SYS(0, 0, close(4));
|
||||
ASSERT_SYS(0, 0, close(3));
|
||||
WAIT(exit, 0);
|
||||
PARENT();
|
||||
EXPECT_SYS(0, 0, close(3));
|
||||
EXPECT_SYS(0, 3, socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
|
||||
EXPECT_SYS(0, 0, connect(3, (struct sockaddr *)&addr, sizeof(addr)));
|
||||
EXPECT_SYS(0, 5, read(3, buf, 16));
|
||||
EXPECT_STREQ("hello", buf);
|
||||
EXPECT_SYS(0, 0, close(3));
|
||||
WAIT(exit, 0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
||||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/atomic.h"
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/calls/internal.h"
|
||||
#include "libc/calls/struct/timeval.h"
|
||||
|
|
@ -32,6 +33,7 @@
|
|||
#include "libc/sysv/consts/so.h"
|
||||
#include "libc/sysv/consts/sock.h"
|
||||
#include "libc/sysv/consts/sol.h"
|
||||
#include "libc/testlib/subprocess.h"
|
||||
#include "libc/testlib/testlib.h"
|
||||
#include "libc/time/time.h"
|
||||
|
||||
|
|
@ -41,13 +43,16 @@ void SetUpOnce(void) {
|
|||
ASSERT_SYS(0, 0, pledge("stdio rpath cpath proc unix", 0));
|
||||
}
|
||||
|
||||
void DatagramServer(void) {
|
||||
TEST(unix, datagram) {
|
||||
if (IsWindows()) return; // no unix datagram on windows :'(
|
||||
atomic_bool *ready = _mapshared(1);
|
||||
SPAWN(fork);
|
||||
char buf[256] = {0};
|
||||
uint32_t len = sizeof(struct sockaddr_un);
|
||||
struct sockaddr_un addr = {AF_UNIX, "foo.sock"};
|
||||
alarm(3);
|
||||
ASSERT_SYS(0, 3, socket(AF_UNIX, SOCK_DGRAM, 0));
|
||||
ASSERT_SYS(0, 0, bind(3, (void *)&addr, len));
|
||||
*ready = true;
|
||||
bzero(&addr, sizeof(addr));
|
||||
ASSERT_SYS(0, 0, getsockname(3, (void *)&addr, &len));
|
||||
ASSERT_EQ(11, len);
|
||||
|
|
@ -55,33 +60,21 @@ void DatagramServer(void) {
|
|||
ASSERT_SYS(0, 5, read(3, buf, 256));
|
||||
EXPECT_STREQ("hello", buf);
|
||||
ASSERT_SYS(0, 0, close(3));
|
||||
}
|
||||
|
||||
TEST(unix, datagram) {
|
||||
if (IsWindows()) return; // no unix datagram on windows :'(
|
||||
int ws;
|
||||
PARENT();
|
||||
while (!*ready) sched_yield();
|
||||
ASSERT_SYS(0, 3, socket(AF_UNIX, SOCK_DGRAM, 0));
|
||||
uint32_t len = sizeof(struct sockaddr_un);
|
||||
struct sockaddr_un addr = {AF_UNIX, "foo.sock"};
|
||||
if (!fork()) {
|
||||
DatagramServer();
|
||||
_Exit(0);
|
||||
}
|
||||
alarm(3);
|
||||
while (!fileexists(addr.sun_path)) usleep(10000);
|
||||
ASSERT_SYS(0, 3, socket(AF_UNIX, SOCK_DGRAM, 0));
|
||||
ASSERT_SYS(0, 5, sendto(3, "hello", 5, 0, (struct sockaddr *)&addr, len));
|
||||
ASSERT_SYS(0, 0, close(3));
|
||||
ASSERT_NE(-1, wait(&ws));
|
||||
EXPECT_TRUE(WIFEXITED(ws));
|
||||
EXPECT_EQ(0, WEXITSTATUS(ws));
|
||||
alarm(0);
|
||||
WAIT(exit, 0);
|
||||
munmap(ready, 1);
|
||||
}
|
||||
|
||||
void StreamServer(void) {
|
||||
void StreamServer(atomic_bool *ready) {
|
||||
char buf[256] = {0};
|
||||
uint32_t len = sizeof(struct sockaddr_un);
|
||||
struct sockaddr_un addr = {AF_UNIX, "foo.sock"};
|
||||
alarm(3);
|
||||
ASSERT_SYS(0, 3, socket(AF_UNIX, SOCK_STREAM, 0));
|
||||
ASSERT_SYS(0, 0, bind(3, (void *)&addr, len));
|
||||
bzero(&addr, sizeof(addr));
|
||||
|
|
@ -92,6 +85,7 @@ void StreamServer(void) {
|
|||
ASSERT_SYS(0, 0, listen(3, 10));
|
||||
bzero(&addr, sizeof(addr));
|
||||
len = sizeof(addr);
|
||||
*ready = true;
|
||||
ASSERT_SYS(0, 4, accept(3, (struct sockaddr *)&addr, &len));
|
||||
ASSERT_EQ(AF_UNIX, addr.sun_family);
|
||||
EXPECT_STREQ("", addr.sun_path);
|
||||
|
|
@ -101,26 +95,26 @@ void StreamServer(void) {
|
|||
}
|
||||
|
||||
TEST(unix, stream) {
|
||||
if (IsWindows() && !IsAtLeastWindows10()) return;
|
||||
int ws;
|
||||
uint32_t len = sizeof(struct sockaddr_un);
|
||||
struct sockaddr_un addr = {AF_UNIX, "foo.sock"};
|
||||
if (IsWindows() && !IsAtLeastWindows10()) return;
|
||||
atomic_bool *ready = _mapshared(1);
|
||||
// TODO(jart): move this line down when kFdProcess is gone
|
||||
ASSERT_SYS(0, 3, socket(AF_UNIX, SOCK_STREAM, 0));
|
||||
if (!fork()) {
|
||||
close(3);
|
||||
StreamServer();
|
||||
StreamServer(ready);
|
||||
_Exit(0);
|
||||
}
|
||||
alarm(3);
|
||||
while (!fileexists(addr.sun_path)) usleep(10000);
|
||||
while (!*ready) sched_yield();
|
||||
uint32_t len = sizeof(struct sockaddr_un);
|
||||
struct sockaddr_un addr = {AF_UNIX, "foo.sock"};
|
||||
ASSERT_SYS(0, 0, connect(3, (void *)&addr, len));
|
||||
ASSERT_SYS(0, 5, write(3, "hello", 5));
|
||||
ASSERT_SYS(0, 0, close(3));
|
||||
ASSERT_NE(-1, wait(&ws));
|
||||
EXPECT_TRUE(WIFEXITED(ws));
|
||||
EXPECT_EQ(0, WEXITSTATUS(ws));
|
||||
alarm(0);
|
||||
munmap(ready, 1);
|
||||
}
|
||||
|
||||
TEST(unix, serverGoesDown_deletedSockFile) { // field of landmine
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue