sr-dev September 2011

sr-dev@lists.kamailio.org

40 participants
298 discussions

Siremis Enhancements: Access restrictions of pages

by James Wyatt

A user could access any page if they knew the URL without authenticating. Users are now redirected to the login page if they try to access another page without being logged in. This patch requires that the User roles, PUA and RLS patches be applied first James

13 years

Siremis enhancements: User roles and redirection

by James Wyatt

Over this summer I have been doing some work for Crocodile RCS on Siremis and have made a number of enhancements. I will be sending patches for these enhancements in a series of emails to this list. Here is the first... The users member and guest were assigned to opposite roles. Member and guest now both are directed to SER page as opposed to accessing the Administration page and getting an access error.

13 years

git:master: modules/auth: mark credentials after verifying realm, not only after authentication succeeded

by Alex Hermann

Module: sip-router Branch: master Commit: 451eb00507c3f4fe81c16da83dae11223efb6cfe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=451eb00… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Sep 12 11:25:26 2011 +0200 modules/auth: mark credentials after verifying realm, not only after authentication succeeded Make $Au backwards compatible with 1.x. In 1.x $Au would be set to the credentials username@domain for matching realm, not only for successfull authentication. --- modules/auth/api.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/auth/api.c b/modules/auth/api.c index b7ce413..14281c9 100644 --- a/modules/auth/api.c +++ b/modules/auth/api.c @@ -94,6 +94,11 @@ auth_result_t pre_auth(struct sip_msg* msg, str* realm, hdr_types_t hftype, c->digest.alg.alg_str.len, c->digest.alg.alg_str.s, c->digest.alg.alg_parsed); + if (mark_authorized_cred(msg, *hdr) < 0) { + LOG(L_ERR, "auth:pre_auth: Error while marking parsed credentials\n"); + return ERROR; + } + /* check authorization header field's validity */ if (check_auth_hdr == NULL) { check_hf = auth_check_hdr_md5; @@ -173,11 +178,6 @@ auth_result_t post_auth(struct sip_msg* msg, struct hdr_field* hdr) } } - if (mark_authorized_cred(msg, hdr) < 0) { - LOG(L_ERR, "auth:post_auth: Error while marking parsed credentials\n"); - res = ERROR; - } - return res; }

13 years

git:master: lib/srdb1: eleminate string copy in db_val2pv_spec()

by Alex Hermann

Module: sip-router Branch: master Commit: 07b830d4aca21074592dc92dd99c7f7da924bcab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=07b830d… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Tue Sep 6 10:18:10 2011 +0200 lib/srdb1: eleminate string copy in db_val2pv_spec() After fixing a memory leak, i now realize pv_set_spec_value() always makes a string copy too, so this one can be removed safely. --- lib/srdb1/db_ut.c | 52 +++++++++------------------------------------------- 1 files changed, 9 insertions(+), 43 deletions(-) diff --git a/lib/srdb1/db_ut.c b/lib/srdb1/db_ut.c index babe0e7..840c861 100644 --- a/lib/srdb1/db_ut.c +++ b/lib/srdb1/db_ut.c @@ -407,8 +407,7 @@ int db_print_set(const db1_con_t* _c, char* _b, const int _l, const db_key_t* _k int db_val2pv_spec(struct sip_msg* msg, db_val_t *dbval, pv_spec_t *pvs) { pv_value_t pv; - str sv = {NULL, 0}; - static str _str_empty = { "", 0 }; + char ll_buf[21]; /* sign, 19 digits and \0 */ if(dbval->nul) { @@ -419,18 +418,18 @@ int db_val2pv_spec(struct sip_msg* msg, db_val_t *dbval, pv_spec_t *pvs) { case DB1_STRING: pv.flags = PV_VAL_STR; - sv.s = (char*)dbval->val.string_val; - sv.len = strlen(sv.s); + pv.rs.s = (char*)dbval->val.string_val; + pv.rs.len = strlen(pv.rs.s); break; case DB1_STR: pv.flags = PV_VAL_STR; - sv.s = (char*)dbval->val.str_val.s; - sv.len = dbval->val.str_val.len; + pv.rs.s = (char*)dbval->val.str_val.s; + pv.rs.len = dbval->val.str_val.len; break; case DB1_BLOB: pv.flags = PV_VAL_STR; - sv.s = (char*)dbval->val.blob_val.s; - sv.len = dbval->val.blob_val.len; + pv.rs.s = (char*)dbval->val.blob_val.s; + pv.rs.len = dbval->val.blob_val.len; break; case DB1_INT: pv.flags = PV_VAL_INT | PV_TYPE_INT; @@ -447,14 +446,8 @@ int db_val2pv_spec(struct sip_msg* msg, db_val_t *dbval, pv_spec_t *pvs) case DB1_BIGINT: /* BIGINT is stored as string */ pv.flags = PV_VAL_STR; - pv.rs.len = 21*sizeof(char); - pv.rs.s = (char*)pkg_malloc(pv.rs.len); - if (pv.rs.s==NULL) - { - LM_ERR("no more memory\n"); - return -1; - } - db_longlong2str(dbval->val.ll_val, pv.rs.s, &pv.rs.len); + db_longlong2str(dbval->val.ll_val, ll_buf, &pv.rs.len); + pv.rs.s = ll_buf; break; default: LM_NOTICE("unknown field type: %d, setting value to null\n", @@ -467,39 +460,12 @@ int db_val2pv_spec(struct sip_msg* msg, db_val_t *dbval, pv_spec_t *pvs) if (pv.flags == PV_VAL_NULL && pvs->type == PVT_AVP) return 0; - /* handle string values */ - if(pv.flags == PV_VAL_STR && sv.s) - { - if(sv.len==0) - { - pv.rs = _str_empty; - } else - { - /* create copy of string value in pkg mem */ - pv.rs.s = (char*)pkg_malloc(sv.len*sizeof(char)); - if(pv.rs.s==NULL) - { - LM_ERR("no more memory\n"); - return -1; - } - memcpy(pv.rs.s, sv.s, sv.len); - pv.rs.len = sv.len; - } - } - /* add value to result pv */ if (pv_set_spec_value(msg, pvs, 0, &pv) != 0) { LM_ERR("Failed to add value to spec\n"); - if (pv.flags == PV_VAL_STR && pv.rs.len > 0) - pkg_free(pv.rs.s); return -1; } - /* free string memory */ - if (pv.flags == PV_VAL_STR && pv.rs.len > 0) { - pkg_free(pv.rs.s); - } - return 0; }

13 years

git:master: modules_k/nathelper: fix add_contact_alias() for contacts without angle brackets <>

by Alex Hermann

Module: sip-router Branch: master Commit: 6537171c48a35af3a0e01f932b6abd595cb5f95a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6537171… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Tue Sep 6 14:44:25 2011 +0200 modules_k/nathelper: fix add_contact_alias() for contacts without angle brackets <> When adding the brackets and the alias, the function suffered from the infamous problem that the same part of a message can only be changed once. Inserting 3 lumps created an offset problem resulting in the alias parameter being added outside the brackets. This patch converts it to adding just 2 non-overlapping lumps by combining the closing > with the alias parameter. --- modules_k/nathelper/nathelper.c | 39 +++++++++++++++------------------------ 1 files changed, 15 insertions(+), 24 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index ad9954f..a7186d7 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -790,7 +790,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 *lt, *gt, *param, *at, *port, *start; + char *bracket, *lt, *param, *at, *port, *start; /* Do nothing if Contact header does not exist */ if (!msg->contact) { @@ -827,9 +827,10 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) } /* 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 = param = NULL; + bracket = memchr(msg->contact->body.s, '<', msg->contact->body.len); + if (bracket == NULL) { + /* add opening < */ lt = (char*)pkg_malloc(1); if (!lt) { LM_ERR("no pkg memory left for lt sign\n"); @@ -845,33 +846,18 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) 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 */; + 1 /* ~ */ + 1 /* proto */ + 1 /* closing > */; param = (char*)pkg_malloc(param_len); if (!param) { LM_ERR("no pkg memory left for alias param\n"); goto err; } at = param; + /* ip address */ append_str(at, SALIAS, SALIAS_LEN); ip_len = ip_addr2sbuf(&(msg->rcv.src_ip), at, param_len - SALIAS_LEN); if (ip_len <= 0) { @@ -879,24 +865,30 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) goto err; } at = at + ip_len; + /* port */ append_chr(at, '~'); port = int2str(msg->rcv.src_port, &len); append_str(at, port, len); + /* proto */ append_chr(at, '~'); if ((msg->rcv.proto < PROTO_UDP) || (msg->rcv.proto > PROTO_SCTP)) { LM_ERR("invalid transport protocol\n"); goto err; } append_chr(at, msg->rcv.proto + '0'); + /* closing > */ + if (bracket == NULL) { + append_chr(at, '>'); + } param_len = at - param; + + /* Add ;alias param */ LM_DBG("adding param <%.*s>\n", param_len, param); if (uri.port.len > 0) { start = uri.port.s + uri.port.len; } else { start = uri.host.s + uri.host.len; } - - /* Add ;alias param */ anchor = anchor_lump(msg, start - msg->buf, 0, 0); if (anchor == NULL) { LM_ERR("anchor_lump for ;alias param failed\n"); @@ -910,7 +902,6 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) err: if (lt) pkg_free(lt); - if (gt) pkg_free(gt); if (param) pkg_free(param); return -1; }

13 years

permissions crashing

by Bogdan Pintea

Hi, Seems like _k/permissions module will crash the router if no rule is set - no rules list files are provided as well as no db_url (more likely to occur if wrong defines are used). Happens on K 3.1.3, but seems that master is still susceptible. The "addr_hash_table" var remains 0 here and being unconditionally deref'ed by script funcs (like allow_source_address() ). A rather artificial case, but still, a warning might be preferable. Bogdan.

13 years

ds_next_dst() dstid avp handling

by Bogdan Pintea

Hi, I've been trying to use the dispatcher module in load balancing distribution scenario, but I get this "cannot uid for dst addr" error, when ds_next_dst() is invoked. Went through the sources and I was wondering if there isn't actually a bug/typo, as the attached diff (against master) tries to fix. Thanks, Bogdan.

13 years

git:3.1: dispatcher(k): typo in ds_next_dst() dstid avp handling

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: cd1290e5602f06be16589cde193d1443aee4dcd2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd1290e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 12 12:52:33 2011 +0200 dispatcher(k): typo in ds_next_dst() dstid avp handling - fixes wrong condition in finding dstid avp - patch by Bogdan Pintea (cherry picked from commit 11f7ddaf80d2865a649d35581f8d0ff06857af04) --- modules_k/dispatcher/dispatch.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index 79bcc57..e16277c 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -1954,9 +1954,9 @@ int ds_next_dst(struct sip_msg *msg, int mode) { prev_avp = search_first_avp(dstid_avp_type, dstid_avp_name, &avp_value, &st); - if(prev_avp!=NULL) + if(prev_avp==NULL) { - LM_ERR("cannot uid for dst addr\n"); + LM_ERR("cannot find uid avp for destination address\n"); return -1; } if(ds_load_replace(msg, &avp_value.s)<0)

13 years

git:master: dispatcher(k): typo in ds_next_dst() dstid avp handling

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 11f7ddaf80d2865a649d35581f8d0ff06857af04 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11f7dda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 12 12:52:33 2011 +0200 dispatcher(k): typo in ds_next_dst() dstid avp handling - fixes wrong condition in finding dstid avp - patch by Bogdan Pintea --- modules_k/dispatcher/dispatch.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index b4f2ee3..f5f5242 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -1928,9 +1928,9 @@ int ds_next_dst(struct sip_msg *msg, int mode) { prev_avp = search_first_avp(dstid_avp_type, dstid_avp_name, &avp_value, &st); - if(prev_avp!=NULL) + if(prev_avp==NULL) { - LM_ERR("cannot uid for dst addr\n"); + LM_ERR("cannot find uid avp for destination address\n"); return -1; } if(ds_load_replace(msg, &avp_value.s)<0)

13 years

git:master: modules_k/dialog: Do not log an ERROR level message when

by Timo Reimann

Module: sip-router Branch: master Commit: 02e845bf64f0151255ca54feb7f59a9b500dc1e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=02e845b… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Sep 12 11:20:55 2011 +0200 modules_k/dialog: Do not log an ERROR level message when attempting to delete a non-existing dialog variable, thereby bringing dialog variable behavior more in line with AVP behavior. Credits to Anca Vamanu (anca.vamanu(a)1and1.ro). --- modules_k/dialog/dlg_var.c | 36 ++++++++++++++---------------------- 1 files changed, 14 insertions(+), 22 deletions(-) diff --git a/modules_k/dialog/dlg_var.c b/modules_k/dialog/dlg_var.c index 3226bc4..310b674 100644 --- a/modules_k/dialog/dlg_var.c +++ b/modules_k/dialog/dlg_var.c @@ -150,10 +150,9 @@ int set_dlg_variable_unsafe(struct dlg_cell *dlg, str *key, str *val) } /* not found: */ - if (!var) { - LM_ERR("dialog variable <%.*s> does not exist in variable list\n", key->len, key->s); - return -1; + LM_DBG("dialog variable <%.*s> does not exist in variable list\n", key->len, key->s); + return 1; } /* insert a new one at the beginning of the list */ @@ -240,6 +239,7 @@ str * get_dlg_variable(struct dlg_cell *dlg, str *key) int set_dlg_variable(struct dlg_cell *dlg, str *key, str *val) { + int ret = -1; if( !dlg || !key || key->len > strlen(key->s) || (val && val->len > strlen(val->s))) { LM_ERR("BUG - bad parameters\n"); @@ -248,18 +248,9 @@ int set_dlg_variable(struct dlg_cell *dlg, str *key, str *val) dlg_lock(d_table, &(d_table->entries[dlg->h_entry])); - if( !val) - { - if (set_dlg_variable_unsafe(dlg, key, NULL)!=0) { - LM_ERR("failed to delete dialog variable <%.*s>\n", key->len,key->s); - goto error; - } - } else { - if (set_dlg_variable_unsafe(dlg, key, val)!=0) { - LM_ERR("failed to store dialog values <%.*s>\n",key->len,key->s); - goto error; - } - } + ret = set_dlg_variable_unsafe(dlg, key, val); + if(ret!= 0) + goto done; dlg->dflags &= DLG_FLAG_CHANGED_VARS; dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); @@ -270,9 +261,9 @@ int set_dlg_variable(struct dlg_cell *dlg, str *key, str *val) return 0; -error: +done: dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); - return -1; + return ret; } int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) @@ -313,6 +304,7 @@ int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) { struct dlg_cell *dlg; + int ret = -1; /* Retrieve the current dialog */ dlg=get_current_dialog( msg); @@ -332,11 +324,11 @@ int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value if (val==NULL || val->flags&(PV_VAL_NONE|PV_VAL_NULL|PV_VAL_EMPTY)) { /* if NULL, remove the value */ - if (set_dlg_variable_unsafe(dlg, &param->pvn.u.isname.name.s, NULL)!=0) { - LM_ERR("failed to delete dialog variable <%.*s>\n", param->pvn.u.isname.name.s.len,param->pvn.u.isname.name.s.s); + ret = set_dlg_variable_unsafe(dlg, &param->pvn.u.isname.name.s, NULL); + if(ret!= 0) { /* unlock dialog */ if (dlg) dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); - return -1; + return ret; } } else { /* if value, must be string */ @@ -347,8 +339,8 @@ int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value return -1; } - if (set_dlg_variable_unsafe(dlg, &param->pvn.u.isname.name.s, &val->rs)!=0) { - LM_ERR("failed to store dialog values <%.*s>\n",param->pvn.u.isname.name.s.len,param->pvn.u.isname.name.s.s); + ret = set_dlg_variable_unsafe(dlg, &param->pvn.u.isname.name.s, &val->rs); + if(ret!= 0) { /* unlock dialog */ if (dlg) dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); return -1;

13 years

← Newer
1
...
17
18
19
20
21
22
23
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2011