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

Scheme parsing fix (https) and extending (ws, wss) #1570

Merged
merged 6 commits into from
Feb 25, 2022
Merged

Scheme parsing fix (https) and extending (ws, wss) #1570

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1636b2f
Scheme parsing fix (https) and extending (ws, wss)
ttaym Feb 22, 2022
8dab02f
fixup! Scheme parsing fix (https) and extending (ws, wss)
ttaym Feb 22, 2022
408dc40
fixup! Scheme parsing fix (https) and extending (ws, wss)
ttaym Feb 22, 2022
5defe02
fixup! Scheme parsing fix (https) and extending (ws, wss)
ttaym Feb 24, 2022
75feb1b
fixup! Scheme parsing fix (https) and extending (ws, wss)
ttaym Feb 24, 2022
2d65537
fixup! Scheme parsing fix (https) and extending (ws, wss)
ttaym Feb 25, 2022
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
83 changes: 74 additions & 9 deletions fw/http_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3838,15 +3838,48 @@ tfw_http_parse_req(void *req_data, unsigned char *data, size_t len,
if (likely(c == '/'))
__FSM_JMP(Req_UriMark);

if (likely(__data_available(p, 7)
&& C4_INT_LCM(p, 'h', 't', 't', 'p')
&& *(p + 4) == ':' && *(p + 5) == '/'
&& *(p + 6) == '/'))
__FSM_MOVE_nofixup_n(Req_UriAuthorityStart, 7);
if (likely(__data_available(p, 4)))
switch (*(unsigned int *)p) {
case TFW_CHAR4_INT('h', 't', 't', 'p'):
if (likely(__data_available(p, 7))
&& *(p + 4) == ':' && *(p + 5) == '/'
&& *(p + 6) == '/')
{
__FSM_MOVE_nofixup_n(
Req_UriAuthorityStart, 7);
}
if (likely(__data_available(p, 8))
&& C4_INT_LCM(p + 4, 's', ':', '/', '/'))
{
__FSM_MOVE_nofixup_n(
Req_UriAuthorityStart, 8);
}
__FSM_MOVE_nofixup_n(Req_UriSchHttp, 4);
case TFW_CHAR4_INT('w', 's', ':', '/'):
if (likely(__data_available(p, 5))
&& *(p + 4) == '/')
{
__FSM_MOVE_nofixup_n(
Req_UriAuthorityStart, 5);
}
__FSM_MOVE_nofixup_n(Req_UriSchWsColonSlash, 4);
case TFW_CHAR4_INT('w', 's', 's', ':'):
if (likely(__data_available(p, 6))
&& *(p + 4) == '/' && *(p + 5) == '/')
{
__FSM_MOVE_nofixup_n(
Req_UriAuthorityStart, 6);
}
__FSM_MOVE_nofixup_n(Req_UriSchWssColon, 4);
default:
TFW_PARSER_BLOCK(Req_Uri);
}

/* "http://" slow path - step char-by-char. */
/* scheme slow path - step char-by-char. */
if (likely(TFW_LC(c) == 'h'))
__FSM_MOVE_nofixup(Req_UriSchH);
else if (TFW_LC(c) == 'w')
__FSM_MOVE_nofixup(Req_UriSchW);
ttaym marked this conversation as resolved.
Show resolved Hide resolved

TFW_PARSER_BLOCK(Req_Uri);
}
Expand Down Expand Up @@ -4735,13 +4768,45 @@ Req_Method_1CharStep: __attribute__((cold))
__FSM_MOVE_nofixup_n(Req_MUSpace, 0);
}

/* process URI scheme: "http://" */
/* process URI scheme */
/* slow path for 'http://' and 'https://' */
__FSM_TX_LC_nofixup(Req_UriSchH, 't', Req_UriSchHt);
__FSM_TX_LC_nofixup(Req_UriSchHt, 't', Req_UriSchHtt);
__FSM_TX_LC_nofixup(Req_UriSchHtt, 'p', Req_UriSchHttp);
__FSM_TX_nofixup(Req_UriSchHttp, ':', Req_UriSchHttpColon);
__FSM_STATE(Req_UriSchHttp, cold) {
switch (TFW_LC(c)) {
case ':':
__FSM_MOVE_nofixup(Req_UriSchHttpColon);
case 's':
__FSM_MOVE_nofixup(Req_UriSchHttps);
}
TFW_PARSER_BLOCK(Req_UriSchHttp);
}
/* http */
__FSM_TX_nofixup(Req_UriSchHttpColon, '/', Req_UriSchHttpColonSlash);
__FSM_TX_nofixup(Req_UriSchHttpColonSlash, '/', Req_UriAuthorityStart);
/* https */
__FSM_TX_nofixup(Req_UriSchHttps, ':', Req_UriSchHttpsColon);
__FSM_TX_nofixup(Req_UriSchHttpsColon, '/', Req_UriSchHttpsColonSlash);
__FSM_TX_nofixup(Req_UriSchHttpsColonSlash, '/', Req_UriAuthorityStart);
/* slow path for 'ws://' and 'wss://' */
__FSM_TX_LC_nofixup(Req_UriSchW, 's', Req_UriSchWs);
__FSM_STATE(Req_UriSchWs, cold) {
switch (TFW_LC(c)) {
case ':':
__FSM_MOVE_nofixup(Req_UriSchWsColon);
case 's':
__FSM_MOVE_nofixup(Req_UriSchWss);
}
TFW_PARSER_BLOCK(Req_UriSchWs);
}
/* ws */
__FSM_TX_nofixup(Req_UriSchWsColon, '/', Req_UriSchWsColonSlash);
__FSM_TX_nofixup(Req_UriSchWsColonSlash, '/', Req_UriAuthorityStart);
/* wss */
__FSM_TX_nofixup(Req_UriSchWss, ':', Req_UriSchWssColon);
__FSM_TX_nofixup(Req_UriSchWssColon, '/', Req_UriSchWssColonSlash);
__FSM_TX_nofixup(Req_UriSchWssColonSlash, '/', Req_UriAuthorityStart);

/* Parse HTTP version (1.1 and 1.0 are supported). */
__FSM_TX_nofixup(Req_HttpVerT1, 'T', Req_HttpVerT2);
Expand Down Expand Up @@ -5731,7 +5796,7 @@ do { \
__FSM_I_field_chunk_flags(fld, TFW_STR_HDR_VALUE); \
__FSM_EXIT(CSTR_POSTPONE); \
}

#define H2_TRY_STR_LAMBDA_fixup(str, fld, lambda, curr_st, next_st) \
H2_TRY_STR_2LAMBDA_fixup(str, fld, {}, lambda, curr_st, next_st)

Expand Down
17 changes: 17 additions & 0 deletions fw/t/unit/test_http_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,23 @@ TEST(http_parser, parses_req_uri)
EXPECT_TFWSTR_EQ(&req->host, "natsys-lab.com");
}

FOR_REQ("GET https://userame@natsys-lab.com HTTP/1.1\r\n\r\n")
{
EXPECT_TFWSTR_EQ(&req->host, "natsys-lab.com");
}

FOR_REQ("GET ws://userame@natsys-lab.com HTTP/1.1\r\n\r\n")
{
EXPECT_TFWSTR_EQ(&req->host, "natsys-lab.com");
}

FOR_REQ("GET wss://userame@natsys-lab.com HTTP/1.1\r\n\r\n")
{
EXPECT_TFWSTR_EQ(&req->host, "natsys-lab.com");
}

EXPECT_BLOCK_REQ("GET sch://userame@natsys-lab.com HTTP/1.1\r\n\r\n");

EXPECT_BLOCK_REQ("GET \x7f HTTP/1.1\r\n"
"Host: test\r\n"
"\r\n");
Expand Down