Mercurial > hg > nginx
changeset 4972:8b635cf36ccc
Added checks that disallow adding a variable with an empty name.
Added variable name syntax checks to "geo" and "map" directives.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Mon, 17 Dec 2012 19:03:33 +0000 |
parents | eaf95350d75c |
children | 44fcb9677c3f |
files | src/http/modules/ngx_http_geo_module.c src/http/modules/ngx_http_limit_conn_module.c src/http/modules/ngx_http_map_module.c src/http/modules/ngx_http_rewrite_module.c src/http/modules/ngx_http_split_clients_module.c src/http/modules/perl/ngx_http_perl_module.c src/http/ngx_http_variables.c |
diffstat | 7 files changed, 32 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_geo_module.c Mon Dec 17 12:08:53 2012 +0000 +++ b/src/http/modules/ngx_http_geo_module.c Mon Dec 17 19:03:33 2012 +0000 @@ -325,7 +325,7 @@ name = value[1]; - if (name.len < 2 || name.data[0] != '$') { + if (name.data[0] != '$') { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid variable name \"%V\"", &name); return NGX_CONF_ERROR; @@ -342,6 +342,13 @@ } name = value[2]; + + if (name.data[0] != '$') { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "invalid variable name \"%V\"", &name); + return NGX_CONF_ERROR; + } + name.len--; name.data++;
--- a/src/http/modules/ngx_http_limit_conn_module.c Mon Dec 17 12:08:53 2012 +0000 +++ b/src/http/modules/ngx_http_limit_conn_module.c Mon Dec 17 19:03:33 2012 +0000 @@ -540,7 +540,7 @@ continue; } - if (value[i].len > 1 && value[i].data[0] == '$') { + if (value[i].data[0] == '$') { value[i].len--; value[i].data++; @@ -613,7 +613,7 @@ value = cf->args->elts; - if (value[2].len < 2 || value[2].data[0] != '$') { + if (value[2].data[0] != '$') { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid variable name \"%V\"", &value[2]); return NGX_CONF_ERROR;
--- a/src/http/modules/ngx_http_map_module.c Mon Dec 17 12:08:53 2012 +0000 +++ b/src/http/modules/ngx_http_map_module.c Mon Dec 17 19:03:33 2012 +0000 @@ -209,6 +209,13 @@ } name = value[2]; + + if (name.data[0] != '$') { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "invalid variable name \"%V\"", &name); + return NGX_CONF_ERROR; + } + name.len--; name.data++;
--- a/src/http/modules/ngx_http_rewrite_module.c Mon Dec 17 12:08:53 2012 +0000 +++ b/src/http/modules/ngx_http_rewrite_module.c Mon Dec 17 19:03:33 2012 +0000 @@ -908,7 +908,7 @@ value = cf->args->elts; - if (value[1].len < 2 || value[1].data[0] != '$') { + if (value[1].data[0] != '$') { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid variable name \"%V\"", &value[1]); return NGX_CONF_ERROR;
--- a/src/http/modules/ngx_http_split_clients_module.c Mon Dec 17 12:08:53 2012 +0000 +++ b/src/http/modules/ngx_http_split_clients_module.c Mon Dec 17 19:03:33 2012 +0000 @@ -139,7 +139,7 @@ name = value[2]; - if (name.len < 2 || name.data[0] != '$') { + if (name.data[0] != '$') { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid variable name \"%V\"", &name); return NGX_CONF_ERROR;
--- a/src/http/modules/perl/ngx_http_perl_module.c Mon Dec 17 12:08:53 2012 +0000 +++ b/src/http/modules/perl/ngx_http_perl_module.c Mon Dec 17 19:03:33 2012 +0000 @@ -968,7 +968,7 @@ value = cf->args->elts; - if (value[1].len < 2 || value[1].data[0] != '$') { + if (value[1].data[0] != '$') { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid variable name \"%V\"", &value[1]); return NGX_CONF_ERROR;
--- a/src/http/ngx_http_variables.c Mon Dec 17 12:08:53 2012 +0000 +++ b/src/http/ngx_http_variables.c Mon Dec 17 19:03:33 2012 +0000 @@ -330,6 +330,12 @@ ngx_http_variable_t *v; ngx_http_core_main_conf_t *cmcf; + if (name->len == 0) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "invalid variable name \"$\""); + return NULL; + } + cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module); key = cmcf->variables_keys->keys.elts; @@ -393,6 +399,12 @@ ngx_http_variable_t *v; ngx_http_core_main_conf_t *cmcf; + if (name->len == 0) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "invalid variable name \"$\""); + return NGX_ERROR; + } + cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module); v = cmcf->variables.elts;