annotate src/os/unix/ngx_user.c @ 664:f5b859b2f097 NGINX_1_1_16

nginx 1.1.16 *) Change: the simultaneous subrequest limit has been raised to 200. *) Feature: the "from" parameter of the "disable_symlinks" directive. *) Feature: the "return" and "error_page" directives can be used to return 307 redirections. *) Bugfix: a segmentation fault might occur in a worker process if the "resolver" directive was used and there was no "error_log" directive specified at global level. Thanks to Roman Arutyunyan. *) Bugfix: a segmentation fault might occur in a worker process if the "proxy_http_version 1.1" or "fastcgi_keep_conn on" directives were used. *) Bugfix: memory leaks. Thanks to Lanshun Zhou. *) Bugfix: in the "disable_symlinks" directive. *) Bugfix: on ZFS filesystem disk cache size might be calculated incorrectly; the bug had appeared in 1.0.1. *) Bugfix: nginx could not be built by the icc 12.1 compiler. *) Bugfix: nginx could not be built by gcc on Solaris; the bug had appeared in 1.1.15.
author Igor Sysoev <http://sysoev.ru>
date Wed, 29 Feb 2012 00:00:00 +0400
parents d0f7a625f27c
children 88a1b4797f2e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
1
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
2 /*
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
3 * Copyright (C) Igor Sysoev
660
d0f7a625f27c nginx 1.1.14
Igor Sysoev <http://sysoev.ru>
parents: 626
diff changeset
4 * Copyright (C) Nginx, Inc.
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
5 */
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
6
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
7
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
8 #include <ngx_config.h>
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
9 #include <ngx_core.h>
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
10
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
11
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
12 /*
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
13 * Solaris has thread-safe crypt()
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
14 * Linux has crypt_r(); "struct crypt_data" is more than 128K
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
15 * FreeBSD needs the mutex to protect crypt()
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
16 *
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
17 * TODO:
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
18 * ngx_crypt_init() to init mutex
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
19 */
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
20
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
21
54
bcb5fce0b038 nginx 0.1.27
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
22 #if (NGX_CRYPT)
bcb5fce0b038 nginx 0.1.27
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
23
76
da9a3b14312d nginx 0.1.38
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
24 #if (NGX_HAVE_GNU_CRYPT_R)
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
25
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
26 ngx_int_t
626
a7a5fa2e395b nginx 1.0.3
Igor Sysoev <http://sysoev.ru>
parents: 604
diff changeset
27 ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
28 {
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
29 char *value;
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
30 size_t len;
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
31 ngx_err_t err;
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
32 struct crypt_data cd;
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
33
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
34 ngx_set_errno(0);
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
35
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
36 cd.initialized = 0;
78
9db7e0b5b27f nginx 0.1.39
Igor Sysoev <http://sysoev.ru>
parents: 76
diff changeset
37 /* work around the glibc bug */
9db7e0b5b27f nginx 0.1.39
Igor Sysoev <http://sysoev.ru>
parents: 76
diff changeset
38 cd.current_salt[0] = ~salt[0];
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
39
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
40 value = crypt_r((char *) key, (char *) salt, &cd);
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
41
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
42 err = ngx_errno;
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
43
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
44 if (err == 0) {
604
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 382
diff changeset
45 len = ngx_strlen(value) + 1;
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
46
382
984bb0b1399b nginx 0.7.3
Igor Sysoev <http://sysoev.ru>
parents: 78
diff changeset
47 *encrypted = ngx_pnalloc(pool, len);
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
48 if (*encrypted) {
604
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 382
diff changeset
49 ngx_memcpy(*encrypted, value, len);
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
50 return NGX_OK;
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
51 }
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
52 }
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
53
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
54 ngx_log_error(NGX_LOG_CRIT, pool->log, err, "crypt_r() failed");
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
55
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
56 return NGX_ERROR;
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
57 }
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
58
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
59 #else
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
60
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
61 ngx_int_t
626
a7a5fa2e395b nginx 1.0.3
Igor Sysoev <http://sysoev.ru>
parents: 604
diff changeset
62 ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
63 {
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
64 char *value;
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
65 size_t len;
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
66 ngx_err_t err;
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
67
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
68 #if (NGX_THREADS && NGX_NONREENTRANT_CRYPT)
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
69
664
f5b859b2f097 nginx 1.1.16
Igor Sysoev <http://sysoev.ru>
parents: 660
diff changeset
70 /* crypt() is a time consuming function, so we only try to lock */
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
71
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
72 if (ngx_mutex_trylock(ngx_crypt_mutex) != NGX_OK) {
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
73 return NGX_AGAIN;
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
74 }
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
75
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
76 #endif
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
77
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
78 ngx_set_errno(0);
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
79
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
80 value = crypt((char *) key, (char *) salt);
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
81
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
82 if (value) {
604
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 382
diff changeset
83 len = ngx_strlen(value) + 1;
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
84
382
984bb0b1399b nginx 0.7.3
Igor Sysoev <http://sysoev.ru>
parents: 78
diff changeset
85 *encrypted = ngx_pnalloc(pool, len);
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
86 if (*encrypted) {
604
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 382
diff changeset
87 ngx_memcpy(*encrypted, value, len);
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
88 }
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
89
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
90 #if (NGX_THREADS && NGX_NONREENTRANT_CRYPT)
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
91 ngx_mutex_unlock(ngx_crypt_mutex);
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
92 #endif
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
93 return NGX_OK;
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
94 }
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
95
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
96 err = ngx_errno;
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
97
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
98 #if (NGX_THREADS && NGX_NONREENTRANT_CRYPT)
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
99 ngx_mutex_unlock(ngx_crypt_mutex);
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
100 #endif
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
101
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
102 ngx_log_error(NGX_LOG_CRIT, pool->log, err, "crypt() failed");
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
103
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
104 return NGX_ERROR;
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
105 }
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
106
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
107 #endif
54
bcb5fce0b038 nginx 0.1.27
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
108
bcb5fce0b038 nginx 0.1.27
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
109 #endif /* NGX_CRYPT */