sr-dev December 2018

sr-dev@lists.kamailio.org

23 participants
314 discussions

[kamailio/kamailio] Pepelux/secfilter (#1772)
by Jose Luis Verdeguer 20 Dec '18

20 Dec '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Some fixes in secfilter module. - Fixed w_check_sqli(). Character '#' could be used in URI header. Its use should not be considered as an SQL injection attack - Added some debug messages and sorted the code You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1772 -- Commit Summary -- * fix w_check_sqli(). Character '#' could be used in URI header. Its use should not be considered as an SQL injection attack * Added some debug messages and sorted the code -- File Changes -- M src/modules/secfilter/secfilter.c (2) M src/modules/secfilter/secfilter_hdr.c (117) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1772.patch https://github.com/kamailio/kamailio/pull/1772.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/1772

3 2

git:master:7c078c79: modules: readme files regenerated - acc_json ... [skip ci]
by Kamailio Dev 20 Dec '18

20 Dec '18

Module: kamailio Branch: master Commit: 7c078c7947ccfc53d8ce037761e0b2ddf6036b3f URL: https://github.com/kamailio/kamailio/commit/7c078c7947ccfc53d8ce037761e0b2d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-12-20T18:46:38+01:00 modules: readme files regenerated - acc_json ... [skip ci] --- Modified: src/modules/acc_json/README --- Diff: https://github.com/kamailio/kamailio/commit/7c078c7947ccfc53d8ce037761e0b2d… Patch: https://github.com/kamailio/kamailio/commit/7c078c7947ccfc53d8ce037761e0b2d…

1 0

git:master:0eaed4af: acc_json: docs correction and updated example
by Julien Chavanton 20 Dec '18

20 Dec '18

Module: kamailio Branch: master Commit: 0eaed4afe6c7150c6714470cdec324d005895def URL: https://github.com/kamailio/kamailio/commit/0eaed4afe6c7150c6714470cdec324d… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2018-12-20T09:44:21-08:00 acc_json: docs correction and updated example --- Modified: src/modules/acc_json/doc/acc_json_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0eaed4afe6c7150c6714470cdec324d… Patch: https://github.com/kamailio/kamailio/commit/0eaed4afe6c7150c6714470cdec324d… --- diff --git a/src/modules/acc_json/doc/acc_json_admin.xml b/src/modules/acc_json/doc/acc_json_admin.xml index 8c05713aef..ea1fbc446c 100644 --- a/src/modules/acc_json/doc/acc_json_admin.xml +++ b/src/modules/acc_json/doc/acc_json_admin.xml @@ -104,7 +104,7 @@ modparam("acc_json", "acc_missed_flag", 3) </section> <section id="acc_json.p.acc_extra"> - <title><varname>acc_extra</varname> (integer)</title> + <title><varname>acc_extra</varname> (string)</title> <para> Extra values to be added to the json dictionary. </para> @@ -189,7 +189,10 @@ modparam("acc_json", "acc_time_format", "%Y/%m/%d %H:%M:%S") Using a rtimer module exec you can access the queue and process them. </para> <para> - Default value is not-set mqueue will not be required + You can also fetch the acc events using mqueue.fetch over JSON-RPC. + </para> + <para> + Default value is not-set mqueue will not be required. </para> <example> <title>output_mqueue usage example</title> @@ -206,15 +209,19 @@ modparam("rtimer", "exec", "timer=nsqt;route=RUN_CDR_PUBLISH") modparam("http_client", "keep_connections", 1) modparam("http_client", "httpcon", "nsqd=>http://localhost:4151/pub?topic=acc") -route[RUN_CDR_PUBLISH] { +route[RUN_ACC_PUBLISH] { $var(count) = 0; while (mq_fetch("acc_events")) { $var(q_size) = mq_size("acc_events"); $var(count) = $var(count) + 1; - xinfo("[RUN_CDR_PUBLISH][$var(q_size)][$var(count)][$mqk(acc_events)][$mqv(acc_events)]\n"); - $var(res) = http_connect("nsqd", "", "application/json", $mqv(acc_events), "$var(nsq_res)"); - if ($var(res) != "200") { + xinfo("[RUN_ACC_PUBLISH][$var(q_size)][$var(count)][$mqk(acc_events)][$mqv(acc_events)]\n"); + $var(res) = http_connect_raw("nsqd", "", "application/json", $mqv(acc_events), "$var(nsq_res)"); + if ($var(res) < 0) { + xerr("[RUN_ACC_PUBLISH][$var(res)] http_connect_raw: timeout or error !\n"); mq_add("acc_events", "acc_key", "$mqv(acc_events)"); + } else if ($var(res) < 200 || $var(res) > 299) { + xerr("[RUN_ACC_PUBLISH][$var(res)] http unexpected response code !\n"); + mq_add("acc_dead_letter_queue", "acc_key", "$mqv(acc_events)"); return; } }

1 0

[kamailio/kamailio] websocket.so: undefined symbol: ws_rm_delay_interval (#1771)
by Jose Luis Verdeguer 20 Dec '18

20 Dec '18

### Description Error loading module websocket.so  Since the last update of the websocket.so module gives an error when starting Kamailio ### Troubleshooting #### Reproduction ``` # service kamailio restart Job for kamailio.service failed. See 'systemctl status kamailio.service' and 'journalctl -xn' for details. # systemctl status kamailio.service ● kamailio.service - LSB: Start the Kamailio SIP proxy server Loaded: loaded (/etc/init.d/kamailio) Active: failed (Result: exit-code) since Thu 2018-12-20 11:51:30 CET; 5s ago Process: 24396 ExecStop=/etc/init.d/kamailio stop (code=exited, status=0/SUCCESS) Process: 24442 ExecStart=/etc/init.d/kamailio start (code=exited, status=1/FAILURE) Dec 20 11:51:30 debian kamailio[24442]: Not starting Kamailio SIP Server: invalid configuration file! ... failed! Dec 20 11:51:30 debian kamailio[24442]: failed! Dec 20 11:51:30 debian kamailio[24442]: 0(24451) INFO: tls [tls_init.c:503]: init_tls_compression(): disabling compression... 0(24451) ERROR: <core> [core/sr_module.c:498]: load_module():...l: ws_rm_delay Dec 20 11:51:30 debian kamailio[24442]: failed! Dec 20 11:51:30 debian systemd[1]: kamailio.service: control process exited, code=exited status=1 Dec 20 11:51:30 debian systemd[1]: Failed to start LSB: Start the Kamailio SIP proxy server. Dec 20 11:51:30 debian systemd[1]: Unit kamailio.service entered failed state. Hint: Some lines were ellipsized, use -l to show in full. # journalctl -xn -- Logs begin at Wed 2018-12-12 02:36:41 CET, end at Thu 2018-12-20 11:51:35 CET. -- Dec 20 11:51:23 debian kernel: iptables denied: IN=eth0 OUT= MAC=00:50:56:a4:88:be:00:1c:73:8e:f6:8f:08:00 SRC=94.102.56.235 DST=5.57.231.245 LEN=40 TOS=0x00 PREC=0x00 TTL=252 ID=55056 PROTO=TCP SPT=58501 Dec 20 11:51:30 debian systemd[1]: Starting LSB: Start the Kamailio SIP proxy server... -- Subject: Unit kamailio.service has begun with start-up -- Defined-By: systemd -- Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel -- -- Unit kamailio.service has begun starting up. Dec 20 11:51:30 debian kamailio[24442]: Not starting Kamailio SIP Server: invalid configuration file! ... failed! Dec 20 11:51:30 debian kamailio[24442]: failed! Dec 20 11:51:30 debian kamailio[24442]: 0(24451) INFO: tls [tls_init.c:503]: init_tls_compression(): disabling compression... 0(24451) ERROR: <core> [core/sr_module.c:498]: load_module(): could not open m Dec 20 11:51:30 debian kamailio[24442]: failed! Dec 20 11:51:30 debian systemd[1]: kamailio.service: control process exited, code=exited status=1 Dec 20 11:51:30 debian systemd[1]: Failed to start LSB: Start the Kamailio SIP proxy server. -- Subject: Unit kamailio.service has failed -- Defined-By: systemd -- Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel -- -- Unit kamailio.service has failed. -- -- The result is failed. Dec 20 11:51:30 debian systemd[1]: Unit kamailio.service entered failed state. Dec 20 11:51:35 debian kernel: iptables denied: IN=eth0 OUT= MAC=00:50:56:a4:88:be:00:1c:73:8f:13:f3:08:00 SRC=89.248.168.107 DST=5.57.231.245 LEN=40 TOS=0x00 PREC=0x00 TTL=252 ID=28132 PROTO=TCP SPT=5834 r ```  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.0-dev1 (i386/linux) baa542 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: baa542 compiled on 11:42:31 Dec 20 2018 with gcc 4.9.2 ``` * **Operating System**:  ``` Linux debian 3.16.0-4-686-pae #1 SMP Debian 3.16.43-2+deb8u2 (2017-06-26) i686 GNU/Linux ``` -- 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/issues/1771

2 2

git:master:d5e40d5f: websocket: removed static from declaration of ws_rm_delay_interval
by Daniel-Constantin Mierla 20 Dec '18

20 Dec '18

Module: kamailio Branch: master Commit: d5e40d5f05795f3902e5ae51bf4c57345e945a9c URL: https://github.com/kamailio/kamailio/commit/d5e40d5f05795f3902e5ae51bf4c573… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-20T13:14:33+01:00 websocket: removed static from declaration of ws_rm_delay_interval - it is used as external in another source file - GH #1771 --- Modified: src/modules/websocket/websocket.c --- Diff: https://github.com/kamailio/kamailio/commit/d5e40d5f05795f3902e5ae51bf4c573… Patch: https://github.com/kamailio/kamailio/commit/d5e40d5f05795f3902e5ae51bf4c573… --- diff --git a/src/modules/websocket/websocket.c b/src/modules/websocket/websocket.c index 4f23177ac7..87cf4e3a5f 100644 --- a/src/modules/websocket/websocket.c +++ b/src/modules/websocket/websocket.c @@ -61,7 +61,7 @@ static int ws_init_rpc(void); sl_api_t ws_slb; #define WS_DEFAULT_RM_DELAY_INTERVAL 5 -static int ws_rm_delay_interval = WS_DEFAULT_RM_DELAY_INTERVAL; +int ws_rm_delay_interval = WS_DEFAULT_RM_DELAY_INTERVAL; #define DEFAULT_TIMER_INTERVAL 1 static int ws_timer_interval = DEFAULT_TIMER_INTERVAL;

1 0

git:master:ae4087ef: dialog: only write debug messages in case cseq or contact fields are empty
by Daniel-Constantin Mierla 20 Dec '18

20 Dec '18

Module: kamailio Branch: master Commit: ae4087ef615c1de5b67c8406eab8316300282d8b URL: https://github.com/kamailio/kamailio/commit/ae4087ef615c1de5b67c8406eab8316… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-20T13:14:33+01:00 dialog: only write debug messages in case cseq or contact fields are empty --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/ae4087ef615c1de5b67c8406eab8316… Patch: https://github.com/kamailio/kamailio/commit/ae4087ef615c1de5b67c8406eab8316… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 983e82d7dd..96406bde35 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -209,8 +209,7 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, cseq = dlg->cseq[DLG_CALLEE_LEG]; } if ((leg==DLG_CALLER_LEG) && (cseq.s==NULL || cseq.len<=0)) { - LM_ERR("empty CSeq number\n"); - goto error0; + LM_DBG("empty CSeq number (leg: %d)\n", leg); } /* extract the contact address */ @@ -226,8 +225,7 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, } contact = ((contact_body_t *)msg->contact->parsed)->contacts->uri; if(contact.s==NULL || contact.len<=0) { - LM_ERR("empty contact uri\n"); - goto error0; + LM_DBG("empty contact uri (leg: %d)\n", leg); } /* extract the record-route addresses */

1 0

git:master:baa54215: secfilter: fix segmentation fault on mod_destroy
by Victor Seva 20 Dec '18

20 Dec '18

Module: kamailio Branch: master Commit: baa542151de2af11752116b69db5d343a2c65159 URL: https://github.com/kamailio/kamailio/commit/baa542151de2af11752116b69db5d34… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-20T11:40:17+01:00 secfilter: fix segmentation fault on mod_destroy --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/baa542151de2af11752116b69db5d34… Patch: https://github.com/kamailio/kamailio/commit/baa542151de2af11752116b69db5d34… --- diff --git a/src/modules/secfilter/secfilter.c b/src/modules/secfilter/secfilter.c index 2b5b91d84e..1a32b1274d 100644 --- a/src/modules/secfilter/secfilter.c +++ b/src/modules/secfilter/secfilter.c @@ -34,7 +34,7 @@ MODULE_VERSION -secf_data_p secf_data; +secf_data_p secf_data = NULL; /* Static and shared functions */ static int mod_init(void); @@ -658,6 +658,8 @@ static int child_init(int rank) static void mod_destroy(void) { LM_DBG("SECFILTER module destroy\n"); + if(!secf_data) + return; /* Free shared data */ free_data(); /* Destroy lock */

1 0

git:master:6e6d82bc: secfilter: fix compilation warning
by Jose Luis Verdeguer 20 Dec '18

20 Dec '18

Module: kamailio Branch: master Commit: 6e6d82bc04a3f6a4744751b70dde8810a48838c5 URL: https://github.com/kamailio/kamailio/commit/6e6d82bc04a3f6a4744751b70dde881… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2018-12-20T10:51:03+01:00 secfilter: fix compilation warning > secfilter.c:516:15: warning: comparison of address of 'msg->rcv.src_ip' equal to a null pointer is always false [-Wtautological-pointer-compare] > if(&msg->rcv.src_ip == NULL) > ~~~~~~~~~^~~~~~ ~~~~ > 1 warning generated. --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/6e6d82bc04a3f6a4744751b70dde881… Patch: https://github.com/kamailio/kamailio/commit/6e6d82bc04a3f6a4744751b70dde881… --- diff --git a/src/modules/secfilter/secfilter.c b/src/modules/secfilter/secfilter.c index 94d592e434..2b5b91d84e 100644 --- a/src/modules/secfilter/secfilter.c +++ b/src/modules/secfilter/secfilter.c @@ -513,8 +513,6 @@ static int w_check_ip(struct sip_msg *msg) if(msg == NULL) return -1; - if(&msg->rcv.src_ip == NULL) - return -1; ip.s = ip_addr2a(&msg->rcv.src_ip); ip.len = strlen(ip.s);

1 0

[kamailio/kamailio] secfilter: some improvements and fixes (#1770)
by Victor Seva 20 Dec '18

20 Dec '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1770 -- Commit Summary -- * secfilter: reduce code copy&paste * secfilter: simplify secf_get_contact() * secfilter: fix memmory leak on error * secfilter: simplify RPC code -- File Changes -- M src/modules/secfilter/secfilter_db.c (22) M src/modules/secfilter/secfilter_hdr.c (44) M src/modules/secfilter/secfilter_rpc.c (88) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1770.patch https://github.com/kamailio/kamailio/pull/1770.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/1770

2 2

git:master:40468c0f: secfilter: simplify RPC code
by Jose Luis Verdeguer 20 Dec '18

20 Dec '18

Module: kamailio Branch: master Commit: 40468c0fb437545cd7ee211ee71183f99f413b9e URL: https://github.com/kamailio/kamailio/commit/40468c0fb437545cd7ee211ee71183f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2018-12-20T10:51:03+01:00 secfilter: simplify RPC code --- Modified: src/modules/secfilter/secfilter_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/40468c0fb437545cd7ee211ee71183f… Patch: https://github.com/kamailio/kamailio/commit/40468c0fb437545cd7ee211ee71183f… --- diff --git a/src/modules/secfilter/secfilter_rpc.c b/src/modules/secfilter/secfilter_rpc.c index 2e5a33288a..e437524336 100644 --- a/src/modules/secfilter/secfilter_rpc.c +++ b/src/modules/secfilter/secfilter_rpc.c @@ -65,81 +65,81 @@ void rpc_add_dst(rpc_t *rpc, void *ctx) "Invalid Parameters. Usage: secfilter.add_dst " "number\n Example: secfilter.add_dst " "555123123"); + return; + } + text = int2str(number, &data.len); + data.s = pkg_malloc(data.len * sizeof(char)); + if(!data.s) { + PKG_MEM_ERROR; + rpc->rpl_printf(ctx, "Error insert values in the blacklist"); + return; + } + memcpy(data.s, text, data.len); + lock_get(&secf_data->lock); + if(append_rule(2, 0, &data) == 0) { + rpc->rpl_printf(ctx, + "Values (%s) inserted into blacklist destinations", data); } else { - text = int2str(number, &data.len); - data.s = pkg_malloc(data.len * sizeof(char)); - if(!data.s) { - PKG_MEM_ERROR; - rpc->rpl_printf(ctx, "Error insert values in the blacklist"); - return; - } - memcpy(data.s, text, data.len); - lock_get(&secf_data->lock); - if(append_rule(2, 0, &data) == 0) { - rpc->rpl_printf(ctx, - "Values (%s) inserted into blacklist destinations", data); - } else { - rpc->rpl_printf(ctx, "Error insert values in the blacklist"); - } - lock_release(&secf_data->lock); - if(data.s) - pkg_free(data.s); + rpc->rpl_printf(ctx, "Error insert values in the blacklist"); } + lock_release(&secf_data->lock); + if(data.s) + pkg_free(data.s); } /* Add blacklist value */ void rpc_add_bl(rpc_t *rpc, void *ctx) { - char *ctype; + char *ctype = NULL; str data = STR_NULL; int type; - if(rpc->scan(ctx, "ss", (char *)(&ctype), (char *)(&data.s)) < 2) { + if(rpc->scan(ctx, "ss", ctype, &data.s) < 2) { rpc->fault(ctx, 0, "Invalid Parameters. Usage: secfilter.add_bl type " "value\n Example: secfilter.add_bl user " "sipvicious"); + return; + } + data.len = strlen(data.s); + type = get_type(ctype); + + lock_get(&secf_data->lock); + if(append_rule(0, type, &data) == 0) { + rpc->rpl_printf(ctx, "Values (%s, %s) inserted into blacklist", + ctype, data); } else { - data.len = strlen(data.s); - type = get_type(ctype); - - lock_get(&secf_data->lock); - if(append_rule(0, type, &data) == 0) { - rpc->rpl_printf(ctx, "Values (%s, %s) inserted into blacklist", - ctype, data); - } else { - rpc->rpl_printf(ctx, "Error insert values in the blacklist"); - } - lock_release(&secf_data->lock); + rpc->rpl_printf(ctx, "Error insert values in the blacklist"); } + lock_release(&secf_data->lock); } /* Add whitelist value */ void rpc_add_wl(rpc_t *rpc, void *ctx) { - char *ctype; + char *ctype = NULL; str data = STR_NULL; int type; - if(rpc->scan(ctx, "ss", (char *)(&ctype), (char *)(&data.s)) < 2) { + if(rpc->scan(ctx, "ss", ctype, &data.s) < 2) { rpc->fault(ctx, 0, "Invalid Parameters. Usage: secfilter.add_wl type " "value\n Example: secfilter.add_wl user " "trusted_user"); + return; + } + data.len = strlen(data.s); + type = get_type(ctype); + + lock_get(&secf_data->lock); + if(append_rule(1, type, &data) == 0) { + rpc->rpl_printf( + ctx, "Values (%s, %s) inserted into whitelist", type, data); } else { - data.len = strlen(data.s); - type = get_type(ctype); - - lock_get(&secf_data->lock); - if(append_rule(1, type, &data) == 0) { - rpc->rpl_printf( - ctx, "Values (%s, %s) inserted into whitelist", type, data); - } else { - rpc->rpl_printf(ctx, "Error insert values in the whitelist"); - } - lock_release(&secf_data->lock); + rpc->rpl_printf(ctx, "Error insert values in the whitelist"); } + lock_release(&secf_data->lock); }

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2018