sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
426 discussions

[kamailio/kamailio] core: parser - allow more chars in mime type (#1055)

by Camille Oudot

allow any char allowed in the **token** definition: https://tools.ietf.org/html/rfc3261#section-25.1 this should fix #1053 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1055 -- Commit Summary -- * core: parser - allow more chars in mime type -- File Changes -- M src/core/parser/parse_content.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1055.patch https://github.com/kamailio/kamailio/pull/1055.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1055

7 years, 7 months

Re: [sr-dev] qpid-proton and rabbitmq (and Kamailio kazoo module)

by Daniel Pocock

On 30/03/17 13:25, Gordon Sim wrote: > On 30/03/17 09:52, Daniel Pocock wrote: >> Sending to RabbitMQ with qpid-proton python >> ------------------------------------------- >> >> I started with the simple_send.py[3] example and trimmed it down to send >> a single string and then stop: >> >> def on_sendable(self, event): >> if self.msg_body is not None: >> print("on_sendable !") >> print ("sending : %s" % (self.msg_body,)) >> msg = Message(body=self.msg_body) >> event.sender.send(msg) >> self.msg_body = None >> >> I found that the connection to RabbitMQ would be dropped and an error >> would appear in the RabbitMQ log. I tried changing the body type to a >> dict containing a string, e.g. {'my_body':'foo'} and then it would >> successfully pass the message to RabbitMQ but then the receiver would >> complain that it was a map and not a string. >> >> I found that the problem could be fixed by adding "inferred=True" to the >> Message constructor: >> >> msg = Message(body=self.msg_body, inferred=True) > > > The python proton library will encode a binary message body as a Data > section if inferred is not set to true (otherwise as a binary value in a > Value section). RabbitMQ does not support Data sections yet I believe. > Is there a bug or feature request for Data sections in RabbitMQ? I couldn't find their bug tracker. I've opened a bug report[1] against the Debian package. > As Robbie mentioned, in python 2.x string literals are not always > explicitly utf8 and are then treated as binary. You can either do u'my > utf8' or import unicode_literals from __future__. If you do that then > you should get a Value section regardless of the inferred property. > In my case the strings are coming from the command line, so now I change the string to unicode like this: _s = unicode(s, "utf-8") and then: a) I can send without inferred=True and the broker accepts the message b) in the C++ receiver, the message is now received as a string and I can use: _json = proton::get<std::string>(m.body()); Could this be made more obvious in the examples perhaps, e.g. helloworld.py could change from: event.sender.send(Message(body="Hello World!")) to event.sender.send(Message(body=unicode("Hello World!", "utf-8"))) I realize that is a bit verbose and redundant when you already have unicode_literals, but for people who are cutting and pasting from the examples they will get up and running more quickly. >> Below is a complete example of the error from the RabbitMQ log when >> inferred=True is not present, the body in this case was the string "foo" >> >> >> Receiving from RabbitMQ with qpid-proton C++ >> -------------------------------------------- >> >> I looked at the receive example simple_recv.cpp[4] and other examples >> and noticed code like this being used to access the message body as >> std::string: >> >> proton::get<std::string>(m.body()) >> >> However, that didn't work for me, it threw a conversion_error exception >> "unexpected type, want: string got: binary" complaining that the body >> was binary. I had to use something like this to convert my message body >> to a std::string: >> >> proton::binary __b = proton::get<proton::binary>(m.body()); >> std::string _s = (std::string)__b; >> >> If I send a string from Python, should it appear as binary in the >> receiver? > > As above it sounds like the message *is* actually being sent as a binary. > >> What is the suggested way to write a receiver that can handle >> any arbitrary message that started as a string and may arrive in some >> other format, especially if the message broker or client is changed at >> some arbitrary time in the future? >> >> I also observed similar issues receiving messages that had been sent >> into RabbitMQ by Kamailio's kazoo module[5], it is linked with the >> librabbitmq client library. > > I'm assuming that is sending over AMQP 0-10. If so, how that is > converted into AMQP 1.0 is dependent on the RabbitMQ implementation. It > may well be always sent as a binary value. However hopefully it would > have a content-type to indicate how to interpret the data (though > structly speaking the AMQP 1.0 spec disallows that). > The kazoo module source code is on Github[2], I had a quick look at it and it isn't immediately obvious to me which AMQP version it uses or which data type it is using for the message body. Is anybody more familiar with AMQP C client programming able to spot any keywords in that code that suggest what it is doing? I've added the kazoo module developers on CC in case they can comment on this, it would be useful to answer this in the module's README file. Regards, Daniel 1. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=859399 2. https://github.com/sipwise/kamailio/tree/master/modules/kazoo

7 years, 7 months

git:5.0:bec8ca37: db_oracle: avoid double free on connection error

by Ovidiu Sas

Module: kamailio Branch: 5.0 Commit: bec8ca379781bccb271591a270840f93b4d1af40 URL: https://github.com/kamailio/kamailio/commit/bec8ca379781bccb271591a270840f9… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-04-03T11:15:09-04:00 db_oracle: avoid double free on connection error (cherry picked from commit 6d9e0202b1817aa19bfaf4502749d817d54f850a) --- Modified: src/modules/db_oracle/ora_con.c --- Diff: https://github.com/kamailio/kamailio/commit/bec8ca379781bccb271591a270840f9… Patch: https://github.com/kamailio/kamailio/commit/bec8ca379781bccb271591a270840f9… --- diff --git a/src/modules/db_oracle/ora_con.c b/src/modules/db_oracle/ora_con.c index 8c84126..a18c925 100644 --- a/src/modules/db_oracle/ora_con.c +++ b/src/modules/db_oracle/ora_con.c @@ -153,7 +153,6 @@ void db_oracle_free_connection(ora_con_t* con) OCIHandleFree(con->errhp, OCI_HTYPE_ERROR); if (con->envhp) OCIHandleFree(con->envhp, OCI_HTYPE_ENV); - free_db_id(con->hdr.id); pkg_free(con); }

7 years, 7 months

git:master:6d9e0202: db_oracle: avoid double free on connection error

by Ovidiu Sas

Module: kamailio Branch: master Commit: 6d9e0202b1817aa19bfaf4502749d817d54f850a URL: https://github.com/kamailio/kamailio/commit/6d9e0202b1817aa19bfaf4502749d81… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-04-03T11:12:48-04:00 db_oracle: avoid double free on connection error --- Modified: src/modules/db_oracle/ora_con.c --- Diff: https://github.com/kamailio/kamailio/commit/6d9e0202b1817aa19bfaf4502749d81… Patch: https://github.com/kamailio/kamailio/commit/6d9e0202b1817aa19bfaf4502749d81… --- diff --git a/src/modules/db_oracle/ora_con.c b/src/modules/db_oracle/ora_con.c index 8c84126..a18c925 100644 --- a/src/modules/db_oracle/ora_con.c +++ b/src/modules/db_oracle/ora_con.c @@ -153,7 +153,6 @@ void db_oracle_free_connection(ora_con_t* con) OCIHandleFree(con->errhp, OCI_HTYPE_ERROR); if (con->envhp) OCIHandleFree(con->envhp, OCI_HTYPE_ENV); - free_db_id(con->hdr.id); pkg_free(con); }

7 years, 7 months

git:master:ccdf6b81: Merge pull request #1036 from lbalaceanu/fix_nocdr_restart

by GitHub

Module: kamailio Branch: master Commit: ccdf6b81f1eb591ba4bb0f6e023992b21720fc58 URL: https://github.com/kamailio/kamailio/commit/ccdf6b81f1eb591ba4bb0f6e023992b… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: GitHub <noreply(a)github.com> Date: 2017-04-03T17:40:44+03:00 Merge pull request #1036 from lbalaceanu/fix_nocdr_restart Fix for no cdr after Kamailio 5.0 restart --- Modified: src/modules/acc/acc_cdr.c --- Diff: https://github.com/kamailio/kamailio/commit/ccdf6b81f1eb591ba4bb0f6e023992b… Patch: https://github.com/kamailio/kamailio/commit/ccdf6b81f1eb591ba4bb0f6e023992b… --- diff --git a/src/modules/acc/acc_cdr.c b/src/modules/acc/acc_cdr.c index f9b25eb..4ffab23 100644 --- a/src/modules/acc/acc_cdr.c +++ b/src/modules/acc/acc_cdr.c @@ -588,7 +588,7 @@ static void cdr_on_start( struct dlg_cell* dialog, int type, struct dlg_cb_params* params) { - if( !dialog || !params) + if( !dialog ) { LM_ERR("invalid values\n!"); return; @@ -663,7 +663,7 @@ static void cdr_on_end( struct dlg_cell* dialog, int type, struct dlg_cb_params* params) { - if( !dialog || !params) + if( !dialog ) { LM_ERR("invalid values\n!"); return; @@ -724,7 +724,7 @@ static void cdr_on_destroy( struct dlg_cell* dialog, int type, struct dlg_cb_params* params) { - if( !dialog || !params) + if( !dialog ) { LM_ERR("invalid values\n!"); return; @@ -738,7 +738,7 @@ static void cdr_on_create( struct dlg_cell* dialog, int type, struct dlg_cb_params* params) { - if( !dialog || !params || !params->req) + if( !dialog ) { LM_ERR( "invalid values\n!"); return; @@ -795,6 +795,65 @@ static void cdr_on_create( struct dlg_cell* dialog, return; } } + +/* callback for loading a dialog frm database */ +static void cdr_on_load( struct dlg_cell* dialog, + int type, + struct dlg_cb_params* params) +{ + if( !dialog ) + { + LM_ERR( "invalid values\n!"); + return; + } + + if( cdr_enable == 0) + { + return; + } + + if( dlgb.register_dlgcb( dialog, DLGCB_CONFIRMED, cdr_on_start, 0, 0) != 0) + { + LM_ERR("can't register create dialog CONFIRM callback\n"); + return; + } + + if(_acc_cdr_on_failed==1) { + if( dlgb.register_dlgcb( dialog, DLGCB_FAILED, cdr_on_failed, 0, 0) != 0) + { + LM_ERR("can't register create dialog FAILED callback\n"); + return; + } + } + + if( dlgb.register_dlgcb( dialog, DLGCB_TERMINATED, cdr_on_end, 0, 0) != 0) + { + LM_ERR("can't register create dialog TERMINATED callback\n"); + return; + } + + if( dlgb.register_dlgcb( dialog, DLGCB_TERMINATED_CONFIRMED, cdr_on_end_confirmed, 0, 0) != 0) + { + LM_ERR("can't register create dialog TERMINATED CONFIRMED callback\n"); + return; + } + + if( dlgb.register_dlgcb( dialog, DLGCB_EXPIRED, cdr_on_expired, 0, 0) != 0) + { + LM_ERR("can't register create dialog EXPIRED callback\n"); + return; + } + + if( dlgb.register_dlgcb( dialog, DLGCB_DESTROY, cdr_on_destroy, 0, 0) != 0) + { + LM_ERR("can't register create dialog DESTROY callback\n"); + return; + } + + LM_DBG("dialog '%p' loaded!", dialog); + +} + /* convert the extra-data string into a list and store it */ int set_cdr_extra( char* cdr_extra_value) { @@ -859,6 +918,12 @@ int init_cdr_generation( void) return -1; } + if( dlgb.register_dlgcb( 0, DLGCB_LOADED, cdr_on_load, 0, 0) != 0) + { + LM_ERR("can't register create callback\n"); + return -1; + } + return 0; }

7 years, 7 months

git:master:b7038258: acc: Fix for no cdr after Kamailio 5.0 restart

by Lucian Balaceanu

Module: kamailio Branch: master Commit: b70382583ea2c7962f7268db3e672236fb35e521 URL: https://github.com/kamailio/kamailio/commit/b70382583ea2c7962f7268db3e67223… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-03-31T18:28:21+03:00 acc: Fix for no cdr after Kamailio 5.0 restart - created cdr_on_load() to be called on DLGCB_LOAD --- Modified: src/modules/acc/acc_cdr.c --- Diff: https://github.com/kamailio/kamailio/commit/b70382583ea2c7962f7268db3e67223… Patch: https://github.com/kamailio/kamailio/commit/b70382583ea2c7962f7268db3e67223… --- diff --git a/src/modules/acc/acc_cdr.c b/src/modules/acc/acc_cdr.c index f9b25eb..4ffab23 100644 --- a/src/modules/acc/acc_cdr.c +++ b/src/modules/acc/acc_cdr.c @@ -588,7 +588,7 @@ static void cdr_on_start( struct dlg_cell* dialog, int type, struct dlg_cb_params* params) { - if( !dialog || !params) + if( !dialog ) { LM_ERR("invalid values\n!"); return; @@ -663,7 +663,7 @@ static void cdr_on_end( struct dlg_cell* dialog, int type, struct dlg_cb_params* params) { - if( !dialog || !params) + if( !dialog ) { LM_ERR("invalid values\n!"); return; @@ -724,7 +724,7 @@ static void cdr_on_destroy( struct dlg_cell* dialog, int type, struct dlg_cb_params* params) { - if( !dialog || !params) + if( !dialog ) { LM_ERR("invalid values\n!"); return; @@ -738,7 +738,7 @@ static void cdr_on_create( struct dlg_cell* dialog, int type, struct dlg_cb_params* params) { - if( !dialog || !params || !params->req) + if( !dialog ) { LM_ERR( "invalid values\n!"); return; @@ -795,6 +795,65 @@ static void cdr_on_create( struct dlg_cell* dialog, return; } } + +/* callback for loading a dialog frm database */ +static void cdr_on_load( struct dlg_cell* dialog, + int type, + struct dlg_cb_params* params) +{ + if( !dialog ) + { + LM_ERR( "invalid values\n!"); + return; + } + + if( cdr_enable == 0) + { + return; + } + + if( dlgb.register_dlgcb( dialog, DLGCB_CONFIRMED, cdr_on_start, 0, 0) != 0) + { + LM_ERR("can't register create dialog CONFIRM callback\n"); + return; + } + + if(_acc_cdr_on_failed==1) { + if( dlgb.register_dlgcb( dialog, DLGCB_FAILED, cdr_on_failed, 0, 0) != 0) + { + LM_ERR("can't register create dialog FAILED callback\n"); + return; + } + } + + if( dlgb.register_dlgcb( dialog, DLGCB_TERMINATED, cdr_on_end, 0, 0) != 0) + { + LM_ERR("can't register create dialog TERMINATED callback\n"); + return; + } + + if( dlgb.register_dlgcb( dialog, DLGCB_TERMINATED_CONFIRMED, cdr_on_end_confirmed, 0, 0) != 0) + { + LM_ERR("can't register create dialog TERMINATED CONFIRMED callback\n"); + return; + } + + if( dlgb.register_dlgcb( dialog, DLGCB_EXPIRED, cdr_on_expired, 0, 0) != 0) + { + LM_ERR("can't register create dialog EXPIRED callback\n"); + return; + } + + if( dlgb.register_dlgcb( dialog, DLGCB_DESTROY, cdr_on_destroy, 0, 0) != 0) + { + LM_ERR("can't register create dialog DESTROY callback\n"); + return; + } + + LM_DBG("dialog '%p' loaded!", dialog); + +} + /* convert the extra-data string into a list and store it */ int set_cdr_extra( char* cdr_extra_value) { @@ -859,6 +918,12 @@ int init_cdr_generation( void) return -1; } + if( dlgb.register_dlgcb( 0, DLGCB_LOADED, cdr_on_load, 0, 0) != 0) + { + LM_ERR("can't register create callback\n"); + return -1; + } + return 0; }

7 years, 7 months

[kamailio/kamailio] Fix for no cdr after Kamailio 5.0 restart (#1036)

by Lucian Balaceanu

Hi Daniel, This is a sketch of how I would force the execution of the acc/cdr dialog callbacks for dialogues created from the database. This solution needs more testing and I don't expect it to be accepted as is. I think that the run_create_callbacks was omitted because at a later step, the callbacks would need to access the initial request (params->req) that originated the dialog. Looking in the generated CDRs one can also spot that certain values are left blank most probably because of the params->req message is missing. How would you solve this problem? Is there a way to populate/ mock the request with values inside the dialog_vars table? Would you add all variables of interest inside that table or inside the dialog table? Thank you, Lucian You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1036 -- Commit Summary -- * Fix for no cdr after Kamailio 5.0 restart -- File Changes -- M src/modules/acc/acc_cdr.c (8) M src/modules/dialog/dlg_db_handler.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1036.patch https://github.com/kamailio/kamailio/pull/1036.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1036

7 years, 7 months

git:master:e26aca34: Merge pull request #1052 from claudiupb/topoh_safetychecks

by GitHub

Module: kamailio Branch: master Commit: e26aca34fc41601ec34e17547d6572a1b2ba365a URL: https://github.com/kamailio/kamailio/commit/e26aca34fc41601ec34e17547d6572a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-04-03T15:42:23+02:00 Merge pull request #1052 from claudiupb/topoh_safetychecks topoh: add additional safety checks --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/e26aca34fc41601ec34e17547d6572a… Patch: https://github.com/kamailio/kamailio/commit/e26aca34fc41601ec34e17547d6572a… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index a320c4a..a1f117e3 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -390,6 +390,14 @@ int th_unmask_via(sip_msg_t *msg, str *cookie) LM_DBG("body: %d: [%.*s]\n", vlen, vlen, via->name.s); if(i!=1) { + /* Skip if via is not encoded */ + if (via->host.len!=th_ip.len + || strncasecmp(via->host.s, th_ip.s, th_ip.len)!=0) + { + LM_DBG("via %d is not encoded",i); + continue; + } + vp = th_get_via_param(via, &th_vparam_name); if(vp==NULL) { @@ -404,7 +412,7 @@ int th_unmask_via(sip_msg_t *msg, str *cookie) &th_vparam_prefix, 0, &out.len); if(out.s==NULL) { - LM_ERR("cannot encode via %d\n", i); + LM_ERR("cannot decode via %d\n", i); return -1; } @@ -475,6 +483,14 @@ int th_unmask_callid(sip_msg_t *msg) LM_ERR("cannot get Call-Id header\n"); return -1; } + + /* Do nothing if call-id is not encoded */ + if ((msg->callid->body.len<th_callid_prefix.len) || + (strncasecmp(msg->callid->body.s,th_callid_prefix.s,th_callid_prefix.len)!=0)) + { + LM_DBG("call-id [%.*s] not encoded",msg->callid->body.len,msg->callid->body.s); + return 0; + } out.s = th_mask_decode(msg->callid->body.s, msg->callid->body.len, &th_callid_prefix, 0, &out.len); @@ -670,6 +686,15 @@ int th_unmask_route(sip_msg_t *msg) i++; if(i!=1) { + /* Skip if route is not encoded */ + if ((rr->nameaddr.uri.len<th_uri_prefix.len) || + (strncasecmp(rr->nameaddr.uri.s,th_uri_prefix.s,th_uri_prefix.len)!=0)) + { + LM_DBG("rr %d is not encoded: [%.*s]",i,rr->nameaddr.uri.len,rr->nameaddr.uri.s); + rr = rr->next; + continue; + } + if(th_get_uri_param_value(&rr->nameaddr.uri, &th_uparam_name, &eval)<0 || eval.len<=0) return -1; @@ -710,6 +735,14 @@ int th_unmask_ruri(sip_msg_t *msg) struct lump* l; str out; + /* Do nothing if ruri is not encoded */ + if ((REQ_LINE(msg).uri.len<th_uri_prefix.len) || + (strncasecmp(REQ_LINE(msg).uri.s,th_uri_prefix.s,th_uri_prefix.len)!=0)) + { + LM_DBG("ruri [%.*s] is not encoded",REQ_LINE(msg).uri.len,REQ_LINE(msg).uri.s); + return 0; + } + if(th_get_uri_param_value(&REQ_LINE(msg).uri, &th_uparam_name, &eval)<0 || eval.len<=0) return -1; @@ -763,6 +796,15 @@ int th_unmask_refer_to(sip_msg_t *msg) } uri = &(get_refer_to(msg)->uri); + + /* Do nothing if refer_to is not encoded */ + if ((uri->len<th_uri_prefix.len) + || (strncasecmp(uri->s, th_uri_prefix.s, th_uri_prefix.len)!=0)) + { + LM_DBG("refer-to [%.*s] is not encoded",uri->len,uri->s); + return 0; + } + if(th_get_uri_param_value(uri, &th_uparam_name, &eval)<0 || eval.len<=0) return -1;

7 years, 7 months

git:master:055fca8d: topoh: add additional safety checks

by Claudiu Boriga

Module: kamailio Branch: master Commit: 055fca8dd2ca9c2ea683a2ea3748d6728d54e5a5 URL: https://github.com/kamailio/kamailio/commit/055fca8dd2ca9c2ea683a2ea3748d67… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2017-04-03T15:37:31+03:00 topoh: add additional safety checks - verify that headers contain expected prefix (including mask ip) before trying to unmask them; otherwise there may be issues when kamailio receives messages that are not masked and topoh is enabled. --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/055fca8dd2ca9c2ea683a2ea3748d67… Patch: https://github.com/kamailio/kamailio/commit/055fca8dd2ca9c2ea683a2ea3748d67… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index a320c4a..a1f117e3 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -390,6 +390,14 @@ int th_unmask_via(sip_msg_t *msg, str *cookie) LM_DBG("body: %d: [%.*s]\n", vlen, vlen, via->name.s); if(i!=1) { + /* Skip if via is not encoded */ + if (via->host.len!=th_ip.len + || strncasecmp(via->host.s, th_ip.s, th_ip.len)!=0) + { + LM_DBG("via %d is not encoded",i); + continue; + } + vp = th_get_via_param(via, &th_vparam_name); if(vp==NULL) { @@ -404,7 +412,7 @@ int th_unmask_via(sip_msg_t *msg, str *cookie) &th_vparam_prefix, 0, &out.len); if(out.s==NULL) { - LM_ERR("cannot encode via %d\n", i); + LM_ERR("cannot decode via %d\n", i); return -1; } @@ -475,6 +483,14 @@ int th_unmask_callid(sip_msg_t *msg) LM_ERR("cannot get Call-Id header\n"); return -1; } + + /* Do nothing if call-id is not encoded */ + if ((msg->callid->body.len<th_callid_prefix.len) || + (strncasecmp(msg->callid->body.s,th_callid_prefix.s,th_callid_prefix.len)!=0)) + { + LM_DBG("call-id [%.*s] not encoded",msg->callid->body.len,msg->callid->body.s); + return 0; + } out.s = th_mask_decode(msg->callid->body.s, msg->callid->body.len, &th_callid_prefix, 0, &out.len); @@ -670,6 +686,15 @@ int th_unmask_route(sip_msg_t *msg) i++; if(i!=1) { + /* Skip if route is not encoded */ + if ((rr->nameaddr.uri.len<th_uri_prefix.len) || + (strncasecmp(rr->nameaddr.uri.s,th_uri_prefix.s,th_uri_prefix.len)!=0)) + { + LM_DBG("rr %d is not encoded: [%.*s]",i,rr->nameaddr.uri.len,rr->nameaddr.uri.s); + rr = rr->next; + continue; + } + if(th_get_uri_param_value(&rr->nameaddr.uri, &th_uparam_name, &eval)<0 || eval.len<=0) return -1; @@ -710,6 +735,14 @@ int th_unmask_ruri(sip_msg_t *msg) struct lump* l; str out; + /* Do nothing if ruri is not encoded */ + if ((REQ_LINE(msg).uri.len<th_uri_prefix.len) || + (strncasecmp(REQ_LINE(msg).uri.s,th_uri_prefix.s,th_uri_prefix.len)!=0)) + { + LM_DBG("ruri [%.*s] is not encoded",REQ_LINE(msg).uri.len,REQ_LINE(msg).uri.s); + return 0; + } + if(th_get_uri_param_value(&REQ_LINE(msg).uri, &th_uparam_name, &eval)<0 || eval.len<=0) return -1; @@ -763,6 +796,15 @@ int th_unmask_refer_to(sip_msg_t *msg) } uri = &(get_refer_to(msg)->uri); + + /* Do nothing if refer_to is not encoded */ + if ((uri->len<th_uri_prefix.len) + || (strncasecmp(uri->s, th_uri_prefix.s, th_uri_prefix.len)!=0)) + { + LM_DBG("refer-to [%.*s] is not encoded",uri->len,uri->s); + return 0; + } + if(th_get_uri_param_value(uri, &th_uparam_name, &eval)<0 || eval.len<=0) return -1;

7 years, 7 months

[kamailio/kamailio] topoh: add additional safety checks (#1052)

by Paul Claudiu Boriga

Hello, I have added some extra verifications to the th_unmask* functions from topoh. The changes add statements which verify that headers contain expected prefix (including mask ip) before trying to unmask them. It seems that some of the th_unmask* functions only check that the headers exist, and then they directly call th_mask_decode on the data. If other messages that are not encoded by topoh are processed by this function, th_mask_decode may not return an error, and instead create an unreadable string and this is added to the message. Therefore I added some additional checks to see that the message has the expected prefix (or when possible check directly that the host IP is the mask_ip set), if the header does not have the expected form then unmasking is not attempted. Thanks, Claudiu Boriga. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1052 -- Commit Summary -- * topoh: add additional safety checks -- File Changes -- M src/modules/topoh/th_msg.c (44) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1052.patch https://github.com/kamailio/kamailio/pull/1052.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1052

7 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2017