Skip to content

[feature] add proxy_protocol support #4

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

Open
kai08-cn wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[feature] add proxy_protocol support #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5aef0d6
[feature] add proxy_protocol support
kai08-cn Apr 12, 2021
0dd305b
[feature] add nginx directive to configure yunsuo on/off
kai08-cn Apr 12, 2021
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
79 changes: 72 additions & 7 deletions ngx_http_yunsuo_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ void* hMod;
HMODULE hMod;
#endif

typedef struct {
ngx_flag_t on;
} ngx_http_yunsuo_loc_conf_t;

static void *ngx_http_yunsuo_create_loc_conf(ngx_conf_t *cf);
static char *ngx_http_yunsuo_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child);

int use_ngx_plugin = 0;

typedef void (*frame_init_pt)();
Expand Down Expand Up @@ -546,7 +553,14 @@ void get_request_or_response_data_handler(void *request, void *data, int data_ty
{
if (r->connection && r->connection->addr_text.data)
{
store_data_by_type("Remote-Ip", 9, (char*)r->connection->addr_text.data, r->connection->addr_text.len, data, 0);
if ((0 == r->headers_in.x_forwarded_for.nelts) && (r->connection->proxy_protocol_addr.len != 0))
{
store_data_by_type("Remote-Ip", 9, (char*)(r->connection->proxy_protocol_addr.data), r->connection->proxy_protocol_addr.len, data, 0);
}
else
{
store_data_by_type("Remote-Ip", 9, (char*)r->connection->addr_text.data, r->connection->addr_text.len, data, 0);
}
}

if (r->connection && r->connection->listening && r->connection->listening->addr_text.data)
Expand Down Expand Up @@ -742,6 +756,13 @@ static ngx_int_t ngx_http_yunsuo_filter_init(ngx_conf_t *cf)

static ngx_command_t ngx_http_yunsuo_commands[] =
{
{ ngx_string("yunsuo"),
NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_flag_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_yunsuo_loc_conf_t, on),
NULL },

ngx_null_command
};

Expand All @@ -753,10 +774,33 @@ static ngx_http_module_t ngx_http_yunsuo_module_ctx =
NULL, /* init main configuration */
NULL, /* create server configuration */
NULL, /* merge server configuration */
NULL, /* create location configuration */
NULL /* merge location configuration */
ngx_http_yunsuo_create_loc_conf, /* create location configuration */
ngx_http_yunsuo_merge_loc_conf /* merge location configuration */
};

static void *
ngx_http_yunsuo_create_loc_conf(ngx_conf_t *cf)
{
ngx_http_yunsuo_loc_conf_t *conf;
conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_yunsuo_loc_conf_t));
if (conf == NULL) {
return NULL;
}
conf->on = NGX_CONF_UNSET;
return conf;
}

static char *
ngx_http_yunsuo_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
{
ngx_http_yunsuo_loc_conf_t *prev = parent;
ngx_http_yunsuo_loc_conf_t *conf = child;

ngx_conf_merge_value(conf->on, prev->on, 0);

return NGX_CONF_OK;
}


ngx_module_t ngx_http_yunsuo_module = {
#if defined (SHARELIB)
Expand Down Expand Up @@ -784,7 +828,12 @@ static ngx_int_t ngx_http_yunsuo_header_filter(ngx_http_request_t *r)
{
return ngx_http_next_header_filter(r);
}
response_header_check(r);
ngx_http_yunsuo_loc_conf_t *lcf;
lcf = ngx_http_get_module_loc_conf(r, ngx_http_yunsuo_module);
if (lcf->on)
{
response_header_check(r);
}
return ngx_http_next_header_filter(r);
}

Expand All @@ -797,7 +846,11 @@ static ngx_int_t ngx_http_yunsuo_body_filter(ngx_http_request_t *r, ngx_chain_t
return ngx_http_next_body_filter(r, *dpIn);
}

response_body_check(r, (void**)dpIn);
ngx_http_yunsuo_loc_conf_t *lcf;
lcf = ngx_http_get_module_loc_conf(r, ngx_http_yunsuo_module);
if (lcf->on){
response_body_check(r, (void**)dpIn);
}
return ngx_http_next_body_filter(r, *dpIn);
}

Expand All @@ -813,7 +866,13 @@ int ngx_http_yunsuo_post_in_handler(ngx_http_request_t *r)
return 0;
}

return post_in_check(r, NULL);
ngx_http_yunsuo_loc_conf_t *lcf;
lcf = ngx_http_get_module_loc_conf(r, ngx_http_yunsuo_module);
if (lcf->on)
{
return post_in_check(r, NULL);
}
return 0;
}

static ngx_int_t ngx_http_yunsuo_handler(ngx_http_request_t *r)
Expand All @@ -835,6 +894,12 @@ static ngx_int_t ngx_http_yunsuo_handler(ngx_http_request_t *r)
return NGX_DECLINED;
}

return request_check(r, r->method);
gx_http_yunsuo_loc_conf_t *lcf;
lcf = ngx_http_get_module_loc_conf(r, ngx_http_yunsuo_module);
if (lcf->on)
{
return request_check(r, r->method);
}
return NGX_DECLINED;
}