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

http0.9: process headers if there are non-space characters #410

Closed
wants to merge 1 commit into from
Closed

http0.9: process headers if there are non-space characters #410

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
8 changes: 1 addition & 7 deletions htp/htp_request.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,21 +744,15 @@ htp_status_t htp_connp_REQ_PROTOCOL(htp_connp_t *connp) {
} else {
// Let's check if the protocol was simply missing
int64_t pos = connp->in_current_read_offset;
int afterspaces = 0;
// Probe if data looks like a header line
while (pos < connp->in_current_len) {
if (connp->in_current_data[pos] == ':') {
if (!htp_is_space(connp->in_current_data[pos])) {
htp_log(connp, HTP_LOG_MARK, HTP_LOG_WARNING, 0, "Request line: missing protocol");
connp->in_tx->is_protocol_0_9 = 0;
// Switch to request header parsing.
connp->in_state = htp_connp_REQ_HEADERS;
connp->in_tx->request_progress = HTP_REQUEST_HEADERS;
return HTP_OK;
} else if (htp_is_lws(connp->in_current_data[pos])) {
// Allows spaces after header name
afterspaces = 1;
} else if (htp_is_space(connp->in_current_data[pos]) || afterspaces == 1) {
break;
}
pos++;
}
Expand Down
1 change: 0 additions & 1 deletion test/test_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,6 @@ TEST_F(ConnectionParsing, Http_0_9_Multiple) {
ASSERT_GE(rc, 0);

ASSERT_EQ(1, htp_list_size(connp->conn->transactions));
ASSERT_TRUE(connp->conn->flags & HTP_CONN_HTTP_0_9_EXTRA);

htp_tx_t *tx = (htp_tx_t *) htp_list_get(connp->conn->transactions, 0);
ASSERT_TRUE(tx != NULL);
Expand Down