kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "http.c: Give HTTP error response when received lines are too long." into 13

Browse Source
This commit is contained in:
George Joseph
2018-09-06 11:49:46 -05:00
committed by Gerrit Code Review
parent 8936a264bb 4e20fe9f06
commit 60b703d9ca
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
main/http.c
View File

@@ -1772,6 +1772,7 @@ static int http_request_headers_get(struct ast_tcptls_session_instance *ser, str
remaining_headers = MAX_HTTP_REQUEST_HEADERS;
for (;;) {
size_t len;
char *name;
char *value;
@@ -1779,6 +1780,13 @@ static int http_request_headers_get(struct ast_tcptls_session_instance *ser, str
ast_http_error(ser, 400, "Bad Request", "Timeout");
return -1;
}
len = strlen(header_line);
if (!len || header_line[len - 1] != '\n') {
/* We didn't get a full line */
ast_http_error(ser, 400, "Bad Request",
(len == sizeof(header_line) - 1) ? "Header line too long" : "Timeout");
return -1;
}
/* Trim trailing characters */
ast_trim_blanks(header_line);
@@ -1847,6 +1855,7 @@ static int httpd_process_request(struct ast_tcptls_session_instance *ser)
struct http_worker_private_data *request;
enum ast_http_method http_method = AST_HTTP_UNKNOWN;
int res;
size_t len;
char request_line[MAX_HTTP_LINE_LENGTH];
if (!fgets(request_line, sizeof(request_line), ser->f)) {
@@ -1857,6 +1866,14 @@ static int httpd_process_request(struct ast_tcptls_session_instance *ser)
request = ser->private_data;
http_request_tracking_init(request);
len = strlen(request_line);
if (!len || request_line[len - 1] != '\n') {
/* We didn't get a full line */
ast_http_error(ser, 400, "Bad Request",
(len == sizeof(request_line) - 1) ? "Request line too long" : "Timeout");
return -1;
}
/* Get method */
method = ast_skip_blanks(request_line);
uri = ast_skip_nonblanks(method);