Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

ss: http: mime parsing with unusual section boundaries

Browse source
This commit is contained in:
Jed Lu 2021-01-06 17:13:17 -08:00 • committed by Andy Green
parent c86e1c5b56
commit 780a165a76
3 changed files with 41 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/secure-streams/private-lib-secure-streams.h
View file

@ -97,6 +97,7 @@ typedef struct lws_ss_handle {
uint8_t boundary_post; /* swallow post CRLF */
uint8_t som:1; /* SOM has been sent */
uint8_t eom:1; /* EOM has been sent */
uint8_t any:1; /* any content has been sent */

44
lib/secure-streams/protocols/ss-h1.c
View file

@ -37,6 +37,7 @@ ss_http_multipart_parser(lws_ss_handle_t *h, void *in, size_t len)
uint8_t *q = (uint8_t *)in;
int pending_issue = 0, n = 0;
/* let's stick it in the boundary state machine first */
while (n < (int)len) {
if (h->u.http.boundary_seq != h->u.http.boundary_len) {
@ -74,7 +75,7 @@ ss_http_multipart_parser(lws_ss_handle_t *h, void *in, size_t len)
* remainder to send.
*/
if (n >= pending_issue + h->u.http.boundary_len +
(h->u.http.any ? 2 : 0) + 1)
(h->u.http.any ? 2 : 0) + 1) {
h->info.rx(ss_to_userobj(h),
&q[pending_issue],
(unsigned int)(n - pending_issue -
@ -82,6 +83,8 @@ ss_http_multipart_parser(lws_ss_handle_t *h, void *in, size_t len)
(h->u.http.any ? 2 : 0) /* crlf */),
(!h->u.http.som ? LWSSS_FLAG_SOM : 0) |
LWSSS_FLAG_EOM | LWSSS_FLAG_RELATED_END);
h->u.http.eom = 1;
}
/*
* Peer may not END_STREAM us
@ -123,28 +126,59 @@ ss_http_multipart_parser(lws_ss_handle_t *h, void *in, size_t len)
* remainder to send.
*/
if (n >= pending_issue + h->u.http.boundary_len +
(h->u.http.any ? 2 : 0))
(h->u.http.any ? 2 : 0)) {
h->info.rx(ss_to_userobj(h), &q[pending_issue],
(unsigned int)(n - pending_issue -
h->u.http.boundary_len -
(h->u.http.any ? 2 /* crlf */ : 0)),
(!h->u.http.som ? LWSSS_FLAG_SOM : 0) |
LWSSS_FLAG_EOM);
h->u.http.eom = 1;
}
}
/* Next message starts after this boundary */
pending_issue = n;
h->u.http.som = 0;
if (h->u.http.eom) {
/* reset only if we have sent eom */
h->u.http.som = 0;
h->u.http.eom = 0;
}
around:
n++;
}
if (pending_issue != n) {
uint8_t oh = 0;
/*
* handle the first or last "--boundaryCRLF" case which is not captured in the
* previous loop, on the Bob downchannel (/directive)
*
* probably does not cover the case that one boundary term is separated in multipile
* one callbacks though never see such case
*/
if ((n >= h->u.http.boundary_len) &&
h->u.http.boundary_seq == h->u.http.boundary_len &&
h->u.http.boundary_post == 2) {
oh = 1;
}
h->info.rx(ss_to_userobj(h), &q[pending_issue],
(unsigned int)(n - pending_issue),
(!h->u.http.som ? LWSSS_FLAG_SOM : 0));
(unsigned int)(oh ?
(n - pending_issue - h->u.http.boundary_len -
(h->u.http.any ? 2 : 0)) :
(n - pending_issue)),
(!h->u.http.som ? LWSSS_FLAG_SOM : 0) |
(oh && h->u.http.any ? LWSSS_FLAG_EOM : 0));
if (oh && h->u.http.any)
h->u.http.eom = 1;
h->u.http.any = 1;
h->u.http.som = 1;
}

2
lib/secure-streams/protocols/ss-h2.c
View file

@ -96,7 +96,7 @@ secstream_h2(struct lws *wsi, enum lws_callback_reasons reason, void *user,
* The peer has sent us additional tx credit...
*/
lwsl_info("%s: LWS_CALLBACK_WSI_TX_CREDIT_GET: %d\n",
__func__, (int32_t)len);
__func__, (int)len);
#if defined(LWS_WITH_SECURE_STREAMS_PROXY_API)
if (h->being_serialized)