Detect more unsafe URIs in ngx_http_parse_unsafe_uri().

The following URIs were considered safe: "..", "../foo", and "/foo/..".
This commit is contained in:
Ruslan Ermilov 2013-12-23 18:11:56 +04:00
parent 3f36c684a1
commit 336bcb22d1

View File

@ -1790,7 +1790,9 @@ ngx_http_parse_unsafe_uri(ngx_http_request_t *r, ngx_str_t *uri,
goto unsafe; goto unsafe;
} }
if (p[0] == '.' && len == 3 && p[1] == '.' && (ngx_path_separator(p[2]))) { if (p[0] == '.' && len > 1 && p[1] == '.'
&& (len == 2 || ngx_path_separator(p[2])))
{
goto unsafe; goto unsafe;
} }
@ -1816,9 +1818,11 @@ ngx_http_parse_unsafe_uri(ngx_http_request_t *r, ngx_str_t *uri,
if (ngx_path_separator(ch) && len > 2) { if (ngx_path_separator(ch) && len > 2) {
/* detect "/../" */ /* detect "/../" and "/.." */
if (p[0] == '.' && p[1] == '.' && ngx_path_separator(p[2])) { if (p[0] == '.' && p[1] == '.'
&& (len == 3 || ngx_path_separator(p[2])))
{
goto unsafe; goto unsafe;
} }
} }