urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-03 01:54:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4828 from urbit/jb/cttp-crash-redux

Browse Source 
vere: fix cttp tls crash from (bad) fix for synchronous error callback
This commit is contained in:
Joe Bryan 2021-04-27 11:33:12 -07:00 committed by GitHub
commit 224e9d172a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 56 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pkg/urbit/vere/io/cttp.c
View File

@ -20,7 +20,8 @@
u3_csat_init = 0, // initialized u3_csat_init = 0, // initialized
u3_csat_addr = 1, // address resolution begun u3_csat_addr = 1, // address resolution begun
u3_csat_quit = 2, // cancellation requested u3_csat_quit = 2, // cancellation requested
u3_csat_ripe = 3 // passed to libh2o u3_csat_conn = 3, // sync connect phase
u3_csat_ripe = 4 // passed to libh2o
} u3_csat; } u3_csat;
/* u3_cres: response to http client. /* u3_cres: response to http client.
@ -827,7 +828,15 @@ _cttp_creq_on_connect(h2o_http1client_t* cli_u, const c3_c* err_c,
u3_creq* ceq_u = (u3_creq *)cli_u->data; u3_creq* ceq_u = (u3_creq *)cli_u->data;
if ( 0 != err_c ) { if ( 0 != err_c ) {
// if synchronously connecting, caller will cleanup
//
if ( u3_csat_conn == ceq_u->sat_e ) {
ceq_u->sat_e = u3_csat_quit;
}
else {
c3_assert( u3_csat_ripe == ceq_u->sat_e );
_cttp_creq_fail(ceq_u, err_c); _cttp_creq_fail(ceq_u, err_c);
}
return 0; return 0;
} }
@ -852,17 +861,10 @@ _cttp_creq_on_connect(h2o_http1client_t* cli_u, const c3_c* err_c,
static void static void
_cttp_creq_connect(u3_creq* ceq_u) _cttp_creq_connect(u3_creq* ceq_u)
{ {
c3_assert( u3_csat_ripe == ceq_u->sat_e ); c3_assert( u3_csat_conn == ceq_u->sat_e );
c3_assert( ceq_u->ipf_c ); c3_assert( ceq_u->ipf_c );
// set hostname for TLS handshake // connect by ip/port, avoiding synchronous getaddrinfo()
//
if ( ceq_u->hot_c && c3y == ceq_u->sec ) {
c3_free(ceq_u->cli_u->ssl.server_name);
ceq_u->cli_u->ssl.server_name = strdup(ceq_u->hot_c);
}
// connect by IP
// //
{ {
h2o_iovec_t ipf_u = h2o_iovec_init(ceq_u->ipf_c, strlen(ceq_u->ipf_c)); h2o_iovec_t ipf_u = h2o_iovec_init(ceq_u->ipf_c, strlen(ceq_u->ipf_c));
@ -874,6 +876,28 @@ _cttp_creq_connect(u3_creq* ceq_u)
h2o_http1client_connect(&ceq_u->cli_u, ceq_u, &ceq_u->ctp_u->ctx_u, h2o_http1client_connect(&ceq_u->cli_u, ceq_u, &ceq_u->ctp_u->ctx_u,
ipf_u, por_s, tls_t, _cttp_creq_on_connect); ipf_u, por_s, tls_t, _cttp_creq_on_connect);
} }
// connect() failed, cb invoked synchronously
//
if ( u3_csat_conn != ceq_u->sat_e ) {
c3_assert( u3_csat_quit == ceq_u->sat_e );
// only one such failure case
//
_cttp_creq_fail(ceq_u, "socket create error");
}
else {
ceq_u->sat_e = u3_csat_ripe;
// fixup hostname for TLS handshake
//
// must be synchronous, after successfull connect() call
//
if ( ceq_u->hot_c && (c3y == ceq_u->sec) ) {
c3_assert( ceq_u->cli_u );
c3_free(ceq_u->cli_u->ssl.server_name);
ceq_u->cli_u->ssl.server_name = strdup(ceq_u->hot_c);
}
}
} }
/* _cttp_creq_resolve_cb(): cb upon IP address resolution /* _cttp_creq_resolve_cb(): cb upon IP address resolution
@ -896,7 +920,7 @@ _cttp_creq_resolve_cb(uv_getaddrinfo_t* adr_u,
ceq_u->ipf_w = ntohl(((struct sockaddr_in *)aif_u->ai_addr)->sin_addr.s_addr); ceq_u->ipf_w = ntohl(((struct sockaddr_in *)aif_u->ai_addr)->sin_addr.s_addr);
ceq_u->ipf_c = _cttp_creq_ip(ceq_u->ipf_w); ceq_u->ipf_c = _cttp_creq_ip(ceq_u->ipf_w);
ceq_u->sat_e = u3_csat_ripe; ceq_u->sat_e = u3_csat_conn;
_cttp_creq_connect(ceq_u); _cttp_creq_connect(ceq_u);
} }
@ -940,7 +964,7 @@ static void
_cttp_creq_start(u3_creq* ceq_u) _cttp_creq_start(u3_creq* ceq_u)
{ {
if ( ceq_u->ipf_c ) { if ( ceq_u->ipf_c ) {
ceq_u->sat_e = u3_csat_ripe; ceq_u->sat_e = u3_csat_conn;
_cttp_creq_connect(ceq_u); _cttp_creq_connect(ceq_u);
} else { } else {
ceq_u->sat_e = u3_csat_addr; ceq_u->sat_e = u3_csat_addr;