nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle HTTP minor versions greater than 9

Browse Source 
(In practice they don't exist, but so long as we're making changes for
standards compliance...)

Also add several more unit tests for good and bad URL types.
This commit is contained in:
Nick Mathewson 2013-09-03 11:37:04 -04:00
parent 5327605caa
commit 270b4f030a
2 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/directory.c
View File

@ -1419,7 +1419,13 @@ parse_http_url(const char *headers, char **url)
/* Check if the header is well formed (next sequence /* Check if the header is well formed (next sequence
* should be HTTP/1.X\r\n). Assumes we're supporting 1.0? */ * should be HTTP/1.X\r\n). Assumes we're supporting 1.0? */
char *e = (char *)eat_whitespace_no_nl(s); char *e = (char *)eat_whitespace_no_nl(s);
if (strcmpstart(e, "HTTP/1.") || !(*(e+8) == '\r')) { {
unsigned minor_ver;
char ch;
if (2 != tor_sscanf(e, "HTTP/1.%u%c", &minor_ver, &ch)) {
return -1;
}
if (ch != '\r')
return -1; return -1;
} }

35
src/test/test_dir.c
View File

@ -2380,7 +2380,15 @@ test_dir_http_handling(void *args)
test_streq(url, "/tor/a/b/c.txt"); test_streq(url, "/tor/a/b/c.txt");
tor_free(url); tor_free(url);
/* Should prepends '/tor/' to url if required */ test_eq(parse_http_url("GET /tor/a/b/c.txt HTTP/1.0\r\n", &url), 0);
test_streq(url, "/tor/a/b/c.txt");
tor_free(url);
test_eq(parse_http_url("GET /tor/a/b/c.txt HTTP/1.600\r\n", &url), 0);
test_streq(url, "/tor/a/b/c.txt");
tor_free(url);
/* Should prepend '/tor/' to url if required */
test_eq(parse_http_url("GET /a/b/c.txt HTTP/1.1\r\n" test_eq(parse_http_url("GET /a/b/c.txt HTTP/1.1\r\n"
"Host: example.com\r\n" "Host: example.com\r\n"
"User-Agent: Mozilla/5.0 (Windows;" "User-Agent: Mozilla/5.0 (Windows;"
@ -2389,6 +2397,14 @@ test_dir_http_handling(void *args)
test_streq(url, "/tor/a/b/c.txt"); test_streq(url, "/tor/a/b/c.txt");
tor_free(url); tor_free(url);
/* Bad headers -- no HTTP/1.x*/
test_eq(parse_http_url("GET /a/b/c.txt\r\n"
"Host: example.com\r\n"
"User-Agent: Mozilla/5.0 (Windows;"
" U; Windows NT 6.1; en-US; rv:1.9.1.5)\r\n",
&url), -1);
tt_assert(!url);
/* Bad headers */ /* Bad headers */
test_eq(parse_http_url("GET /a/b/c.txt\r\n" test_eq(parse_http_url("GET /a/b/c.txt\r\n"
"Host: example.com\r\n" "Host: example.com\r\n"
@ -2397,10 +2413,23 @@ test_dir_http_handling(void *args)
&url), -1); &url), -1);
tt_assert(!url); tt_assert(!url);
/* TODO: more http handling tests */ test_eq(parse_http_url("GET /tor/a/b/c.txt", &url), -1);
tt_assert(!url);
test_eq(parse_http_url("GET /tor/a/b/c.txt HTTP/1.1", &url), -1);
tt_assert(!url);
test_eq(parse_http_url("GET /tor/a/b/c.txt HTTP/1.1x\r\n", &url), -1);
tt_assert(!url);
test_eq(parse_http_url("GET /tor/a/b/c.txt HTTP/1.", &url), -1);
tt_assert(!url);
test_eq(parse_http_url("GET /tor/a/b/c.txt HTTP/1.\r", &url), -1);
tt_assert(!url);
done: done:
; tor_free(url);
} }
#define DIR_LEGACY(name) \ #define DIR_LEGACY(name) \