Skip to content

Minor updates to HTTP version validation #8189

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

Merged
bryancall merged 1 commit into from
Aug 3, 2021
Merged

Minor updates to HTTP version validation #8189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 6 additions & 9 deletions proxy/hdrs/HTTP.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,26 +633,23 @@ http_hdr_type_set(HTTPHdrImpl *hh, HTTPType type)
-------------------------------------------------------------------------*/

bool
is_version_supported(const uint8_t major, const uint8_t minor)
is_http1_version(const uint8_t major, const uint8_t minor)
{
if (major == 1) {
return minor == 1 || minor == 0;
}

return false;
// Return true if 1.1 or 1.0
return (major == 1) && (minor == 1 || minor == 0);
}

bool
is_http_hdr_version_supported(const HTTPVersion &http_version)
is_http1_hdr_version_supported(const HTTPVersion &http_version)
{
return is_version_supported(http_version.get_major(), http_version.get_minor());
return is_http1_version(http_version.get_major(), http_version.get_minor());
}

bool
http_hdr_version_set(HTTPHdrImpl *hh, const HTTPVersion &ver)
{
hh->m_version = ver;
return is_version_supported(ver.get_major(), ver.get_minor());
return is_http1_version(ver.get_major(), ver.get_minor());
}

/*-------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion proxy/hdrs/HTTP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ HTTPValRange* http_parse_range (const char *buf, Arena *arena);
*/
HTTPValTE *http_parse_te(const char *buf, int len, Arena *arena);

bool is_http_hdr_version_supported(const HTTPVersion &http_version);
bool is_http1_hdr_version_supported(const HTTPVersion &http_version);

class IOBufferReader;

Expand Down
2 changes: 1 addition & 1 deletion proxy/http/HttpSM.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,7 @@ HttpSM::state_read_client_request_header(int event, void *data)
t_state.http_return_code = HTTP_STATUS_REQUEST_URI_TOO_LONG :
t_state.http_return_code = HTTP_STATUS_NONE;

if (!is_http_hdr_version_supported(t_state.hdr_info.client_request.version_get())) {
if (!is_http1_hdr_version_supported(t_state.hdr_info.client_request.version_get())) {
t_state.http_return_code = HTTP_STATUS_HTTPVER_NOT_SUPPORTED;
}

Expand Down