sr-dev May 2021

sr-dev@lists.kamailio.org

12 participants
288 discussions

git:master:c0532161: jwt: handle claims that have numeric values
by Daniel-Constantin Mierla 03 May '21

03 May '21

Module: kamailio Branch: master Commit: c0532161f18cce514adaf2b5d784999319445911 URL: https://github.com/kamailio/kamailio/commit/c0532161f18cce514adaf2b5d784999… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T08:00:32+02:00 jwt: handle claims that have numeric values - values in between quotes are string always --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c0532161f18cce514adaf2b5d784999… Patch: https://github.com/kamailio/kamailio/commit/c0532161f18cce514adaf2b5d784999… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 6426381efb..4a88c9f0dd 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -186,6 +186,7 @@ static int ki_jwt_generate(sip_msg_t* msg, str *key, str *alg, str *claims) param_t *pit = NULL; int ret = 0; jwt_t *jwt = NULL; + long lval = 0; if(key==NULL || key->s==NULL || alg==NULL || alg->s==NULL || claims==NULL || claims->s==NULL || claims->len<=0) { @@ -242,16 +243,30 @@ static int ki_jwt_generate(sip_msg_t* msg, str *key, str *alg, str *claims) iat = time(NULL); ret = jwt_add_grant_int(jwt, "iat", iat); + if(ret != 0) { + LM_ERR("failed to add iat grant\n"); + goto error; + } for (pit = params_list; pit; pit=pit->next) { if(pit->name.len>0 && pit->body.len>0) { pit->name.s[pit->name.len] = '\0'; pit->body.s[pit->body.len] = '\0'; - jwt_add_grant(jwt, pit->name.s, pit->body.s); + if(pit->body.s[-1] == '\"' || pit->body.s[-1] == '\'') { + ret = jwt_add_grant(jwt, pit->name.s, pit->body.s); + } else if(str2slong(&pit->body, &lval)==0) { + ret = jwt_add_grant_int(jwt, pit->name.s, lval); + } else { + ret = jwt_add_grant(jwt, pit->name.s, pit->body.s); + } + if(ret != 0) { + LM_ERR("failed to add %s grant\n", pit->name.s); + goto error; + } } } ret = jwt_set_alg(jwt, valg, (unsigned char*)kdata.s, (size_t)kdata.len); - if (ret < 0) { + if (ret != 0) { LM_ERR("failed to set algorithm and key\n"); goto error; } @@ -324,6 +339,7 @@ static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, jwt_t *jwt = NULL; jwt_valid_t *jwt_valid = NULL; str sparams = STR_NULL; + long lval = 0; if(key==NULL || key->s==NULL || alg==NULL || alg->s==NULL || claims==NULL || claims->s==NULL || claims->len<=0 @@ -384,7 +400,17 @@ static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, if(pit->name.len>0 && pit->body.len>0) { pit->name.s[pit->name.len] = '\0'; pit->body.s[pit->body.len] = '\0'; - jwt_valid_add_grant(jwt_valid, pit->name.s, pit->body.s); + if(pit->body.s[-1] == '\"' || pit->body.s[-1] == '\'') { + ret = jwt_valid_add_grant(jwt_valid, pit->name.s, pit->body.s); + } else if(str2slong(&pit->body, &lval)==0) { + ret = jwt_valid_add_grant_int(jwt_valid, pit->name.s, lval); + } else { + ret = jwt_valid_add_grant(jwt_valid, pit->name.s, pit->body.s); + } + if(ret != 0) { + LM_ERR("failed to add %s valid grant\n", pit->name.s); + goto error; + } } }

1 0

git:master:80c906d5: core: ut - functions to convert from str to long
by Daniel-Constantin Mierla 03 May '21

03 May '21

Module: kamailio Branch: master Commit: 80c906d5418ece5e4a3e993cc632a0e6ae3d24be URL: https://github.com/kamailio/kamailio/commit/80c906d5418ece5e4a3e993cc632a0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T08:00:32+02:00 core: ut - functions to convert from str to long --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/80c906d5418ece5e4a3e993cc632a0e… Patch: https://github.com/kamailio/kamailio/commit/80c906d5418ece5e4a3e993cc632a0e… --- diff --git a/src/core/ut.h b/src/core/ut.h index 4ab08024a7..61ff696e13 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -628,69 +628,88 @@ static inline void strlower(str* _s) } +#define str2unval(_s, _r) do { \ + int i; \ + if (_r == NULL) return -1; \ + *_r = 0; \ + if (_s == NULL) return -1; \ + if (_s->len < 0) return -1; \ + if (_s->s == NULL) return -1; \ + for(i = 0; i < _s->len; i++) { \ + if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { \ + *_r *= 10; \ + *_r += _s->s[i] - '0'; \ + } else { \ + return -1; \ + } \ + } \ + return 0; \ + } while(0) + /* - * Convert a str into integer + * Convert an str to unsigned long */ -static inline int str2int(str* _s, unsigned int* _r) +static inline int str2ulong(str* _s, unsigned long* _r) { - int i; + str2unval(_s, _r); +} - if (_r == NULL) return -1; - *_r = 0; - if (_s == NULL) return -1; - if (_s->len < 0) return -1; - if (_s->s == NULL) return -1; +/* + * Convert an str to unsigned integer + */ +static inline int str2int(str* _s, unsigned int* _r) +{ + str2unval(_s, _r); +} - for(i = 0; i < _s->len; i++) { - if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { - *_r *= 10; - *_r += _s->s[i] - '0'; - } else { - return -1; - } - } +#define str2snval(_s, _r) do { \ + int i; \ + int sign; \ + if (_s == NULL) return -1; \ + if (_r == NULL) return -1; \ + if (_s->len < 0) return -1; \ + if (_s->s == NULL) return -1; \ + *_r = 0; \ + sign = 1; \ + i = 0; \ + if (_s->s[0] == '+') { \ + i++; \ + } else if (_s->s[0] == '-') { \ + sign = -1; \ + i++; \ + } \ + for(; i < _s->len; i++) { \ + if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { \ + *_r *= 10; \ + *_r += _s->s[i] - '0'; \ + } else { \ + return -1; \ + } \ + } \ + *_r *= sign; \ + return 0; \ + } while(0) - return 0; +/* + * Convert an str to signed long + */ +static inline int str2slong(str* _s, long* _r) +{ + str2snval(_s, _r); } + /* * Convert an str to signed integer */ static inline int str2sint(str* _s, int* _r) { - int i; - int sign; - - if (_s == NULL) return -1; - if (_r == NULL) return -1; - if (_s->len < 0) return -1; - if (_s->s == NULL) return -1; - - *_r = 0; - sign = 1; - i = 0; - if (_s->s[0] == '+') { - i++; - } else if (_s->s[0] == '-') { - sign = -1; - i++; - } - for(; i < _s->len; i++) { - if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { - *_r *= 10; - *_r += _s->s[i] - '0'; - } else { - return -1; - } - } - *_r *= sign; - - return 0; + str2snval(_s, _r); } /* - * Convert a str into integer + * Convert an strz to integer */ static inline int strz2int(char* _s, unsigned int* _r) { @@ -713,7 +732,7 @@ static inline int strz2int(char* _s, unsigned int* _r) } /* - * Convert an str to signed integer + * Convert an strz to signed integer */ static inline int strz2sint(char* _s, int* _r) {

1 0

git:master:201c219a: lost: error response fix in lost_function(), lost_held_dereference() and lost_held_function()
by Wolfgang Kampichler 02 May '21

02 May '21

Module: kamailio Branch: master Commit: 201c219a5496924e701cc2b17fb0a439ee530813 URL: https://github.com/kamailio/kamailio/commit/201c219a5496924e701cc2b17fb0a43… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-02T17:28:44+02:00 lost: error response fix in lost_function(), lost_held_dereference() and lost_held_function() - error variable was set to 0 (clean up) before return. Lost functions now returns 500 in case of LOST/HELD server error, or 400 in case of internal error, otherwise 2xx. --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.c Modified: src/modules/lost/response.h --- Diff: https://github.com/kamailio/kamailio/commit/201c219a5496924e701cc2b17fb0a43… Patch: https://github.com/kamailio/kamailio/commit/201c219a5496924e701cc2b17fb0a43…

1 0

git:master:824920d5: topos_redis: use initial transaction method for early dialog branch loading
by Daniel-Constantin Mierla 01 May '21

01 May '21

Module: kamailio Branch: master Commit: 824920d5b159d80ce3c241313bf647b5dbbf6661 URL: https://github.com/kamailio/kamailio/commit/824920d5b159d80ce3c241313bf647b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-01T14:38:36+02:00 topos_redis: use initial transaction method for early dialog branch loading --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/824920d5b159d80ce3c241313bf647b… Patch: https://github.com/kamailio/kamailio/commit/824920d5b159d80ce3c241313bf647b… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index d63543dc38..c2d43b4c33 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -588,6 +588,7 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat str skey = STR_NULL; str sval = STR_NULL; str xuuid = str_init(""); + str smethod = str_init("INVITE"); if(msg==NULL || md==NULL || sd==NULL) return -1; @@ -622,12 +623,17 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat xuuid.len = sd->b_uuid.len - 1; } + if(md->s_method_id & (METHOD_SUBSCRIBE|METHOD_NOTIFY)) { + smethod.s = "SUBSCRIBE"; + smethod.len =9; + } + rp = _tps_redis_cbuf; rkey.len = snprintf(rp, TPS_REDIS_DATA_SIZE, "%.*s%.*s:%.*s:%.*s:x%.*s", _tps_redis_bprefix.len, _tps_redis_bprefix.s, - md->s_method.len, md->s_method.s, + smethod.len, smethod.s, md->a_callid.len, md->a_callid.s, md->b_tag.len, md->b_tag.s, xuuid.len, xuuid.s); @@ -1161,15 +1167,11 @@ int tps_redis_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, return -1; } - if(md->s_method.len==6 && strncmp(md->s_method.s, "INVITE", 6)==0) { - if(tps_redis_insert_initial_method_branch(md, sd)<0) { - LM_ERR("failed to insert INVITE extra branch data\n"); - return -1; - } - } - if(md->s_method.len==9 && strncmp(md->s_method.s, "SUBSCRIBE", 9)==0) { + if(md->s_method_id==METHOD_INVITE + || md->s_method_id==METHOD_SUBSCRIBE) { if(tps_redis_insert_initial_method_branch(md, sd)<0) { - LM_ERR("failed to insert SUBSCRIBE extra branch data\n"); + LM_ERR("failed to insert %.*s extra initial branch data\n", + md->s_method.len, md->s_method.s); return -1; } }

1 0

git:master:7b3a33d8: topos_redis: use also stored record to get uuid for branch replies
by Daniel-Constantin Mierla 01 May '21

01 May '21

Module: kamailio Branch: master Commit: 7b3a33d88ae3e3bbef88294720aa21ba34118b8e URL: https://github.com/kamailio/kamailio/commit/7b3a33d88ae3e3bbef88294720aa21b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-01T13:28:32+02:00 topos_redis: use also stored record to get uuid for branch replies --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/7b3a33d88ae3e3bbef88294720aa21b… Patch: https://github.com/kamailio/kamailio/commit/7b3a33d88ae3e3bbef88294720aa21b…

1 0

git:master:b798fda3: pkg: small spelling fix in comments
by Henning Westerholt 01 May '21

01 May '21

Module: kamailio Branch: master Commit: b798fda339b74e9595d2a5d44af9835ec196ca3e URL: https://github.com/kamailio/kamailio/commit/b798fda339b74e9595d2a5d44af9835… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-05-01T08:17:28Z pkg: small spelling fix in comments --- Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/wheezy --- Diff: https://github.com/kamailio/kamailio/commit/b798fda339b74e9595d2a5d44af9835… Patch: https://github.com/kamailio/kamailio/commit/b798fda339b74e9595d2a5d44af9835… --- diff --git a/pkg/kamailio/deb/debian/backports/precise b/pkg/kamailio/deb/debian/backports/precise index 8b060e0956..27dc6c6122 100755 --- a/pkg/kamailio/deb/debian/backports/precise +++ b/pkg/kamailio/deb/debian/backports/precise @@ -91,7 +91,7 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ ruby/' ${DIST}/rules # no python3 for app_python3 sed -i -e '/python3-dev/d' -e '/^Package: kamailio-python3-modules/,/^$/d' \ ${DIST}/control -# this removes python3 from Package: kamalio +# this removes python3 from Package: kamailio sed -i -e '/python3/d' ${DIST}/control # add that again sed -i '/lsb-base,/a \ python3,' ${DIST}/control diff --git a/pkg/kamailio/deb/debian/backports/wheezy b/pkg/kamailio/deb/debian/backports/wheezy index 95180221f0..d08477b0ad 100755 --- a/pkg/kamailio/deb/debian/backports/wheezy +++ b/pkg/kamailio/deb/debian/backports/wheezy @@ -91,7 +91,7 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ ruby/' ${DIST}/rules # no python3 for app_python3 sed -i -e '/python3-dev/d' -e '/^Package: kamailio-python3-modules/,/^$/d' \ ${DIST}/control -# this removes python3 from Package: kamalio +# this removes python3 from Package: kamailio sed -i -e '/python3/d' ${DIST}/control # add that again sed -i '/lsb-base,/a \ python3,' ${DIST}/control

1 0

topos_redis enhancement
by Juha Heinanen 01 May '21

01 May '21

Daniel, I studied a bit topos_redis source and noticed that it lacks x_context td and tt keys. Is there something else missing in order to make spirals work also when redis backend is in use? -- Juha

2 4

git:master:5707f9ef: topos_redis: use uuid for initial transaction indexing
by Daniel-Constantin Mierla 01 May '21

01 May '21

Module: kamailio Branch: master Commit: 5707f9ef7f6a0d9b9bcd00ff85168b977591a30a URL: https://github.com/kamailio/kamailio/commit/5707f9ef7f6a0d9b9bcd00ff85168b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-01T08:07:08+02:00 topos_redis: use uuid for initial transaction indexing --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5707f9ef7f6a0d9b9bcd00ff85168b9… Patch: https://github.com/kamailio/kamailio/commit/5707f9ef7f6a0d9b9bcd00ff85168b9… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 5f0fda701e..78013993fe 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -314,6 +314,7 @@ int tps_redis_insert_initial_method_branch(tps_data_t *td) redisc_server_t *rsrv = NULL; redisReply *rrpl = NULL; unsigned long lval = 0; + str xuuid = str_init(""); if(td->x_vbranch1.len<=0) { LM_INFO("no via branch for this message\n"); @@ -331,13 +332,22 @@ int tps_redis_insert_initial_method_branch(tps_data_t *td) memset(argvlen, 0, TPS_REDIS_NR_KEYS * sizeof(size_t)); argc = 0; + if(td->a_uuid.len>1) { + xuuid.s = td->a_uuid.s + 1; + xuuid.len = td->a_uuid.len - 1; + } else if(td->b_uuid.len>1) { + xuuid.s = td->b_uuid.s + 1; + xuuid.len = td->b_uuid.len - 1; + } + rp = _tps_redis_cbuf; rkey.len = snprintf(rp, TPS_REDIS_DATA_SIZE-128, - "%.*s%.*s:%.*s:%.*s", + "%.*s%.*s:%.*s:%.*s:x%.*s", _tps_redis_bprefix.len, _tps_redis_bprefix.s, td->s_method.len, td->s_method.s, td->a_callid.len, td->a_callid.s, - td->b_tag.len, td->b_tag.s); + td->b_tag.len, td->b_tag.s, + xuuid.len, xuuid.s); if(rkey.len<0 || rkey.len>=TPS_REDIS_DATA_SIZE-128) { LM_ERR("error or insufficient buffer size: %d\n", rkey.len); return -1; @@ -571,6 +581,7 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat redisReply *rrpl = NULL; str skey = STR_NULL; str sval = STR_NULL; + str xuuid = str_init(""); if(msg==NULL || md==NULL || sd==NULL) return -1; @@ -591,14 +602,23 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat memset(argvlen, 0, TPS_REDIS_NR_KEYS * sizeof(size_t)); argc = 0; + if(md->a_uuid.len>1) { + xuuid.s = md->a_uuid.s + 1; + xuuid.len = md->a_uuid.len - 1; + } else if(md->b_uuid.len>1) { + xuuid.s = md->b_uuid.s + 1; + xuuid.len = md->b_uuid.len - 1; + } + rp = _tps_redis_cbuf; rkey.len = snprintf(rp, TPS_REDIS_DATA_SIZE, - "%.*s%.*s:%.*s:%.*s", + "%.*s%.*s:%.*s:%.*s:x%.*s", _tps_redis_bprefix.len, _tps_redis_bprefix.s, md->s_method.len, md->s_method.s, md->a_callid.len, md->a_callid.s, - md->b_tag.len, md->b_tag.s); + md->b_tag.len, md->b_tag.s, + xuuid.len, xuuid.s); if(rkey.len<0 || rkey.len>=TPS_REDIS_DATA_SIZE) { LM_ERR("error or insufficient buffer size: %d\n", rkey.len); return -1;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2021