mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-11-24 02:59:01 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #2890 from cesanta/tls

Browse Source 
Fix multiple TLS records in buffer
This commit is contained in:
Sergio R. Caprile 2024-10-01 18:30:04 -03:00 committed by GitHub
commit 3525f044f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mongoose.c
View File

@ -7547,25 +7547,28 @@ static void read_conn(struct mg_connection *c) {
if (c->is_tls) { if (c->is_tls) {
// Do not read to the raw TLS buffer if it already has enough. // Do not read to the raw TLS buffer if it already has enough.
// This is to prevent overflowing c->rtls if our reads are slow // This is to prevent overflowing c->rtls if our reads are slow
long m;
if (c->rtls.len < 16 * 1024 + 40) { // TLS record, header, MAC, padding if (c->rtls.len < 16 * 1024 + 40) { // TLS record, header, MAC, padding
if (!ioalloc(c, &c->rtls)) return; if (!ioalloc(c, &c->rtls)) return;
n = recv_raw(c, (char *) &c->rtls.buf[c->rtls.len], n = recv_raw(c, (char *) &c->rtls.buf[c->rtls.len],
c->rtls.size - c->rtls.len); c->rtls.size - c->rtls.len);
if (n > 0) c->rtls.len += (size_t) n;
}
// there can still be > 16K from last iteration, always mg_tls_recv()
m = c->is_tls_hs ? (long) MG_IO_WAIT : mg_tls_recv(c, buf, len);
if (n == MG_IO_ERR) { if (n == MG_IO_ERR) {
if (c->rtls.len == 0 || c->is_io_err) { if (c->rtls.len == 0 || m < 0) {
// Close only when we have fully drained both rtls and TLS buffers // Close only when we have fully drained both rtls and TLS buffers
c->is_closing = 1; // or there's nothing we can do about it. c->is_closing = 1; // or there's nothing we can do about it.
} else { // TLS buffer is capped to max record size, mark and m = -1;
c->is_io_err = 1; // give TLS a chance to process that. } else { // see #2885
// TLS buffer is capped to max record size, even though, there can
// be more than one record, give TLS a chance to process them.
} }
} else { } else if (c->is_tls_hs) {
if (n > 0) c->rtls.len += (size_t) n; mg_tls_handshake(c);
if (c->is_tls_hs) mg_tls_handshake(c);
} }
} n = m;
n = c->is_tls_hs ? (long) MG_IO_WAIT
: c->is_closing ? -1
: mg_tls_recv(c, buf, len);
} else { } else {
n = recv_raw(c, buf, len); n = recv_raw(c, buf, len);
} }

23
src/sock.c
View File

@ -278,25 +278,28 @@ static void read_conn(struct mg_connection *c) {
if (c->is_tls) { if (c->is_tls) {
// Do not read to the raw TLS buffer if it already has enough. // Do not read to the raw TLS buffer if it already has enough.
// This is to prevent overflowing c->rtls if our reads are slow // This is to prevent overflowing c->rtls if our reads are slow
long m;
if (c->rtls.len < 16 * 1024 + 40) { // TLS record, header, MAC, padding if (c->rtls.len < 16 * 1024 + 40) { // TLS record, header, MAC, padding
if (!ioalloc(c, &c->rtls)) return; if (!ioalloc(c, &c->rtls)) return;
n = recv_raw(c, (char *) &c->rtls.buf[c->rtls.len], n = recv_raw(c, (char *) &c->rtls.buf[c->rtls.len],
c->rtls.size - c->rtls.len); c->rtls.size - c->rtls.len);
if (n > 0) c->rtls.len += (size_t) n;
}
// there can still be > 16K from last iteration, always mg_tls_recv()
m = c->is_tls_hs ? (long) MG_IO_WAIT : mg_tls_recv(c, buf, len);
if (n == MG_IO_ERR) { if (n == MG_IO_ERR) {
if (c->rtls.len == 0 || c->is_io_err) { if (c->rtls.len == 0 || m < 0) {
// Close only when we have fully drained both rtls and TLS buffers // Close only when we have fully drained both rtls and TLS buffers
c->is_closing = 1; // or there's nothing we can do about it. c->is_closing = 1; // or there's nothing we can do about it.
} else { // TLS buffer is capped to max record size, mark and m = MG_IO_ERR;
c->is_io_err = 1; // give TLS a chance to process that. } else { // see #2885
// TLS buffer is capped to max record size, even though, there can
// be more than one record, give TLS a chance to process them.
} }
} else { } else if (c->is_tls_hs) {
if (n > 0) c->rtls.len += (size_t) n; mg_tls_handshake(c);
if (c->is_tls_hs) mg_tls_handshake(c);
} }
} n = m;
n = c->is_tls_hs ? (long) MG_IO_WAIT
: c->is_closing ? -1
: mg_tls_recv(c, buf, len);
} else { } else {
n = recv_raw(c, buf, len); n = recv_raw(c, buf, len);
} }