sr-dev November 2022

sr-dev@lists.kamailio.org

11 participants
219 discussions

git:master:f264b374: jwt: added function to verify with key value given as parameter
by Daniel-Constantin Mierla 23 Nov '22

23 Nov '22

Module: kamailio Branch: master Commit: f264b3745a2e666f9bb617cb1d5cf9ac0e1a439e URL: https://github.com/kamailio/kamailio/commit/f264b3745a2e666f9bb617cb1d5cf9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-23T10:35:55+01:00 jwt: added function to verify with key value given as parameter --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]f264b3745a2e666f9bb617cb1d5cf9a… Patch: https://github.com/kamailio/kamailio/commit/f264b3745a2e666f9bb617cb1d5cf9a… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 0afedd237c..adda8d3845 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -46,6 +46,8 @@ static int w_jwt_generate_4(sip_msg_t* msg, char* pkey, char* palg, char* pclaim static int w_jwt_generate_3(sip_msg_t* msg, char* pkey, char* palg, char* pclaims); static int w_jwt_verify(sip_msg_t* msg, char* pkeypath, char* palg, char* pclaims, char *pjwtval); +static int w_jwt_verify_key(sip_msg_t* msg, char* pkey, char* palg, char* pclaims, + char *pjwtval); static int _jwt_key_mode = 0; @@ -67,6 +69,8 @@ static cmd_export_t cmds[]={ fixup_spve_all, 0, ANY_ROUTE}, {"jwt_verify", (cmd_function)w_jwt_verify, 4, fixup_spve_all, 0, ANY_ROUTE}, + {"jwt_verify_key", (cmd_function)w_jwt_verify_key, 4, + fixup_spve_all, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -596,6 +600,37 @@ static int w_jwt_verify(sip_msg_t* msg, char* pkeypath, char* palg, char* pclaim return ki_jwt_verify(msg, &skeypath, &salg, &sclaims, &sjwtval); } +/** + * + */ +static int w_jwt_verify_key(sip_msg_t* msg, char* pkey, char* palg, char* pclaims, + char *pjwtval) +{ + str skey = STR_NULL; + str salg = STR_NULL; + str sclaims = STR_NULL; + str sjwtval = STR_NULL; + + if (fixup_get_svalue(msg, (gparam_t*)pkey, &skey) != 0) { + LM_ERR("cannot get the key value\n"); + return -1; + } + if (fixup_get_svalue(msg, (gparam_t*)palg, &salg) != 0) { + LM_ERR("cannot get algorithm value\n"); + return -1; + } + if (fixup_get_svalue(msg, (gparam_t*)pclaims, &sclaims) != 0) { + LM_ERR("cannot get claims value\n"); + return -1; + } + if (fixup_get_svalue(msg, (gparam_t*)pjwtval, &sjwtval) != 0) { + LM_ERR("cannot get jwt value\n"); + return -1; + } + + return ki_jwt_verify(msg, &skey, &salg, &sclaims, &sjwtval); +} + /** * */ @@ -650,6 +685,11 @@ static sr_kemi_t sr_kemi_jwt_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("jwt"), str_init("jwt_verify_key"), + SR_KEMIP_INT, ki_jwt_verify_key, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; [View Less]

1 0

git:master:269455ef: jwt: renamed parameter to indicate is a path to file
by Daniel-Constantin Mierla 23 Nov '22

23 Nov '22

Module: kamailio Branch: master Commit: 269455efb3827c9700f85715113b1757508b9767 URL: https://github.com/kamailio/kamailio/commit/269455efb3827c9700f85715113b175… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-23T10:32:40+01:00 jwt: renamed parameter to indicate is a path to file --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]269455efb3827c9700f85715113b175… Patch: https://github.com/kamailio/kamailio/commit/269455efb3827c9700f85715113b175… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index d533b88a15..0afedd237c 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -44,7 +44,7 @@ static void mod_destroy(void); static int w_jwt_generate_4(sip_msg_t* msg, char* pkey, char* palg, char* pclaims, char* pheaders); static int w_jwt_generate_3(sip_msg_t* msg, char* pkey, char* palg, char* pclaims); -static int w_jwt_verify(sip_msg_t* msg, char* pkey, char* palg, char* pclaims, +static int w_jwt_verify(sip_msg_t* msg, char* pkeypath, char* palg, char* pclaims, char *pjwtval); static int _jwt_key_mode = 0; @@ -418,16 +418,13 @@ static int w_jwt_generate_4(sip_msg_t* msg, char* pkey, char* palg, char* pclaim /** * */ -static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, +static int ki_jwt_verify_key(sip_msg_t* msg, str *key, str *alg, str *claims, str *jwtval) { str dupclaims = STR_NULL; jwt_alg_t valg = JWT_ALG_NONE; str kdata = STR_NULL; time_t iat; - FILE *fpk = NULL; - unsigned char keybuf[10240]; - size_t keybuf_len = 0; param_t* params_list = NULL; param_hooks_t phooks; param_t *pit = NULL; @@ -446,6 +443,8 @@ static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, _jwt_verify_status = 0; + kdata = *key; + trim(&kdata); valg = jwt_str_alg(alg->s); if (valg == JWT_ALG_INVAL) { LM_ERR("not supported algorithm: %s\n", alg->s); @@ -455,25 +454,6 @@ static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, LM_ERR("failed to duplicate claims\n"); return -1; } - jwt_fcache_get(key, &kdata); - if(kdata.s==NULL) { - fpk= fopen(key->s, "r"); - if(fpk==NULL) { - LM_ERR("failed to read key file: %s\n", key->s); - goto error; - } - keybuf_len = fread(keybuf, 1, sizeof(keybuf), fpk); - fclose(fpk); - if(keybuf_len==0) { - LM_ERR("unable to read key file content: %s\n", key->s); - goto error; - } - kdata.s = (char*)keybuf; - kdata.len = (int)keybuf_len; - trim(&kdata); - kdata.s[keybuf_len] = '\0'; - jwt_fcache_add(key, &kdata); - } sparams = dupclaims; if(sparams.s[sparams.len-1]==';') { sparams.len--; @@ -548,15 +528,55 @@ static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, /** * */ -static int w_jwt_verify(sip_msg_t* msg, char* pkey, char* palg, char* pclaims, +static int ki_jwt_verify(sip_msg_t* msg, str *keypath, str *alg, str *claims, + str *jwtval) +{ + str kdata = STR_NULL; + FILE *fpk = NULL; + unsigned char keybuf[10240]; + size_t keybuf_len = 0; + + if(keypath==NULL || keypath->s==NULL || alg==NULL || alg->s==NULL + || claims==NULL || claims->s==NULL || claims->len<=0 + || jwtval==NULL || jwtval->s==NULL || jwtval->len<=0) { + LM_ERR("invalid parameters\n"); + return -1; + } + + jwt_fcache_get(keypath, &kdata); + if(kdata.s==NULL) { + fpk= fopen(keypath->s, "r"); + if(fpk==NULL) { + LM_ERR("failed to read key file: %s\n", keypath->s); + return -1; + } + keybuf_len = fread(keybuf, 1, sizeof(keybuf), fpk); + fclose(fpk); + if(keybuf_len==0) { + LM_ERR("unable to read key file content: %s\n", keypath->s); + return -1; + } + kdata.s = (char*)keybuf; + kdata.len = (int)keybuf_len; + trim(&kdata); + kdata.s[keybuf_len] = '\0'; + jwt_fcache_add(keypath, &kdata); + } + return ki_jwt_verify_key(msg, &kdata, alg, claims, jwtval); +} + +/** + * + */ +static int w_jwt_verify(sip_msg_t* msg, char* pkeypath, char* palg, char* pclaims, char *pjwtval) { - str skey = STR_NULL; + str skeypath = STR_NULL; str salg = STR_NULL; str sclaims = STR_NULL; str sjwtval = STR_NULL; - if (fixup_get_svalue(msg, (gparam_t*)pkey, &skey) != 0) { + if (fixup_get_svalue(msg, (gparam_t*)pkeypath, &skeypath) != 0) { LM_ERR("cannot get path to the key file\n"); return -1; } @@ -573,7 +593,7 @@ static int w_jwt_verify(sip_msg_t* msg, char* pkey, char* palg, char* pclaims, return -1; } - return ki_jwt_verify(msg, &skey, &salg, &sclaims, &sjwtval); + return ki_jwt_verify(msg, &skeypath, &salg, &sclaims, &sjwtval); } /** [View Less]

1 0

git:master:92998664: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 23 Nov '22

23 Nov '22

Module: kamailio Branch: master Commit: 929986648dcfefa1212cbfcc129b7bb3a44259d6 URL: https://github.com/kamailio/kamailio/commit/929986648dcfefa1212cbfcc129b7bb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-11-23T09:16:28+01:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:ced18c6f: presence: docs - small typo
by Daniel-Constantin Mierla 23 Nov '22

23 Nov '22

Module: kamailio Branch: master Commit: ced18c6f3c3a4632cb23510334466c236f08d26f URL: https://github.com/kamailio/kamailio/commit/ced18c6f3c3a4632cb23510334466c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-23T09:07:44+01:00 presence: docs - small typo --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ced18c6f3c3a4632cb23510334466c2…… [View More]

1 0

git:master:4a6b6e3f: auth_radius: updated to use xavp long value field
by Daniel-Constantin Mierla 22 Nov '22

22 Nov '22

Module: kamailio Branch: master Commit: 4a6b6e3f14318794405ba88a50f3d78971d60197 URL: https://github.com/kamailio/kamailio/commit/4a6b6e3f14318794405ba88a50f3d78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T10:19:06+01:00 auth_radius: updated to use xavp long value field --- Modified: src/modules/auth_radius/sterman.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:e37d9dbc: cnxcc: updated to use xavp long value field
by Daniel-Constantin Mierla 22 Nov '22

22 Nov '22

Module: kamailio Branch: master Commit: e37d9dbcfd199797a3514392e5a03f98a2c1151b URL: https://github.com/kamailio/kamailio/commit/e37d9dbcfd199797a3514392e5a03f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T10:18:04+01:00 cnxcc: updated to use xavp long value field --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:d4251378: memcached: updated to use xavp long value field
by Daniel-Constantin Mierla 22 Nov '22

22 Nov '22

Module: kamailio Branch: master Commit: d4251378c701a46803e24df607c0959a2975fa7b URL: https://github.com/kamailio/kamailio/commit/d4251378c701a46803e24df607c0959… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T10:16:35+01:00 memcached: updated to use xavp long value field --- Modified: src/modules/memcached/mcd_var.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:68dcaf76: misc_radius: updated to use xavp long value field
by Daniel-Constantin Mierla 22 Nov '22

22 Nov '22

Module: kamailio Branch: master Commit: 68dcaf766c5c08ebb9ad08a9203f40dd77b74933 URL: https://github.com/kamailio/kamailio/commit/68dcaf766c5c08ebb9ad08a9203f40d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T10:15:14+01:00 misc_radius: updated to use xavp long value field --- Modified: src/modules/misc_radius/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:e14d2ee2: peering: updated to use xavp long value field
by Daniel-Constantin Mierla 22 Nov '22

22 Nov '22

Module: kamailio Branch: master Commit: e14d2ee291f76cc4d1187ccbc1c88f6ccf36fe28 URL: https://github.com/kamailio/kamailio/commit/e14d2ee291f76cc4d1187ccbc1c88f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T10:12:17+01:00 peering: updated to use xavp long value field --- Modified: src/modules/peering/verify.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:4b6328ce: erlang: use proper name for the long field of xavp
by Daniel-Constantin Mierla 22 Nov '22

22 Nov '22

Module: kamailio Branch: master Commit: 4b6328ce015bbdc0899dc948c0f981649039407c URL: https://github.com/kamailio/kamailio/commit/4b6328ce015bbdc0899dc948c0f9816… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T10:10:41+01:00 erlang: use proper name for the long field of xavp --- Modified: src/modules/erlang/pv_xbuff.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

← Newer
1
...
15
16
17
18
19
20
21
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2022