mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-13 06:12:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

realip: chains of trusted proxies and IPv6 support.

Browse Source 
The module now supports recursive search of client address through
the chain of trusted proxies, controlled by the "real_ip_recursive"
directive (closes #2).  It also gets full IPv6 support (closes #44)
and canonical value of the $client_addr variable on address change.

Example:
    real_ip_header X-Forwarded-For;
    set_real_ip_from 127.0.0.0/8;
    set_real_ip_from ::1;
    set_real_ip_from unix:;
    real_ip_recursive on;
This commit is contained in:
Ruslan Ermilov 2012-05-14 12:41:03 +00:00
parent 8e5dc474e5
commit 7627530b50
1 changed files with 45 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
src/http/modules/ngx_http_realip_module.c
View File

@ -16,13 +16,11 @@
typedef struct { typedef struct {
ngx_array_t *from; /* array of ngx_in_cidr_t */ ngx_array_t *from; /* array of ngx_cidr_t */
ngx_uint_t type; ngx_uint_t type;
ngx_uint_t hash; ngx_uint_t hash;
ngx_str_t header; ngx_str_t header;
#if (NGX_HAVE_UNIX_DOMAIN) ngx_flag_t recursive;
ngx_uint_t unixsock; /* unsigned unixsock:2; */
#endif
} ngx_http_realip_loc_conf_t; } ngx_http_realip_loc_conf_t;
@ -35,8 +33,8 @@ typedef struct {
static ngx_int_t ngx_http_realip_handler(ngx_http_request_t *r); static ngx_int_t ngx_http_realip_handler(ngx_http_request_t *r);
static ngx_int_t ngx_http_realip_set_addr(ngx_http_request_t *r, u_char *ip, static ngx_int_t ngx_http_realip_set_addr(ngx_http_request_t *r,
size_t len); ngx_addr_t *addr);
static void ngx_http_realip_cleanup(void *data); static void ngx_http_realip_cleanup(void *data);
static char *ngx_http_realip_from(ngx_conf_t *cf, ngx_command_t *cmd, static char *ngx_http_realip_from(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf); void *conf);
@ -63,6 +61,13 @@ static ngx_command_t ngx_http_realip_commands[] = {
0, 0,
NULL }, NULL },
{ ngx_string("real_ip_recursive"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_realip_loc_conf_t, recursive),
NULL },
ngx_null_command ngx_null_command
}; };
@ -105,10 +110,9 @@ ngx_http_realip_handler(ngx_http_request_t *r)
u_char *ip, *p; u_char *ip, *p;
size_t len; size_t len;
ngx_uint_t i, hash; ngx_uint_t i, hash;
ngx_addr_t addr;
ngx_list_part_t *part; ngx_list_part_t *part;
ngx_table_elt_t *header; ngx_table_elt_t *header;
struct sockaddr_in *sin;
ngx_in_cidr_t *from;
ngx_connection_t *c; ngx_connection_t *c;
ngx_http_realip_ctx_t *ctx; ngx_http_realip_ctx_t *ctx;
ngx_http_realip_loc_conf_t *rlcf; ngx_http_realip_loc_conf_t *rlcf;
@ -121,12 +125,7 @@ ngx_http_realip_handler(ngx_http_request_t *r)
rlcf = ngx_http_get_module_loc_conf(r, ngx_http_realip_module); rlcf = ngx_http_get_module_loc_conf(r, ngx_http_realip_module);
if (rlcf->from == NULL if (rlcf->from == NULL) {
#if (NGX_HAVE_UNIX_DOMAIN)
&& !rlcf->unixsock
#endif
)
{
return NGX_DECLINED; return NGX_DECLINED;
} }
@ -152,15 +151,6 @@ ngx_http_realip_handler(ngx_http_request_t *r)
len = r->headers_in.x_forwarded_for->value.len; len = r->headers_in.x_forwarded_for->value.len;
ip = r->headers_in.x_forwarded_for->value.data; ip = r->headers_in.x_forwarded_for->value.data;
for (p = ip + len - 1; p > ip; p--) {
if (*p == ' ' || *p == ',') {
p++;
len -= p - ip;
ip = p;
break;
}
}
break; break;
default: /* NGX_HTTP_REALIP_HEADER */ default: /* NGX_HTTP_REALIP_HEADER */
@ -204,42 +194,27 @@ found:
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "realip: \"%s\"", ip); ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "realip: \"%s\"", ip);
/* AF_INET only */ addr.sockaddr = c->sockaddr;
addr.socklen = c->socklen;
/* addr.name = c->addr_text; */
if (c->sockaddr->sa_family == AF_INET) { if (ngx_http_get_forwarded_addr(r, &addr, ip, len, rlcf->from,
sin = (struct sockaddr_in *) c->sockaddr; rlcf->recursive)
== NGX_OK)
from = rlcf->from->elts; {
for (i = 0; i < rlcf->from->nelts; i++) { return ngx_http_realip_set_addr(r, &addr);
ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
"realip: %08XD %08XD %08XD",
sin->sin_addr.s_addr, from[i].mask, from[i].addr);
if ((sin->sin_addr.s_addr & from[i].mask) == from[i].addr) {
return ngx_http_realip_set_addr(r, ip, len);
}
}
} }
#if (NGX_HAVE_UNIX_DOMAIN)
if (c->sockaddr->sa_family == AF_UNIX && rlcf->unixsock) {
return ngx_http_realip_set_addr(r, ip, len);
}
#endif
return NGX_DECLINED; return NGX_DECLINED;
} }
static ngx_int_t static ngx_int_t
ngx_http_realip_set_addr(ngx_http_request_t *r, u_char *ip, size_t len) ngx_http_realip_set_addr(ngx_http_request_t *r, ngx_addr_t *addr)
{ {
size_t len;
u_char *p; u_char *p;
ngx_int_t rc; u_char text[NGX_SOCKADDR_STRLEN];
ngx_addr_t addr;
ngx_connection_t *c; ngx_connection_t *c;
ngx_pool_cleanup_t *cln; ngx_pool_cleanup_t *cln;
ngx_http_realip_ctx_t *ctx; ngx_http_realip_ctx_t *ctx;
@ -254,15 +229,9 @@ ngx_http_realip_set_addr(ngx_http_request_t *r, u_char *ip, size_t len)
c = r->connection; c = r->connection;
rc = ngx_parse_addr(c->pool, &addr, ip, len); len = ngx_sock_ntop(addr->sockaddr, text, NGX_SOCKADDR_STRLEN, 0);
if (len == 0) {
switch (rc) {
case NGX_DECLINED:
return NGX_DECLINED;
case NGX_ERROR:
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
default: /* NGX_OK */
break;
} }
p = ngx_pnalloc(c->pool, len); p = ngx_pnalloc(c->pool, len);
@ -270,7 +239,7 @@ ngx_http_realip_set_addr(ngx_http_request_t *r, u_char *ip, size_t len)
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }
ngx_memcpy(p, ip, len); ngx_memcpy(p, text, len);
cln->handler = ngx_http_realip_cleanup; cln->handler = ngx_http_realip_cleanup;
@ -279,8 +248,8 @@ ngx_http_realip_set_addr(ngx_http_request_t *r, u_char *ip, size_t len)
ctx->socklen = c->socklen; ctx->socklen = c->socklen;
ctx->addr_text = c->addr_text; ctx->addr_text = c->addr_text;
c->sockaddr = addr.sockaddr; c->sockaddr = addr->sockaddr;
c->socklen = addr.socklen; c->socklen = addr->socklen;
c->addr_text.len = len; c->addr_text.len = len;
c->addr_text.data = p; c->addr_text.data = p;
@ -310,34 +279,33 @@ ngx_http_realip_from(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_int_t rc; ngx_int_t rc;
ngx_str_t *value; ngx_str_t *value;
ngx_cidr_t cidr; ngx_cidr_t *cidr;
ngx_in_cidr_t *from;
value = cf->args->elts; value = cf->args->elts;
#if (NGX_HAVE_UNIX_DOMAIN)
if (ngx_strcmp(value[1].data, "unix:") == 0) {
rlcf->unixsock = 1;
return NGX_CONF_OK;
}
#endif
if (rlcf->from == NULL) { if (rlcf->from == NULL) {
rlcf->from = ngx_array_create(cf->pool, 2, rlcf->from = ngx_array_create(cf->pool, 2,
sizeof(ngx_in_cidr_t)); sizeof(ngx_cidr_t));
if (rlcf->from == NULL) { if (rlcf->from == NULL) {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
} }
from = ngx_array_push(rlcf->from); cidr = ngx_array_push(rlcf->from);
if (from == NULL) { if (cidr == NULL) {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
rc = ngx_ptocidr(&value[1], &cidr); #if (NGX_HAVE_UNIX_DOMAIN)
if (ngx_strcmp(value[1].data, "unix:") == 0) {
cidr->family = AF_UNIX;
return NGX_CONF_OK;
}
#endif
rc = ngx_ptocidr(&value[1], cidr);
if (rc == NGX_ERROR) { if (rc == NGX_ERROR) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%V\"", ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%V\"",
@ -345,20 +313,11 @@ ngx_http_realip_from(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
if (cidr.family != AF_INET) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"set_real_ip_from\" supports IPv4 only");
return NGX_CONF_ERROR;
}
if (rc == NGX_DONE) { if (rc == NGX_DONE) {
ngx_conf_log_error(NGX_LOG_WARN, cf, 0, ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
"low address bits of %V are meaningless", &value[1]); "low address bits of %V are meaningless", &value[1]);
} }
from->mask = cidr.u.in.mask;
from->addr = cidr.u.in.addr;
return NGX_CONF_OK; return NGX_CONF_OK;
} }
@ -409,9 +368,7 @@ ngx_http_realip_create_loc_conf(ngx_conf_t *cf)
*/ */
conf->type = NGX_CONF_UNSET_UINT; conf->type = NGX_CONF_UNSET_UINT;
#if (NGX_HAVE_UNIX_DOMAIN) conf->recursive = NGX_CONF_UNSET;
conf->unixsock = 2;
#endif
return conf; return conf;
} }
@ -427,13 +384,8 @@ ngx_http_realip_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
conf->from = prev->from; conf->from = prev->from;
} }
#if (NGX_HAVE_UNIX_DOMAIN)
if (conf->unixsock == 2) {
conf->unixsock = (prev->unixsock == 2) ? 0 : prev->unixsock;
}
#endif
ngx_conf_merge_uint_value(conf->type, prev->type, NGX_HTTP_REALIP_XREALIP); ngx_conf_merge_uint_value(conf->type, prev->type, NGX_HTTP_REALIP_XREALIP);
ngx_conf_merge_value(conf->recursive, prev->recursive, 0);
if (conf->header.len == 0) { if (conf->header.len == 0) {
conf->hash = prev->hash; conf->hash = prev->hash;