Skip to content

A couple of fixes to nginx_refactoring branch #721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

A couple of fixes to nginx_refactoring branch #721

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62ead2a
Fixed segmentation fault if http context is not defined.
defanator May 12, 2014
c74a806
Merge branch 'nginx_refactoring' of github.com:defanator/ModSecurity …
defanator May 14, 2014
f16d98b
Removed unneeded and invalid initialization.
defanator May 14, 2014
1baeaef
Obtain port from r->connection->local_sockaddr.
defanator May 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 36 additions & 6 deletions nginx/modsecurity/ngx_http_modsecurity.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,13 @@ ngx_http_modsecurity_load_request(ngx_http_request_t *r)
{
ngx_http_modsecurity_ctx_t *ctx;
request_rec *req;
ngx_str_t str;
size_t root;
ngx_str_t path;
ngx_uint_t port;
struct sockaddr_in *sin;
#if (NGX_HAVE_INET6)
struct sockaddr_in6 *sin6;
#endif

ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity);
req = ctx->req;
Expand Down Expand Up @@ -324,10 +328,30 @@ ngx_http_modsecurity_load_request(ngx_http_request_t *r)
req->parsed_uri.path = (char *)ngx_pstrdup0(r->pool, &r->uri);
req->parsed_uri.is_initialized = 1;

str.data = r->port_start;
str.len = r->port_end - r->port_start;
req->parsed_uri.port = ngx_atoi(str.data, str.len);
req->parsed_uri.port_str = (char *)ngx_pstrdup0(r->pool, &str);
switch (r->connection->local_sockaddr->sa_family) {

#if (NGX_HAVE_INET6)
case AF_INET6:
sin6 = (struct sockaddr_in6 *) r->connection->local_sockaddr;
port = ntohs(sin6->sin6_port);
break;
#endif

#if (NGX_HAVE_UNIX_DOMAIN)
case AF_UNIX:
port = 0;
break;
#endif

default: /* AF_INET */
sin = (struct sockaddr_in *) r->connection->local_sockaddr;
port = ntohs(sin->sin_port);
break;
}

req->parsed_uri.port = port;
req->parsed_uri.port_str = ngx_pnalloc(r->pool, sizeof("65535"));
(void) ngx_sprintf((u_char *)req->parsed_uri.port_str, "%ui%c", port, '\0');

req->parsed_uri.query = r->args.len ? req->args : NULL;
req->parsed_uri.dns_looked_up = 0;
Expand Down Expand Up @@ -1083,6 +1107,12 @@ ngx_http_modsecurity_init(ngx_conf_t *cf)
static ngx_int_t
ngx_http_modsecurity_init_process(ngx_cycle_t *cycle)
{
if (ngx_http_cycle_get_module_main_conf(cycle, ngx_http_modsecurity)
== NULL)
{
return NGX_OK;
}

/* must set log hook here cf->log maybe changed */
modsecSetLogHook(cycle->log, modsecLog);
modsecInitProcess();
Expand All @@ -1091,7 +1121,7 @@ ngx_http_modsecurity_init_process(ngx_cycle_t *cycle)

static ngx_int_t
ngx_http_modsecurity_handler(ngx_http_request_t *r) {
ngx_int_t rc = NULL;
ngx_int_t rc;
ngx_http_modsecurity_ctx_t *ctx = NULL;
ngx_http_modsecurity_loc_conf_t *cf = NULL;

Expand Down