urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-28 05:22:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2101 from urbit/http-respond-safe

Browse Source 
vere: fix use-after-free in http responses
This commit is contained in:
Joe Bryan 2019-12-16 11:46:58 -08:00 committed by GitHub
commit 2f6d512248
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pkg/urbit/vere/http.c
View File

@ -325,9 +325,9 @@ _http_req_done(void* ptr_v)
{ {
u3_hreq* req_u = (u3_hreq*)ptr_v; u3_hreq* req_u = (u3_hreq*)ptr_v;
// client canceled request // client canceled request before response
if ( (u3_rsat_plan == req_u->sat_e ) || //
(0 != req_u->gen_u && c3n == ((u3_hgen*)req_u->gen_u)->dun )) { if ( u3_rsat_plan == req_u->sat_e ) {
_http_req_kill(req_u); _http_req_kill(req_u);
} }
@ -420,7 +420,6 @@ static void
_http_hgen_send(u3_hgen* gen_u) _http_hgen_send(u3_hgen* gen_u)
{ {
c3_assert( c3y == gen_u->red ); c3_assert( c3y == gen_u->red );
c3_assert( 0 == gen_u->nud_u );
u3_hreq* req_u = gen_u->req_u; u3_hreq* req_u = gen_u->req_u;
h2o_req_t* rec_u = req_u->rec_u; h2o_req_t* rec_u = req_u->rec_u;
@ -428,29 +427,33 @@ _http_hgen_send(u3_hgen* gen_u)
c3_w len_w; c3_w len_w;
h2o_iovec_t* vec_u = _cttp_bods_to_vec(gen_u->bod_u, &len_w); h2o_iovec_t* vec_u = _cttp_bods_to_vec(gen_u->bod_u, &len_w);
// not ready again until _proceed
//
gen_u->red = c3n;
// stash [bod_u] to free later
//
_cttp_bods_free(gen_u->nud_u);
gen_u->nud_u = gen_u->bod_u;
gen_u->bod_u = 0;
if ( c3n == gen_u->dun ) { if ( c3n == gen_u->dun ) {
h2o_send(rec_u, vec_u, len_w, H2O_SEND_STATE_IN_PROGRESS); h2o_send(rec_u, vec_u, len_w, H2O_SEND_STATE_IN_PROGRESS);
// Restart the timer
uv_timer_start(req_u->tim_u, _http_req_timer_cb, 45 * 1000, 0); uv_timer_start(req_u->tim_u, _http_req_timer_cb, 45 * 1000, 0);
} }
else { else {
h2o_send(rec_u, vec_u, len_w, H2O_SEND_STATE_FINAL); // close connection if shutdown pending
//
u3_h2o_serv* h2o_u = req_u->hon_u->htp_u->h2o_u; u3_h2o_serv* h2o_u = req_u->hon_u->htp_u->h2o_u;
if ( 0 != h2o_u->ctx_u.shutdown_requested ) { if ( 0 != h2o_u->ctx_u.shutdown_requested ) {
rec_u->http1_is_persistent = 0; rec_u->http1_is_persistent = 0;
} }
h2o_send(rec_u, vec_u, len_w, H2O_SEND_STATE_FINAL);
} }
// not ready again until _proceed c3_free(vec_u);
gen_u->red = c3n;
// stash bod_u to be free'd later
gen_u->nud_u = gen_u->bod_u;
gen_u->bod_u = 0;
free(vec_u);
} }
/* _http_hgen_stop(): h2o is closing an in-progress response. /* _http_hgen_stop(): h2o is closing an in-progress response.
@ -458,7 +461,13 @@ _http_hgen_send(u3_hgen* gen_u)
static void static void
_http_hgen_stop(h2o_generator_t* neg_u, h2o_req_t* rec_u) _http_hgen_stop(h2o_generator_t* neg_u, h2o_req_t* rec_u)
{ {
// kill request in %light u3_hgen* gen_u = (u3_hgen*)neg_u;
// response not complete, enqueue cancel
//
if ( c3n == gen_u->dun ) {
_http_req_kill(gen_u->req_u);
}
} }
/* _http_hgen_proceed(): h2o is ready for more response data. /* _http_hgen_proceed(): h2o is ready for more response data.
@ -474,11 +483,6 @@ _http_hgen_proceed(h2o_generator_t* neg_u, h2o_req_t* rec_u)
gen_u->red = c3y; gen_u->red = c3y;
_http_heds_free(gen_u->hed_u);
gen_u->hed_u = 0;
_cttp_bods_free(gen_u->nud_u);
gen_u->nud_u = 0;
if ( 0 != gen_u->bod_u || c3y == gen_u->dun ) { if ( 0 != gen_u->bod_u || c3y == gen_u->dun ) {
_http_hgen_send(gen_u); _http_hgen_send(gen_u);
} }
@ -514,6 +518,7 @@ _http_start_respond(u3_hreq* req_u,
"hosed"; "hosed";
u3_hhed* hed_u = _http_heds_from_noun(u3k(headers)); u3_hhed* hed_u = _http_heds_from_noun(u3k(headers));
u3_hhed* deh_u = hed_u;
c3_i has_len_i = 0; c3_i has_len_i = 0;
@ -521,7 +526,6 @@ _http_start_respond(u3_hreq* req_u,
if ( 0 == strncmp(hed_u->nam_c, "content-length", 14) ) { if ( 0 == strncmp(hed_u->nam_c, "content-length", 14) ) {
has_len_i = 1; has_len_i = 1;
} }
else { else {
h2o_add_header_by_str(&rec_u->pool, &rec_u->res.headers, h2o_add_header_by_str(&rec_u->pool, &rec_u->res.headers,
hed_u->nam_c, hed_u->nam_w, 0, 0, hed_u->nam_c, hed_u->nam_w, 0, 0,
@ -539,7 +543,7 @@ _http_start_respond(u3_hreq* req_u,
gen_u->bod_u = ( u3_nul == data ) ? gen_u->bod_u = ( u3_nul == data ) ?
0 : _cttp_bod_from_octs(u3k(u3t(data))); 0 : _cttp_bod_from_octs(u3k(u3t(data)));
gen_u->nud_u = 0; gen_u->nud_u = 0;
gen_u->hed_u = hed_u; gen_u->hed_u = deh_u;
gen_u->req_u = req_u; gen_u->req_u = req_u;
// if we don't explicitly set this field, h2o will send with // if we don't explicitly set this field, h2o will send with