Skip to content

add forward_auth to redirect parameters from source to target with push #1657

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add forward_auth to redirect parameters from source to target with push #1657

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f05e754
add forward_auth to redirect parameters from source to target with push
younes200 Jan 11, 2022
5453e97
fix warning
younes200 Jan 11, 2022
e04ee27
fix comparison between signed and unsigned warning
younes200 Jan 11, 2022
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
63 changes: 57 additions & 6 deletions ngx_rtmp_relay_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ typedef struct {
ngx_msec_t push_reconnect;
ngx_msec_t pull_reconnect;
ngx_rtmp_relay_ctx_t **ctx;
ngx_flag_t forward_auth;
} ngx_rtmp_relay_app_conf_t;


Expand Down Expand Up @@ -121,6 +122,12 @@ static ngx_command_t ngx_rtmp_relay_commands[] = {
NGX_RTMP_APP_CONF_OFFSET,
offsetof(ngx_rtmp_relay_app_conf_t, session_relay),
NULL },
{ ngx_string("forward_auth"),
NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
ngx_conf_set_flag_slot,
NGX_RTMP_APP_CONF_OFFSET,
offsetof(ngx_rtmp_relay_app_conf_t, forward_auth),
NULL },


ngx_null_command
Expand Down Expand Up @@ -191,7 +198,7 @@ ngx_rtmp_relay_create_app_conf(ngx_conf_t *cf)
racf->session_relay = NGX_CONF_UNSET;
racf->push_reconnect = NGX_CONF_UNSET_MSEC;
racf->pull_reconnect = NGX_CONF_UNSET_MSEC;

racf->forward_auth = NGX_CONF_UNSET;
return racf;
}

Expand All @@ -211,6 +218,7 @@ ngx_rtmp_relay_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
3000);
ngx_conf_merge_msec_value(conf->pull_reconnect, prev->pull_reconnect,
3000);
ngx_conf_merge_value(conf->forward_auth, prev->forward_auth, 0);

return NGX_CONF_OK;
}
Expand Down Expand Up @@ -671,8 +679,32 @@ ngx_rtmp_relay_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
goto next;
}

name.len = ngx_strlen(v->name);
name.data = v->name;
//safe adding args (auth) to the name
if(racf->forward_auth)
{
ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
"relay: name='%s' args='%s'",
v->name, v->args);

name.len = ngx_strlen(v->name) + ngx_strlen(v->args) + 1;
name.data = ngx_palloc(s->connection->pool, name.len + 1);

if (name.data == NULL) {
ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
"what the heck");
return NGX_ERROR;
}
*ngx_cpymem(name.data, v->name, ngx_strlen(v->name)) = 0;
u_char q[1];
q[0] = '?';
*ngx_cpymem(name.data + ngx_strlen(v->name), q, 1) = 0;
*ngx_cpymem(name.data +ngx_strlen(v->name)+1,v->args, ngx_strlen(v->args)) = 0;
}
else
{
name.len = ngx_strlen(v->name) ;
name.data = v->name;
}

t = racf->pushes.elts;
for (n = 0; n < racf->pushes.nelts; ++n, ++t) {
Expand All @@ -685,6 +717,11 @@ ngx_rtmp_relay_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
}

if (ngx_rtmp_relay_push(s, &name, target) == NGX_OK) {
ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
"relay: push succeed name='%V' app='%V' "
"playpath='%V' url='%V'",
&name, &target->app, &target->play_path,
&target->url.url);
continue;
}

Expand Down Expand Up @@ -762,12 +799,26 @@ ngx_rtmp_relay_play_local(ngx_rtmp_session_t *s)
if (ctx == NULL) {
return NGX_ERROR;
}

int arg_pos = 0;
for(int c = 0 ; c < (int)(ctx->name.len) ; c++)
{
if (ctx->name.data[c] == '?')
{
arg_pos = c;
}
}
ngx_memzero(&v, sizeof(ngx_rtmp_play_t));
v.silent = 1;
*(ngx_cpymem(v.name, ctx->name.data,
if(arg_pos != 0)
*(ngx_cpymem(v.name, ctx->name.data,
arg_pos)) = 0;
else
*(ngx_cpymem(v.name, ctx->name.data,
ngx_min(sizeof(v.name) - 1, ctx->name.len))) = 0;


ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
"relay: play name='%s'",
v.name);
return ngx_rtmp_play(s, &v);
}

Expand Down