mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-25 22:56:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Disable symlinks: added the "from" parameter support to the open file cache.

Browse Source
This commit is contained in:
Valentin Bartenev 2012-02-27 16:46:57 +00:00
parent 075e852a4e
commit 346791187f
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/ngx_open_file_cache.c
View File

@ -229,6 +229,7 @@ ngx_open_cached_file(ngx_open_file_cache_t *cache, ngx_str_t *name,
&& now - file->created < of->valid && now - file->created < of->valid
#if (NGX_HAVE_OPENAT) #if (NGX_HAVE_OPENAT)
&& of->disable_symlinks == file->disable_symlinks && of->disable_symlinks == file->disable_symlinks
&& of->disable_symlinks_from == file->disable_symlinks_from
#endif #endif
)) ))
{ {
@ -395,6 +396,7 @@ update:
file->err = of->err; file->err = of->err;
#if (NGX_HAVE_OPENAT) #if (NGX_HAVE_OPENAT)
file->disable_symlinks = of->disable_symlinks; file->disable_symlinks = of->disable_symlinks;
file->disable_symlinks_from = of->disable_symlinks_from;
#endif #endif
if (of->err == 0) { if (of->err == 0) {
@ -583,7 +585,28 @@ ngx_open_file_wrapper(ngx_str_t *name, ngx_open_file_info_t *of,
at_name = *name; at_name = *name;
if (*p == '/') { if (of->disable_symlinks_from) {
cp = p + of->disable_symlinks_from;
*cp = '\0';
at_fd = ngx_open_file(p, NGX_FILE_SEARCH|NGX_FILE_NONBLOCK,
NGX_FILE_OPEN, 0);
*cp = '/';
if (at_fd == NGX_INVALID_FILE) {
of->err = ngx_errno;
of->failed = ngx_open_file_n;
return NGX_INVALID_FILE;
}
at_name.len = of->disable_symlinks_from;
p = cp + 1;
} else if (*p == '/') {
at_fd = ngx_open_file("/", at_fd = ngx_open_file("/",
NGX_FILE_SEARCH|NGX_FILE_NONBLOCK, NGX_FILE_SEARCH|NGX_FILE_NONBLOCK,
NGX_FILE_OPEN, 0); NGX_FILE_OPEN, 0);

2
src/core/ngx_open_file_cache.h
View File

@ -33,6 +33,7 @@ typedef struct {
ngx_uint_t min_uses; ngx_uint_t min_uses;
#if (NGX_HAVE_OPENAT) #if (NGX_HAVE_OPENAT)
size_t disable_symlinks_from;
unsigned disable_symlinks:2; unsigned disable_symlinks:2;
#endif #endif
@ -69,6 +70,7 @@ struct ngx_cached_open_file_s {
uint32_t uses; uint32_t uses;
#if (NGX_HAVE_OPENAT) #if (NGX_HAVE_OPENAT)
size_t disable_symlinks_from;
unsigned disable_symlinks:2; unsigned disable_symlinks:2;
#endif #endif