sr-dev September 2014

sr-dev@lists.kamailio.org

33 participants
375 discussions

git:master: exec: add parameter to control the option for bash exec safety check of CVE-2014-6271
by Daniel-Constantin Mierla 25 Sep '14

25 Sep '14

Module: sip-router Branch: master Commit: 21eb073c25b66b110193f1607b93f256f7d9fdfa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=21eb073… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 25 16:59:34 2014 +0200 exec: add parameter to control the option for bash exec safety check of CVE-2014-6271 - parameter: bash_safety - default is 1 (enabled), set to 0 to disable - just in case someone needs that kind of header and knows what he/she does --- modules/exec/exec_hf.c | 6 ++++-- modules/exec/exec_mod.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/exec/exec_hf.c b/modules/exec/exec_hf.c index e0e5491..bd7a3d4 100644 --- a/modules/exec/exec_hf.c +++ b/modules/exec/exec_hf.c @@ -52,6 +52,8 @@ #include "../../char_msg_val.h" #include "exec_hf.h" +extern int exec_bash_safety; + /* should be environment variables set by header fields ? */ unsigned int setvars=1; @@ -256,7 +258,7 @@ static int print_hf_var(struct hf_wrapper *w, int offset) memcpy(envvar, w->prefix, w->prefix_len); c=envvar+w->prefix_len; memcpy(c, hname, hlen ); c+=hlen; *c=EV_ASSIGN;c++; - if (!strncmp(w->u.hf->body.s,"() {",MIN(w->u.hf->body.len,4))) { + if (exec_bash_safety && !strncmp(w->u.hf->body.s,"() {",MIN(w->u.hf->body.len,4))) { memcpy(c, w->u.hf->body.s+offset+2, w->u.hf->body.len-2 ); c+=(w->u.hf->body.len-2); } else { @@ -265,7 +267,7 @@ static int print_hf_var(struct hf_wrapper *w, int offset) } for (wi=w->next_same; wi; wi=wi->next_same) { *c=HF_SEPARATOR;c++; - if (!strncmp(w->u.hf->body.s,"() {",MIN(w->u.hf->body.len,4))) { + if (exec_bash_safety && !strncmp(w->u.hf->body.s,"() {",MIN(w->u.hf->body.len,4))) { memcpy(c, w->u.hf->body.s+offset+2, w->u.hf->body.len-2 ); c+=(w->u.hf->body.len-2); } else { diff --git a/modules/exec/exec_mod.c b/modules/exec/exec_mod.c index 3aadf0f..b872456 100644 --- a/modules/exec/exec_mod.c +++ b/modules/exec/exec_mod.c @@ -44,6 +44,7 @@ MODULE_VERSION unsigned int time_to_kill=0; +int exec_bash_safety=1; static int mod_init( void ); @@ -77,6 +78,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"time_to_kill", INT_PARAM, &time_to_kill}, {"setvars", INT_PARAM, &setvars }, + {"bash_safety", INT_PARAM, &exec_bash_safety }, {0, 0, 0} };

1 0

git:master: usrloc: restore usrloc attributes in DB_ONLY mode
by Hugh Waite 25 Sep '14

25 Sep '14

Module: sip-router Branch: master Commit: 22b559cb25c25b3801b1849a5da76a8ec937ef83 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=22b559c… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: Tue Sep 23 13:29:15 2014 +0100 usrloc: restore usrloc attributes in DB_ONLY mode - restores xavps per location during a lookup --- modules/usrloc/udomain.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/modules/usrloc/udomain.c b/modules/usrloc/udomain.c index bf00b63..184e9d5 100644 --- a/modules/usrloc/udomain.c +++ b/modules/usrloc/udomain.c @@ -531,12 +531,18 @@ error: */ urecord_t* db_load_urecord(db1_con_t* _c, udomain_t* _d, str *_aor) { + char tname_buf[64]; + str tname; ucontact_info_t *ci; db_key_t columns[16]; db_key_t keys[2]; db_key_t order; db_val_t vals[2]; db1_res_t* res = NULL; + db_row_t *row; + str aname; + str avalue; + sr_xval_t aval; str contact; char *domain; int i; @@ -630,6 +636,88 @@ urecord_t* db_load_urecord(db1_con_t* _c, udomain_t* _d, str *_aor) } ul_dbf.free_result(_c, res); + + /* Retrieve ul attributes */ + if(ul_xavp_contact_name.s==NULL) { + /* feature disabled by mod param */ + goto done; + } + + if(_d->name->len + 6>=64) { + LM_ERR("attributes table name is too big\n"); + goto done; + } + strncpy(tname_buf, _d->name->s, _d->name->len); + tname_buf[_d->name->len] = '\0'; + strcat(tname_buf, "_attrs"); + tname.s = tname_buf; + tname.len = _d->name->len + 6; + + keys[0] = &ulattrs_ruid_col; + vals[0].type = DB1_STR; + vals[0].nul = 0; + columns[0] = &ulattrs_aname_col; + columns[1] = &ulattrs_atype_col; + columns[2] = &ulattrs_avalue_col; + + if (ul_dbf.use_table(ul_dbh, &tname) < 0) { + LM_ERR("sql use_table failed for %.*s\n", tname.len, tname.s); + goto done; + } + + for (c = r->contacts; c != NULL; c = c->next) { + vals[0].val.str_val.s = c->ruid.s; + vals[0].val.str_val.len = c->ruid.len; + + if (ul_dbf.query(ul_dbh, keys, 0, vals, columns, 1, 3, 0, &res) < 0) { + LM_ERR("db_query failed\n"); + continue; + } + + if (RES_ROW_N(res) == 0) { + LM_DBG("location attrs table is empty\n"); + ul_dbf.free_result(ul_dbh, res); + continue; + } + + for(i = 0; i < RES_ROW_N(res); i++) { + row = RES_ROWS(res) + i; + + aname.s = (char*)VAL_STRING(ROW_VALUES(row)); + aname.len = strlen(aname.s); + avalue.s = (char*)VAL_STRING(ROW_VALUES(row) + 2); + avalue.len = strlen(avalue.s); + memset(&aval, 0, sizeof(sr_xval_t)); + if(VAL_INT(ROW_VALUES(row)+1)==0) { + /* string value */ + aval.v.s = avalue; + aval.type = SR_XTYPE_STR; + } else if(VAL_INT(ROW_VALUES(row)+1)==1) { + /* int value */ + str2sint(&avalue, &aval.v.i); + aval.type = SR_XTYPE_INT; + } else { + /* unknown type - ignore */ + continue; + } + + /* add xavp to contact */ + if(c->xavp==NULL) { + if(xavp_add_xavp_value(&ul_xavp_contact_name, &aname, + &aval, &c->xavp)==NULL) + LM_INFO("cannot add first xavp to contact - ignoring\n"); + } else { + if(c->xavp->val.type==SR_XTYPE_XAVP) { + if(xavp_add_value(&aname, &aval, &c->xavp->val.v.xavp)==NULL) + LM_INFO("cannot add values to contact xavp\n"); + } + } + } + ul_dbf.free_result(ul_dbh, res); + } + + +done: return r; }

1 0

[tracker] Comment added: CANCEL sent shortly after '100 trying' response to INVITE does not always end the call
by sip-router 24 Sep '14

24 Sep '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#468 - CANCEL sent shortly after '100 trying' response to INVITE does not always end the call User who did this - Daniel-Constantin Mierla (miconda) ---------- Thanks for troubleshooting and providing detailed report. route[NATMANAGE] is executed from a branch_route in this case. I think the problem is that in this case the transaction is created, the branch route is executed and take a bit to complete. Cancel comes, another process handles it, marking transaction as cancelled. The forst process after execution of branch route is doing a send without checking if someone else canceled its own created transaction. I will look soon as sources to confirm my guess and get a fix for it if proved valid. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=468#comment1648 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: zombie dialogs in state 5
by sip-router 24 Sep '14

24 Sep '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#424 - zombie dialogs in state 5 User who did this - Daniel-Constantin Mierla (miconda) ---------- Just as remark, if you use dlg_manage() before loose_route(), the event route is executed inside dlg_manage(). In your case, is in loose_route() indeed. Can you give another try with master? I just pushed a patch. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=424#comment1647 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: dialog: set again the dialog ids in context for BYE processing
by Daniel-Constantin Mierla 24 Sep '14

24 Sep '14

Module: sip-router Branch: master Commit: 5b733fa361afced0418947c965b256dbe7ae3a68 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b733fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 24 23:46:00 2014 +0200 dialog: set again the dialog ids in context for BYE processing - they can be reset by event route execution --- modules/dialog/dlg_handlers.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 16c711f..d804310 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -1310,6 +1310,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) _dlg_ctx.cpid = my_pid(); _dlg_ctx.expect_t = 1; + dlg_set_ctx_iuid(dlg); if_update_stat( dlg_enable_stats, active_dlgs, -1); goto done;

1 0

usrloc attributes in DB_ONLY mode
by Waite, Hugh 24 Sep '14

24 Sep '14

Hello, I've been trying to use the usrloc attributes feature to store and retrieve additional data per location. This works for in-memory tables, but not when db_mode=DB_ONLY. The attached patch adds this so the xavps are restored when doing a DB lookup for a single aor. Is this a bugfix for an incomplete feature or do I need to wait for the thaw before committing? Regards, Hugh ________________________________ This e-mail and any attachment is for authorised use by the intended recipient(s) only. It may contain proprietary material, confidential information and/or be subject to legal privilege. It should not be copied, disclosed to, retained or used by, any other party. If you are not an intended recipient then please promptly delete this e-mail and any attachment and all copies and inform the sender. Thank you for understanding.

3 2

git:master: dispatcher: added ids to some sections in docs
by Daniel-Constantin Mierla 23 Sep '14

23 Sep '14

Module: sip-router Branch: master Commit: fa54c6997abe0a944a7454e21884cc95fea85b89 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fa54c69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 23 23:50:58 2014 +0200 dispatcher: added ids to some sections in docs --- modules/dispatcher/doc/dispatcher_admin.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index 11c75ce..6381431 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -1295,7 +1295,7 @@ onreply_route { </section> - <section> + <section id="dispatcher.ex.install"> <title>Installation and Running</title> <section> <title>Destination List File</title> @@ -1358,7 +1358,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) </example> </section> - <section> + <section id="dispatcher.ex.config"> <title>&kamailio; config file</title> <para> Next picture shows a sample usage of the dispatcher module. @@ -1374,7 +1374,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) </section> </section> - <section> + <section id="dispatcher.ex.event_routes"> <title>Event routes</title> <section> <title>

1 0

git:master: uuid Minor doc updates
by Olle E. Johansson 23 Sep '14

23 Sep '14

Module: sip-router Branch: master Commit: 2e047d4536f36627651abba08fbd4d511b299b05 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e047d4… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Tue Sep 23 21:57:44 2014 +0200 uuid Minor doc updates --- modules/uuid/README | 7 +++++-- modules/uuid/doc/uuid_admin.xml | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/uuid/README b/modules/uuid/README index 2b1ce31..1be3f53 100644 --- a/modules/uuid/README +++ b/modules/uuid/README @@ -44,7 +44,10 @@ Chapter 1. Admin Guide 1. Overview This module exports the $uuid(type) class of variables that return - unique values using libuuid functions. + unique values using functions from the libuuid library. UUIDs are used + in the +sip.instance media feature tag in SIP, but can also be used for + other purposes, like defining a unique session ID for a group of SIP + dialogs. 2. Dependencies @@ -64,7 +67,7 @@ Chapter 1. Admin Guide 3. Usage - Following variables can be used: + The following variables can be used: * $uuid(g) - return the UUID value using uuid_generate(). * $uuid(r) - return the UUID value using uuid_generate_random(). * $uuid(t) - return the UUID value using uuid_generate_time(). diff --git a/modules/uuid/doc/uuid_admin.xml b/modules/uuid/doc/uuid_admin.xml index 902d006..5cc0649 100644 --- a/modules/uuid/doc/uuid_admin.xml +++ b/modules/uuid/doc/uuid_admin.xml @@ -17,7 +17,10 @@ <title>Overview</title> <para> This module exports the $uuid(type) class of variables that return - unique values using libuuid functions. + unique values using functions from the libuuid library. UUIDs are + used in the +sip.instance media feature tag in SIP, but can also + be used for other purposes, like defining a unique session ID for a + group of SIP dialogs. </para> </section> @@ -55,7 +58,7 @@ <section> <title>Usage</title> <para> - Following variables can be used: + The following variables can be used: <itemizedlist> <listitem> <para>

1 0

git:master: jsonrpc-s Update docs
by Olle E. Johansson 23 Sep '14

23 Sep '14

Module: sip-router Branch: master Commit: 615b79edafc990d2a82394c8b020fd7687dc7bc5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=615b79e… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Tue Sep 23 21:49:18 2014 +0200 jsonrpc-s Update docs JSON-RPC is called JSON-RPC with a hyphen. --- modules/jsonrpc-s/README | 19 ++++++++++--------- modules/jsonrpc-s/doc/jsonrpc-s_admin.xml | 17 +++++++++-------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/modules/jsonrpc-s/README b/modules/jsonrpc-s/README index c06769b..bb92a7a 100644 --- a/modules/jsonrpc-s/README +++ b/modules/jsonrpc-s/README @@ -67,8 +67,9 @@ Chapter 1. Admin Guide 1.1. Limitations - This module provides JSONRPC server over HTTP implementation, tailored - for the needs of Kamailio. + This module provides a JSON-RPC server over HTTP implementation, + tailored for the needs of Kamailio. It implements the Kamailio RPC + interface over JSON-RPC. The JSONRPC-S module uses the xHTTP module to handle HTTP requests. Read the documentation of the xHTTP module for more details. @@ -77,10 +78,10 @@ Chapter 1. Admin Guide * This module does not implement asynchronous RPC commands. It is unlikely that asynchronous RPC commands will be executed from an - JSONRPC over HTTP client. + JSON-RPC over HTTP client. * This module does not accept parameters embedded in a structure (see - RPC documentation for more info about how parameters can be passed - to RPC). + the RPC documentation for more info about how parameters can be + passed to RPC). 2. Dependencies @@ -104,7 +105,7 @@ Chapter 1. Admin Guide 3.1. pretty_format (int) - Pretty format for JSONRPC response document. + Pretty format for JSON-RPC response document. Default value is '0'. @@ -167,11 +168,11 @@ event_route[xhttp:request] { 4.2. jsonrpc_exec(cmd) - Execute JSONRPC command given as parameter. + Execute a JSON-RPC command given as a parameter. - The parameter has to be a full valid JSONRPC document. It can be a + The parameter has to be a valid full JSON-RPC document. It can be a dynamic string with variables. The result of the command can be - accessed via $jsonrpl(key) variables. + accessed via $jsonrpl(key) pseudo variables. Example 1.3. jsonrpc_exec usage ... diff --git a/modules/jsonrpc-s/doc/jsonrpc-s_admin.xml b/modules/jsonrpc-s/doc/jsonrpc-s_admin.xml index 77a0e3a..a12b153 100644 --- a/modules/jsonrpc-s/doc/jsonrpc-s_admin.xml +++ b/modules/jsonrpc-s/doc/jsonrpc-s_admin.xml @@ -16,8 +16,9 @@ <section> <title>Overview</title> <para> - This module provides JSONRPC server over HTTP implementation, - tailored for the needs of &kamailio;. + This module provides a JSON-RPC server over HTTP implementation, + tailored for the needs of &kamailio;. It implements the &kamailio; + RPC interface over JSON-RPC. <para> </para> The JSONRPC-S module uses the xHTTP module to handle HTTP requests. @@ -31,13 +32,13 @@ <para> This module does not implement asynchronous RPC commands. It is unlikely that asynchronous RPC commands will be executed - from an JSONRPC over HTTP client. + from an JSON-RPC over HTTP client. </para> </listitem> <listitem> <para> This module does not accept parameters embedded in a structure - (see RPC documentation for more info about how parameters can be + (see the RPC documentation for more info about how parameters can be passed to RPC). </para> </listitem> @@ -80,7 +81,7 @@ <section> <title><varname>pretty_format</varname> (int)</title> <para> - Pretty format for JSONRPC response document. + Pretty format for JSON-RPC response document. </para> <para> <emphasis> @@ -159,12 +160,12 @@ event_route[xhttp:request] { <function moreinfo="none">jsonrpc_exec(cmd)</function> </title> <para> - Execute JSONRPC command given as parameter. + Execute a JSON-RPC command given as a parameter. </para> <para> - The parameter has to be a full valid JSONRPC document. It can + The parameter has to be a valid full JSON-RPC document. It can be a dynamic string with variables. The result of the command - can be accessed via $jsonrpl(key) variables. + can be accessed via $jsonrpl(key) pseudo variables. </para> <example> <title><function>jsonrpc_exec</function> usage</title>

1 0

git:master: xmlrpc Update docs, change SER to &kamailio; , fix typo
by Olle E. Johansson 23 Sep '14

23 Sep '14

Module: sip-router Branch: master Commit: 3b6133bb3e7ba1d075fd173fc0322d391f10160b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b6133b… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Tue Sep 23 21:38:53 2014 +0200 xmlrpc Update docs, change SER to &kamailio;, fix typo --- modules/xmlrpc/README | 100 +++++++++++++++++----------------- modules/xmlrpc/doc/xmlrpc.xml | 50 ++++++++++-------- modules/xmlrpc/doc/xmlrpc_admin.xml | 12 ++-- 3 files changed, 84 insertions(+), 78 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3b6…

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2014