<p>Richard Mudgett has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/9718">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_pjsip_endpoint_identifier_ip.c: Fix crash on non-generic headers.<br><br>The identify section's match_header method used code that assumed you were<br>matching a generic header. Any other type of header could cause a crash<br>if the header structure variant did not match the generic header enough.<br><br>* Made use code that will work for any header type instead of generic<br>headers.<br>* Made check all headers of the requested name.<br>* Added regex support to match_header so you could match a To: header<br>among other complex headers.<br><br>ASTERISK-27548<br><br>Change-Id: I27dfd4ff5e2259b906640e3c330681b76b4ed1f1<br>---<br>M CHANGES<br>M res/res_pjsip_endpoint_identifier_ip.c<br>2 files changed, 86 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/18/9718/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/CHANGES b/CHANGES</span><br><span>index 8116882..a5a34cb 100644</span><br><span>--- a/CHANGES</span><br><span>+++ b/CHANGES</span><br><span>@@ -19,6 +19,13 @@</span><br><span> when both 'SIP' and 'Q.850' Reason headers are received. This option allows</span><br><span> the 'Q.850' Reason header to be suppressed. The default value is 'no'.</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+res_pjsip_endpoint_identifier_ip</span><br><span style="color: hsl(120, 100%, 40%);">+------------------</span><br><span style="color: hsl(120, 100%, 40%);">+ * Added regex support to the identify section match_header option. You</span><br><span style="color: hsl(120, 100%, 40%);">+ specify a regex instead of an explicit string by surounding the header</span><br><span style="color: hsl(120, 100%, 40%);">+ value with slashes:</span><br><span style="color: hsl(120, 100%, 40%);">+ match_header = SIPHeader: /regex/</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ------------------------------------------------------------------------------</span><br><span> --- Functionality changes from Asterisk 13.21.0 to Asterisk 13.22.0 ----------</span><br><span> ------------------------------------------------------------------------------</span><br><span>diff --git a/res/res_pjsip_endpoint_identifier_ip.c b/res/res_pjsip_endpoint_identifier_ip.c</span><br><span>index e737b6f..8a56e84 100644</span><br><span>--- a/res/res_pjsip_endpoint_identifier_ip.c</span><br><span>+++ b/res/res_pjsip_endpoint_identifier_ip.c</span><br><span>@@ -42,7 +42,7 @@</span><br><span> <description></span><br><span> <para>This module provides alternatives to matching inbound requests to</span><br><span> a configured endpoint. At least one of the matching mechanisms</span><br><span style="color: hsl(0, 100%, 40%);">- must be provided, or the object configuration will be invalid.</para></span><br><span style="color: hsl(120, 100%, 40%);">+ must be provided, or the object configuration is invalid.</para></span><br><span> <para>The matching mechanisms are provided by the following</span><br><span> configuration options:</para></span><br><span> <enumlist></span><br><span>@@ -86,6 +86,13 @@</span><br><span> specified with a <literal>:</literal>, as in</span><br><span> <literal>match_header = SIPHeader: value</literal>.</span><br><span> </para></span><br><span style="color: hsl(120, 100%, 40%);">+ <para>The specified SIP header value can be a regular</span><br><span style="color: hsl(120, 100%, 40%);">+ expression if the value is of the form</span><br><span style="color: hsl(120, 100%, 40%);">+ /<replaceable>regex</replaceable>/.</span><br><span style="color: hsl(120, 100%, 40%);">+ </para></span><br><span style="color: hsl(120, 100%, 40%);">+ <note><para>Use of a regex is expensive so be sure you need</span><br><span style="color: hsl(120, 100%, 40%);">+ to use a regex to match your endpoint.</span><br><span style="color: hsl(120, 100%, 40%);">+ </para></note></span><br><span> </description></span><br><span> </configOption></span><br><span> <configOption name="type"></span><br><span>@@ -146,11 +153,14 @@</span><br><span> {</span><br><span> struct ip_identify_match *identify = obj;</span><br><span> struct pjsip_rx_data *rdata = arg;</span><br><span style="color: hsl(0, 100%, 40%);">- pjsip_generic_string_hdr *header;</span><br><span style="color: hsl(0, 100%, 40%);">- pj_str_t pj_header_name;</span><br><span style="color: hsl(0, 100%, 40%);">- pj_str_t pj_header_value;</span><br><span style="color: hsl(120, 100%, 40%);">+ pjsip_hdr *header;</span><br><span> char *c_header;</span><br><span> char *c_value;</span><br><span style="color: hsl(120, 100%, 40%);">+ pj_str_t pj_header_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ int len;</span><br><span style="color: hsl(120, 100%, 40%);">+ int header_present;</span><br><span style="color: hsl(120, 100%, 40%);">+ int is_regex;</span><br><span style="color: hsl(120, 100%, 40%);">+ regex_t regex_buf;</span><br><span> </span><br><span> if (ast_strlen_zero(identify->match_header)) {</span><br><span> return 0;</span><br><span>@@ -166,27 +176,77 @@</span><br><span> *c_value = '\0';</span><br><span> c_value++;</span><br><span> c_value = ast_strip(c_value);</span><br><span style="color: hsl(120, 100%, 40%);">+ len = strlen(c_value);</span><br><span style="color: hsl(120, 100%, 40%);">+ is_regex = 2 < len && c_value[0] == '/' && c_value[len - 1] == '/';</span><br><span style="color: hsl(120, 100%, 40%);">+ if (is_regex) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make "/regex/" into "regex" */</span><br><span style="color: hsl(120, 100%, 40%);">+ c_value[len - 1] = '\0';</span><br><span style="color: hsl(120, 100%, 40%);">+ ++c_value;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (regcomp(®ex_buf, c_value, REG_EXTENDED | REG_NOSUB)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(LOG_ERROR, "Identify '%s': Could not compile match_header regex: /%s/\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_sorcery_object_get_id(identify), c_value);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> pj_header_name = pj_str(c_header);</span><br><span style="color: hsl(0, 100%, 40%);">- header = pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &pj_header_name, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!header) {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check all headers of the given name for a match. */</span><br><span style="color: hsl(120, 100%, 40%);">+ header_present = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (header = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ (header = pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &pj_header_name, header));</span><br><span style="color: hsl(120, 100%, 40%);">+ header = header->next) {</span><br><span style="color: hsl(120, 100%, 40%);">+ char *pos;</span><br><span style="color: hsl(120, 100%, 40%);">+ char buf[PATH_MAX];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ header_present = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Print header line to buf */</span><br><span style="color: hsl(120, 100%, 40%);">+ len = pjsip_hdr_print_on(header, buf, sizeof(buf) - 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (len < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Buffer not large enough or no header vptr! */</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_assert(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[len] = '\0';</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Remove header name from pj_buf and trim blanks. */</span><br><span style="color: hsl(120, 100%, 40%);">+ pos = strchr(buf, ':');</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!pos) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* No header name? Bug in PJPROJECT if so. */</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_assert(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ ++pos;</span><br><span style="color: hsl(120, 100%, 40%);">+ pos = ast_strip(pos);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Does header value match what we are looking for? */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (is_regex) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!regexec(®ex_buf, pos, 0, NULL, 0)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ regfree(®ex_buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMP_MATCH;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (!strcmp(c_value, pos)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMP_MATCH;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_debug(3, "Identify '%s': SIP message has header '%s' but value '%s' does not match%s '%s'\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_sorcery_object_get_id(identify),</span><br><span style="color: hsl(120, 100%, 40%);">+ c_header,</span><br><span style="color: hsl(120, 100%, 40%);">+ pos,</span><br><span style="color: hsl(120, 100%, 40%);">+ is_regex ? " regex" : "",</span><br><span style="color: hsl(120, 100%, 40%);">+ c_value);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (is_regex) {</span><br><span style="color: hsl(120, 100%, 40%);">+ regfree(®ex_buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!header_present) {</span><br><span> ast_debug(3, "Identify '%s': SIP message does not have header '%s'\n",</span><br><span> ast_sorcery_object_get_id(identify),</span><br><span> c_header);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- pj_header_value = pj_str(c_value);</span><br><span style="color: hsl(0, 100%, 40%);">- if (pj_strcmp(&pj_header_value, &header->hvalue)) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_debug(3, "Identify '%s': SIP message has header '%s' but value '%.*s' does not match '%s'\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ast_sorcery_object_get_id(identify),</span><br><span style="color: hsl(0, 100%, 40%);">- c_header,</span><br><span style="color: hsl(0, 100%, 40%);">- (int) pj_strlen(&header->hvalue), pj_strbuf(&header->hvalue),</span><br><span style="color: hsl(0, 100%, 40%);">- c_value);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return CMP_MATCH;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> /*! \brief Comparator function for matching an object by IP address */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9718">change 9718</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/9718"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I27dfd4ff5e2259b906640e3c330681b76b4ed1f1 </div>
<div style="display:none"> Gerrit-Change-Number: 9718 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Mudgett <rmudgett@digium.com> </div>