[asterisk-dev] [Code Review] RFC compliant uri and display-name encode/decode

[Olle E. Johansson]

22 jan 2010 kl. 17.32 skrev David Vossel:

> 
> 
>> On 2010-01-22 08:43:23, Nick Lewis wrote:
>>> There are a number of other headers that contain uris. One such header is "p-asserted-id". Without checking the abnf I guess that the following headers may also contain uris: "remote-party-id", "diversion", "refer-to", "referred-by", "also". If so they will all benefit from a dose of parse_uri and SIP_PEDANTIC_DECODE. Come to think of it some may also contain display names and benefit from get_calleridname.
> 
> You have made some very valid points.  These issues should be addressed, but for the interested of getting this code through I want to put some bounds on the discussion only as it relates to this review.  I have several changes I believe should be made as well.  Personally I think decoding only when pedantic is on should completely go away, but this is outside the scope of this review.  We need to make progress by getting this committed.
Kevin and I agreed to remove pedantic in trunk for decoding, so I'll go ahead and do just that at some point in the near future. It's just stupid to keep it.

/O
> 
> With that said, please limit the review of this issue directly to the functionality of the new encode/decode functions and any code that is directly affected by this.  The only reason I changed some code to break up URIs with the parse_uri function was because it was necessary in order to properly parse the uri and decode its separate parts. I only did this with URIs that were already being decoded.
> 
> 
> - David
> 
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/469/#review1391
> -----------------------------------------------------------
> 
> 
> On 2010-01-21 18:36:47, David Vossel wrote:
>> 
>> -----------------------------------------------------------
>> This is an automatically generated e-mail. To reply, visit:
>> https://reviewboard.asterisk.org/r/469/
>> -----------------------------------------------------------
>> 
>> (Updated 2010-01-21 18:36:47)
>> 
>> 
>> Review request for Asterisk Developers.
>> 
>> 
>> Summary
>> -------
>> 
>> Parts of this patch were posted in separate reviews a few weeks ago.  During the discussion of those patches I took down the reviews as I felt the code was not complete.  This review is a combination of the two uri encode/decode patches, a complete rewrite of the get_calleridname() function, and the addition of two new unit tests.  These changes are in response to (issue #16299) and are a compilation of code written by both wdoekes and myself.
>> 
>> ------Changes------
>> 
>> 1.  URI Encoding
>> 
>> This patch changes ast_uri_encode()'s behavior when doreserved is enabled.  Previously when doreserved was enabled only a small set of reserved characters were encoded.  This set was comprised primarily of the reserved characters defined in RFC3261 section 25.1, but contained other characters as well.  Rather than only escaping the reserved set, doreserved now escapes all characters not within the unreserved set as defined by RFC 3261 and RFC 2396.  Also, the 'doreserved' variable has been renamed to 'do_special_char' in attempts to avoid confusion.
>> 
>> When doreserve is not enabled, the previous logic of only encoding the characters <= 0X1F and > 0X7f remains, except for the '%' character, which must always be encoded as it signifies a HEX escaped character during the decode process.
>> 
>> In RFC 3261 and RFC 2396 the unreserved character set is defined by all alphanumeric characters and a small number of characters defined in the mark set.
>> mark        =  "-" / "_" / "." / "!" / "~" / "*" / "'" / "(" / ")"
>> unreserved  =  alphanum / mark
>> 
>> 2. URI Decoding: Break up URI before decode.
>> 
>> In chan_sip.c ast_uri_decode is called on the entire URI instead of it's individual parts after it is parsed.  This is not good as ast_uri_decode can introduce special characters back into the URI which can mess up parsing.  This patch resolves this by not decoding a URI until parsing is completely done.  There are many instances where we check to see if pedantic checking is enabled before we decode a URI.  In these cases a new macro, SIP_PEDANTIC_DECODE, is used on the individual parsed segments of the URI rather than constantly putting if (pedantic) { decode() } checks everywhere in the code.  In the areas where ast_uri_decode is not dependent upon pedantic checking this macro is not used, but decoding is still moved to each individual part of the URI.  The only behavior that should change from this patch is the time at which decoding occurs.
>> 
>> Since I had to look over every place URI parsing occurs to create this patch, I found several places where we use duplicate code for parsing.  To consolidate the code, those areas have updated to use the parse_uri() function where possible.
>> 
>> 3. SIP display-name decoding according to RFC3261 section 25.
>> 
>> To properly decode the display-name portion of a FROM header, chan_sip's get_calleridname() function required a complete re-write.  More information about this change can be found in the comments at the beginning of this function.
>> 
>> 4. Unit Tests.
>> 
>> Unit tests for ast_uri_encode, ast_uri_decode, and get_calleridname() have been written.  This involved the addition of the test_utils.c file for testing the utils api.
>> 
>> 
>> Diffs
>> -----
>> 
>>  /trunk/include/asterisk/utils.h 242134 
>>  /trunk/main/test.c 242134 
>>  /trunk/main/test_utils.c PRE-CREATION 
>>  /trunk/channels/chan_sip.c 242134 
>>  /trunk/main/utils.c 242134 
>> 
>> Diff: https://reviewboard.asterisk.org/r/469/diff
>> 
>> 
>> Testing
>> -------
>> 
>> - new unit tests pass
>> - verified SIP registrations, calls, and transfers work correctly within my test environment
>> 
>> 
>> Thanks,
>> 
>> David
>> 
>> 
> 
> 
> -- 
> _____________________________________________________________________
> -- Bandwidth and Colocation Provided by http://www.api-digital.com --
> 
> asterisk-dev mailing list
> To UNSUBSCRIBE or update options visit:
>   http://lists.digium.com/mailman/listinfo/asterisk-dev

---
* Olle E Johansson - oej at edvina.net
* Cell phone +46 70 593 68 51, Office +46 8 96 40 20, Sweden