Mercurial > hg > nginx
annotate src/core/ngx_hash.c @ 7536:c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
To save memory hash code uses u_short to store resulting bucket sizes,
so maximum bucket size is limited to 65536 minus ngx_cacheline_size (larger
values will be aligned to 65536 which will overflow u_short). However,
there were no checks to enforce this, and using larger bucket sizes
resulted in overflows and segmentation faults.
Appropriate safety checks to enforce this added to ngx_hash_init().
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Thu, 18 Jul 2019 18:27:44 +0300 |
| parents | 7fc16ff7ddc4 |
| children | eb9c7fb796d5 |
| rev | line source |
|---|---|
| 507 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4412 | 4 * Copyright (C) Nginx, Inc. |
| 507 | 5 */ |
| 6 | |
| 7 | |
| 8 #include <ngx_config.h> | |
| 9 #include <ngx_core.h> | |
| 10 | |
| 11 | |
| 589 | 12 void * |
| 13 ngx_hash_find(ngx_hash_t *hash, ngx_uint_t key, u_char *name, size_t len) | |
| 14 { | |
| 15 ngx_uint_t i; | |
| 16 ngx_hash_elt_t *elt; | |
| 17 | |
| 18 #if 0 | |
| 2155 | 19 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, "hf:\"%*s\"", len, name); |
| 589 | 20 #endif |
| 21 | |
| 22 elt = hash->buckets[key % hash->size]; | |
| 23 | |
| 24 if (elt == NULL) { | |
| 25 return NULL; | |
| 26 } | |
| 27 | |
| 28 while (elt->value) { | |
| 29 if (len != (size_t) elt->len) { | |
| 30 goto next; | |
| 31 } | |
| 32 | |
| 33 for (i = 0; i < len; i++) { | |
| 34 if (name[i] != elt->name[i]) { | |
| 35 goto next; | |
| 36 } | |
| 37 } | |
| 38 | |
| 39 return elt->value; | |
| 40 | |
| 41 next: | |
| 42 | |
| 43 elt = (ngx_hash_elt_t *) ngx_align_ptr(&elt->name[0] + elt->len, | |
| 44 sizeof(void *)); | |
| 45 continue; | |
| 46 } | |
| 47 | |
| 48 return NULL; | |
| 49 } | |
| 50 | |
| 51 | |
| 52 void * | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
53 ngx_hash_find_wc_head(ngx_hash_wildcard_t *hwc, u_char *name, size_t len) |
| 589 | 54 { |
| 55 void *value; | |
| 56 ngx_uint_t i, n, key; | |
| 57 | |
| 58 #if 0 | |
| 2155 | 59 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, "wch:\"%*s\"", len, name); |
| 589 | 60 #endif |
| 61 | |
| 62 n = len; | |
| 63 | |
| 64 while (n) { | |
| 65 if (name[n - 1] == '.') { | |
| 66 break; | |
| 67 } | |
| 68 | |
| 69 n--; | |
| 70 } | |
| 71 | |
| 72 key = 0; | |
| 73 | |
| 74 for (i = n; i < len; i++) { | |
| 75 key = ngx_hash(key, name[i]); | |
| 76 } | |
| 77 | |
| 78 #if 0 | |
| 79 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, "key:\"%ui\"", key); | |
| 80 #endif | |
| 81 | |
| 82 value = ngx_hash_find(&hwc->hash, key, &name[n], len - n); | |
| 83 | |
| 2149 | 84 #if 0 |
| 85 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, "value:\"%p\"", value); | |
| 86 #endif | |
| 87 | |
| 589 | 88 if (value) { |
| 591 | 89 |
| 90 /* | |
| 91 * the 2 low bits of value have the special meaning: | |
|
2168
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
92 * 00 - value is data pointer for both "example.com" |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
93 * and "*.example.com"; |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
94 * 01 - value is data pointer for "*.example.com" only; |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
95 * 10 - value is pointer to wildcard hash allowing |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
96 * both "example.com" and "*.example.com"; |
| 591 | 97 * 11 - value is pointer to wildcard hash allowing |
|
2168
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
98 * "*.example.com" only. |
| 591 | 99 */ |
| 100 | |
|
2168
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
101 if ((uintptr_t) value & 2) { |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
102 |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
103 if (n == 0) { |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
104 |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
105 /* "example.com" */ |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
106 |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
107 if ((uintptr_t) value & 1) { |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
108 return NULL; |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
109 } |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
110 |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
111 hwc = (ngx_hash_wildcard_t *) |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
112 ((uintptr_t) value & (uintptr_t) ~3); |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
113 return hwc->value; |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
114 } |
| 591 | 115 |
| 116 hwc = (ngx_hash_wildcard_t *) ((uintptr_t) value & (uintptr_t) ~3); | |
| 117 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
118 value = ngx_hash_find_wc_head(hwc, name, n - 1); |
| 589 | 119 |
| 120 if (value) { | |
| 121 return value; | |
| 122 } | |
| 123 | |
| 124 return hwc->value; | |
| 125 } | |
| 126 | |
|
2168
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
127 if ((uintptr_t) value & 1) { |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
128 |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
129 if (n == 0) { |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
130 |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
131 /* "example.com" */ |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
132 |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
133 return NULL; |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
134 } |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
135 |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
136 return (void *) ((uintptr_t) value & (uintptr_t) ~3); |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
137 } |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
138 |
| 589 | 139 return value; |
| 140 } | |
| 141 | |
| 142 return hwc->value; | |
| 143 } | |
| 144 | |
| 145 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
146 void * |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
147 ngx_hash_find_wc_tail(ngx_hash_wildcard_t *hwc, u_char *name, size_t len) |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
148 { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
149 void *value; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
150 ngx_uint_t i, key; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
151 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
152 #if 0 |
| 2155 | 153 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, "wct:\"%*s\"", len, name); |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
154 #endif |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
155 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
156 key = 0; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
157 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
158 for (i = 0; i < len; i++) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
159 if (name[i] == '.') { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
160 break; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
161 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
162 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
163 key = ngx_hash(key, name[i]); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
164 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
165 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
166 if (i == len) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
167 return NULL; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
168 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
169 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
170 #if 0 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
171 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, "key:\"%ui\"", key); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
172 #endif |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
173 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
174 value = ngx_hash_find(&hwc->hash, key, name, i); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
175 |
| 2155 | 176 #if 0 |
| 177 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, "value:\"%p\"", value); | |
| 178 #endif | |
| 179 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
180 if (value) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
181 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
182 /* |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
183 * the 2 low bits of value have the special meaning: |
|
2168
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
184 * 00 - value is data pointer; |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
185 * 11 - value is pointer to wildcard hash allowing "example.*". |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
186 */ |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
187 |
|
2168
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
188 if ((uintptr_t) value & 2) { |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
189 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
190 i++; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
191 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
192 hwc = (ngx_hash_wildcard_t *) ((uintptr_t) value & (uintptr_t) ~3); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
193 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
194 value = ngx_hash_find_wc_tail(hwc, &name[i], len - i); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
195 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
196 if (value) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
197 return value; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
198 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
199 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
200 return hwc->value; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
201 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
202 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
203 return value; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
204 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
205 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
206 return hwc->value; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
207 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
208 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
209 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
210 void * |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
211 ngx_hash_find_combined(ngx_hash_combined_t *hash, ngx_uint_t key, u_char *name, |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
212 size_t len) |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
213 { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
214 void *value; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
215 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
216 if (hash->hash.buckets) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
217 value = ngx_hash_find(&hash->hash, key, name, len); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
218 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
219 if (value) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
220 return value; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
221 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
222 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
223 |
| 2195 | 224 if (len == 0) { |
| 225 return NULL; | |
| 226 } | |
| 227 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
228 if (hash->wc_head && hash->wc_head->hash.buckets) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
229 value = ngx_hash_find_wc_head(hash->wc_head, name, len); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
230 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
231 if (value) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
232 return value; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
233 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
234 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
235 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
236 if (hash->wc_tail && hash->wc_tail->hash.buckets) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
237 value = ngx_hash_find_wc_tail(hash->wc_tail, name, len); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
238 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
239 if (value) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
240 return value; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
241 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
242 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
243 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
244 return NULL; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
245 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
246 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
247 |
| 589 | 248 #define NGX_HASH_ELT_SIZE(name) \ |
|
3510
4c70bbdfd076
allow hash key values more than 255 bytes, it does not actually increase mean
Igor Sysoev <igor@sysoev.ru>
parents:
3118
diff
changeset
|
249 (sizeof(void *) + ngx_align((name)->key.len + 2, sizeof(void *))) |
| 589 | 250 |
| 507 | 251 ngx_int_t |
| 589 | 252 ngx_hash_init(ngx_hash_init_t *hinit, ngx_hash_key_t *names, ngx_uint_t nelts) |
| 253 { | |
| 254 u_char *elts; | |
| 595 | 255 size_t len; |
| 256 u_short *test; | |
| 589 | 257 ngx_uint_t i, n, key, size, start, bucket_size; |
| 258 ngx_hash_elt_t *elt, **buckets; | |
| 259 | |
|
6225
3b6d69857de2
Core: fixed potential division by zero when initializing hash.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6224
diff
changeset
|
260 if (hinit->max_size == 0) { |
|
3b6d69857de2
Core: fixed potential division by zero when initializing hash.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6224
diff
changeset
|
261 ngx_log_error(NGX_LOG_EMERG, hinit->pool->log, 0, |
|
3b6d69857de2
Core: fixed potential division by zero when initializing hash.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6224
diff
changeset
|
262 "could not build %s, you should " |
|
3b6d69857de2
Core: fixed potential division by zero when initializing hash.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6224
diff
changeset
|
263 "increase %s_max_size: %i", |
|
3b6d69857de2
Core: fixed potential division by zero when initializing hash.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6224
diff
changeset
|
264 hinit->name, hinit->name, hinit->max_size); |
|
3b6d69857de2
Core: fixed potential division by zero when initializing hash.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6224
diff
changeset
|
265 return NGX_ERROR; |
|
3b6d69857de2
Core: fixed potential division by zero when initializing hash.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6224
diff
changeset
|
266 } |
|
3b6d69857de2
Core: fixed potential division by zero when initializing hash.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6224
diff
changeset
|
267 |
|
7536
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
268 if (hinit->bucket_size > 65536 - ngx_cacheline_size) { |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
269 ngx_log_error(NGX_LOG_EMERG, hinit->pool->log, 0, |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
270 "could not build %s, too large " |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
271 "%s_bucket_size: %i", |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
272 hinit->name, hinit->name, hinit->bucket_size); |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
273 return NGX_ERROR; |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
274 } |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
275 |
| 589 | 276 for (n = 0; n < nelts; n++) { |
| 277 if (hinit->bucket_size < NGX_HASH_ELT_SIZE(&names[n]) + sizeof(void *)) | |
| 278 { | |
| 279 ngx_log_error(NGX_LOG_EMERG, hinit->pool->log, 0, | |
|
6224
ddf35e019a80
Core: fixed style in the error message.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5985
diff
changeset
|
280 "could not build %s, you should " |
| 589 | 281 "increase %s_bucket_size: %i", |
| 282 hinit->name, hinit->name, hinit->bucket_size); | |
| 283 return NGX_ERROR; | |
| 284 } | |
| 285 } | |
| 286 | |
| 595 | 287 test = ngx_alloc(hinit->max_size * sizeof(u_short), hinit->pool->log); |
| 589 | 288 if (test == NULL) { |
| 289 return NGX_ERROR; | |
| 290 } | |
| 291 | |
| 631 | 292 bucket_size = hinit->bucket_size - sizeof(void *); |
| 293 | |
| 746 | 294 start = nelts / (bucket_size / (2 * sizeof(void *))); |
| 589 | 295 start = start ? start : 1; |
| 296 | |
|
4404
840f3e768ef8
Fixed division by zero exception in ngx_hash_init().
Valentin Bartenev <vbart@nginx.com>
parents:
3510
diff
changeset
|
297 if (hinit->max_size > 10000 && nelts && hinit->max_size / nelts < 100) { |
| 631 | 298 start = hinit->max_size - 1000; |
| 299 } | |
| 589 | 300 |
|
5636
54f847c88cf7
Core: fixed hash to actually try max_size.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5635
diff
changeset
|
301 for (size = start; size <= hinit->max_size; size++) { |
| 589 | 302 |
| 595 | 303 ngx_memzero(test, size * sizeof(u_short)); |
| 589 | 304 |
| 305 for (n = 0; n < nelts; n++) { | |
| 306 if (names[n].key.data == NULL) { | |
| 307 continue; | |
| 308 } | |
| 309 | |
| 310 key = names[n].key_hash % size; | |
|
7536
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
311 len = test[key] + NGX_HASH_ELT_SIZE(&names[n]); |
| 589 | 312 |
| 313 #if 0 | |
| 314 ngx_log_error(NGX_LOG_ALERT, hinit->pool->log, 0, | |
|
7536
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
315 "%ui: %ui %uz \"%V\"", |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
316 size, key, len, &names[n].key); |
| 589 | 317 #endif |
| 318 | |
|
7536
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
319 if (len > bucket_size) { |
| 589 | 320 goto next; |
| 321 } | |
|
7536
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
322 |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
323 test[key] = (u_short) len; |
| 589 | 324 } |
| 325 | |
| 326 goto found; | |
| 327 | |
| 328 next: | |
| 329 | |
| 330 continue; | |
| 331 } | |
| 332 | |
|
5985
f961c719fb09
Core: fixed potential buffer overrun when initializing hash.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5870
diff
changeset
|
333 size = hinit->max_size; |
|
5870
5e72578e6503
Core: fixed buffer overrun when hash max_size reached.
Yichun Zhang <agentzh@gmail.com>
parents:
5636
diff
changeset
|
334 |
|
5635
c348dea081fb
Core: hash now ignores bucket_size if it hits max_size limit.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4689
diff
changeset
|
335 ngx_log_error(NGX_LOG_WARN, hinit->pool->log, 0, |
|
c348dea081fb
Core: hash now ignores bucket_size if it hits max_size limit.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4689
diff
changeset
|
336 "could not build optimal %s, you should increase " |
|
c348dea081fb
Core: hash now ignores bucket_size if it hits max_size limit.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4689
diff
changeset
|
337 "either %s_max_size: %i or %s_bucket_size: %i; " |
|
c348dea081fb
Core: hash now ignores bucket_size if it hits max_size limit.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4689
diff
changeset
|
338 "ignoring %s_bucket_size", |
| 589 | 339 hinit->name, hinit->name, hinit->max_size, |
|
5635
c348dea081fb
Core: hash now ignores bucket_size if it hits max_size limit.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4689
diff
changeset
|
340 hinit->name, hinit->bucket_size, hinit->name); |
| 589 | 341 |
| 342 found: | |
| 343 | |
| 344 for (i = 0; i < size; i++) { | |
| 345 test[i] = sizeof(void *); | |
| 346 } | |
| 347 | |
| 348 for (n = 0; n < nelts; n++) { | |
| 349 if (names[n].key.data == NULL) { | |
| 350 continue; | |
| 351 } | |
| 352 | |
| 353 key = names[n].key_hash % size; | |
|
7536
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
354 len = test[key] + NGX_HASH_ELT_SIZE(&names[n]); |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
355 |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
356 if (len > 65536 - ngx_cacheline_size) { |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
357 ngx_log_error(NGX_LOG_EMERG, hinit->pool->log, 0, |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
358 "could not build %s, you should " |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
359 "increase %s_max_size: %i", |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
360 hinit->name, hinit->name, hinit->max_size); |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
361 return NGX_ERROR; |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
362 } |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
363 |
|
c3f60d618c17
Core: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6743
diff
changeset
|
364 test[key] = (u_short) len; |
| 589 | 365 } |
| 366 | |
| 367 len = 0; | |
| 368 | |
| 369 for (i = 0; i < size; i++) { | |
| 370 if (test[i] == sizeof(void *)) { | |
| 371 continue; | |
| 372 } | |
| 373 | |
| 595 | 374 test[i] = (u_short) (ngx_align(test[i], ngx_cacheline_size)); |
| 589 | 375 |
| 376 len += test[i]; | |
| 377 } | |
| 378 | |
| 379 if (hinit->hash == NULL) { | |
| 380 hinit->hash = ngx_pcalloc(hinit->pool, sizeof(ngx_hash_wildcard_t) | |
| 381 + size * sizeof(ngx_hash_elt_t *)); | |
| 382 if (hinit->hash == NULL) { | |
| 383 ngx_free(test); | |
| 384 return NGX_ERROR; | |
| 385 } | |
| 386 | |
| 387 buckets = (ngx_hash_elt_t **) | |
| 388 ((u_char *) hinit->hash + sizeof(ngx_hash_wildcard_t)); | |
| 389 | |
| 390 } else { | |
| 391 buckets = ngx_pcalloc(hinit->pool, size * sizeof(ngx_hash_elt_t *)); | |
| 392 if (buckets == NULL) { | |
| 393 ngx_free(test); | |
| 394 return NGX_ERROR; | |
| 395 } | |
| 396 } | |
| 397 | |
| 398 elts = ngx_palloc(hinit->pool, len + ngx_cacheline_size); | |
| 399 if (elts == NULL) { | |
| 400 ngx_free(test); | |
| 401 return NGX_ERROR; | |
| 402 } | |
| 403 | |
| 404 elts = ngx_align_ptr(elts, ngx_cacheline_size); | |
| 405 | |
| 406 for (i = 0; i < size; i++) { | |
| 407 if (test[i] == sizeof(void *)) { | |
| 408 continue; | |
| 409 } | |
| 410 | |
| 411 buckets[i] = (ngx_hash_elt_t *) elts; | |
| 412 elts += test[i]; | |
| 413 } | |
| 414 | |
| 415 for (i = 0; i < size; i++) { | |
| 416 test[i] = 0; | |
| 417 } | |
| 418 | |
| 419 for (n = 0; n < nelts; n++) { | |
| 420 if (names[n].key.data == NULL) { | |
| 421 continue; | |
| 422 } | |
| 423 | |
| 424 key = names[n].key_hash % size; | |
| 425 elt = (ngx_hash_elt_t *) ((u_char *) buckets[key] + test[key]); | |
| 426 | |
| 427 elt->value = names[n].value; | |
|
3510
4c70bbdfd076
allow hash key values more than 255 bytes, it does not actually increase mean
Igor Sysoev <igor@sysoev.ru>
parents:
3118
diff
changeset
|
428 elt->len = (u_short) names[n].key.len; |
| 589 | 429 |
| 2135 | 430 ngx_strlow(elt->name, names[n].key.data, names[n].key.len); |
| 589 | 431 |
| 595 | 432 test[key] = (u_short) (test[key] + NGX_HASH_ELT_SIZE(&names[n])); |
| 589 | 433 } |
| 434 | |
| 435 for (i = 0; i < size; i++) { | |
| 436 if (buckets[i] == NULL) { | |
| 437 continue; | |
| 438 } | |
| 439 | |
| 440 elt = (ngx_hash_elt_t *) ((u_char *) buckets[i] + test[i]); | |
| 441 | |
| 442 elt->value = NULL; | |
| 443 } | |
| 444 | |
| 445 ngx_free(test); | |
| 446 | |
| 447 hinit->hash->buckets = buckets; | |
| 448 hinit->hash->size = size; | |
| 449 | |
| 450 #if 0 | |
| 451 | |
| 452 for (i = 0; i < size; i++) { | |
| 453 ngx_str_t val; | |
| 454 ngx_uint_t key; | |
| 455 | |
| 456 elt = buckets[i]; | |
| 457 | |
| 458 if (elt == NULL) { | |
| 459 ngx_log_error(NGX_LOG_ALERT, hinit->pool->log, 0, | |
| 460 "%ui: NULL", i); | |
| 461 continue; | |
| 462 } | |
| 463 | |
| 464 while (elt->value) { | |
| 465 val.len = elt->len; | |
| 466 val.data = &elt->name[0]; | |
| 467 | |
| 468 key = hinit->key(val.data, val.len); | |
| 469 | |
| 470 ngx_log_error(NGX_LOG_ALERT, hinit->pool->log, 0, | |
| 471 "%ui: %p \"%V\" %ui", i, elt, &val, key); | |
| 472 | |
| 473 elt = (ngx_hash_elt_t *) ngx_align_ptr(&elt->name[0] + elt->len, | |
| 474 sizeof(void *)); | |
| 475 } | |
| 476 } | |
| 477 | |
| 478 #endif | |
| 479 | |
| 480 return NGX_OK; | |
| 481 } | |
| 482 | |
| 483 | |
| 484 ngx_int_t | |
| 485 ngx_hash_wildcard_init(ngx_hash_init_t *hinit, ngx_hash_key_t *names, | |
| 486 ngx_uint_t nelts) | |
| 487 { | |
| 593 | 488 size_t len, dot_len; |
| 591 | 489 ngx_uint_t i, n, dot; |
| 589 | 490 ngx_array_t curr_names, next_names; |
| 491 ngx_hash_key_t *name, *next_name; | |
| 492 ngx_hash_init_t h; | |
| 493 ngx_hash_wildcard_t *wdc; | |
| 494 | |
| 495 if (ngx_array_init(&curr_names, hinit->temp_pool, nelts, | |
| 496 sizeof(ngx_hash_key_t)) | |
| 497 != NGX_OK) | |
| 498 { | |
| 499 return NGX_ERROR; | |
| 500 } | |
| 501 | |
| 502 if (ngx_array_init(&next_names, hinit->temp_pool, nelts, | |
| 503 sizeof(ngx_hash_key_t)) | |
| 504 != NGX_OK) | |
| 505 { | |
| 506 return NGX_ERROR; | |
| 507 } | |
| 508 | |
| 509 for (n = 0; n < nelts; n = i) { | |
| 510 | |
| 511 #if 0 | |
| 512 ngx_log_error(NGX_LOG_ALERT, hinit->pool->log, 0, | |
| 513 "wc0: \"%V\"", &names[n].key); | |
| 514 #endif | |
| 515 | |
| 591 | 516 dot = 0; |
| 517 | |
| 589 | 518 for (len = 0; len < names[n].key.len; len++) { |
| 519 if (names[n].key.data[len] == '.') { | |
| 591 | 520 dot = 1; |
| 589 | 521 break; |
| 522 } | |
| 523 } | |
| 524 | |
| 525 name = ngx_array_push(&curr_names); | |
| 526 if (name == NULL) { | |
| 527 return NGX_ERROR; | |
| 528 } | |
| 529 | |
| 591 | 530 name->key.len = len; |
| 589 | 531 name->key.data = names[n].key.data; |
| 532 name->key_hash = hinit->key(name->key.data, name->key.len); | |
| 533 name->value = names[n].value; | |
| 534 | |
| 535 #if 0 | |
| 536 ngx_log_error(NGX_LOG_ALERT, hinit->pool->log, 0, | |
| 593 | 537 "wc1: \"%V\" %ui", &name->key, dot); |
| 589 | 538 #endif |
| 539 | |
| 593 | 540 dot_len = len + 1; |
| 541 | |
| 591 | 542 if (dot) { |
| 543 len++; | |
| 544 } | |
| 545 | |
| 589 | 546 next_names.nelts = 0; |
| 547 | |
| 548 if (names[n].key.len != len) { | |
| 549 next_name = ngx_array_push(&next_names); | |
| 550 if (next_name == NULL) { | |
| 551 return NGX_ERROR; | |
| 552 } | |
| 553 | |
| 554 next_name->key.len = names[n].key.len - len; | |
| 555 next_name->key.data = names[n].key.data + len; | |
| 3118 | 556 next_name->key_hash = 0; |
| 589 | 557 next_name->value = names[n].value; |
| 558 | |
| 559 #if 0 | |
| 560 ngx_log_error(NGX_LOG_ALERT, hinit->pool->log, 0, | |
| 561 "wc2: \"%V\"", &next_name->key); | |
| 562 #endif | |
| 563 } | |
| 564 | |
| 565 for (i = n + 1; i < nelts; i++) { | |
| 566 if (ngx_strncmp(names[n].key.data, names[i].key.data, len) != 0) { | |
| 567 break; | |
| 568 } | |
| 569 | |
| 593 | 570 if (!dot |
| 571 && names[i].key.len > len | |
| 572 && names[i].key.data[len] != '.') | |
| 573 { | |
| 574 break; | |
| 575 } | |
| 576 | |
| 589 | 577 next_name = ngx_array_push(&next_names); |
| 578 if (next_name == NULL) { | |
| 579 return NGX_ERROR; | |
| 580 } | |
| 581 | |
| 593 | 582 next_name->key.len = names[i].key.len - dot_len; |
| 583 next_name->key.data = names[i].key.data + dot_len; | |
| 3118 | 584 next_name->key_hash = 0; |
| 589 | 585 next_name->value = names[i].value; |
| 586 | |
| 587 #if 0 | |
| 588 ngx_log_error(NGX_LOG_ALERT, hinit->pool->log, 0, | |
| 591 | 589 "wc3: \"%V\"", &next_name->key); |
| 589 | 590 #endif |
| 591 } | |
| 592 | |
| 593 if (next_names.nelts) { | |
| 593 | 594 |
| 589 | 595 h = *hinit; |
| 596 h.hash = NULL; | |
| 597 | |
| 598 if (ngx_hash_wildcard_init(&h, (ngx_hash_key_t *) next_names.elts, | |
| 599 next_names.nelts) | |
| 600 != NGX_OK) | |
| 601 { | |
| 602 return NGX_ERROR; | |
| 603 } | |
| 604 | |
| 605 wdc = (ngx_hash_wildcard_t *) h.hash; | |
| 606 | |
| 607 if (names[n].key.len == len) { | |
| 608 wdc->value = names[n].value; | |
| 609 } | |
| 610 | |
|
2502
23706c19fab8
fix r2169 for .def.com and .abc.def.com case
Igor Sysoev <igor@sysoev.ru>
parents:
2195
diff
changeset
|
611 name->value = (void *) ((uintptr_t) wdc | (dot ? 3 : 2)); |
|
2168
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
612 |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
613 } else if (dot) { |
|
80924319ba05
fix the case when unset domain.tld was matched by *.domain.tld
Igor Sysoev <igor@sysoev.ru>
parents:
2155
diff
changeset
|
614 name->value = (void *) ((uintptr_t) name->value | 1); |
| 589 | 615 } |
| 616 } | |
| 617 | |
| 618 if (ngx_hash_init(hinit, (ngx_hash_key_t *) curr_names.elts, | |
| 619 curr_names.nelts) | |
| 620 != NGX_OK) | |
| 621 { | |
| 622 return NGX_ERROR; | |
| 623 } | |
| 624 | |
| 625 return NGX_OK; | |
| 626 } | |
| 627 | |
| 628 | |
| 629 ngx_uint_t | |
| 630 ngx_hash_key(u_char *data, size_t len) | |
| 631 { | |
| 632 ngx_uint_t i, key; | |
| 633 | |
| 634 key = 0; | |
| 635 | |
| 636 for (i = 0; i < len; i++) { | |
| 637 key = ngx_hash(key, data[i]); | |
| 638 } | |
| 639 | |
| 640 return key; | |
| 641 } | |
| 642 | |
| 643 | |
| 644 ngx_uint_t | |
| 645 ngx_hash_key_lc(u_char *data, size_t len) | |
| 646 { | |
| 647 ngx_uint_t i, key; | |
| 648 | |
| 649 key = 0; | |
| 650 | |
| 651 for (i = 0; i < len; i++) { | |
| 652 key = ngx_hash(key, ngx_tolower(data[i])); | |
| 653 } | |
| 654 | |
| 655 return key; | |
| 656 } | |
| 657 | |
| 658 | |
| 2136 | 659 ngx_uint_t |
| 660 ngx_hash_strlow(u_char *dst, u_char *src, size_t n) | |
| 661 { | |
| 662 ngx_uint_t key; | |
| 663 | |
| 664 key = 0; | |
| 665 | |
| 666 while (n--) { | |
| 667 *dst = ngx_tolower(*src); | |
| 668 key = ngx_hash(key, *dst); | |
| 669 dst++; | |
| 670 src++; | |
| 671 } | |
| 672 | |
| 673 return key; | |
| 674 } | |
| 675 | |
| 676 | |
| 589 | 677 ngx_int_t |
| 593 | 678 ngx_hash_keys_array_init(ngx_hash_keys_arrays_t *ha, ngx_uint_t type) |
| 679 { | |
| 680 ngx_uint_t asize; | |
| 681 | |
| 682 if (type == NGX_HASH_SMALL) { | |
| 683 asize = 4; | |
| 684 ha->hsize = 107; | |
| 685 | |
| 686 } else { | |
| 687 asize = NGX_HASH_LARGE_ASIZE; | |
| 688 ha->hsize = NGX_HASH_LARGE_HSIZE; | |
| 689 } | |
| 690 | |
| 691 if (ngx_array_init(&ha->keys, ha->temp_pool, asize, sizeof(ngx_hash_key_t)) | |
| 692 != NGX_OK) | |
| 693 { | |
| 694 return NGX_ERROR; | |
| 695 } | |
| 696 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
697 if (ngx_array_init(&ha->dns_wc_head, ha->temp_pool, asize, |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
698 sizeof(ngx_hash_key_t)) |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
699 != NGX_OK) |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
700 { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
701 return NGX_ERROR; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
702 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
703 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
704 if (ngx_array_init(&ha->dns_wc_tail, ha->temp_pool, asize, |
| 593 | 705 sizeof(ngx_hash_key_t)) |
| 706 != NGX_OK) | |
| 707 { | |
| 708 return NGX_ERROR; | |
| 709 } | |
| 710 | |
| 711 ha->keys_hash = ngx_pcalloc(ha->temp_pool, sizeof(ngx_array_t) * ha->hsize); | |
| 712 if (ha->keys_hash == NULL) { | |
| 713 return NGX_ERROR; | |
| 714 } | |
| 715 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
716 ha->dns_wc_head_hash = ngx_pcalloc(ha->temp_pool, |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
717 sizeof(ngx_array_t) * ha->hsize); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
718 if (ha->dns_wc_head_hash == NULL) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
719 return NGX_ERROR; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
720 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
721 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
722 ha->dns_wc_tail_hash = ngx_pcalloc(ha->temp_pool, |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
723 sizeof(ngx_array_t) * ha->hsize); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
724 if (ha->dns_wc_tail_hash == NULL) { |
| 593 | 725 return NGX_ERROR; |
| 726 } | |
| 727 | |
| 728 return NGX_OK; | |
| 729 } | |
| 730 | |
| 731 | |
| 732 ngx_int_t | |
| 733 ngx_hash_add_key(ngx_hash_keys_arrays_t *ha, ngx_str_t *key, void *value, | |
| 734 ngx_uint_t flags) | |
| 735 { | |
| 736 size_t len; | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
737 u_char *p; |
| 593 | 738 ngx_str_t *name; |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
739 ngx_uint_t i, k, n, skip, last; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
740 ngx_array_t *keys, *hwc; |
| 593 | 741 ngx_hash_key_t *hk; |
| 742 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
743 last = key->len; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
744 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
745 if (flags & NGX_HASH_WILDCARD_KEY) { |
| 593 | 746 |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
747 /* |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
748 * supported wildcards: |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
749 * "*.example.com", ".example.com", and "www.example.*" |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
750 */ |
| 593 | 751 |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
752 n = 0; |
| 593 | 753 |
| 754 for (i = 0; i < key->len; i++) { | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
755 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
756 if (key->data[i] == '*') { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
757 if (++n > 1) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
758 return NGX_DECLINED; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
759 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
760 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
761 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
762 if (key->data[i] == '.' && key->data[i + 1] == '.') { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
763 return NGX_DECLINED; |
| 597 | 764 } |
|
6245
3cf25d33886a
Core: fixed segfault with null in wildcard hash names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6225
diff
changeset
|
765 |
|
3cf25d33886a
Core: fixed segfault with null in wildcard hash names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6225
diff
changeset
|
766 if (key->data[i] == '\0') { |
|
3cf25d33886a
Core: fixed segfault with null in wildcard hash names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6225
diff
changeset
|
767 return NGX_DECLINED; |
|
3cf25d33886a
Core: fixed segfault with null in wildcard hash names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6225
diff
changeset
|
768 } |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
769 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
770 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
771 if (key->len > 1 && key->data[0] == '.') { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
772 skip = 1; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
773 goto wildcard; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
774 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
775 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
776 if (key->len > 2) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
777 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
778 if (key->data[0] == '*' && key->data[1] == '.') { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
779 skip = 2; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
780 goto wildcard; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
781 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
782 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
783 if (key->data[i - 2] == '.' && key->data[i - 1] == '*') { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
784 skip = 0; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
785 last -= 2; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
786 goto wildcard; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
787 } |
| 593 | 788 } |
| 789 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
790 if (n) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
791 return NGX_DECLINED; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
792 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
793 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
794 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
795 /* exact hash */ |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
796 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
797 k = 0; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
798 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
799 for (i = 0; i < last; i++) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
800 if (!(flags & NGX_HASH_READONLY_KEY)) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
801 key->data[i] = ngx_tolower(key->data[i]); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
802 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
803 k = ngx_hash(k, key->data[i]); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
804 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
805 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
806 k %= ha->hsize; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
807 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
808 /* check conflicts in exact hash */ |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
809 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
810 name = ha->keys_hash[k].elts; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
811 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
812 if (name) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
813 for (i = 0; i < ha->keys_hash[k].nelts; i++) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
814 if (last != name[i].len) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
815 continue; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
816 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
817 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
818 if (ngx_strncmp(key->data, name[i].data, last) == 0) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
819 return NGX_BUSY; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
820 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
821 } |
| 593 | 822 |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
823 } else { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
824 if (ngx_array_init(&ha->keys_hash[k], ha->temp_pool, 4, |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
825 sizeof(ngx_str_t)) |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
826 != NGX_OK) |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
827 { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
828 return NGX_ERROR; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
829 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
830 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
831 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
832 name = ngx_array_push(&ha->keys_hash[k]); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
833 if (name == NULL) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
834 return NGX_ERROR; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
835 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
836 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
837 *name = *key; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
838 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
839 hk = ngx_array_push(&ha->keys); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
840 if (hk == NULL) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
841 return NGX_ERROR; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
842 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
843 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
844 hk->key = *key; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
845 hk->key_hash = ngx_hash_key(key->data, last); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
846 hk->value = value; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
847 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
848 return NGX_OK; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
849 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
850 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
851 wildcard: |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
852 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
853 /* wildcard hash */ |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
854 |
| 2136 | 855 k = ngx_hash_strlow(&key->data[skip], &key->data[skip], last - skip); |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
856 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
857 k %= ha->hsize; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
858 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
859 if (skip == 1) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
860 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
861 /* check conflicts in exact hash for ".example.com" */ |
| 593 | 862 |
| 863 name = ha->keys_hash[k].elts; | |
| 864 | |
| 865 if (name) { | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
866 len = last - skip; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
867 |
| 593 | 868 for (i = 0; i < ha->keys_hash[k].nelts; i++) { |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
869 if (len != name[i].len) { |
| 593 | 870 continue; |
| 871 } | |
| 872 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
873 if (ngx_strncmp(&key->data[1], name[i].data, len) == 0) { |
| 593 | 874 return NGX_BUSY; |
| 875 } | |
| 876 } | |
| 877 | |
| 878 } else { | |
| 879 if (ngx_array_init(&ha->keys_hash[k], ha->temp_pool, 4, | |
| 880 sizeof(ngx_str_t)) | |
| 881 != NGX_OK) | |
| 882 { | |
| 883 return NGX_ERROR; | |
| 884 } | |
| 885 } | |
| 886 | |
| 887 name = ngx_array_push(&ha->keys_hash[k]); | |
| 888 if (name == NULL) { | |
| 889 return NGX_ERROR; | |
| 890 } | |
| 891 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
892 name->len = last - 1; |
| 2049 | 893 name->data = ngx_pnalloc(ha->temp_pool, name->len); |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
894 if (name->data == NULL) { |
| 593 | 895 return NGX_ERROR; |
| 896 } | |
| 897 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
898 ngx_memcpy(name->data, &key->data[1], name->len); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
899 } |
| 593 | 900 |
| 901 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
902 if (skip) { |
| 593 | 903 |
| 904 /* | |
| 905 * convert "*.example.com" to "com.example.\0" | |
| 906 * and ".example.com" to "com.example\0" | |
| 907 */ | |
| 908 | |
| 2049 | 909 p = ngx_pnalloc(ha->temp_pool, last); |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
910 if (p == NULL) { |
| 619 | 911 return NGX_ERROR; |
| 912 } | |
| 913 | |
| 593 | 914 len = 0; |
| 915 n = 0; | |
| 916 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
917 for (i = last - 1; i; i--) { |
| 593 | 918 if (key->data[i] == '.') { |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
919 ngx_memcpy(&p[n], &key->data[i + 1], len); |
| 593 | 920 n += len; |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
921 p[n++] = '.'; |
| 593 | 922 len = 0; |
| 923 continue; | |
| 924 } | |
| 925 | |
| 926 len++; | |
| 927 } | |
| 928 | |
| 929 if (len) { | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
930 ngx_memcpy(&p[n], &key->data[1], len); |
| 593 | 931 n += len; |
| 932 } | |
| 933 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
934 p[n] = '\0'; |
| 619 | 935 |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
936 hwc = &ha->dns_wc_head; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
937 keys = &ha->dns_wc_head_hash[k]; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
938 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
939 } else { |
| 619 | 940 |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
941 /* convert "www.example.*" to "www.example\0" */ |
| 619 | 942 |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
943 last++; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
944 |
| 2049 | 945 p = ngx_pnalloc(ha->temp_pool, last); |
|
1415
d83687d29853
fix trailing wildcard when two or more listen used in one server
Igor Sysoev <igor@sysoev.ru>
parents:
1253
diff
changeset
|
946 if (p == NULL) { |
|
d83687d29853
fix trailing wildcard when two or more listen used in one server
Igor Sysoev <igor@sysoev.ru>
parents:
1253
diff
changeset
|
947 return NGX_ERROR; |
|
d83687d29853
fix trailing wildcard when two or more listen used in one server
Igor Sysoev <igor@sysoev.ru>
parents:
1253
diff
changeset
|
948 } |
|
d83687d29853
fix trailing wildcard when two or more listen used in one server
Igor Sysoev <igor@sysoev.ru>
parents:
1253
diff
changeset
|
949 |
| 1492 | 950 ngx_cpystrn(p, key->data, last); |
|
1415
d83687d29853
fix trailing wildcard when two or more listen used in one server
Igor Sysoev <igor@sysoev.ru>
parents:
1253
diff
changeset
|
951 |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
952 hwc = &ha->dns_wc_tail; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
953 keys = &ha->dns_wc_tail_hash[k]; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
954 } |
| 593 | 955 |
| 956 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
957 /* check conflicts in wildcard hash */ |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
958 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
959 name = keys->elts; |
| 593 | 960 |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
961 if (name) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
962 len = last - skip; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
963 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
964 for (i = 0; i < keys->nelts; i++) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
965 if (len != name[i].len) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
966 continue; |
| 593 | 967 } |
| 968 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
969 if (ngx_strncmp(key->data + skip, name[i].data, len) == 0) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
970 return NGX_BUSY; |
| 593 | 971 } |
| 972 } | |
| 973 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
974 } else { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
975 if (ngx_array_init(keys, ha->temp_pool, 4, sizeof(ngx_str_t)) != NGX_OK) |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
976 { |
| 593 | 977 return NGX_ERROR; |
| 978 } | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
979 } |
| 593 | 980 |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
981 name = ngx_array_push(keys); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
982 if (name == NULL) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
983 return NGX_ERROR; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
984 } |
| 619 | 985 |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
986 name->len = last - skip; |
| 2049 | 987 name->data = ngx_pnalloc(ha->temp_pool, name->len); |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
988 if (name->data == NULL) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
989 return NGX_ERROR; |
| 593 | 990 } |
| 991 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
992 ngx_memcpy(name->data, key->data + skip, name->len); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
746
diff
changeset
|
993 |
|
4689
d2ed9fee092b
Fixed handling of conflicting wildcard server names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
994 |
|
d2ed9fee092b
Fixed handling of conflicting wildcard server names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
995 /* add to wildcard hash */ |
|
d2ed9fee092b
Fixed handling of conflicting wildcard server names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
996 |
|
d2ed9fee092b
Fixed handling of conflicting wildcard server names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
997 hk = ngx_array_push(hwc); |
|
d2ed9fee092b
Fixed handling of conflicting wildcard server names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
998 if (hk == NULL) { |
|
d2ed9fee092b
Fixed handling of conflicting wildcard server names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
999 return NGX_ERROR; |
|
d2ed9fee092b
Fixed handling of conflicting wildcard server names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
1000 } |
|
d2ed9fee092b
Fixed handling of conflicting wildcard server names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
1001 |
|
d2ed9fee092b
Fixed handling of conflicting wildcard server names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
1002 hk->key.len = last - 1; |
|
d2ed9fee092b
Fixed handling of conflicting wildcard server names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
1003 hk->key.data = p; |
|
d2ed9fee092b
Fixed handling of conflicting wildcard server names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
1004 hk->key_hash = 0; |
|
d2ed9fee092b
Fixed handling of conflicting wildcard server names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
1005 hk->value = value; |
|
d2ed9fee092b
Fixed handling of conflicting wildcard server names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
1006 |
| 593 | 1007 return NGX_OK; |
| 1008 } |