annotate src/os/unix/ngx_user.c @ 694:88a1b4797f2e NGINX_1_3_10

nginx 1.3.10 *) Change: domain names specified in configuration file are now resolved to IPv6 addresses as well as IPv4 ones. *) Change: now if the "include" directive with mask is used on Unix systems, included files are sorted in alphabetical order. *) Change: the "add_header" directive adds headers to 201 responses. *) Feature: the "geo" directive now supports IPv6 addresses in CIDR notation. *) Feature: the "flush" and "gzip" parameters of the "access_log" directive. *) Feature: variables support in the "auth_basic" directive. *) Bugfix: nginx could not be built with the ngx_http_perl_module in some cases. *) Bugfix: a segmentation fault might occur in a worker process if the ngx_http_xslt_module was used. *) Bugfix: nginx could not be built on MacOSX in some cases. Thanks to Piotr Sikora. *) Bugfix: the "limit_rate" directive with high rates might result in truncated responses on 32-bit platforms. Thanks to Alexey Antropov. *) Bugfix: a segmentation fault might occur in a worker process if the "if" directive was used. Thanks to Piotr Sikora. *) Bugfix: a "100 Continue" response was issued with "413 Request Entity Too Large" responses. *) Bugfix: the "image_filter", "image_filter_jpeg_quality" and "image_filter_sharpen" directives might be inherited incorrectly. Thanks to Ian Babrou. *) Bugfix: "crypt_r() failed" errors might appear if the "auth_basic" directive was used on Linux. *) Bugfix: in backup servers handling. Thanks to Thomas Chen. *) Bugfix: proxied HEAD requests might return incorrect response if the "gzip" directive was used.
author Igor Sysoev <http://sysoev.ru>
date Tue, 25 Dec 2012 00:00:00 +0400
parents f5b859b2f097
children
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;
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
31 struct crypt_data cd;
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
32
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
33 cd.initialized = 0;
78
9db7e0b5b27f nginx 0.1.39
Igor Sysoev <http://sysoev.ru>
parents: 76
diff changeset
34 /* work around the glibc bug */
9db7e0b5b27f nginx 0.1.39
Igor Sysoev <http://sysoev.ru>
parents: 76
diff changeset
35 cd.current_salt[0] = ~salt[0];
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
36
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
37 value = crypt_r((char *) key, (char *) salt, &cd);
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
38
694
88a1b4797f2e nginx 1.3.10
Igor Sysoev <http://sysoev.ru>
parents: 664
diff changeset
39 if (value) {
604
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 382
diff changeset
40 len = ngx_strlen(value) + 1;
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
41
382
984bb0b1399b nginx 0.7.3
Igor Sysoev <http://sysoev.ru>
parents: 78
diff changeset
42 *encrypted = ngx_pnalloc(pool, len);
694
88a1b4797f2e nginx 1.3.10
Igor Sysoev <http://sysoev.ru>
parents: 664
diff changeset
43 if (*encrypted == NULL) {
88a1b4797f2e nginx 1.3.10
Igor Sysoev <http://sysoev.ru>
parents: 664
diff changeset
44 return NGX_ERROR;
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
45 }
694
88a1b4797f2e nginx 1.3.10
Igor Sysoev <http://sysoev.ru>
parents: 664
diff changeset
46
88a1b4797f2e nginx 1.3.10
Igor Sysoev <http://sysoev.ru>
parents: 664
diff changeset
47 ngx_memcpy(*encrypted, value, len);
88a1b4797f2e nginx 1.3.10
Igor Sysoev <http://sysoev.ru>
parents: 664
diff changeset
48 return NGX_OK;
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
49 }
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
50
694
88a1b4797f2e nginx 1.3.10
Igor Sysoev <http://sysoev.ru>
parents: 664
diff changeset
51 ngx_log_error(NGX_LOG_CRIT, pool->log, ngx_errno, "crypt_r() failed");
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
52
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
53 return NGX_ERROR;
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
54 }
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
55
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
56 #else
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 ngx_int_t
626
a7a5fa2e395b nginx 1.0.3
Igor Sysoev <http://sysoev.ru>
parents: 604
diff changeset
59 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
60 {
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
61 char *value;
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
62 size_t len;
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
63 ngx_err_t err;
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
64
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
65 #if (NGX_THREADS && NGX_NONREENTRANT_CRYPT)
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
66
664
f5b859b2f097 nginx 1.1.16
Igor Sysoev <http://sysoev.ru>
parents: 660
diff changeset
67 /* 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
68
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
69 if (ngx_mutex_trylock(ngx_crypt_mutex) != NGX_OK) {
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
70 return NGX_AGAIN;
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
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
73 #endif
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 value = crypt((char *) key, (char *) salt);
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
76
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
77 if (value) {
604
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 382
diff changeset
78 len = ngx_strlen(value) + 1;
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
79
382
984bb0b1399b nginx 0.7.3
Igor Sysoev <http://sysoev.ru>
parents: 78
diff changeset
80 *encrypted = ngx_pnalloc(pool, len);
694
88a1b4797f2e nginx 1.3.10
Igor Sysoev <http://sysoev.ru>
parents: 664
diff changeset
81 if (*encrypted == NULL) {
88a1b4797f2e nginx 1.3.10
Igor Sysoev <http://sysoev.ru>
parents: 664
diff changeset
82 #if (NGX_THREADS && NGX_NONREENTRANT_CRYPT)
88a1b4797f2e nginx 1.3.10
Igor Sysoev <http://sysoev.ru>
parents: 664
diff changeset
83 ngx_mutex_unlock(ngx_crypt_mutex);
88a1b4797f2e nginx 1.3.10
Igor Sysoev <http://sysoev.ru>
parents: 664
diff changeset
84 #endif
88a1b4797f2e nginx 1.3.10
Igor Sysoev <http://sysoev.ru>
parents: 664
diff changeset
85 return NGX_ERROR;
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
86 }
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
87
694
88a1b4797f2e nginx 1.3.10
Igor Sysoev <http://sysoev.ru>
parents: 664
diff changeset
88 ngx_memcpy(*encrypted, value, len);
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
89 #if (NGX_THREADS && NGX_NONREENTRANT_CRYPT)
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
90 ngx_mutex_unlock(ngx_crypt_mutex);
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
91 #endif
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
92 return NGX_OK;
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
93 }
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
94
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
95 err = ngx_errno;
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
96
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
97 #if (NGX_THREADS && NGX_NONREENTRANT_CRYPT)
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
98 ngx_mutex_unlock(ngx_crypt_mutex);
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
99 #endif
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
100
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
101 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
102
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 54
diff changeset
103 return NGX_ERROR;
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
104 }
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 #endif
54
bcb5fce0b038 nginx 0.1.27
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
107
bcb5fce0b038 nginx 0.1.27
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
108 #endif /* NGX_CRYPT */