Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

conn: do not chdir for conn.sock #581

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

conn: do not chdir for conn.sock #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a2b707d
conn: do not chdir for conn.sock
mrdomino Jan 5, 2024
ee14650
conn: cleanup
mrdomino Jan 5, 2024
098d25c
conn: always close fid_i
mrdomino Jan 5, 2024
6a3cf10
conn: rm tmpdir
mrdomino Jan 5, 2024
4f49b0c
conn: SOCK_PATH_MAX
mrdomino Jan 5, 2024
69711d4
conn: only show tmp socket
mrdomino Jan 5, 2024
c32a8c3
conn: move listen after path setup
mrdomino Jan 8, 2024
d87a67e
conn: remove trailing / from TMPDIR
mrdomino Jan 8, 2024
105073b
vere: U3_SOCK_MAX in portable.h
mrdomino Jan 8, 2024
fa829a5
conn: whitespace
mrdomino Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pkg/c3/portable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
# include <sys/resource.h>
# include <sys/mman.h>
# include <sys/sendfile.h>
# include <sys/socket.h>
# include <sys/un.h>

# elif defined(U3_OS_osx)
# include <ctype.h>
Expand All @@ -57,6 +59,8 @@
# include <sys/syslimits.h>
# include <sys/mman.h>
# include <sys/clonefile.h>
# include <sys/types.h>
# include <sys/un.h>
# include <copyfile.h>

# elif defined(U3_OS_bsd)
Expand All @@ -75,6 +79,8 @@
# include <sys/time.h>
# include <sys/resource.h>
# include <sys/mman.h>
# include <sys/types.h>
# include <sys/un.h>

# else
#error "port: headers"
Expand Down Expand Up @@ -111,6 +117,7 @@


# define U3_BIN_ALIAS ".run"
# define U3_SOCK_MAX sizeof(((struct sockaddr_un *)0)->sun_path)

/** Address space layout.
***
Expand Down
126 changes: 80 additions & 46 deletions pkg/vere/io/conn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,55 +693,79 @@ _conn_init_sock(u3_shan* san_u)
u3l_log("conn: listening on %s", pip_c);

#else // _WIN32
// the full socket path is limited to about 108 characters,
// and we want it to be relative to the pier. save our current
// path, chdir to the pier, open the socket at the desired
// path, then chdir back. hopefully there aren't any threads.
//
c3_c pax_c[2048];
c3_i err_i;

if ( NULL == getcwd(pax_c, sizeof(pax_c)) ) {
u3l_log("conn: getcwd: %s", uv_strerror(errno));
u3_king_bail();
c3_c tad_c[U3_SOCK_MAX];
c3_w len_w;
c3_i err_i, fid_i;
c3_c* ven_c;

if ( (ven_c = getenv("TMPDIR")) ) {
if ( !(len_w = strlen(ven_c)) ) {
ven_c = 0;
} else {
if ( ven_c[len_w - 1] == '/' ) {
--len_w;
}
if ( len_w >= U3_SOCK_MAX - sizeof("/urbit-XXXXXX/conn.sock") ) {
u3l_log("conn: TMPDIR too long");
ven_c = 0;
}
}
}
if ( 0 != chdir(u3_Host.dir_c) ) {
u3l_log("conn: chdir: %s", uv_strerror(errno));
u3_king_bail();
if ( !ven_c ) {
ven_c = "/tmp";
len_w = 4;
}
if ( 0 != unlink(URB_SOCK_PATH) && errno != ENOENT ) {
u3l_log("conn: unlink: %s", uv_strerror(errno));
goto _conn_sock_err_chdir;
memcpy(tad_c, ven_c, len_w);
memcpy(tad_c + len_w, "/urbit-XXXXXX", sizeof("/urbit-XXXXXX"));
if ( !mkdtemp(tad_c) ) {
u3l_log("conn: mkdtemp: %s", strerror(errno));
u3_king_bail();
}
memcpy(tad_c + len_w + sizeof("/urbit-XXXXXX") - 1, "/conn.sock",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The string "/urbit-XXXXXX" gets reused a lot, we should make it a constant or macro

sizeof("/conn.sock"));
if ( 0 != (err_i = uv_pipe_init(u3L, &san_u->pyp_u, 0)) ) {
u3l_log("conn: uv_pipe_init: %s", uv_strerror(err_i));
goto _conn_sock_err_chdir;
goto _conn_sock_err_rmdir;
}
if ( 0 != (err_i = uv_pipe_bind(&san_u->pyp_u, URB_SOCK_PATH)) ) {
if ( 0 != (err_i = uv_pipe_bind(&san_u->pyp_u, tad_c)) ) {
u3l_log("conn: uv_pipe_bind: %s", uv_strerror(err_i));
goto _conn_sock_err_chdir;
goto _conn_sock_err_rmdir;
}
if ( -1 == (fid_i = open(u3_Host.dir_c, O_DIRECTORY)) ) {
u3l_log("conn: open: %s", strerror(errno));
goto _conn_sock_err_unlink;
}
if ( 0 != unlinkat(fid_i, URB_SOCK_PATH, 0) && ENOENT != errno ) {
u3l_log("conn: unlinkat: %s", strerror(errno));
goto _conn_sock_err_close;
}
if ( 0 != symlinkat(tad_c, fid_i, URB_SOCK_PATH) ) {
u3l_log("conn: symlinkat: %s", strerror(errno));
goto _conn_sock_err_close;
}
if ( 0 != close(fid_i) ) {
u3l_log("conn: close: %s", strerror(errno));
}
if ( 0 != (err_i = uv_listen((uv_stream_t*)&san_u->pyp_u, 0,
_conn_sock_cb)) ) {
u3l_log("conn: uv_listen: %s", uv_strerror(err_i));
goto _conn_sock_err_unlink;
}
if ( 0 != chdir(pax_c) ) {
u3l_log("conn: chdir: %s", uv_strerror(errno));
goto _conn_sock_err_close;
}
u3l_log("conn: listening on %s/%s", u3_Host.dir_c, URB_SOCK_PATH);
u3l_log("conn: listening on %s", tad_c);
return;

_conn_sock_err_close:
uv_close((uv_handle_t*)&san_u->pyp_u, _conn_close_cb);
if ( 0 != close(fid_i) ) {
u3l_log("conn: close: %s", strerror(errno));
}
_conn_sock_err_unlink:
if ( 0 != unlink(URB_SOCK_PATH) ) {
u3l_log("conn: unlink: %s", uv_strerror(errno));
if ( 0 != unlink(tad_c) ) {
u3l_log("conn: unlink: %s", strerror(errno));
}
_conn_sock_err_chdir:
if ( 0 != chdir(pax_c) ) {
u3l_log("conn: chdir: %s", uv_strerror(errno));
_conn_sock_err_rmdir:
*strrchr(tad_c, '/') = 0;
if ( 0 != rmdir(tad_c) ) {
u3l_log("conn: rmdir: %s", strerror(errno));
}
u3_king_bail();
#endif // _WIN32
Expand Down Expand Up @@ -855,24 +879,34 @@ static void
_conn_io_exit(u3_auto* car_u)
{
u3_conn* con_u = (u3_conn*)car_u;
c3_c* pax_c = u3_Host.dir_c;
c3_w len_w = strlen(pax_c) + 1 + sizeof(URB_SOCK_PATH);
c3_c* paf_c = c3_malloc(len_w);
c3_i wit_i;

wit_i = snprintf(paf_c, len_w, "%s/%s", pax_c, URB_SOCK_PATH);
u3_assert(wit_i > 0);
u3_assert(len_w == (c3_w)wit_i + 1);

if ( 0 != unlink(paf_c) ) {
if ( ENOENT != errno ) {
u3l_log("conn: failed to unlink socket: %s", uv_strerror(errno));
c3_c* fas_c;
c3_c tad_c[U3_SOCK_MAX];
c3_i fid_i, got_i;

if ( -1 == (fid_i = open(u3_Host.dir_c, O_DIRECTORY)) ) {
u3l_log("conn: open: %s", strerror(errno));
} else if ( -1 == (got_i = readlinkat(fid_i, URB_SOCK_PATH, tad_c,
sizeof(tad_c) - 1)) ) {
u3l_log("conn: readlinkat: %s", strerror(errno));
} else {
tad_c[got_i] = 0;
if ( 0 != unlinkat(fid_i, URB_SOCK_PATH, 0) && ENOENT != errno ) {
u3l_log("conn: unlinkat: %s", strerror(errno));
}
if ( 0 != unlink(tad_c) && ENOENT != errno ) {
u3l_log("conn: unlink: %s", strerror(errno));
} else if ( !(fas_c = strrchr(tad_c, '/')) ) {
u3l_log("conn: strange conn.sock: %s", tad_c);
} else {
*fas_c = 0;
if ( 0 != rmdir(tad_c) && ENOENT != errno ) {
u3l_log("conn: rmdir: %s", strerror(errno));
}
}
}
else {
// u3l_log("conn: unlinked %s", paf_c);
if ( -1 != fid_i && 0 != close(fid_i) ) {
u3l_log("conn: close: %s", strerror(errno));
}
c3_free(paf_c);

{
u3_shan* san_u = con_u->san_u;
Expand Down