Mercurial > hg > nginx
annotate src/http/modules/ngx_http_referer_module.c @ 5350:8220e393c241
Referer: fixed server_name regex matching.
The server_name regexes are normally compiled for case-sensitive matching.
This violates case-insensitive obligations in the referer module. To fix
this, the host string is converted to lower case before matching.
Previously server_name regex was executed against the whole referer string
after dropping the scheme part. This could led to an improper matching, e.g.:
server_name ~^localhost$;
valid_referers server_names;
Referer: http://localhost/index.html
It was changed to look only at the hostname part.
The server_name regexes are separated into another array to not clash with
regular regexes.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Thu, 29 Aug 2013 22:35:26 +0400 |
parents | 9b8a634e348a |
children | a2c772963b04 |
rev | line source |
---|---|
577 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4412 | 4 * Copyright (C) Nginx, Inc. |
577 | 5 */ |
6 | |
7 | |
8 #include <ngx_config.h> | |
9 #include <ngx_core.h> | |
10 #include <ngx_http.h> | |
11 | |
12 | |
595 | 13 #define NGX_HTTP_REFERER_NO_URI_PART ((void *) 4) |
14 | |
1388 | 15 |
577 | 16 typedef struct { |
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
17 ngx_hash_combined_t hash; |
577 | 18 |
1388 | 19 #if (NGX_PCRE) |
20 ngx_array_t *regex; | |
5350
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
21 ngx_array_t *server_name_regex; |
1388 | 22 #endif |
23 | |
593 | 24 ngx_flag_t no_referer; |
25 ngx_flag_t blocked_referer; | |
577 | 26 |
593 | 27 ngx_hash_keys_arrays_t *keys; |
3939
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
28 |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
29 ngx_uint_t referer_hash_max_size; |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
30 ngx_uint_t referer_hash_bucket_size; |
577 | 31 } ngx_http_referer_conf_t; |
32 | |
33 | |
34 static void * ngx_http_referer_create_conf(ngx_conf_t *cf); | |
35 static char * ngx_http_referer_merge_conf(ngx_conf_t *cf, void *parent, | |
36 void *child); | |
37 static char *ngx_http_valid_referers(ngx_conf_t *cf, ngx_command_t *cmd, | |
38 void *conf); | |
5349
9b8a634e348a
Referer: fixed error type usage inconsistency for ngx_http_add*().
Sergey Kandaurov <pluknet@nginx.com>
parents:
5321
diff
changeset
|
39 static ngx_int_t ngx_http_add_referer(ngx_conf_t *cf, |
9b8a634e348a
Referer: fixed error type usage inconsistency for ngx_http_add*().
Sergey Kandaurov <pluknet@nginx.com>
parents:
5321
diff
changeset
|
40 ngx_hash_keys_arrays_t *keys, ngx_str_t *value, ngx_str_t *uri); |
9b8a634e348a
Referer: fixed error type usage inconsistency for ngx_http_add*().
Sergey Kandaurov <pluknet@nginx.com>
parents:
5321
diff
changeset
|
41 static ngx_int_t ngx_http_add_regex_referer(ngx_conf_t *cf, |
5350
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
42 ngx_http_referer_conf_t *rlcf, ngx_str_t *name); |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
43 #if (NGX_PCRE) |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
44 static ngx_int_t ngx_http_add_regex_server_name(ngx_conf_t *cf, |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
45 ngx_http_referer_conf_t *rlcf, ngx_http_regex_t *regex); |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
46 #endif |
593 | 47 static int ngx_libc_cdecl ngx_http_cmp_referer_wildcards(const void *one, |
48 const void *two); | |
577 | 49 |
50 | |
51 static ngx_command_t ngx_http_referer_commands[] = { | |
52 | |
53 { ngx_string("valid_referers"), | |
54 NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, | |
55 ngx_http_valid_referers, | |
56 NGX_HTTP_LOC_CONF_OFFSET, | |
57 0, | |
58 NULL }, | |
59 | |
3939
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
60 { ngx_string("referer_hash_max_size"), |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
61 NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
62 ngx_conf_set_num_slot, |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
63 NGX_HTTP_LOC_CONF_OFFSET, |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
64 offsetof(ngx_http_referer_conf_t, referer_hash_max_size), |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
65 NULL }, |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
66 |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
67 { ngx_string("referer_hash_bucket_size"), |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
68 NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
69 ngx_conf_set_num_slot, |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
70 NGX_HTTP_LOC_CONF_OFFSET, |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
71 offsetof(ngx_http_referer_conf_t, referer_hash_bucket_size), |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
72 NULL }, |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
73 |
577 | 74 ngx_null_command |
75 }; | |
76 | |
77 | |
78 static ngx_http_module_t ngx_http_referer_module_ctx = { | |
79 NULL, /* preconfiguration */ | |
80 NULL, /* postconfiguration */ | |
81 | |
82 NULL, /* create main configuration */ | |
83 NULL, /* init main configuration */ | |
84 | |
85 NULL, /* create server configuration */ | |
86 NULL, /* merge server configuration */ | |
87 | |
88 ngx_http_referer_create_conf, /* create location configuration */ | |
89 ngx_http_referer_merge_conf /* merge location configuration */ | |
90 }; | |
91 | |
92 | |
93 ngx_module_t ngx_http_referer_module = { | |
94 NGX_MODULE_V1, | |
95 &ngx_http_referer_module_ctx, /* module context */ | |
96 ngx_http_referer_commands, /* module directives */ | |
97 NGX_HTTP_MODULE, /* module type */ | |
98 NULL, /* init master */ | |
99 NULL, /* init module */ | |
100 NULL, /* init process */ | |
101 NULL, /* init thread */ | |
102 NULL, /* exit thread */ | |
103 NULL, /* exit process */ | |
104 NULL, /* exit master */ | |
105 NGX_MODULE_V1_PADDING | |
106 }; | |
107 | |
108 | |
109 static ngx_int_t | |
110 ngx_http_referer_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, | |
111 uintptr_t data) | |
112 { | |
1388 | 113 u_char *p, *ref, *last; |
114 size_t len; | |
115 ngx_str_t *uri; | |
116 ngx_uint_t i, key; | |
117 ngx_http_referer_conf_t *rlcf; | |
118 u_char buf[256]; | |
5350
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
119 #if (NGX_PCRE) |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
120 ngx_int_t rc; |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
121 ngx_str_t referer; |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
122 #endif |
577 | 123 |
593 | 124 rlcf = ngx_http_get_module_loc_conf(r, ngx_http_referer_module); |
577 | 125 |
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
126 if (rlcf->hash.hash.buckets == NULL |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
127 && rlcf->hash.wc_head == NULL |
1388 | 128 && rlcf->hash.wc_tail == NULL |
129 #if (NGX_PCRE) | |
130 && rlcf->regex == NULL | |
5350
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
131 && rlcf->server_name_regex == NULL |
1388 | 132 #endif |
133 ) | |
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
134 { |
595 | 135 goto valid; |
577 | 136 } |
137 | |
138 if (r->headers_in.referer == NULL) { | |
593 | 139 if (rlcf->no_referer) { |
595 | 140 goto valid; |
141 } | |
577 | 142 |
595 | 143 goto invalid; |
577 | 144 } |
145 | |
146 len = r->headers_in.referer->value.len; | |
147 ref = r->headers_in.referer->value.data; | |
148 | |
3459 | 149 if (len >= sizeof("http://i.ru") - 1) { |
150 last = ref + len; | |
151 | |
152 if (ngx_strncasecmp(ref, (u_char *) "http://", 7) == 0) { | |
153 ref += 7; | |
5321
9806f7932474
Referer module: fixed regex matching against HTTPS referers.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5221
diff
changeset
|
154 len -= 7; |
3459 | 155 goto valid_scheme; |
156 | |
157 } else if (ngx_strncasecmp(ref, (u_char *) "https://", 8) == 0) { | |
158 ref += 8; | |
5321
9806f7932474
Referer module: fixed regex matching against HTTPS referers.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5221
diff
changeset
|
159 len -= 8; |
3459 | 160 goto valid_scheme; |
595 | 161 } |
577 | 162 } |
163 | |
3459 | 164 if (rlcf->blocked_referer) { |
165 goto valid; | |
166 } | |
167 | |
168 goto invalid; | |
169 | |
170 valid_scheme: | |
171 | |
595 | 172 i = 0; |
173 key = 0; | |
577 | 174 |
595 | 175 for (p = ref; p < last; p++) { |
593 | 176 if (*p == '/' || *p == ':') { |
177 break; | |
577 | 178 } |
595 | 179 |
180 buf[i] = ngx_tolower(*p); | |
181 key = ngx_hash(key, buf[i++]); | |
182 | |
183 if (i == 256) { | |
184 goto invalid; | |
185 } | |
593 | 186 } |
577 | 187 |
1388 | 188 uri = ngx_hash_find_combined(&rlcf->hash, key, buf, p - ref); |
577 | 189 |
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
190 if (uri) { |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
191 goto uri; |
577 | 192 } |
193 | |
1388 | 194 #if (NGX_PCRE) |
195 | |
5350
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
196 if (rlcf->server_name_regex) { |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
197 referer.len = p - ref; |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
198 referer.data = buf; |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
199 |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
200 rc = ngx_regex_exec_array(rlcf->server_name_regex, &referer, |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
201 r->connection->log); |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
202 |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
203 if (rc == NGX_OK) { |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
204 goto valid; |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
205 } |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
206 |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
207 if (rc == NGX_ERROR) { |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
208 return rc; |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
209 } |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
210 |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
211 /* NGX_DECLINED */ |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
212 } |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
213 |
1388 | 214 if (rlcf->regex) { |
5321
9806f7932474
Referer module: fixed regex matching against HTTPS referers.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5221
diff
changeset
|
215 referer.len = len; |
1388 | 216 referer.data = ref; |
217 | |
1785 | 218 rc = ngx_regex_exec_array(rlcf->regex, &referer, r->connection->log); |
1388 | 219 |
1785 | 220 if (rc == NGX_OK) { |
1388 | 221 goto valid; |
222 } | |
1785 | 223 |
224 if (rc == NGX_ERROR) { | |
225 return rc; | |
226 } | |
227 | |
228 /* NGX_DECLINED */ | |
1388 | 229 } |
230 | |
231 #endif | |
232 | |
595 | 233 invalid: |
234 | |
577 | 235 *v = ngx_http_variable_true_value; |
236 | |
237 return NGX_OK; | |
595 | 238 |
239 uri: | |
240 | |
241 for ( /* void */ ; p < last; p++) { | |
242 if (*p == '/') { | |
243 break; | |
244 } | |
245 } | |
246 | |
247 len = last - p; | |
248 | |
249 if (uri == NGX_HTTP_REFERER_NO_URI_PART) { | |
250 goto valid; | |
251 } | |
252 | |
253 if (len < uri->len || ngx_strncmp(uri->data, p, uri->len) != 0) { | |
254 goto invalid; | |
255 } | |
256 | |
257 valid: | |
258 | |
259 *v = ngx_http_variable_null_value; | |
260 | |
261 return NGX_OK; | |
577 | 262 } |
263 | |
264 | |
265 static void * | |
266 ngx_http_referer_create_conf(ngx_conf_t *cf) | |
267 { | |
268 ngx_http_referer_conf_t *conf; | |
269 | |
593 | 270 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_referer_conf_t)); |
577 | 271 if (conf == NULL) { |
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
1800
diff
changeset
|
272 return NULL; |
577 | 273 } |
274 | |
1782
db07cb9d1cbc
regex valid_referers were not inherited
Igor Sysoev <igor@sysoev.ru>
parents:
1704
diff
changeset
|
275 #if (NGX_PCRE) |
db07cb9d1cbc
regex valid_referers were not inherited
Igor Sysoev <igor@sysoev.ru>
parents:
1704
diff
changeset
|
276 conf->regex = NGX_CONF_UNSET_PTR; |
5350
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
277 conf->server_name_regex = NGX_CONF_UNSET_PTR; |
1782
db07cb9d1cbc
regex valid_referers were not inherited
Igor Sysoev <igor@sysoev.ru>
parents:
1704
diff
changeset
|
278 #endif |
db07cb9d1cbc
regex valid_referers were not inherited
Igor Sysoev <igor@sysoev.ru>
parents:
1704
diff
changeset
|
279 |
577 | 280 conf->no_referer = NGX_CONF_UNSET; |
281 conf->blocked_referer = NGX_CONF_UNSET; | |
3939
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
282 conf->referer_hash_max_size = NGX_CONF_UNSET_UINT; |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
283 conf->referer_hash_bucket_size = NGX_CONF_UNSET_UINT; |
577 | 284 |
285 return conf; | |
286 } | |
287 | |
288 | |
289 static char * | |
290 ngx_http_referer_merge_conf(ngx_conf_t *cf, void *parent, void *child) | |
291 { | |
292 ngx_http_referer_conf_t *prev = parent; | |
293 ngx_http_referer_conf_t *conf = child; | |
294 | |
593 | 295 ngx_hash_init_t hash; |
296 | |
297 if (conf->keys == NULL) { | |
298 conf->hash = prev->hash; | |
299 | |
1800 | 300 #if (NGX_PCRE) |
1782
db07cb9d1cbc
regex valid_referers were not inherited
Igor Sysoev <igor@sysoev.ru>
parents:
1704
diff
changeset
|
301 ngx_conf_merge_ptr_value(conf->regex, prev->regex, NULL); |
5350
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
302 ngx_conf_merge_ptr_value(conf->server_name_regex, |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
303 prev->server_name_regex, NULL); |
1800 | 304 #endif |
577 | 305 ngx_conf_merge_value(conf->no_referer, prev->no_referer, 0); |
306 ngx_conf_merge_value(conf->blocked_referer, prev->blocked_referer, 0); | |
3939
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
307 ngx_conf_merge_uint_value(conf->referer_hash_max_size, |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
308 prev->referer_hash_max_size, 2048); |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
309 ngx_conf_merge_uint_value(conf->referer_hash_bucket_size, |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
310 prev->referer_hash_bucket_size, 64); |
593 | 311 |
312 return NGX_CONF_OK; | |
313 } | |
314 | |
603 | 315 if ((conf->no_referer == 1 || conf->blocked_referer == 1) |
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
316 && conf->keys->keys.nelts == 0 |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
317 && conf->keys->dns_wc_head.nelts == 0 |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
318 && conf->keys->dns_wc_tail.nelts == 0) |
603 | 319 { |
320 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, | |
321 "the \"none\" or \"blocked\" referers are specified " | |
322 "in the \"valid_referers\" directive " | |
323 "without any valid referer"); | |
324 return NGX_CONF_ERROR; | |
325 } | |
326 | |
3939
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
327 ngx_conf_merge_uint_value(conf->referer_hash_max_size, |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
328 prev->referer_hash_max_size, 2048); |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
329 ngx_conf_merge_uint_value(conf->referer_hash_bucket_size, |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
330 prev->referer_hash_bucket_size, 64); |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
331 conf->referer_hash_bucket_size = ngx_align(conf->referer_hash_bucket_size, |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
332 ngx_cacheline_size); |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
333 |
593 | 334 hash.key = ngx_hash_key_lc; |
3939
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
335 hash.max_size = conf->referer_hash_max_size; |
3cbbe86a7a95
referer_hash_max_size and referer_hash_bucket_size directives
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
336 hash.bucket_size = conf->referer_hash_bucket_size; |
4008
debb2f235aa3
Fix names of the referer hash size directives introduced in r3940.
Igor Sysoev <igor@sysoev.ru>
parents:
3939
diff
changeset
|
337 hash.name = "referer_hash"; |
593 | 338 hash.pool = cf->pool; |
339 | |
340 if (conf->keys->keys.nelts) { | |
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
341 hash.hash = &conf->hash.hash; |
593 | 342 hash.temp_pool = NULL; |
343 | |
344 if (ngx_hash_init(&hash, conf->keys->keys.elts, conf->keys->keys.nelts) | |
345 != NGX_OK) | |
346 { | |
347 return NGX_CONF_ERROR; | |
348 } | |
349 } | |
350 | |
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
351 if (conf->keys->dns_wc_head.nelts) { |
593 | 352 |
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
353 ngx_qsort(conf->keys->dns_wc_head.elts, |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
354 (size_t) conf->keys->dns_wc_head.nelts, |
593 | 355 sizeof(ngx_hash_key_t), |
356 ngx_http_cmp_referer_wildcards); | |
357 | |
358 hash.hash = NULL; | |
359 hash.temp_pool = cf->temp_pool; | |
360 | |
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
361 if (ngx_hash_wildcard_init(&hash, conf->keys->dns_wc_head.elts, |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
362 conf->keys->dns_wc_head.nelts) |
593 | 363 != NGX_OK) |
364 { | |
365 return NGX_CONF_ERROR; | |
366 } | |
367 | |
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
368 conf->hash.wc_head = (ngx_hash_wildcard_t *) hash.hash; |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
369 } |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
370 |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
371 if (conf->keys->dns_wc_tail.nelts) { |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
372 |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
373 ngx_qsort(conf->keys->dns_wc_tail.elts, |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
374 (size_t) conf->keys->dns_wc_tail.nelts, |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
375 sizeof(ngx_hash_key_t), |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
376 ngx_http_cmp_referer_wildcards); |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
377 |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
378 hash.hash = NULL; |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
379 hash.temp_pool = cf->temp_pool; |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
380 |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
381 if (ngx_hash_wildcard_init(&hash, conf->keys->dns_wc_tail.elts, |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
382 conf->keys->dns_wc_tail.nelts) |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
383 != NGX_OK) |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
384 { |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
385 return NGX_CONF_ERROR; |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
386 } |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
387 |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
388 conf->hash.wc_tail = (ngx_hash_wildcard_t *) hash.hash; |
577 | 389 } |
390 | |
1800 | 391 #if (NGX_PCRE) |
1782
db07cb9d1cbc
regex valid_referers were not inherited
Igor Sysoev <igor@sysoev.ru>
parents:
1704
diff
changeset
|
392 ngx_conf_merge_ptr_value(conf->regex, prev->regex, NULL); |
5350
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
393 ngx_conf_merge_ptr_value(conf->server_name_regex, prev->server_name_regex, |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
394 NULL); |
1800 | 395 #endif |
1782
db07cb9d1cbc
regex valid_referers were not inherited
Igor Sysoev <igor@sysoev.ru>
parents:
1704
diff
changeset
|
396 |
577 | 397 if (conf->no_referer == NGX_CONF_UNSET) { |
398 conf->no_referer = 0; | |
399 } | |
400 | |
401 if (conf->blocked_referer == NGX_CONF_UNSET) { | |
402 conf->blocked_referer = 0; | |
403 } | |
404 | |
611 | 405 conf->keys = NULL; |
406 | |
577 | 407 return NGX_CONF_OK; |
408 } | |
409 | |
410 | |
411 static char * | |
412 ngx_http_valid_referers(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
413 { | |
593 | 414 ngx_http_referer_conf_t *rlcf = conf; |
577 | 415 |
593 | 416 u_char *p; |
595 | 417 ngx_str_t *value, uri, name; |
593 | 418 ngx_uint_t i, n; |
577 | 419 ngx_http_variable_t *var; |
420 ngx_http_server_name_t *sn; | |
421 ngx_http_core_srv_conf_t *cscf; | |
422 | |
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3459
diff
changeset
|
423 ngx_str_set(&name, "invalid_referer"); |
577 | 424 |
5221
8f74cf107137
Referer module: added $invalid_referer to variables hash.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
425 var = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE); |
577 | 426 if (var == NULL) { |
427 return NGX_CONF_ERROR; | |
428 } | |
429 | |
637 | 430 var->get_handler = ngx_http_referer_variable; |
577 | 431 |
593 | 432 if (rlcf->keys == NULL) { |
433 rlcf->keys = ngx_pcalloc(cf->temp_pool, sizeof(ngx_hash_keys_arrays_t)); | |
434 if (rlcf->keys == NULL) { | |
435 return NGX_CONF_ERROR; | |
436 } | |
577 | 437 |
593 | 438 rlcf->keys->pool = cf->pool; |
439 rlcf->keys->temp_pool = cf->pool; | |
440 | |
441 if (ngx_hash_keys_array_init(rlcf->keys, NGX_HASH_SMALL) != NGX_OK) { | |
577 | 442 return NGX_CONF_ERROR; |
443 } | |
444 } | |
445 | |
446 value = cf->args->elts; | |
447 | |
448 for (i = 1; i < cf->args->nelts; i++) { | |
449 if (value[i].len == 0) { | |
450 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
451 "invalid referer \"%V\"", &value[i]); | |
452 return NGX_CONF_ERROR; | |
453 } | |
454 | |
455 if (ngx_strcmp(value[i].data, "none") == 0) { | |
593 | 456 rlcf->no_referer = 1; |
577 | 457 continue; |
458 } | |
459 | |
460 if (ngx_strcmp(value[i].data, "blocked") == 0) { | |
593 | 461 rlcf->blocked_referer = 1; |
577 | 462 continue; |
463 } | |
464 | |
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3459
diff
changeset
|
465 ngx_str_null(&uri); |
595 | 466 |
577 | 467 if (ngx_strcmp(value[i].data, "server_names") == 0) { |
593 | 468 |
469 cscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_core_module); | |
577 | 470 |
593 | 471 sn = cscf->server_names.elts; |
472 for (n = 0; n < cscf->server_names.nelts; n++) { | |
1388 | 473 |
474 #if (NGX_PCRE) | |
475 if (sn[n].regex) { | |
476 | |
5350
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
477 if (ngx_http_add_regex_server_name(cf, rlcf, sn[n].regex) |
1388 | 478 != NGX_OK) |
479 { | |
480 return NGX_CONF_ERROR; | |
481 } | |
482 | |
483 continue; | |
484 } | |
485 #endif | |
486 | |
595 | 487 if (ngx_http_add_referer(cf, rlcf->keys, &sn[n].name, &uri) |
488 != NGX_OK) | |
489 { | |
593 | 490 return NGX_CONF_ERROR; |
491 } | |
492 } | |
577 | 493 |
494 continue; | |
495 } | |
496 | |
1388 | 497 if (value[i].data[0] == '~') { |
5350
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
498 if (ngx_http_add_regex_referer(cf, rlcf, &value[i]) != NGX_OK) { |
1388 | 499 return NGX_CONF_ERROR; |
500 } | |
501 | |
502 continue; | |
503 } | |
504 | |
1242 | 505 p = (u_char *) ngx_strchr(value[i].data, '/'); |
577 | 506 |
593 | 507 if (p) { |
595 | 508 uri.len = (value[i].data + value[i].len) - p; |
509 uri.data = p; | |
593 | 510 value[i].len = p - value[i].data; |
577 | 511 } |
512 | |
595 | 513 if (ngx_http_add_referer(cf, rlcf->keys, &value[i], &uri) != NGX_OK) { |
577 | 514 return NGX_CONF_ERROR; |
515 } | |
516 } | |
517 | |
518 return NGX_CONF_OK; | |
519 } | |
593 | 520 |
521 | |
5349
9b8a634e348a
Referer: fixed error type usage inconsistency for ngx_http_add*().
Sergey Kandaurov <pluknet@nginx.com>
parents:
5321
diff
changeset
|
522 static ngx_int_t |
593 | 523 ngx_http_add_referer(ngx_conf_t *cf, ngx_hash_keys_arrays_t *keys, |
595 | 524 ngx_str_t *value, ngx_str_t *uri) |
593 | 525 { |
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
526 ngx_int_t rc; |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
527 ngx_str_t *u; |
593 | 528 |
595 | 529 if (uri->len == 0) { |
530 u = NGX_HTTP_REFERER_NO_URI_PART; | |
531 | |
532 } else { | |
533 u = ngx_palloc(cf->pool, sizeof(ngx_str_t)); | |
534 if (u == NULL) { | |
5349
9b8a634e348a
Referer: fixed error type usage inconsistency for ngx_http_add*().
Sergey Kandaurov <pluknet@nginx.com>
parents:
5321
diff
changeset
|
535 return NGX_ERROR; |
595 | 536 } |
537 | |
538 *u = *uri; | |
539 } | |
540 | |
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
541 rc = ngx_hash_add_key(keys, value, u, NGX_HASH_WILDCARD_KEY); |
593 | 542 |
543 if (rc == NGX_OK) { | |
5349
9b8a634e348a
Referer: fixed error type usage inconsistency for ngx_http_add*().
Sergey Kandaurov <pluknet@nginx.com>
parents:
5321
diff
changeset
|
544 return NGX_OK; |
593 | 545 } |
546 | |
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
547 if (rc == NGX_DECLINED) { |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
548 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
549 "invalid hostname or wildcard \"%V\"", value); |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
550 } |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1242
diff
changeset
|
551 |
593 | 552 if (rc == NGX_BUSY) { |
553 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
554 "conflicting parameter \"%V\"", value); | |
555 } | |
556 | |
5349
9b8a634e348a
Referer: fixed error type usage inconsistency for ngx_http_add*().
Sergey Kandaurov <pluknet@nginx.com>
parents:
5321
diff
changeset
|
557 return NGX_ERROR; |
593 | 558 } |
559 | |
560 | |
5349
9b8a634e348a
Referer: fixed error type usage inconsistency for ngx_http_add*().
Sergey Kandaurov <pluknet@nginx.com>
parents:
5321
diff
changeset
|
561 static ngx_int_t |
1388 | 562 ngx_http_add_regex_referer(ngx_conf_t *cf, ngx_http_referer_conf_t *rlcf, |
5350
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
563 ngx_str_t *name) |
1388 | 564 { |
565 #if (NGX_PCRE) | |
3325 | 566 ngx_regex_elt_t *re; |
567 ngx_regex_compile_t rc; | |
568 u_char errstr[NGX_MAX_CONF_ERRSTR]; | |
1388 | 569 |
3122
3e994ac670dc
test space between "~" and regex in server_name and invalid_referers
Igor Sysoev <igor@sysoev.ru>
parents:
3116
diff
changeset
|
570 if (name->len == 1) { |
3e994ac670dc
test space between "~" and regex in server_name and invalid_referers
Igor Sysoev <igor@sysoev.ru>
parents:
3116
diff
changeset
|
571 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "empty regex in \"%V\"", name); |
5349
9b8a634e348a
Referer: fixed error type usage inconsistency for ngx_http_add*().
Sergey Kandaurov <pluknet@nginx.com>
parents:
5321
diff
changeset
|
572 return NGX_ERROR; |
3122
3e994ac670dc
test space between "~" and regex in server_name and invalid_referers
Igor Sysoev <igor@sysoev.ru>
parents:
3116
diff
changeset
|
573 } |
3e994ac670dc
test space between "~" and regex in server_name and invalid_referers
Igor Sysoev <igor@sysoev.ru>
parents:
3116
diff
changeset
|
574 |
1782
db07cb9d1cbc
regex valid_referers were not inherited
Igor Sysoev <igor@sysoev.ru>
parents:
1704
diff
changeset
|
575 if (rlcf->regex == NGX_CONF_UNSET_PTR) { |
1785 | 576 rlcf->regex = ngx_array_create(cf->pool, 2, sizeof(ngx_regex_elt_t)); |
1388 | 577 if (rlcf->regex == NULL) { |
5349
9b8a634e348a
Referer: fixed error type usage inconsistency for ngx_http_add*().
Sergey Kandaurov <pluknet@nginx.com>
parents:
5321
diff
changeset
|
578 return NGX_ERROR; |
1388 | 579 } |
580 } | |
581 | |
1785 | 582 re = ngx_array_push(rlcf->regex); |
583 if (re == NULL) { | |
5349
9b8a634e348a
Referer: fixed error type usage inconsistency for ngx_http_add*().
Sergey Kandaurov <pluknet@nginx.com>
parents:
5321
diff
changeset
|
584 return NGX_ERROR; |
1388 | 585 } |
586 | |
587 name->len--; | |
588 name->data++; | |
589 | |
3325 | 590 ngx_memzero(&rc, sizeof(ngx_regex_compile_t)); |
1388 | 591 |
3325 | 592 rc.pattern = *name; |
593 rc.pool = cf->pool; | |
594 rc.options = NGX_REGEX_CASELESS; | |
595 rc.err.len = NGX_MAX_CONF_ERRSTR; | |
596 rc.err.data = errstr; | |
597 | |
598 if (ngx_regex_compile(&rc) != NGX_OK) { | |
599 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &rc.err); | |
5349
9b8a634e348a
Referer: fixed error type usage inconsistency for ngx_http_add*().
Sergey Kandaurov <pluknet@nginx.com>
parents:
5321
diff
changeset
|
600 return NGX_ERROR; |
1388 | 601 } |
602 | |
3325 | 603 re->regex = rc.regex; |
1785 | 604 re->name = name->data; |
1388 | 605 |
5349
9b8a634e348a
Referer: fixed error type usage inconsistency for ngx_http_add*().
Sergey Kandaurov <pluknet@nginx.com>
parents:
5321
diff
changeset
|
606 return NGX_OK; |
1388 | 607 |
608 #else | |
609 | |
610 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
611 "the using of the regex \"%V\" requires PCRE library", | |
612 name); | |
613 | |
5349
9b8a634e348a
Referer: fixed error type usage inconsistency for ngx_http_add*().
Sergey Kandaurov <pluknet@nginx.com>
parents:
5321
diff
changeset
|
614 return NGX_ERROR; |
1388 | 615 |
616 #endif | |
617 } | |
618 | |
619 | |
5350
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
620 #if (NGX_PCRE) |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
621 |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
622 static ngx_int_t |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
623 ngx_http_add_regex_server_name(ngx_conf_t *cf, ngx_http_referer_conf_t *rlcf, |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
624 ngx_http_regex_t *regex) |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
625 { |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
626 ngx_regex_elt_t *re; |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
627 |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
628 if (rlcf->server_name_regex == NGX_CONF_UNSET_PTR) { |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
629 rlcf->server_name_regex = ngx_array_create(cf->pool, 2, |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
630 sizeof(ngx_regex_elt_t)); |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
631 if (rlcf->server_name_regex == NULL) { |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
632 return NGX_ERROR; |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
633 } |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
634 } |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
635 |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
636 re = ngx_array_push(rlcf->server_name_regex); |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
637 if (re == NULL) { |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
638 return NGX_ERROR; |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
639 } |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
640 |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
641 re->regex = regex->regex; |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
642 re->name = regex->name.data; |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
643 |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
644 return NGX_OK; |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
645 } |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
646 |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
647 #endif |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
648 |
8220e393c241
Referer: fixed server_name regex matching.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5349
diff
changeset
|
649 |
593 | 650 static int ngx_libc_cdecl |
651 ngx_http_cmp_referer_wildcards(const void *one, const void *two) | |
652 { | |
653 ngx_hash_key_t *first, *second; | |
654 | |
655 first = (ngx_hash_key_t *) one; | |
656 second = (ngx_hash_key_t *) two; | |
657 | |
3116
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
658 return ngx_dns_strcmp(first->key.data, second->key.data); |
593 | 659 } |