Mercurial > hg > nginx
annotate src/core/ngx_open_file_cache.c @ 4477:7033faf6dc3c
Added disable_symlinks directive.
To completely disable symlinks (disable_symlinks on)
we use openat(O_NOFOLLOW) for each path component
to avoid races.
To allow symlinks with the same owner (disable_symlinks if_not_owner),
use openat() (followed by fstat()) and fstatat(AT_SYMLINK_NOFOLLOW),
and then compare uids between fstat() and fstatat().
As there is a race between openat() and fstatat() we don't
know if openat() in fact opened symlink or not. Therefore,
we have to compare uids even if fstatat() reports the opened
component isn't a symlink (as we don't know whether it was
symlink during openat() or not).
Default value is off, i.e. symlinks are allowed.
author | Andrey Belov <defan@nginx.com> |
---|---|
date | Mon, 13 Feb 2012 16:29:04 +0000 |
parents | 94ef9d25ec5b |
children | 5e6436812c9a |
rev | line source |
---|---|
1453 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4412 | 4 * Copyright (C) Nginx, Inc. |
1453 | 5 */ |
6 | |
7 | |
8 #include <ngx_config.h> | |
9 #include <ngx_core.h> | |
10 #include <ngx_event.h> | |
11 | |
12 | |
13 /* | |
14 * open file cache caches | |
15 * open file handles with stat() info; | |
16 * directories stat() info; | |
17 * files and directories errors: not found, access denied, etc. | |
18 */ | |
19 | |
20 | |
3178 | 21 #define NGX_MIN_READ_AHEAD (128 * 1024) |
22 | |
23 | |
1453 | 24 static void ngx_open_file_cache_cleanup(void *data); |
4477
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
25 #if (NGX_HAVE_OPENAT) |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
26 static ngx_fd_t ngx_openat_file_owner(ngx_fd_t at_fd, const u_char *name, |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
27 ngx_int_t mode, ngx_int_t create, ngx_int_t access); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
28 #endif |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
29 static ngx_fd_t ngx_open_file_wrapper(ngx_str_t *name, |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
30 ngx_open_file_info_t *of, ngx_int_t mode, ngx_int_t create, |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
31 ngx_int_t access); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
32 static ngx_int_t ngx_file_info_wrapper(ngx_str_t *name, |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
33 ngx_open_file_info_t *of, ngx_file_info_t *fi); |
4476
94ef9d25ec5b
Changed ngx_open_and_stat_file() to use ngx_str_t.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
34 static ngx_int_t ngx_open_and_stat_file(ngx_str_t *name, |
94ef9d25ec5b
Changed ngx_open_and_stat_file() to use ngx_str_t.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
35 ngx_open_file_info_t *of, ngx_log_t *log); |
1775 | 36 static void ngx_open_file_add_event(ngx_open_file_cache_t *cache, |
37 ngx_cached_open_file_t *file, ngx_open_file_info_t *of, ngx_log_t *log); | |
1453 | 38 static void ngx_open_file_cleanup(void *data); |
39 static void ngx_close_cached_file(ngx_open_file_cache_t *cache, | |
1772 | 40 ngx_cached_open_file_t *file, ngx_uint_t min_uses, ngx_log_t *log); |
1775 | 41 static void ngx_open_file_del_event(ngx_cached_open_file_t *file); |
1453 | 42 static void ngx_expire_old_cached_files(ngx_open_file_cache_t *cache, |
43 ngx_uint_t n, ngx_log_t *log); | |
44 static void ngx_open_file_cache_rbtree_insert_value(ngx_rbtree_node_t *temp, | |
45 ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel); | |
1775 | 46 static ngx_cached_open_file_t * |
47 ngx_open_file_lookup(ngx_open_file_cache_t *cache, ngx_str_t *name, | |
48 uint32_t hash); | |
1453 | 49 static void ngx_open_file_cache_remove(ngx_event_t *ev); |
50 | |
51 | |
52 ngx_open_file_cache_t * | |
53 ngx_open_file_cache_init(ngx_pool_t *pool, ngx_uint_t max, time_t inactive) | |
54 { | |
55 ngx_pool_cleanup_t *cln; | |
56 ngx_open_file_cache_t *cache; | |
57 | |
58 cache = ngx_palloc(pool, sizeof(ngx_open_file_cache_t)); | |
59 if (cache == NULL) { | |
60 return NULL; | |
61 } | |
62 | |
1761 | 63 ngx_rbtree_init(&cache->rbtree, &cache->sentinel, |
1743
4fc402c3ec73
optimize rbtree initialization and insert
Igor Sysoev <igor@sysoev.ru>
parents:
1458
diff
changeset
|
64 ngx_open_file_cache_rbtree_insert_value); |
1453 | 65 |
1765 | 66 ngx_queue_init(&cache->expire_queue); |
67 | |
1453 | 68 cache->current = 0; |
69 cache->max = max; | |
70 cache->inactive = inactive; | |
71 | |
72 cln = ngx_pool_cleanup_add(pool, 0); | |
73 if (cln == NULL) { | |
74 return NULL; | |
75 } | |
76 | |
77 cln->handler = ngx_open_file_cache_cleanup; | |
78 cln->data = cache; | |
79 | |
80 return cache; | |
81 } | |
82 | |
83 | |
84 static void | |
85 ngx_open_file_cache_cleanup(void *data) | |
86 { | |
87 ngx_open_file_cache_t *cache = data; | |
88 | |
1765 | 89 ngx_queue_t *q; |
1453 | 90 ngx_cached_open_file_t *file; |
91 | |
92 ngx_log_debug0(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0, | |
93 "open file cache cleanup"); | |
94 | |
95 for ( ;; ) { | |
96 | |
1765 | 97 if (ngx_queue_empty(&cache->expire_queue)) { |
1766 | 98 break; |
1453 | 99 } |
100 | |
1765 | 101 q = ngx_queue_last(&cache->expire_queue); |
102 | |
103 file = ngx_queue_data(q, ngx_cached_open_file_t, queue); | |
104 | |
105 ngx_queue_remove(q); | |
1453 | 106 |
107 ngx_rbtree_delete(&cache->rbtree, &file->node); | |
108 | |
109 cache->current--; | |
110 | |
111 ngx_log_debug1(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0, | |
112 "delete cached open file: %s", file->name); | |
113 | |
114 if (!file->err && !file->is_dir) { | |
115 file->close = 1; | |
116 file->count = 0; | |
1772 | 117 ngx_close_cached_file(cache, file, 0, ngx_cycle->log); |
1453 | 118 |
119 } else { | |
120 ngx_free(file->name); | |
121 ngx_free(file); | |
122 } | |
123 } | |
124 | |
125 if (cache->current) { | |
126 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, | |
127 "%d items still leave in open file cache", | |
128 cache->current); | |
129 } | |
130 | |
131 if (cache->rbtree.root != cache->rbtree.sentinel) { | |
132 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, | |
133 "rbtree still is not empty in open file cache"); | |
134 | |
135 } | |
136 } | |
137 | |
138 | |
139 ngx_int_t | |
140 ngx_open_cached_file(ngx_open_file_cache_t *cache, ngx_str_t *name, | |
141 ngx_open_file_info_t *of, ngx_pool_t *pool) | |
142 { | |
143 time_t now; | |
144 uint32_t hash; | |
145 ngx_int_t rc; | |
2756
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2629
diff
changeset
|
146 ngx_file_info_t fi; |
1453 | 147 ngx_pool_cleanup_t *cln; |
148 ngx_cached_open_file_t *file; | |
149 ngx_pool_cleanup_file_t *clnf; | |
150 ngx_open_file_cache_cleanup_t *ofcln; | |
151 | |
2069
23930ccd2642
use ngx_file_info() and test uniq if file is already open
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
152 of->fd = NGX_INVALID_FILE; |
1453 | 153 of->err = 0; |
154 | |
155 if (cache == NULL) { | |
156 | |
2756
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2629
diff
changeset
|
157 if (of->test_only) { |
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2629
diff
changeset
|
158 |
4477
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
159 if (ngx_file_info_wrapper(name, of, &fi) == NGX_FILE_ERROR) { |
2756
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2629
diff
changeset
|
160 return NGX_ERROR; |
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2629
diff
changeset
|
161 } |
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2629
diff
changeset
|
162 |
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2629
diff
changeset
|
163 of->uniq = ngx_file_uniq(&fi); |
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2629
diff
changeset
|
164 of->mtime = ngx_file_mtime(&fi); |
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2629
diff
changeset
|
165 of->size = ngx_file_size(&fi); |
3899
e7cd13b7f759
Use more precise stat.st_blocks to account cache size on Unix
Igor Sysoev <igor@sysoev.ru>
parents:
3497
diff
changeset
|
166 of->fs_size = ngx_file_fs_size(&fi); |
2756
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2629
diff
changeset
|
167 of->is_dir = ngx_is_dir(&fi); |
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2629
diff
changeset
|
168 of->is_file = ngx_is_file(&fi); |
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2629
diff
changeset
|
169 of->is_link = ngx_is_link(&fi); |
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2629
diff
changeset
|
170 of->is_exec = ngx_is_exec(&fi); |
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2629
diff
changeset
|
171 |
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2629
diff
changeset
|
172 return NGX_OK; |
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2629
diff
changeset
|
173 } |
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2629
diff
changeset
|
174 |
1453 | 175 cln = ngx_pool_cleanup_add(pool, sizeof(ngx_pool_cleanup_file_t)); |
176 if (cln == NULL) { | |
177 return NGX_ERROR; | |
178 } | |
179 | |
4476
94ef9d25ec5b
Changed ngx_open_and_stat_file() to use ngx_str_t.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
180 rc = ngx_open_and_stat_file(name, of, pool->log); |
1453 | 181 |
182 if (rc == NGX_OK && !of->is_dir) { | |
183 cln->handler = ngx_pool_cleanup_file; | |
184 clnf = cln->data; | |
185 | |
186 clnf->fd = of->fd; | |
187 clnf->name = name->data; | |
188 clnf->log = pool->log; | |
189 } | |
190 | |
191 return rc; | |
192 } | |
193 | |
194 cln = ngx_pool_cleanup_add(pool, sizeof(ngx_open_file_cache_cleanup_t)); | |
195 if (cln == NULL) { | |
196 return NGX_ERROR; | |
197 } | |
198 | |
199 now = ngx_time(); | |
200 | |
1775 | 201 hash = ngx_crc32_long(name->data, name->len); |
202 | |
203 file = ngx_open_file_lookup(cache, name, hash); | |
204 | |
205 if (file) { | |
206 | |
207 file->uses++; | |
208 | |
1987 | 209 ngx_queue_remove(&file->queue); |
210 | |
1775 | 211 if (file->fd == NGX_INVALID_FILE && file->err == 0 && !file->is_dir) { |
212 | |
213 /* file was not used often enough to keep open */ | |
214 | |
4476
94ef9d25ec5b
Changed ngx_open_and_stat_file() to use ngx_str_t.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
215 rc = ngx_open_and_stat_file(name, of, pool->log); |
1453 | 216 |
1775 | 217 if (rc != NGX_OK && (of->err == 0 || !of->errors)) { |
218 goto failed; | |
219 } | |
220 | |
221 goto add_event; | |
1453 | 222 } |
223 | |
2070 | 224 if (file->use_event |
2063
67a29af877ed
initialize of.uniq in ngx_open_cached_file()
Igor Sysoev <igor@sysoev.ru>
parents:
2006
diff
changeset
|
225 || (file->event == NULL |
67a29af877ed
initialize of.uniq in ngx_open_cached_file()
Igor Sysoev <igor@sysoev.ru>
parents:
2006
diff
changeset
|
226 && (of->uniq == 0 || of->uniq == file->uniq) |
4477
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
227 && now - file->created < of->valid |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
228 #if (NGX_HAVE_OPENAT) |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
229 && of->disable_symlinks == file->disable_symlinks |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
230 #endif |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
231 )) |
1775 | 232 { |
233 if (file->err == 0) { | |
1772 | 234 |
1775 | 235 of->fd = file->fd; |
236 of->uniq = file->uniq; | |
237 of->mtime = file->mtime; | |
238 of->size = file->size; | |
1453 | 239 |
1775 | 240 of->is_dir = file->is_dir; |
241 of->is_file = file->is_file; | |
242 of->is_link = file->is_link; | |
243 of->is_exec = file->is_exec; | |
2246
987831d73bd8
cache directio flag in open file cache
Igor Sysoev <igor@sysoev.ru>
parents:
2231
diff
changeset
|
244 of->is_directio = file->is_directio; |
1453 | 245 |
1775 | 246 if (!file->is_dir) { |
247 file->count++; | |
248 ngx_open_file_add_event(cache, file, of, pool->log); | |
1453 | 249 } |
250 | |
1775 | 251 } else { |
252 of->err = file->err; | |
4477
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
253 #if (NGX_HAVE_OPENAT) |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
254 of->failed = file->disable_symlinks ? ngx_openat_file_n |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
255 : ngx_open_file_n; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
256 #else |
2783
87c088e6956a
set of.failed for cached error, the bug has been introduced in r2757
Igor Sysoev <igor@sysoev.ru>
parents:
2782
diff
changeset
|
257 of->failed = ngx_open_file_n; |
4477
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
258 #endif |
1775 | 259 } |
260 | |
261 goto found; | |
262 } | |
263 | |
264 ngx_log_debug4(NGX_LOG_DEBUG_CORE, pool->log, 0, | |
265 "retest open file: %s, fd:%d, c:%d, e:%d", | |
266 file->name, file->fd, file->count, file->err); | |
1453 | 267 |
1775 | 268 if (file->is_dir) { |
269 | |
270 /* | |
271 * chances that directory became file are very small | |
272 * so test_dir flag allows to use a single syscall | |
273 * in ngx_file_info() instead of three syscalls | |
274 */ | |
275 | |
276 of->test_dir = 1; | |
277 } | |
278 | |
2069
23930ccd2642
use ngx_file_info() and test uniq if file is already open
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
279 of->fd = file->fd; |
23930ccd2642
use ngx_file_info() and test uniq if file is already open
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
280 of->uniq = file->uniq; |
23930ccd2642
use ngx_file_info() and test uniq if file is already open
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
281 |
4476
94ef9d25ec5b
Changed ngx_open_and_stat_file() to use ngx_str_t.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
282 rc = ngx_open_and_stat_file(name, of, pool->log); |
1453 | 283 |
1775 | 284 if (rc != NGX_OK && (of->err == 0 || !of->errors)) { |
285 goto failed; | |
286 } | |
287 | |
288 if (of->is_dir) { | |
289 | |
290 if (file->is_dir || file->err) { | |
291 goto update; | |
292 } | |
293 | |
294 /* file became directory */ | |
1453 | 295 |
1775 | 296 } else if (of->err == 0) { /* file */ |
297 | |
298 if (file->is_dir || file->err) { | |
299 goto add_event; | |
300 } | |
1453 | 301 |
2070 | 302 if (of->uniq == file->uniq) { |
1453 | 303 |
1775 | 304 if (file->event) { |
305 file->use_event = 1; | |
1453 | 306 } |
307 | |
4101
31cf2902de60
Fix of the previous commit: is_directio flag processing introduced in r4077
Igor Sysoev <igor@sysoev.ru>
parents:
4100
diff
changeset
|
308 of->is_directio = file->is_directio; |
31cf2902de60
Fix of the previous commit: is_directio flag processing introduced in r4077
Igor Sysoev <igor@sysoev.ru>
parents:
4100
diff
changeset
|
309 |
4100
efeee901439a
Bugfix: open_file_cache did not update file info on retest.
Igor Sysoev <igor@sysoev.ru>
parents:
4076
diff
changeset
|
310 goto update; |
1775 | 311 } |
1453 | 312 |
1775 | 313 /* file was changed */ |
1453 | 314 |
1775 | 315 } else { /* error to cache */ |
1453 | 316 |
1775 | 317 if (file->err || file->is_dir) { |
318 goto update; | |
1453 | 319 } |
320 | |
1775 | 321 /* file was removed, etc. */ |
322 } | |
323 | |
324 if (file->count == 0) { | |
325 | |
326 ngx_open_file_del_event(file); | |
1453 | 327 |
1775 | 328 if (ngx_close_file(file->fd) == NGX_FILE_ERROR) { |
329 ngx_log_error(NGX_LOG_ALERT, pool->log, ngx_errno, | |
4476
94ef9d25ec5b
Changed ngx_open_and_stat_file() to use ngx_str_t.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
330 ngx_close_file_n " \"%V\" failed", name); |
1775 | 331 } |
1453 | 332 |
1775 | 333 goto add_event; |
334 } | |
335 | |
336 ngx_rbtree_delete(&cache->rbtree, &file->node); | |
337 | |
338 cache->current--; | |
339 | |
340 file->close = 1; | |
341 | |
342 goto create; | |
1453 | 343 } |
344 | |
345 /* not found */ | |
346 | |
4476
94ef9d25ec5b
Changed ngx_open_and_stat_file() to use ngx_str_t.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
347 rc = ngx_open_and_stat_file(name, of, pool->log); |
1453 | 348 |
349 if (rc != NGX_OK && (of->err == 0 || !of->errors)) { | |
350 goto failed; | |
351 } | |
352 | |
353 create: | |
354 | |
355 if (cache->current >= cache->max) { | |
356 ngx_expire_old_cached_files(cache, 0, pool->log); | |
357 } | |
358 | |
359 file = ngx_alloc(sizeof(ngx_cached_open_file_t), pool->log); | |
360 | |
361 if (file == NULL) { | |
362 goto failed; | |
363 } | |
364 | |
365 file->name = ngx_alloc(name->len + 1, pool->log); | |
366 | |
367 if (file->name == NULL) { | |
368 ngx_free(file); | |
369 file = NULL; | |
370 goto failed; | |
371 } | |
372 | |
373 ngx_cpystrn(file->name, name->data, name->len + 1); | |
374 | |
375 file->node.key = hash; | |
376 | |
377 ngx_rbtree_insert(&cache->rbtree, &file->node); | |
378 | |
379 cache->current++; | |
380 | |
1775 | 381 file->uses = 1; |
1453 | 382 file->count = 0; |
2934
b6d588fa3ee9
initialize use_event field in open file cache
Igor Sysoev <igor@sysoev.ru>
parents:
2783
diff
changeset
|
383 file->use_event = 0; |
1775 | 384 file->event = NULL; |
385 | |
386 add_event: | |
387 | |
388 ngx_open_file_add_event(cache, file, of, pool->log); | |
1453 | 389 |
390 update: | |
391 | |
392 file->fd = of->fd; | |
393 file->err = of->err; | |
4477
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
394 #if (NGX_HAVE_OPENAT) |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
395 file->disable_symlinks = of->disable_symlinks; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
396 #endif |
1453 | 397 |
398 if (of->err == 0) { | |
399 file->uniq = of->uniq; | |
400 file->mtime = of->mtime; | |
401 file->size = of->size; | |
402 | |
403 file->close = 0; | |
404 | |
405 file->is_dir = of->is_dir; | |
406 file->is_file = of->is_file; | |
407 file->is_link = of->is_link; | |
408 file->is_exec = of->is_exec; | |
2246
987831d73bd8
cache directio flag in open file cache
Igor Sysoev <igor@sysoev.ru>
parents:
2231
diff
changeset
|
409 file->is_directio = of->is_directio; |
1453 | 410 |
411 if (!of->is_dir) { | |
412 file->count++; | |
413 } | |
414 } | |
415 | |
416 file->created = now; | |
417 | |
418 found: | |
419 | |
420 file->accessed = now; | |
421 | |
1765 | 422 ngx_queue_insert_head(&cache->expire_queue, &file->queue); |
1453 | 423 |
1772 | 424 ngx_log_debug5(NGX_LOG_DEBUG_CORE, pool->log, 0, |
425 "cached open file: %s, fd:%d, c:%d, e:%d, u:%d", | |
426 file->name, file->fd, file->count, file->err, file->uses); | |
1453 | 427 |
428 if (of->err == 0) { | |
429 | |
430 if (!of->is_dir) { | |
431 cln->handler = ngx_open_file_cleanup; | |
432 ofcln = cln->data; | |
433 | |
434 ofcln->cache = cache; | |
435 ofcln->file = file; | |
1772 | 436 ofcln->min_uses = of->min_uses; |
1453 | 437 ofcln->log = pool->log; |
438 } | |
439 | |
440 return NGX_OK; | |
441 } | |
442 | |
443 return NGX_ERROR; | |
444 | |
445 failed: | |
446 | |
1988
34051c712e41
fix segfault when file is deleted and open_file_cache_errors is off
Igor Sysoev <igor@sysoev.ru>
parents:
1987
diff
changeset
|
447 if (file) { |
1453 | 448 ngx_rbtree_delete(&cache->rbtree, &file->node); |
449 | |
450 cache->current--; | |
451 | |
1988
34051c712e41
fix segfault when file is deleted and open_file_cache_errors is off
Igor Sysoev <igor@sysoev.ru>
parents:
1987
diff
changeset
|
452 if (file->count == 0) { |
34051c712e41
fix segfault when file is deleted and open_file_cache_errors is off
Igor Sysoev <igor@sysoev.ru>
parents:
1987
diff
changeset
|
453 |
2006
b52cb9bf2064
style fix: remove tabs and trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1988
diff
changeset
|
454 if (file->fd != NGX_INVALID_FILE) { |
b52cb9bf2064
style fix: remove tabs and trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1988
diff
changeset
|
455 if (ngx_close_file(file->fd) == NGX_FILE_ERROR) { |
b52cb9bf2064
style fix: remove tabs and trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1988
diff
changeset
|
456 ngx_log_error(NGX_LOG_ALERT, pool->log, ngx_errno, |
b52cb9bf2064
style fix: remove tabs and trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1988
diff
changeset
|
457 ngx_close_file_n " \"%s\" failed", |
1988
34051c712e41
fix segfault when file is deleted and open_file_cache_errors is off
Igor Sysoev <igor@sysoev.ru>
parents:
1987
diff
changeset
|
458 file->name); |
2006
b52cb9bf2064
style fix: remove tabs and trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1988
diff
changeset
|
459 } |
b52cb9bf2064
style fix: remove tabs and trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1988
diff
changeset
|
460 } |
1988
34051c712e41
fix segfault when file is deleted and open_file_cache_errors is off
Igor Sysoev <igor@sysoev.ru>
parents:
1987
diff
changeset
|
461 |
34051c712e41
fix segfault when file is deleted and open_file_cache_errors is off
Igor Sysoev <igor@sysoev.ru>
parents:
1987
diff
changeset
|
462 ngx_free(file->name); |
34051c712e41
fix segfault when file is deleted and open_file_cache_errors is off
Igor Sysoev <igor@sysoev.ru>
parents:
1987
diff
changeset
|
463 ngx_free(file); |
34051c712e41
fix segfault when file is deleted and open_file_cache_errors is off
Igor Sysoev <igor@sysoev.ru>
parents:
1987
diff
changeset
|
464 |
34051c712e41
fix segfault when file is deleted and open_file_cache_errors is off
Igor Sysoev <igor@sysoev.ru>
parents:
1987
diff
changeset
|
465 } else { |
34051c712e41
fix segfault when file is deleted and open_file_cache_errors is off
Igor Sysoev <igor@sysoev.ru>
parents:
1987
diff
changeset
|
466 file->close = 1; |
1453 | 467 } |
468 } | |
469 | |
470 if (of->fd != NGX_INVALID_FILE) { | |
471 if (ngx_close_file(of->fd) == NGX_FILE_ERROR) { | |
472 ngx_log_error(NGX_LOG_ALERT, pool->log, ngx_errno, | |
4476
94ef9d25ec5b
Changed ngx_open_and_stat_file() to use ngx_str_t.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
473 ngx_close_file_n " \"%V\" failed", name); |
1453 | 474 } |
475 } | |
476 | |
477 return NGX_ERROR; | |
478 } | |
479 | |
480 | |
4477
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
481 #if (NGX_HAVE_OPENAT) |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
482 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
483 static ngx_fd_t |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
484 ngx_openat_file_owner(ngx_fd_t at_fd, const u_char *name, |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
485 ngx_int_t mode, ngx_int_t create, ngx_int_t access) |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
486 { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
487 ngx_fd_t fd; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
488 ngx_file_info_t fi, atfi; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
489 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
490 /* |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
491 * To allow symlinks with the same owner, use openat() (followed |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
492 * by fstat()) and fstatat(AT_SYMLINK_NOFOLLOW), and then compare |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
493 * uids between fstat() and fstatat(). |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
494 * |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
495 * As there is a race between openat() and fstatat() we don't |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
496 * know if openat() in fact opened symlink or not. Therefore, |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
497 * we have to compare uids even if fstatat() reports the opened |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
498 * component isn't a symlink (as we don't know whether it was |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
499 * symlink during openat() or not). |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
500 */ |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
501 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
502 fd = ngx_openat_file(at_fd, name, mode, create, access); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
503 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
504 if (fd == NGX_FILE_ERROR) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
505 return NGX_FILE_ERROR; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
506 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
507 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
508 if (ngx_file_at_info(at_fd, name, &atfi, AT_SYMLINK_NOFOLLOW) |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
509 == NGX_FILE_ERROR) |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
510 { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
511 ngx_close_file(fd); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
512 return NGX_FILE_ERROR; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
513 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
514 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
515 if (ngx_fd_info(fd, &fi) == NGX_FILE_ERROR) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
516 ngx_close_file(fd); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
517 return NGX_FILE_ERROR; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
518 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
519 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
520 if (fi.st_uid != atfi.st_uid) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
521 ngx_close_file(fd); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
522 ngx_set_errno(NGX_ELOOP); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
523 return NGX_FILE_ERROR; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
524 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
525 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
526 return fd; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
527 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
528 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
529 #endif |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
530 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
531 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
532 static ngx_fd_t |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
533 ngx_open_file_wrapper(ngx_str_t *name, ngx_open_file_info_t *of, |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
534 ngx_int_t mode, ngx_int_t create, ngx_int_t access) |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
535 { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
536 ngx_fd_t fd; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
537 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
538 #if !(NGX_HAVE_OPENAT) |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
539 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
540 fd = ngx_open_file(name->data, mode, create, access); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
541 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
542 if (fd == NGX_FILE_ERROR) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
543 of->err = ngx_errno; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
544 of->failed = ngx_open_file_n; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
545 return NGX_FILE_ERROR; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
546 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
547 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
548 return fd; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
549 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
550 #else |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
551 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
552 u_char *p, *cp, *end; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
553 ngx_fd_t at_fd; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
554 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
555 if (of->disable_symlinks == NGX_DISABLE_SYMLINKS_OFF) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
556 fd = ngx_open_file(name->data, mode, create, access); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
557 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
558 if (fd == NGX_FILE_ERROR) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
559 of->err = ngx_errno; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
560 of->failed = ngx_open_file_n; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
561 return NGX_FILE_ERROR; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
562 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
563 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
564 return fd; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
565 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
566 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
567 at_fd = ngx_openat_file(AT_FDCWD, "/", NGX_FILE_RDONLY|NGX_FILE_NONBLOCK, |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
568 NGX_FILE_OPEN, 0); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
569 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
570 if (at_fd == NGX_FILE_ERROR) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
571 of->err = ngx_errno; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
572 of->failed = ngx_openat_file_n; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
573 return NGX_FILE_ERROR; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
574 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
575 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
576 end = name->data + name->len; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
577 p = name->data + 1; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
578 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
579 for ( ;; ) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
580 cp = ngx_strlchr(p, end, '/'); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
581 if (cp == NULL) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
582 break; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
583 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
584 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
585 *cp = '\0'; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
586 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
587 if (of->disable_symlinks == NGX_DISABLE_SYMLINKS_NOTOWNER) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
588 fd = ngx_openat_file_owner(at_fd, p, |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
589 NGX_FILE_RDONLY|NGX_FILE_NONBLOCK, |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
590 NGX_FILE_OPEN, 0); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
591 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
592 } else { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
593 fd = ngx_openat_file(at_fd, p, |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
594 NGX_FILE_RDONLY|NGX_FILE_NONBLOCK|NGX_FILE_NOFOLLOW, |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
595 NGX_FILE_OPEN, 0); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
596 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
597 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
598 *cp = '/'; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
599 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
600 ngx_close_file(at_fd); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
601 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
602 if (fd == NGX_FILE_ERROR) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
603 of->err = ngx_errno; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
604 of->failed = ngx_openat_file_n; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
605 return NGX_FILE_ERROR; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
606 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
607 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
608 p = cp + 1; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
609 at_fd = fd; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
610 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
611 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
612 if (of->disable_symlinks == NGX_DISABLE_SYMLINKS_NOTOWNER) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
613 fd = ngx_openat_file_owner(at_fd, p, mode, create, access); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
614 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
615 } else { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
616 fd = ngx_openat_file(at_fd, p, mode|NGX_FILE_NOFOLLOW, create, access); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
617 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
618 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
619 if (fd == NGX_FILE_ERROR) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
620 of->err = ngx_errno; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
621 of->failed = ngx_openat_file_n; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
622 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
623 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
624 ngx_close_file(at_fd); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
625 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
626 return fd; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
627 #endif |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
628 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
629 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
630 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
631 static ngx_int_t |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
632 ngx_file_info_wrapper(ngx_str_t *name, ngx_open_file_info_t *of, |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
633 ngx_file_info_t *fi) |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
634 { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
635 ngx_int_t rc; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
636 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
637 #if !(NGX_HAVE_OPENAT) |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
638 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
639 rc = ngx_file_info(name->data, fi); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
640 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
641 if (rc == NGX_FILE_ERROR) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
642 of->err = ngx_errno; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
643 of->failed = ngx_file_info_n; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
644 return NGX_FILE_ERROR; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
645 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
646 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
647 return rc; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
648 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
649 #else |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
650 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
651 ngx_fd_t fd; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
652 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
653 if (of->disable_symlinks == NGX_DISABLE_SYMLINKS_OFF) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
654 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
655 rc = ngx_file_info(name->data, fi); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
656 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
657 if (rc == NGX_FILE_ERROR) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
658 of->err = ngx_errno; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
659 of->failed = ngx_file_info_n; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
660 return NGX_FILE_ERROR; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
661 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
662 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
663 return rc; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
664 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
665 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
666 fd = ngx_open_file_wrapper(name, of, NGX_FILE_RDONLY|NGX_FILE_NONBLOCK, |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
667 NGX_FILE_OPEN, 0); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
668 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
669 if (fd == NGX_FILE_ERROR) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
670 return NGX_FILE_ERROR; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
671 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
672 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
673 if (ngx_fd_info(fd, fi) == NGX_FILE_ERROR) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
674 of->err = ngx_errno; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
675 of->failed = ngx_fd_info_n; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
676 ngx_close_file(fd); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
677 return NGX_FILE_ERROR; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
678 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
679 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
680 ngx_close_file(fd); |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
681 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
682 return NGX_OK; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
683 #endif |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
684 } |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
685 |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
686 |
1453 | 687 static ngx_int_t |
4476
94ef9d25ec5b
Changed ngx_open_and_stat_file() to use ngx_str_t.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
688 ngx_open_and_stat_file(ngx_str_t *name, ngx_open_file_info_t *of, |
94ef9d25ec5b
Changed ngx_open_and_stat_file() to use ngx_str_t.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
689 ngx_log_t *log) |
1453 | 690 { |
691 ngx_fd_t fd; | |
692 ngx_file_info_t fi; | |
693 | |
2070 | 694 if (of->fd != NGX_INVALID_FILE) { |
1453 | 695 |
4477
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
696 if (ngx_file_info_wrapper(name, of, &fi) == NGX_FILE_ERROR) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
697 of->fd = NGX_INVALID_FILE; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
698 return NGX_ERROR; |
1453 | 699 } |
700 | |
2070 | 701 if (of->uniq == ngx_file_uniq(&fi)) { |
2069
23930ccd2642
use ngx_file_info() and test uniq if file is already open
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
702 goto done; |
23930ccd2642
use ngx_file_info() and test uniq if file is already open
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
703 } |
1453 | 704 |
2070 | 705 } else if (of->test_dir) { |
706 | |
4477
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
707 if (ngx_file_info_wrapper(name, of, &fi) == NGX_FILE_ERROR) { |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
708 of->fd = NGX_INVALID_FILE; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
709 return NGX_ERROR; |
2070 | 710 } |
711 | |
2460
225fa4abd76f
test ngx_file_info() result, the bug has been introduced in r2070
Igor Sysoev <igor@sysoev.ru>
parents:
2246
diff
changeset
|
712 if (ngx_is_dir(&fi)) { |
2069
23930ccd2642
use ngx_file_info() and test uniq if file is already open
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
713 goto done; |
1453 | 714 } |
715 } | |
716 | |
2072 | 717 if (!of->log) { |
3497
ac281bc4c187
use non-blocking open() not to hang on FIFO files, etc.
Igor Sysoev <igor@sysoev.ru>
parents:
3178
diff
changeset
|
718 |
ac281bc4c187
use non-blocking open() not to hang on FIFO files, etc.
Igor Sysoev <igor@sysoev.ru>
parents:
3178
diff
changeset
|
719 /* |
ac281bc4c187
use non-blocking open() not to hang on FIFO files, etc.
Igor Sysoev <igor@sysoev.ru>
parents:
3178
diff
changeset
|
720 * Use non-blocking open() not to hang on FIFO files, etc. |
ac281bc4c187
use non-blocking open() not to hang on FIFO files, etc.
Igor Sysoev <igor@sysoev.ru>
parents:
3178
diff
changeset
|
721 * This flag has no effect on a regular files. |
ac281bc4c187
use non-blocking open() not to hang on FIFO files, etc.
Igor Sysoev <igor@sysoev.ru>
parents:
3178
diff
changeset
|
722 */ |
ac281bc4c187
use non-blocking open() not to hang on FIFO files, etc.
Igor Sysoev <igor@sysoev.ru>
parents:
3178
diff
changeset
|
723 |
4477
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
724 fd = ngx_open_file_wrapper(name, of, NGX_FILE_RDONLY|NGX_FILE_NONBLOCK, |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
725 NGX_FILE_OPEN, 0); |
2072 | 726 |
727 } else { | |
4477
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
728 fd = ngx_open_file_wrapper(name, of, NGX_FILE_APPEND, |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
729 NGX_FILE_CREATE_OR_OPEN, |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
730 NGX_FILE_DEFAULT_ACCESS); |
2072 | 731 } |
1453 | 732 |
733 if (fd == NGX_INVALID_FILE) { | |
4477
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
734 of->fd = NGX_INVALID_FILE; |
7033faf6dc3c
Added disable_symlinks directive.
Andrey Belov <defan@nginx.com>
parents:
4476
diff
changeset
|
735 return NGX_ERROR; |
1453 | 736 } |
737 | |
738 if (ngx_fd_info(fd, &fi) == NGX_FILE_ERROR) { | |
739 ngx_log_error(NGX_LOG_CRIT, log, ngx_errno, | |
4476
94ef9d25ec5b
Changed ngx_open_and_stat_file() to use ngx_str_t.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
740 ngx_fd_info_n " \"%V\" failed", name); |
1453 | 741 |
742 if (ngx_close_file(fd) == NGX_FILE_ERROR) { | |
743 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, | |
4476
94ef9d25ec5b
Changed ngx_open_and_stat_file() to use ngx_str_t.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
744 ngx_close_file_n " \"%V\" failed", name); |
1453 | 745 } |
746 | |
2069
23930ccd2642
use ngx_file_info() and test uniq if file is already open
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
747 of->fd = NGX_INVALID_FILE; |
23930ccd2642
use ngx_file_info() and test uniq if file is already open
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
748 |
1453 | 749 return NGX_ERROR; |
750 } | |
751 | |
752 if (ngx_is_dir(&fi)) { | |
753 if (ngx_close_file(fd) == NGX_FILE_ERROR) { | |
754 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, | |
4476
94ef9d25ec5b
Changed ngx_open_and_stat_file() to use ngx_str_t.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
755 ngx_close_file_n " \"%V\" failed", name); |
1453 | 756 } |
757 | |
2069
23930ccd2642
use ngx_file_info() and test uniq if file is already open
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
758 of->fd = NGX_INVALID_FILE; |
23930ccd2642
use ngx_file_info() and test uniq if file is already open
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
759 |
23930ccd2642
use ngx_file_info() and test uniq if file is already open
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
760 } else { |
23930ccd2642
use ngx_file_info() and test uniq if file is already open
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
761 of->fd = fd; |
2129 | 762 |
3178 | 763 if (of->read_ahead && ngx_file_size(&fi) > NGX_MIN_READ_AHEAD) { |
764 if (ngx_read_ahead(fd, of->read_ahead) == NGX_ERROR) { | |
765 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, | |
4476
94ef9d25ec5b
Changed ngx_open_and_stat_file() to use ngx_str_t.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
766 ngx_read_ahead_n " \"%V\" failed", name); |
3178 | 767 } |
768 } | |
769 | |
2129 | 770 if (of->directio <= ngx_file_size(&fi)) { |
3164
b1b1775698d5
uniform ngx_directio_on/off() interface with other file functions
Igor Sysoev <igor@sysoev.ru>
parents:
2934
diff
changeset
|
771 if (ngx_directio_on(fd) == NGX_FILE_ERROR) { |
2129 | 772 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, |
4476
94ef9d25ec5b
Changed ngx_open_and_stat_file() to use ngx_str_t.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
773 ngx_directio_on_n " \"%V\" failed", name); |
2231
8564129d49b6
*) handle unaligned file part for directio
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
774 |
8564129d49b6
*) handle unaligned file part for directio
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
775 } else { |
8564129d49b6
*) handle unaligned file part for directio
Igor Sysoev <igor@sysoev.ru>
parents:
2129
diff
changeset
|
776 of->is_directio = 1; |
2129 | 777 } |
778 } | |
1453 | 779 } |
780 | |
2069
23930ccd2642
use ngx_file_info() and test uniq if file is already open
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
781 done: |
23930ccd2642
use ngx_file_info() and test uniq if file is already open
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
782 |
1453 | 783 of->uniq = ngx_file_uniq(&fi); |
784 of->mtime = ngx_file_mtime(&fi); | |
785 of->size = ngx_file_size(&fi); | |
3899
e7cd13b7f759
Use more precise stat.st_blocks to account cache size on Unix
Igor Sysoev <igor@sysoev.ru>
parents:
3497
diff
changeset
|
786 of->fs_size = ngx_file_fs_size(&fi); |
1453 | 787 of->is_dir = ngx_is_dir(&fi); |
788 of->is_file = ngx_is_file(&fi); | |
789 of->is_link = ngx_is_link(&fi); | |
790 of->is_exec = ngx_is_exec(&fi); | |
791 | |
792 return NGX_OK; | |
793 } | |
794 | |
795 | |
1775 | 796 /* |
797 * we ignore any possible event setting error and | |
798 * fallback to usual periodic file retests | |
799 */ | |
800 | |
801 static void | |
802 ngx_open_file_add_event(ngx_open_file_cache_t *cache, | |
803 ngx_cached_open_file_t *file, ngx_open_file_info_t *of, ngx_log_t *log) | |
804 { | |
805 ngx_open_file_cache_event_t *fev; | |
806 | |
807 if (!(ngx_event_flags & NGX_USE_VNODE_EVENT) | |
808 || !of->events | |
809 || file->event | |
810 || of->fd == NGX_INVALID_FILE | |
811 || file->uses < of->min_uses) | |
812 { | |
813 return; | |
814 } | |
815 | |
2070 | 816 file->use_event = 0; |
817 | |
1775 | 818 file->event = ngx_calloc(sizeof(ngx_event_t), log); |
819 if (file->event== NULL) { | |
820 return; | |
821 } | |
822 | |
823 fev = ngx_alloc(sizeof(ngx_open_file_cache_event_t), log); | |
824 if (fev == NULL) { | |
825 ngx_free(file->event); | |
826 file->event = NULL; | |
827 return; | |
828 } | |
829 | |
830 fev->fd = of->fd; | |
831 fev->file = file; | |
832 fev->cache = cache; | |
833 | |
834 file->event->handler = ngx_open_file_cache_remove; | |
835 file->event->data = fev; | |
836 | |
837 /* | |
838 * although vnode event may be called while ngx_cycle->poll | |
839 * destruction, however, cleanup procedures are run before any | |
840 * memory freeing and events will be canceled. | |
841 */ | |
842 | |
843 file->event->log = ngx_cycle->log; | |
844 | |
845 if (ngx_add_event(file->event, NGX_VNODE_EVENT, NGX_ONESHOT_EVENT) | |
846 != NGX_OK) | |
847 { | |
848 ngx_free(file->event->data); | |
849 ngx_free(file->event); | |
850 file->event = NULL; | |
851 return; | |
852 } | |
853 | |
854 /* | |
2071 | 855 * we do not set file->use_event here because there may be a race |
856 * condition: a file may be deleted between opening the file and | |
857 * adding event, so we rely upon event notification only after | |
858 * one file revalidation on next file access | |
1775 | 859 */ |
860 | |
861 return; | |
862 } | |
863 | |
864 | |
1453 | 865 static void |
866 ngx_open_file_cleanup(void *data) | |
867 { | |
868 ngx_open_file_cache_cleanup_t *c = data; | |
869 | |
870 c->file->count--; | |
871 | |
1772 | 872 ngx_close_cached_file(c->cache, c->file, c->min_uses, c->log); |
1453 | 873 |
874 /* drop one or two expired open files */ | |
875 ngx_expire_old_cached_files(c->cache, 1, c->log); | |
876 } | |
877 | |
878 | |
879 static void | |
880 ngx_close_cached_file(ngx_open_file_cache_t *cache, | |
1772 | 881 ngx_cached_open_file_t *file, ngx_uint_t min_uses, ngx_log_t *log) |
1453 | 882 { |
1772 | 883 ngx_log_debug5(NGX_LOG_DEBUG_CORE, log, 0, |
884 "close cached open file: %s, fd:%d, c:%d, u:%d, %d", | |
885 file->name, file->fd, file->count, file->uses, file->close); | |
1453 | 886 |
887 if (!file->close) { | |
888 | |
889 file->accessed = ngx_time(); | |
890 | |
1765 | 891 ngx_queue_remove(&file->queue); |
1453 | 892 |
1765 | 893 ngx_queue_insert_head(&cache->expire_queue, &file->queue); |
1453 | 894 |
1772 | 895 if (file->uses >= min_uses || file->count) { |
896 return; | |
897 } | |
1453 | 898 } |
899 | |
1775 | 900 ngx_open_file_del_event(file); |
1453 | 901 |
902 if (file->count) { | |
903 return; | |
904 } | |
905 | |
1772 | 906 if (file->fd != NGX_INVALID_FILE) { |
907 | |
908 if (ngx_close_file(file->fd) == NGX_FILE_ERROR) { | |
909 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, | |
910 ngx_close_file_n " \"%s\" failed", file->name); | |
911 } | |
912 | |
913 file->fd = NGX_INVALID_FILE; | |
914 } | |
915 | |
916 if (!file->close) { | |
917 return; | |
1453 | 918 } |
919 | |
920 ngx_free(file->name); | |
921 ngx_free(file); | |
922 } | |
923 | |
924 | |
925 static void | |
1775 | 926 ngx_open_file_del_event(ngx_cached_open_file_t *file) |
927 { | |
928 if (file->event == NULL) { | |
929 return; | |
930 } | |
931 | |
932 (void) ngx_del_event(file->event, NGX_VNODE_EVENT, | |
933 file->count ? NGX_FLUSH_EVENT : NGX_CLOSE_EVENT); | |
934 | |
935 ngx_free(file->event->data); | |
936 ngx_free(file->event); | |
937 file->event = NULL; | |
938 file->use_event = 0; | |
939 } | |
940 | |
941 | |
942 static void | |
1453 | 943 ngx_expire_old_cached_files(ngx_open_file_cache_t *cache, ngx_uint_t n, |
944 ngx_log_t *log) | |
945 { | |
946 time_t now; | |
1765 | 947 ngx_queue_t *q; |
1453 | 948 ngx_cached_open_file_t *file; |
949 | |
950 now = ngx_time(); | |
951 | |
952 /* | |
953 * n == 1 deletes one or two inactive files | |
954 * n == 0 deletes least recently used file by force | |
955 * and one or two inactive files | |
956 */ | |
957 | |
958 while (n < 3) { | |
959 | |
1765 | 960 if (ngx_queue_empty(&cache->expire_queue)) { |
1453 | 961 return; |
962 } | |
963 | |
1765 | 964 q = ngx_queue_last(&cache->expire_queue); |
965 | |
966 file = ngx_queue_data(q, ngx_cached_open_file_t, queue); | |
967 | |
1453 | 968 if (n++ != 0 && now - file->accessed <= cache->inactive) { |
969 return; | |
970 } | |
971 | |
1765 | 972 ngx_queue_remove(q); |
1453 | 973 |
974 ngx_rbtree_delete(&cache->rbtree, &file->node); | |
975 | |
976 cache->current--; | |
977 | |
978 ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, | |
979 "expire cached open file: %s", file->name); | |
980 | |
981 if (!file->err && !file->is_dir) { | |
982 file->close = 1; | |
1772 | 983 ngx_close_cached_file(cache, file, 0, log); |
1453 | 984 |
985 } else { | |
986 ngx_free(file->name); | |
987 ngx_free(file); | |
988 } | |
989 } | |
990 } | |
991 | |
992 | |
993 static void | |
994 ngx_open_file_cache_rbtree_insert_value(ngx_rbtree_node_t *temp, | |
995 ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel) | |
996 { | |
997 ngx_rbtree_node_t **p; | |
998 ngx_cached_open_file_t *file, *file_temp; | |
999 | |
1000 for ( ;; ) { | |
1001 | |
1002 if (node->key < temp->key) { | |
1003 | |
1004 p = &temp->left; | |
1005 | |
1006 } else if (node->key > temp->key) { | |
1007 | |
1008 p = &temp->right; | |
1009 | |
1010 } else { /* node->key == temp->key */ | |
1011 | |
1012 file = (ngx_cached_open_file_t *) node; | |
1013 file_temp = (ngx_cached_open_file_t *) temp; | |
1014 | |
1015 p = (ngx_strcmp(file->name, file_temp->name) < 0) | |
1016 ? &temp->left : &temp->right; | |
1017 } | |
1018 | |
1019 if (*p == sentinel) { | |
1020 break; | |
1021 } | |
1022 | |
1023 temp = *p; | |
1024 } | |
1025 | |
1026 *p = node; | |
1027 node->parent = temp; | |
1028 node->left = sentinel; | |
1029 node->right = sentinel; | |
1030 ngx_rbt_red(node); | |
1031 } | |
1032 | |
1033 | |
1775 | 1034 static ngx_cached_open_file_t * |
1035 ngx_open_file_lookup(ngx_open_file_cache_t *cache, ngx_str_t *name, | |
1036 uint32_t hash) | |
1037 { | |
1038 ngx_int_t rc; | |
1039 ngx_rbtree_node_t *node, *sentinel; | |
1040 ngx_cached_open_file_t *file; | |
1041 | |
1042 node = cache->rbtree.root; | |
1043 sentinel = cache->rbtree.sentinel; | |
1044 | |
1045 while (node != sentinel) { | |
1046 | |
1047 if (hash < node->key) { | |
1048 node = node->left; | |
1049 continue; | |
1050 } | |
1051 | |
1052 if (hash > node->key) { | |
1053 node = node->right; | |
1054 continue; | |
1055 } | |
1056 | |
1057 /* hash == node->key */ | |
1058 | |
1059 do { | |
1060 file = (ngx_cached_open_file_t *) node; | |
1061 | |
1062 rc = ngx_strcmp(name->data, file->name); | |
1063 | |
1064 if (rc == 0) { | |
1065 return file; | |
1066 } | |
1067 | |
1068 node = (rc < 0) ? node->left : node->right; | |
1069 | |
1070 } while (node != sentinel && hash == node->key); | |
1071 | |
1072 break; | |
1073 } | |
1074 | |
1075 return NULL; | |
1076 } | |
1077 | |
1078 | |
1453 | 1079 static void |
1080 ngx_open_file_cache_remove(ngx_event_t *ev) | |
1081 { | |
1082 ngx_cached_open_file_t *file; | |
1083 ngx_open_file_cache_event_t *fev; | |
1084 | |
1085 fev = ev->data; | |
1086 file = fev->file; | |
1087 | |
1765 | 1088 ngx_queue_remove(&file->queue); |
1453 | 1089 |
1090 ngx_rbtree_delete(&fev->cache->rbtree, &file->node); | |
1091 | |
1092 fev->cache->current--; | |
1093 | |
1094 /* NGX_ONESHOT_EVENT was already deleted */ | |
1095 file->event = NULL; | |
2070 | 1096 file->use_event = 0; |
1453 | 1097 |
1098 file->close = 1; | |
1099 | |
1772 | 1100 ngx_close_cached_file(fev->cache, file, 0, ev->log); |
1453 | 1101 |
1102 /* free memory only when fev->cache and fev->file are already not needed */ | |
1103 | |
1104 ngx_free(ev->data); | |
1105 ngx_free(ev); | |
1106 } |