[Asterisk-code-review] res pjsip session: Prevent user=phone being added to anonimi... (asterisk[15])

[dtryba]

dtryba has uploaded this change for review. ( https://gerrit.asterisk.org/6718


Change subject: res_pjsip_session: Prevent user=phone being added to anonimized URIs.
......................................................................

res_pjsip_session: Prevent user=phone being added to anonimized URIs.

Move ast_sip_add_usereqphone to be called after anonymization of URIs,
to prevent the user_eq_phone adding "user=phone" to URIs containing a
username that is not a phonenumber (RFC3261 19.1.1). An extra call to
ast_sip_add_usereqphone on the saved version before anonymization is
added to add user=phone" to the PAI.

ASTERISK-27047 #close

Change-Id: Ie5644bc66341b86dc08b1f7442210de2e6acdec6
---
M res/res_pjsip_session.c
1 file changed, 3 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/18/6718/1

diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c
index 49f2f17..cf7d512 100644
--- a/res/res_pjsip_session.c
+++ b/res/res_pjsip_session.c
@@ -1329,10 +1329,9 @@
 		pj_strdup2(dlg_pool, &dlg_info_uri->host, session->endpoint->fromdomain);
 	}
 
-	ast_sip_add_usereqphone(session->endpoint, dlg_pool, dlg_info->uri);
-
 	/* We need to save off the non-anonymized From for RPID/PAI generation (for domain) */
 	session->saved_from_hdr = pjsip_hdr_clone(dlg_pool, dlg_info);
+	ast_sip_add_usereqphone(session->endpoint, dlg_pool, session->saved_from_hdr->uri);
 
 	/* In chan_sip, fromuser and fromdomain trump restricted so we only
 	 * anonymize if they're not set.
@@ -1349,6 +1348,8 @@
 			pj_strdup2(dlg_pool, &dlg_info_uri->host, "anonymous.invalid");
 		}
 	}
+
+	ast_sip_add_usereqphone(session->endpoint, dlg_pool, dlg_info->uri);
 }
 
 int ast_sip_session_refresh(struct ast_sip_session *session,

-- 
To view, visit https://gerrit.asterisk.org/6718
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 15
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5644bc66341b86dc08b1f7442210de2e6acdec6
Gerrit-Change-Number: 6718
Gerrit-PatchSet: 1
Gerrit-Owner: dtryba <daniel at tryba.nl>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20171010/90c79cae/attachment-0001.html>