opensource/nginx-rtmp-module
1
0
Fork 0
mirror of https://github.com/arut/nginx-rtmp-module.git synced 2025-08-06 15:00:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactored & restyled access module; implemented access inheritance from higher config levels

Browse Source
This commit is contained in:
Roman Arutyunyan
2012-10-04 11:25:51 +04:00
parent 83aa7b9e89
commit cc632eb6b6
1 changed files with 87 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
ngx_rtmp_access_module.c
View File

@ -46,9 +46,9 @@ typedef struct {
typedef struct { typedef struct {
ngx_array_t *rules; /* array of ngx_rtmp_access_rule_t */ ngx_array_t rules; /* array of ngx_rtmp_access_rule_t */
#if (NGX_HAVE_INET6) #if (NGX_HAVE_INET6)
ngx_array_t *rules6; /* array of ngx_rtmp_access_rule6_t */ ngx_array_t rules6; /* array of ngx_rtmp_access_rule6_t */
#endif #endif
} ngx_rtmp_access_app_conf_t; } ngx_rtmp_access_app_conf_t;
@ -111,13 +111,67 @@ ngx_rtmp_access_create_app_conf(ngx_conf_t *cf)
return NULL; return NULL;
} }
if (ngx_array_init(&aacf->rules, cf->pool, 1,
sizeof(ngx_rtmp_access_rule_t))
!= NGX_OK)
{
return NULL;
}
#if (NGX_HAVE_INET6)
if (ngx_array_init(&aacf->rules6, cf->pool, 1,
sizeof(ngx_rtmp_access_rule6_t))
!= NGX_OK)
{
return NULL;
}
#endif
return aacf; return aacf;
} }
static ngx_int_t
ngx_rtmp_access_merge_rules(ngx_array_t *prev, ngx_array_t *rules)
{
void *p;
if (prev->nelts == 0) {
return NGX_OK;
}
if (rules->nelts == 0) {
*rules = *prev;
return NGX_OK;
}
p = ngx_array_push_n(rules, prev->nelts);
if (p == NULL) {
return NGX_ERROR;
}
ngx_memcpy(p, prev->elts, prev->size * prev->nelts);
return NGX_OK;
}
static char * static char *
ngx_rtmp_access_merge_app_conf(ngx_conf_t *cf, void *parent, void *child) ngx_rtmp_access_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
{ {
ngx_rtmp_access_app_conf_t *prev = parent;
ngx_rtmp_access_app_conf_t *conf = child;
if (ngx_rtmp_access_merge_rules(&prev->rules, &conf->rules) != NGX_OK) {
return NGX_CONF_ERROR;
}
#if (NGX_HAVE_INET6)
if (ngx_rtmp_access_merge_rules(&prev->rules6, &conf->rules6) != NGX_OK) {
return NGX_CONF_ERROR;
}
#endif
return NGX_CONF_OK; return NGX_CONF_OK;
} }
@ -136,23 +190,22 @@ ngx_rtmp_access_found(ngx_rtmp_session_t *s, ngx_uint_t deny)
static ngx_int_t static ngx_int_t
ngx_rtmp_access_inet(ngx_rtmp_session_t *s, ngx_rtmp_access_inet(ngx_rtmp_session_t *s, in_addr_t addr, ngx_uint_t flag)
ngx_rtmp_access_app_conf_t *ascf,
in_addr_t addr, ngx_uint_t flag)
{ {
ngx_uint_t i; ngx_uint_t i;
ngx_rtmp_access_rule_t *rule; ngx_rtmp_access_rule_t *rule;
ngx_rtmp_access_app_conf_t *ascf;
rule = ascf->rules->elts; ascf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_access_module);
for (i = 0; i < ascf->rules->nelts; i++) {
rule = ascf->rules.elts;
for (i = 0; i < ascf->rules.nelts; i++) {
ngx_log_debug3(NGX_LOG_DEBUG_HTTP, s->connection->log, 0, ngx_log_debug3(NGX_LOG_DEBUG_HTTP, s->connection->log, 0,
"access: %08XD %08XD %08XD", "access: %08XD %08XD %08XD",
addr, rule[i].mask, rule[i].addr); addr, rule[i].mask, rule[i].addr);
if ((addr & rule[i].mask) == rule[i].addr if ((addr & rule[i].mask) == rule[i].addr && (flag & rule[i].flags)) {
&& flag & rule[i].flags)
{
return ngx_rtmp_access_found(s, rule[i].deny); return ngx_rtmp_access_found(s, rule[i].deny);
} }
} }
@ -164,16 +217,17 @@ ngx_rtmp_access_inet(ngx_rtmp_session_t *s,
#if (NGX_HAVE_INET6) #if (NGX_HAVE_INET6)
static ngx_int_t static ngx_int_t
ngx_rtmp_access_inet6(ngx_rtmp_session_t *s, ngx_rtmp_access_inet6(ngx_rtmp_session_t *s, u_char *p, ngx_uint_t flag)
ngx_rtmp_access_app_conf_t *ascf,
u_char *p, ngx_uint_t flag)
{ {
ngx_uint_t n; ngx_uint_t n;
ngx_uint_t i; ngx_uint_t i;
ngx_rtmp_access_rule6_t *rule6; ngx_rtmp_access_rule6_t *rule6;
ngx_rtmp_access_app_conf_t *ascf;
rule6 = ascf->rules6->elts; ascf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_access_module);
for (i = 0; i < ascf->rules6->nelts; i++) {
rule6 = ascf->rules6.elts;
for (i = 0; i < ascf->rules6.nelts; i++) {
#if (NGX_DEBUG) #if (NGX_DEBUG)
{ {
@ -223,7 +277,6 @@ ngx_rtmp_access(ngx_rtmp_session_t *s, ngx_uint_t flag)
#endif #endif
ascf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_access_module); ascf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_access_module);
if (ascf == NULL) { if (ascf == NULL) {
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, s->connection->log, 0, ngx_log_debug0(NGX_LOG_DEBUG_HTTP, s->connection->log, 0,
"access: NULL app conf"); "access: NULL app conf");
@ -238,12 +291,8 @@ ngx_rtmp_access(ngx_rtmp_session_t *s, ngx_uint_t flag)
switch (s->connection->sockaddr->sa_family) { switch (s->connection->sockaddr->sa_family) {
case AF_INET: case AF_INET:
if (ascf->rules) {
sin = (struct sockaddr_in *) s->connection->sockaddr; sin = (struct sockaddr_in *) s->connection->sockaddr;
return ngx_rtmp_access_inet(s, ascf, return ngx_rtmp_access_inet(s, sin->sin_addr.s_addr, flag);
sin->sin_addr.s_addr, flag);
}
break;
#if (NGX_HAVE_INET6) #if (NGX_HAVE_INET6)
@ -251,23 +300,20 @@ ngx_rtmp_access(ngx_rtmp_session_t *s, ngx_uint_t flag)
sin6 = (struct sockaddr_in6 *) s->connection->sockaddr; sin6 = (struct sockaddr_in6 *) s->connection->sockaddr;
p = sin6->sin6_addr.s6_addr; p = sin6->sin6_addr.s6_addr;
if (ascf->rules && IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) { if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
addr = p[12] << 24; addr = p[12] << 24;
addr += p[13] << 16; addr += p[13] << 16;
addr += p[14] << 8; addr += p[14] << 8;
addr += p[15]; addr += p[15];
return ngx_rtmp_access_inet(s, ascf, htonl(addr), flag); return ngx_rtmp_access_inet(s, htonl(addr), flag);
} }
if (ascf->rules6) { return ngx_rtmp_access_inet6(s, p, flag);
return ngx_rtmp_access_inet6(s, ascf, p, flag);
}
#endif #endif
} }
return NGX_OK; return NGX_OK;
} }
@ -295,22 +341,23 @@ ngx_rtmp_access_rule(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
flags = 0; flags = 0;
if (cf->args->nelts == 2) { if (cf->args->nelts == 2) {
flags = NGX_RTMP_ACCESS_PUBLISH | NGX_RTMP_ACCESS_PLAY; flags = NGX_RTMP_ACCESS_PUBLISH | NGX_RTMP_ACCESS_PLAY;
} else { } else {
for(; n < cf->args->nelts - 1; ++n) { for(; n < cf->args->nelts - 1; ++n) {
if (value[n].len == sizeof("publish") - 1 if (value[n].len == sizeof("publish") - 1 &&
&& ngx_strcmp(value[1].data, "publish") == 0) ngx_strcmp(value[1].data, "publish") == 0)
{ {
flags |= NGX_RTMP_ACCESS_PUBLISH; flags |= NGX_RTMP_ACCESS_PUBLISH;
continue; continue;
} }
if (value[n].len == sizeof("play") - 1 if (value[n].len == sizeof("play") - 1 &&
&& ngx_strcmp(value[1].data, "play") == 0) ngx_strcmp(value[1].data, "play") == 0)
{ {
flags |= NGX_RTMP_ACCESS_PLAY; flags |= NGX_RTMP_ACCESS_PLAY;
continue; continue;
@ -337,7 +384,8 @@ ngx_rtmp_access_rule(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
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]);
} }
} }
@ -347,14 +395,6 @@ ngx_rtmp_access_rule(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
case AF_INET6: case AF_INET6:
case 0: /* all */ case 0: /* all */
if (ascf->rules6 == NULL) {
ascf->rules6 = ngx_array_create(cf->pool, 4,
sizeof(ngx_rtmp_access_rule6_t));
if (ascf->rules6 == NULL) {
return NGX_CONF_ERROR;
}
}
rule6 = ngx_array_push(ascf->rules6); rule6 = ngx_array_push(ascf->rules6);
if (rule6 == NULL) { if (rule6 == NULL) {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
@ -374,15 +414,7 @@ ngx_rtmp_access_rule(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
default: /* AF_INET */ default: /* AF_INET */
if (ascf->rules == NULL) { rule = ngx_array_push(&ascf->rules);
ascf->rules = ngx_array_create(cf->pool, 4,
sizeof(ngx_rtmp_access_rule_t));
if (ascf->rules == NULL) {
return NGX_CONF_ERROR;
}
}
rule = ngx_array_push(ascf->rules);
if (rule == NULL) { if (rule == NULL) {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }