85daa67bc
Denys Vlasenko
2013-03-25
Subject
httpd: don't allow tabs and multiple spaces in request string
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
networking/httpd.c+5 -2
| @@ -1964,7 +1964,9 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr) | |
| send_headers_and_exit(HTTP_BAD_REQUEST); | |
| /* Determine type of request (GET/POST) */ | |
| - | urlp = strpbrk(iobuf, " \t"); |
| + | // rfc2616: method and URI is separated by exactly one space |
| + | //urlp = strpbrk(iobuf, " \t"); - no, tab isn't allowed |
| + | urlp = strchr(iobuf, ' '); |
| if (urlp == NULL) | |
| send_headers_and_exit(HTTP_BAD_REQUEST); | |
| *urlp++ = '\0'; | |
| @@ -1982,7 +1984,8 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr) | |
| if (strcasecmp(iobuf, request_GET) != 0) | |
| send_headers_and_exit(HTTP_NOT_IMPLEMENTED); | |
| #endif | |
| - | urlp = skip_whitespace(urlp); |
| + | // rfc2616: method and URI is separated by exactly one space |
| + | //urlp = skip_whitespace(urlp); - should not be necessary |
| if (urlp[0] != '/') | |
| send_headers_and_exit(HTTP_BAD_REQUEST); | |