sr-dev November 2010

sr-dev@lists.kamailio.org

17 participants
108 discussions

git:master: permissions(k): changed params from PVAR to SPVE type

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 18e67ca2d125f87b85c00eb74b057b9c010a8a26 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=18e67ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 25 22:25:01 2010 +0100 permissions(k): changed params from PVAR to SPVE type - type of fixup params for allow_trusted() updated from PVAR to SPVE - PVAR can be non-zero terminated string - SPVE accepts also static string or combination of PVs - adapted patch submitted by Alex Hermann for crash related to static protocol value, FS#102 --- modules_k/permissions/permissions.c | 4 +- modules_k/permissions/trusted.c | 77 +++++++++++++++++------------------ 2 files changed, 39 insertions(+), 42 deletions(-) diff --git a/modules_k/permissions/permissions.c b/modules_k/permissions/permissions.c index 4d41817..5beb016 100644 --- a/modules_k/permissions/permissions.c +++ b/modules_k/permissions/permissions.c @@ -129,8 +129,8 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE | FAILURE_ROUTE}, {"allow_trusted", (cmd_function)allow_trusted_0, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, - {"allow_trusted", (cmd_function)allow_trusted_2, 2, fixup_pvar_pvar, - fixup_free_pvar_pvar, REQUEST_ROUTE | FAILURE_ROUTE}, + {"allow_trusted", (cmd_function)allow_trusted_2, 2, fixup_spve_spve, + fixup_free_spve_spve, REQUEST_ROUTE | FAILURE_ROUTE}, {"allow_uri", (cmd_function)allow_uri, 2, double_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE|LOCAL_ROUTE}, {"allow_address", (cmd_function)allow_address, 3, fixup_igp_pvar_pvar, diff --git a/modules_k/permissions/trusted.c b/modules_k/permissions/trusted.c index 77545ad..33cae33 100644 --- a/modules_k/permissions/trusted.c +++ b/modules_k/permissions/trusted.c @@ -35,6 +35,7 @@ #include "../../config.h" #include "../../lib/srdb1/db.h" #include "../../ip_addr.h" +#include "../../mod_fix.h" #include "../../mem/shm_mem.h" #include "../../parser/msg_parser.h" #include "../../parser/parse_from.h" @@ -462,51 +463,47 @@ int allow_trusted_0(struct sip_msg* _msg, char* str1, char* str2) */ int allow_trusted_2(struct sip_msg* _msg, char* _src_ip_sp, char* _proto_sp) { - pv_spec_t *src_ip_sp, *proto_sp; - pv_value_t pv_val; - char *src_ip, *proto; + str src_ip, proto; int proto_int; - src_ip_sp = (pv_spec_t *)_src_ip_sp; - proto_sp = (pv_spec_t *)_proto_sp; - - if (src_ip_sp && (pv_get_spec_value(_msg, src_ip_sp, &pv_val) == 0)) { - if (pv_val.flags & PV_VAL_STR) { - src_ip = pv_val.rs.s; - } else { - LM_ERR("src_ip pvar value is not string\n"); - return -1; - } - } else { - LM_ERR("src_ip pvar does not exist or has no value\n"); - return -1; + if (_src_ip_sp==NULL + || (fixup_get_svalue(_msg, (gparam_p)_src_ip_sp, &src_ip) != 0)) { + LM_ERR("src_ip param does not exist or has no value\n"); + return -1; } - if (proto_sp && (pv_get_spec_value(_msg, proto_sp, &pv_val) == 0)) { - if (pv_val.flags & PV_VAL_STR) { - strlower(&(pv_val.rs)); - proto = pv_val.rs.s; - } else { - LM_ERR("proto pvar value is not string\n"); - return -1; - } - } else { - LM_ERR("proto pvar does not exist or has no value\n"); - return -1; + if (_proto_sp==NULL + || (fixup_get_svalue(_msg, (gparam_p)_proto_sp, &proto) != 0)) { + LM_ERR("proto param does not exist or has no value\n"); + return -1; } - - if (strcmp(proto, "udp") == 0) { - proto_int = PROTO_UDP; - } else if (strcmp(proto, "tcp") == 0) { - proto_int = PROTO_TCP; - } else if (strcmp(proto, "tls") == 0) { - proto_int = PROTO_TLS; - } else if (strcmp(proto, "sctp") == 0) { - proto_int = PROTO_SCTP; - } else { - LM_ERR("unknown protocol %s\n", proto); - return -1; + if(proto.len!=3 && proto.len!=4) + goto error; + + switch(proto.s[0]) { + case 'u': case 'U': + if (proto.len==3 && strncasecmp(proto.s, "udp", 3) == 0) { + proto_int = PROTO_UDP; + } else goto error; + break; + case 't': case 'T': + if (proto.len==3 && strncasecmp(proto.s, "tcp", 3) == 0) { + proto_int = PROTO_TCP; + } else if (proto.len==3 && strncasecmp(proto.s, "tls", 3) == 0) { + proto_int = PROTO_TLS; + } else goto error; + break; + case 's': case 'S': + if (proto.len==4 && strncasecmp(proto.s, "sctp", 4) == 0) { + proto_int = PROTO_SCTP; + } else goto error; + break; + default: + goto error; } - return allow_trusted(_msg, src_ip, proto_int); + return allow_trusted(_msg, src_ip.s, proto_int); +error: + LM_ERR("unknown protocol %.*s\n", proto.len, proto.s); + return -1; }

14 years

git:master: modules/topoh : If a message contains a bad CSEQ, skip processing it.

by Marius Zbihlei

Module: sip-router Branch: master Commit: 50453970817aa4ed551d7ab2b351b3742c839848 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5045397… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Nov 26 10:59:12 2010 +0200 modules/topoh : If a message contains a bad CSEQ, skip processing it. This would likely cause a segmentation fault when receiving messages with bad CSEQs. --- modules/topoh/th_msg.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/topoh/th_msg.c b/modules/topoh/th_msg.c index 5304b1e..5f87971 100644 --- a/modules/topoh/th_msg.c +++ b/modules/topoh/th_msg.c @@ -1040,6 +1040,11 @@ int th_route_direction(sip_msg_t *msg) int th_skip_msg(sip_msg_t *msg) { + if (!get_cseq(msg)) { + LM_WARN("Invalid/Unparsed CSeq in message. Skipping."); + return 1; + } + if((get_cseq(msg)->method_id)&(METHOD_REGISTER|METHOD_PUBLISH)) return 1;

14 years

git:kamailio_3.0: modules/topoh : If a message contains a bad CSEQ, skip processing it.

by Marius Zbihlei

Module: sip-router Branch: kamailio_3.0 Commit: 29990057d8b17cf0ded395438465c6cb2c38207f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2999005… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Nov 26 10:59:12 2010 +0200 modules/topoh : If a message contains a bad CSEQ, skip processing it. This would likely cause a segmentation fault when receiving messages with bad CSEQs. --- modules/topoh/th_msg.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/topoh/th_msg.c b/modules/topoh/th_msg.c index 731d831..b430e25 100644 --- a/modules/topoh/th_msg.c +++ b/modules/topoh/th_msg.c @@ -1033,6 +1033,11 @@ int th_route_direction(sip_msg_t *msg) int th_skip_msg(sip_msg_t *msg) { + if (!get_cseq(msg)) { + LM_WARN("Invalid/Unparsed CSeq in message. Skipping."); + return 1; + } + if((get_cseq(msg)->method_id)&(METHOD_REGISTER|METHOD_PUBLISH)) return 1;

14 years

git:master: topoh: enhaced description of mask_ip parameter

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 4fe783a09d6af1a2c16659f961b9097a021805d8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4fe783a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 26 10:00:42 2010 +0100 topoh: enhaced description of mask_ip parameter --- modules/topoh/README | 7 ++++--- modules/topoh/doc/topoh_admin.xml | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/topoh/README b/modules/topoh/README index 2940d5e..0ed980f 100644 --- a/modules/topoh/README +++ b/modules/topoh/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright � 2009 FhG FOKUS + Copyright © 2009 FhG FOKUS __________________________________________________________________ Table of Contents @@ -132,8 +132,9 @@ modparam("topoh", "mask_key", "some secret here") 3.2. mask_ip (str) IP address to be used in masked headers to build valid SIP URIs. Can be - any IP address, does not affect routing when used on the main SIP - server. + any IP address, even a private-space IP address (e.g., 192.168.1.1), + but must not be SIP server's local IP address. It is not used at all + for SIP routing. Default value is "10.1.1.10". diff --git a/modules/topoh/doc/topoh_admin.xml b/modules/topoh/doc/topoh_admin.xml index 9f8673d..d028437 100644 --- a/modules/topoh/doc/topoh_admin.xml +++ b/modules/topoh/doc/topoh_admin.xml @@ -89,8 +89,9 @@ modparam("topoh", "mask_key", "some secret here") <title><varname>mask_ip</varname> (str)</title> <para> IP address to be used in masked headers to build valid - SIP URIs. Can be any IP address, does not affect routing - when used on the main SIP server. + SIP URIs. Can be any IP address, even a private-space IP address + (e.g., 192.168.1.1), but must not be SIP server's local IP address. + It is not used at all for SIP routing. </para> <para> <emphasis>

14 years

git:master: topoh: more verbose err reporting during init

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 11ea0c4de66e40bfa1ba03a351f7ec6bc5f0fbfc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11ea0c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 26 09:54:04 2010 +0100 topoh: more verbose err reporting during init - check also if mask ip != local ip - should prevent the crashes when mask ip == local ip --- modules/topoh/topoh_mod.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/modules/topoh/topoh_mod.c b/modules/topoh/topoh_mod.c index a1f3fd2..87a8a13 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -42,6 +42,7 @@ #include "../../events.h" #include "../../dprint.h" #include "../../ut.h" +#include "../../forward.h" #include "../../parser/msg_parser.h" #include "../../parser/parse_to.h" #include "../../parser/parse_from.h" @@ -110,6 +111,16 @@ static int mod_init(void) { th_cookie_name.len = strlen(th_cookie_name.s); th_ip.len = strlen(th_ip.s); + if(th_ip.len<=0) + { + LM_ERR("mask IP parameter is invalid\n"); + goto error; + } + if(check_self(&th_ip, 0, 0)==1) + { + LM_ERR("mask IP must be different than SIP server local IP\n"); + goto error; + } th_uparam_name.len = strlen(th_uparam_name.s); th_uparam_prefix.len = strlen(th_uparam_prefix.s); th_vparam_name.len = strlen(th_vparam_name.s); @@ -121,18 +132,25 @@ static int mod_init(void) + th_vparam_prefix.len; th_via_prefix.s = (char*)pkg_malloc(th_via_prefix.len+1); if(th_via_prefix.s==NULL) + { + LM_ERR("via prefix parameter is invalid\n"); goto error; + } /* 'sip:' + ip + ';' + param + '=' + prefix (+ '\0') */ th_uri_prefix.len = 4 + th_ip.len + 1 + th_uparam_name.len + 1 + th_uparam_prefix.len; th_uri_prefix.s = (char*)pkg_malloc(th_uri_prefix.len+1); if(th_uri_prefix.s==NULL) + { + LM_ERR("uri prefix parameter is invalid\n"); goto error; + } /* build via prefix */ memcpy(th_via_prefix.s, "SIP/2.0/UDP ", 12); memcpy(th_via_prefix.s+12, th_ip.s, th_ip.len); th_via_prefix.s[12+th_ip.len] = ';'; - memcpy(th_via_prefix.s+12+th_ip.len+1, th_vparam_name.s, th_vparam_name.len); + memcpy(th_via_prefix.s+12+th_ip.len+1, th_vparam_name.s, + th_vparam_name.len); th_via_prefix.s[12+th_ip.len+1+th_vparam_name.len] = '='; memcpy(th_via_prefix.s+12+th_ip.len+1+th_vparam_name.len+1, th_vparam_prefix.s, th_vparam_prefix.len);

14 years

git:3.1: modules_k/nathelper: add_contact_alias adds <>s around contact URI

by Juha Heinanen

Module: sip-router Branch: 3.1 Commit: f5ef15fee0c3bf09adf2506effa0895f72af9034 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f5ef15f… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Nov 26 10:37:30 2010 +0200 modules_k/nathelper: add_contact_alias adds <>s around contact URI Make sure that Contact URI is surrounded by <> when adding ;alias parameter. Otherwise, ;alias parameter may be interpreted as header parameter, because the syntax seems to be ambiguous. --- modules_k/nathelper/nathelper.c | 69 +++++++++++++++++++++++++++++++------- 1 files changed, 56 insertions(+), 13 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 82c6528..dd737a3 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -786,7 +786,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) struct lump *anchor; struct sip_uri uri; struct ip_addr *ip; - char *param, *at, *port, *start; + char *lt, *gt, *param, *at, *port, *start; /* Do nothing if Contact header does not exist */ if (!msg->contact) { @@ -816,25 +816,63 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) return 2; } - /* Add alias param */ + /* Check if function has been called already */ if ((c->uri.s < msg->buf) || (c->uri.s > (msg->buf + msg->len))) { LM_ERR("you can't call alias_contact twice, check your config!\n"); return -1; } + + /* Check if Contact URI needs to be enclosed in <>s */ + lt = gt = param = NULL; + at = memchr(msg->contact->body.s, '<', msg->contact->body.len); + if (at == NULL) { + lt = (char*)pkg_malloc(1); + if (!lt) { + LM_ERR("no pkg memory left for lt sign\n"); + goto err; + } + *lt = '<'; + anchor = anchor_lump(msg, msg->contact->body.s - msg->buf, 0, 0); + if (anchor == NULL) { + LM_ERR("anchor_lump for beginning of contact body failed\n"); + goto err; + } + if (insert_new_lump_before(anchor, lt, 1, 0) == 0) { + LM_ERR("insert_new_lump_before for \"<\" failed\n"); + goto err; + } + gt = (char*)pkg_malloc(1); + if (!gt) { + LM_ERR("no pkg memory left for gt sign\n"); + goto err; + } + *gt = '>'; + anchor = anchor_lump(msg, msg->contact->body.s + + msg->contact->body.len - msg->buf, 0, 0); + if (anchor == NULL) { + LM_ERR("anchor_lump for end of contact body failed\n"); + goto err; + } + if (insert_new_lump_before(anchor, gt, 1, 0) == 0) { + LM_ERR("insert_new_lump_before for \">\" failed\n"); + goto err; + } + } + + /* Create ;alias param */ param_len = SALIAS_LEN + IP6_MAX_STR_SIZE + 1 /* ~ */ + 5 /* port */ + 1 /* ~ */ + 1 /* proto */; param = (char*)pkg_malloc(param_len); if (!param) { LM_ERR("no pkg memory left for alias param\n"); - return -1; + goto err; } at = param; append_str(at, SALIAS, SALIAS_LEN); ip_len = ip_addr2sbuf(&(msg->rcv.src_ip), at, param_len - SALIAS_LEN); if (ip_len <= 0) { - pkg_free(param); LM_ERR("failed to copy source ip\n"); - return -1; + goto err; } at = at + ip_len; append_chr(at, '~'); @@ -842,9 +880,8 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) append_str(at, port, len); append_chr(at, '~'); if ((msg->rcv.proto < PROTO_UDP) || (msg->rcv.proto > PROTO_SCTP)) { - pkg_free(param); LM_ERR("invalid transport protocol\n"); - return -1; + goto err; } append_chr(at, msg->rcv.proto + '0'); param_len = at - param; @@ -854,18 +891,24 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) } else { start = uri.host.s + uri.host.len; } + + /* Add ;alias param */ anchor = anchor_lump(msg, start - msg->buf, 0, 0); if (anchor == NULL) { - pkg_free(param); - LM_ERR("anchor_lump failed\n"); - return -1; + LM_ERR("anchor_lump for ;alias param failed\n"); + goto err; } if (insert_new_lump_after(anchor, param, param_len, 0) == 0) { - LM_ERR("insert_new_lump_after failed\n"); - pkg_free(param); - return -1; + LM_ERR("insert_new_lump_after for ;alias param failed\n"); + goto err; } return 1; + + err: + if (lt) pkg_free(lt); + if (gt) pkg_free(gt); + if (param) pkg_free(param); + return -1; }

14 years

[tracker] Comment added: Segfault in allow_trusted2

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#102 - Segfault in allow_trusted2 User who did this - Daniel-Constantin Mierla (miconda) ---------- I spotted some other potential issues with the types of parameters used in fixup so I did a bigger patch that should fix also the problem you reported. Can you test the patch from the following commit I did on master branch on v3.1? http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=18e67ca… If all ok, I will backport. Thanks! ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=102#comment133 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.

14 years

[tracker] Task opened: $snd(name) pvar contains local instead of remote socket info

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Alex Hermann (axlh) Attached to Project - sip-router Summary - $snd(name) pvar contains local instead of remote socket info Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Normal Reported Version - 3.1 Due in Version - Undecided Due Date - Undecided Details - The following fragment <code> onsend_route { xlog("Sending request to $snd(proto):$snd(af):$snd(ip):$snd(port) len: $ml"); return; } </code> always logs the local listen ip and port of kamailio. Documentation says: "$snd(name) - return attributes of the address where the request is going to be sent." More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=103 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.

14 years

[tracker] Assignee added: $snd(name) pvar contains local instead of remote socket info

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#103 - $snd(name) pvar contains local instead of remote socket info User who did this - Alex Hermann (axlh) http://sip-router.org/tracker/index.php?do=details&task_id=103 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.

14 years

[tracker] Task opened: Segfault in allow_trusted2 (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Alex Hermann (axlh) Attached to Project - sip-router Summary - Segfault in allow_trusted2 Task Type - Bug Report Category - Modules kamailio Status - Assigned Assigned To - Daniel-Constantin Mierla Operating System - All Severity - Medium Priority - Normal Reported Version - 3.1 Due in Version - Undecided Due Date - Undecided Details - if (allow_trusted("$si", "$proto")) Will cause a segfault. $proto is returned from the following code fragment in pv_core.c: int pv_get_proto(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str s; if(msg==NULL) return -1; switch(msg->rcv.proto) { case PROTO_UDP: s.s = "udp"; s.len = 3; break; The "udp" string is allocated by the compiler in the TEXT segment, which by its nature is not writable. The tolower() which allow_trusted2() tries to do later is rewarded with a segfault. Attached patch fixes the segfault. One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=102 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.

14 years

← Newer
1
2
3
4
5
6
7
8
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2010