mirror of
https://github.com/nginx/nginx.git
synced 2026-10-21 03:21:08 +00:00
Dav: destination validation for COPY and MOVE with "alias".
Some checks are pending
buildbot / buildbot (push) Waiting to run
Some checks are pending
buildbot / buildbot (push) Waiting to run
If COPY or MOVE methods are enabled, the DAV module assumes that it is
configured for the whole server, and does not try validate that the
destination URI is within the particular location. This, however, does
not work well if it is in fact configured in a non-root location, and
this location uses the "alias" directive, such as in the following
configuration:
location /prefix/ {
dav_methods COPY;
alias /foo/;
}
In particular, if the destination URI is shorter than the aliased
location prefix, calling ngx_http_map_uri_to_path() with such
destination URI used to result in segmentation faults (9739e755b). And
if the destination URI is longer than the aliased location prefix, but
does not match it, calling ngx_http_map_uri_to_path() resulted in
unexpected path values, including ones above the "alias" directory
specified.
The fix is to check destination URI prefix if "alias" is used, similarly
to what we do with "try_files". Additionally, the
ngx_http_map_uri_to_path() function was updated with additional sanity
checking to prevent similar issues.
This change is a modified version of a patch by Maxim Dounin. The
modifications include skipping the prefix check if the URI was
rewritten, which preserves the "alias" diagnostics of
ngx_http_map_uri_to_path().
Signed-off-by: Vadim Zhestikov <v.zhestikov@f5.com>
Origin: <https://freenginx.org/hg/nginx/rev/aae28b083279>
This commit is contained in:
parent
0a5db852e1
commit
3dbce28821
2 changed files with 19 additions and 9 deletions
|
|
@ -539,7 +539,7 @@ static ngx_int_t
|
|||
ngx_http_dav_copy_move_handler(ngx_http_request_t *r)
|
||||
{
|
||||
u_char *p, *host, *last, ch;
|
||||
size_t len, root;
|
||||
size_t len, root, alias;
|
||||
ngx_err_t err;
|
||||
ngx_int_t rc, depth;
|
||||
ngx_uint_t overwrite, slash, dir, flags;
|
||||
|
|
@ -649,15 +649,19 @@ destination_done:
|
|||
}
|
||||
|
||||
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
|
||||
alias = clcf->alias;
|
||||
|
||||
if (clcf->alias
|
||||
&& clcf->alias != NGX_MAX_SIZE_T_VALUE
|
||||
&& duri.len < clcf->alias)
|
||||
{
|
||||
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
|
||||
"client sent invalid \"Destination\" header: \"%V\"",
|
||||
&dest->value);
|
||||
return NGX_HTTP_BAD_REQUEST;
|
||||
if (alias && alias != NGX_MAX_SIZE_T_VALUE && r->valid_location) {
|
||||
|
||||
if (alias > duri.len
|
||||
|| ngx_filename_cmp(duri.data, r->uri.data, alias) != 0)
|
||||
{
|
||||
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
|
||||
"\"Destination\" URI \"%V\" must be "
|
||||
"within location prefix when using \"alias\"",
|
||||
&dest->value);
|
||||
return NGX_HTTP_BAD_REQUEST;
|
||||
}
|
||||
}
|
||||
|
||||
depth = ngx_http_dav_depth(r, NGX_HTTP_DAV_INFINITY_DEPTH);
|
||||
|
|
|
|||
|
|
@ -1994,6 +1994,12 @@ ngx_http_map_uri_to_path(ngx_http_request_t *r, ngx_str_t *path,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
if (alias > r->uri.len && alias != NGX_MAX_SIZE_T_VALUE) {
|
||||
ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
|
||||
"URI shorter than aliased URI part");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (clcf->root_lengths == NULL) {
|
||||
|
||||
*root_length = clcf->root.len;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue