kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-15 17:27:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARI: Don't leak implementation details

Browse Source 
This change prevents channels used as implementation details from
leaking out to ARI. It does this by preventing creation of JSON blobs
of channel snapshots created from those channels and sanitizing JSON
blobs of bridge snapshots as they are created. This introduces a
framework for excluding information from output targeted at Stasis
applications on a consumer-by-consumer basis using channel sanitization
callbacks which could be extended to bridges or endpoints if necessary.

This prevents unhelpful error messages from being generated by
ast_json_pack.

This also corrects a bug where BridgeCreated events would not be
created.

(closes issue ASTERISK-22744)
Review: https://reviewboard.asterisk.org/r/2987/
Reported by: David M. Lee
........

Merged revisions 403069 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2013-11-22 20:10:46 +00:00
parent 1c45a32ee8
commit d9015a5356
16 changed files with 314 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
res/res_stasis.c
View File

@@ -627,6 +627,7 @@ static int send_start_msg(struct app *app, struct ast_channel *chan,
struct ast_json *json_args;
int i;
struct stasis_message_sanitizer *sanitize = stasis_app_get_sanitizer();
ast_assert(chan != NULL);
@@ -636,11 +637,16 @@ static int send_start_msg(struct app *app, struct ast_channel *chan,
return -1;
}
if (sanitize && sanitize->channel_snapshot
&& sanitize->channel_snapshot(snapshot)) {
return 0;
}
msg = ast_json_pack("{s: s, s: o, s: [], s: o}",
"type", "StasisStart",
"timestamp", ast_json_timeval(ast_tvnow(), NULL),
"args",
"channel", ast_channel_snapshot_to_json(snapshot));
"channel", ast_channel_snapshot_to_json(snapshot, NULL));
if (!msg) {
return -1;
}
@@ -665,6 +671,7 @@ static int send_end_msg(struct app *app, struct ast_channel *chan)
{
RAII_VAR(struct ast_json *, msg, NULL, ast_json_unref);
RAII_VAR(struct ast_channel_snapshot *, snapshot, NULL, ao2_cleanup);
struct stasis_message_sanitizer *sanitize = stasis_app_get_sanitizer();
ast_assert(chan != NULL);
@@ -674,10 +681,15 @@ static int send_end_msg(struct app *app, struct ast_channel *chan)
return -1;
}
if (sanitize && sanitize->channel_snapshot
&& sanitize->channel_snapshot(snapshot)) {
return 0;
}
msg = ast_json_pack("{s: s, s: o, s: o}",
"type", "StasisEnd",
"timestamp", ast_json_timeval(ast_tvnow(), NULL),
"channel", ast_channel_snapshot_to_json(snapshot));
"channel", ast_channel_snapshot_to_json(snapshot, NULL));
if (!msg) {
return -1;
}
@@ -1153,6 +1165,34 @@ static int unload_module(void)
return 0;
}
/* \brief Sanitization callback for channel snapshots */
static int channel_snapshot_sanitizer(const struct ast_channel_snapshot *snapshot)
{
if (!snapshot || !(snapshot->tech_properties & AST_CHAN_TP_INTERNAL)) {
return 0;
}
return 1;
}
/* \brief Sanitization callback for channel unique IDs */
static int channel_id_sanitizer(const char *id)
{
RAII_VAR(struct ast_channel_snapshot *, snapshot, ast_channel_snapshot_get_latest(id), ao2_cleanup);
return channel_snapshot_sanitizer(snapshot);
}
/* \brief Sanitization callbacks for communication to Stasis applications */
struct stasis_message_sanitizer app_sanitizer = {
.channel_id = channel_id_sanitizer,
.channel_snapshot = channel_snapshot_sanitizer,
};
struct stasis_message_sanitizer *stasis_app_get_sanitizer(void)
{
return &app_sanitizer;
}
static int load_module(void)
{
apps_registry = ao2_container_alloc(APPS_NUM_BUCKETS, app_hash, app_compare);