kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip_registrar: Validate Contact URI before adding to responses"

Browse Source
This commit is contained in:
Friendly Automation
2019-09-26 04:50:26 -05:00
committed by Gerrit Code Review
parent f156391176 982a5025b3
commit eccfa323a5
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
res/res_pjsip_registrar.c
View File

@@ -224,14 +224,21 @@ static int registrar_add_contact(void *obj, void *arg, int flags)
{ {
struct ast_sip_contact *contact = obj; struct ast_sip_contact *contact = obj;
pjsip_tx_data *tdata = arg; pjsip_tx_data *tdata = arg;
pjsip_contact_hdr *hdr = pjsip_contact_hdr_create(tdata->pool);
pj_str_t uri; pj_str_t uri;
pjsip_uri *parsed;
pj_strdup2_with_null(tdata->pool, &uri, contact->uri); pj_strdup2_with_null(tdata->pool, &uri, contact->uri);
hdr->uri = pjsip_parse_uri(tdata->pool, uri.ptr, uri.slen, PJSIP_PARSE_URI_AS_NAMEADDR); parsed = pjsip_parse_uri(tdata->pool, uri.ptr, uri.slen, PJSIP_PARSE_URI_AS_NAMEADDR);
hdr->expires = ast_tvdiff_ms(contact->expiration_time, ast_tvnow()) / 1000;
pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)hdr); if (parsed && (PJSIP_URI_SCHEME_IS_SIP(parsed) || PJSIP_URI_SCHEME_IS_SIPS(parsed))) {
pjsip_contact_hdr *hdr = pjsip_contact_hdr_create(tdata->pool);
hdr->uri = parsed;
hdr->expires = ast_tvdiff_ms(contact->expiration_time, ast_tvnow()) / 1000;
pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr *) hdr);
} else {
ast_log(LOG_WARNING, "Skipping invalid Contact URI \"%.*s\" for AOR %s\n",
(int) uri.slen, uri.ptr, contact->aor);
}
return 0; return 0;
} }