sr-dev November 2022

sr-dev@lists.kamailio.org

11 participants
217 discussions

git:master:ccf74015: core: kemi - prototypes for kemi functions with (str, long) params
by Daniel-Constantin Mierla 24 Nov '22

24 Nov '22

Module: kamailio Branch: master Commit: ccf74015e7f1bf60f56efa1f24a6370e0857c4c9 URL: https://github.com/kamailio/kamailio/commit/ccf74015e7f1bf60f56efa1f24a6370… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-24T10:32:29+01:00 core: kemi - prototypes for kemi functions with (str,long) params --- Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/ccf74015e7f1bf60f56efa1f24a6370… Patch: https://github.com/kamailio/kamailio/commit/ccf74015e7f1bf60f56efa1f24a6370… --- diff --git a/src/core/kemi.h b/src/core/kemi.h index 2a8ce7105f..9749f2632d 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -105,6 +105,7 @@ typedef int (*sr_kemi_fmnn_f)(sip_msg_t*, int, int); typedef int (*sr_kemi_fmns_f)(sip_msg_t*, int, str*); typedef int (*sr_kemi_fmsn_f)(sip_msg_t*, str*, int); typedef int (*sr_kemi_fmss_f)(sip_msg_t*, str*, str*); +typedef int (*sr_kemi_fmsl_f)(sip_msg_t*, str*, long); /* sip_msg_t and three int|str params */ typedef int (*sr_kemi_fmnnn_f)(sip_msg_t*, int, int, int); @@ -183,6 +184,7 @@ typedef sr_kemi_xval_t* (*sr_kemi_xfmnn_f)(sip_msg_t*, int, int); typedef sr_kemi_xval_t* (*sr_kemi_xfmns_f)(sip_msg_t*, int, str*); typedef sr_kemi_xval_t* (*sr_kemi_xfmsn_f)(sip_msg_t*, str*, int); typedef sr_kemi_xval_t* (*sr_kemi_xfmss_f)(sip_msg_t*, str*, str*); +typedef sr_kemi_xval_t* (*sr_kemi_xfmsl_f)(sip_msg_t*, str*, long); /* return xval, params sip_msg_t and three int|str params */ typedef sr_kemi_xval_t* (*sr_kemi_xfmnnn_f)(sip_msg_t*, int, int, int);

1 0

git:master:3406b914: core: kemi - function to get/set pv with long value
by Daniel-Constantin Mierla 24 Nov '22

24 Nov '22

Module: kamailio Branch: master Commit: 3406b9143a399a0445d09b83f40fe2fbe1781761 URL: https://github.com/kamailio/kamailio/commit/3406b9143a399a0445d09b83f40fe2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-24T10:15:33+01:00 core: kemi - function to get/set pv with long value --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/3406b9143a399a0445d09b83f40fe2f… Patch: https://github.com/kamailio/kamailio/commit/3406b9143a399a0445d09b83f40fe2f… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index d6716507b3..ed98bffd44 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -3164,6 +3164,51 @@ static int sr_kemi_pv_geti (sip_msg_t *msg, str *pvn) return vi; } +/** + * + */ +static sr_kemi_xval_t* sr_kemi_pv_getl (sip_msg_t *msg, str *pvn) +{ + pv_spec_t *pvs; + pv_value_t val; + int vi; + + memset(&_sr_kemi_xval, 0, sizeof(sr_kemi_xval_t)); + _sr_kemi_xval.vtype = SR_KEMIP_LONG; + + LM_DBG("pv get: %.*s\n", pvn->len, pvn->s); + vi = pv_locate_name(pvn); + if(vi != pvn->len) { + LM_WARN("invalid pv [%.*s] (%d/%d)\n", pvn->len, pvn->s, vi, pvn->len); + return &_sr_kemi_xval; + } + pvs = pv_cache_get(pvn); + if(pvs==NULL) { + LM_WARN("cannot get pv spec for [%.*s]\n", pvn->len, pvn->s); + return &_sr_kemi_xval; + } + + memset(&val, 0, sizeof(pv_value_t)); + if(pv_get_spec_value(msg, pvs, &val) != 0) { + LM_WARN("unable to get pv value for [%.*s]\n", pvn->len, pvn->s); + return &_sr_kemi_xval; + } + if(val.flags&PV_VAL_NULL) { + return &_sr_kemi_xval; + } + if(val.flags&(PV_TYPE_INT|PV_VAL_INT)) { + _sr_kemi_xval.v.l = val.ri; + return &_sr_kemi_xval; + } + if(val.ri!=0) { + _sr_kemi_xval.v.l = val.ri; + return &_sr_kemi_xval; + } + str2slong(&val.rs, &_sr_kemi_xval.v.l); + + return &_sr_kemi_xval; +} + /** * */ @@ -3197,6 +3242,43 @@ static int sr_kemi_pv_seti (sip_msg_t *msg, str *pvn, int ival) return SR_KEMI_TRUE; } +/** + * + */ +static int sr_kemi_pv_setl (sip_msg_t *msg, str *pvn, sr_kemi_xval_t *xval) +{ + pv_spec_t *pvs; + pv_value_t val; + int pl; + + LM_DBG("pv get: %.*s\n", pvn->len, pvn->s); + pl = pv_locate_name(pvn); + if(pl != pvn->len) { + LM_ERR("invalid pv [%.*s] (%d/%d)\n", pvn->len, pvn->s, pl, pvn->len); + return SR_KEMI_FALSE; + } + pvs = pv_cache_get(pvn); + if(pvs==NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", pvn->len, pvn->s); + return SR_KEMI_FALSE; + } + + memset(&val, 0, sizeof(pv_value_t)); + if(xval==NULL || !(xval->vtype & SR_KEMIP_LONG)) { + val.ri = 0; + } else { + val.ri = xval->v.l; + } + val.flags |= PV_TYPE_INT|PV_VAL_INT; + + if(pv_set_spec_value(msg, pvs, 0, &val)<0) { + LM_ERR("unable to set pv [%.*s]\n", pvn->len, pvn->s); + return SR_KEMI_FALSE; + } + + return SR_KEMI_TRUE; +} + /** * */ @@ -3317,6 +3399,11 @@ static sr_kemi_t _sr_kemi_pv[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pv"), str_init("getl"), + SR_KEMIP_XVAL, sr_kemi_pv_getl, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pv"), str_init("getvn"), SR_KEMIP_XVAL, sr_kemi_pv_getvn, { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, @@ -3332,6 +3419,11 @@ static sr_kemi_t _sr_kemi_pv[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pv"), str_init("setl"), + SR_KEMIP_BOOL, sr_kemi_pv_setl, + { SR_KEMIP_STR, SR_KEMIP_LONG, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pv"), str_init("sets"), SR_KEMIP_BOOL, sr_kemi_pv_sets, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:8b5531ad: core: kemi - added long type and field to xval union
by Daniel-Constantin Mierla 24 Nov '22

24 Nov '22

Module: kamailio Branch: master Commit: 8b5531ad22fb324551ed27aa0beac2033df1afd8 URL: https://github.com/kamailio/kamailio/commit/8b5531ad22fb324551ed27aa0beac20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-24T09:56:15+01:00 core: kemi - added long type and field to xval union --- Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/8b5531ad22fb324551ed27aa0beac20… Patch: https://github.com/kamailio/kamailio/commit/8b5531ad22fb324551ed27aa0beac20… --- diff --git a/src/core/kemi.h b/src/core/kemi.h index 26e9bd4860..2a8ce7105f 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -30,10 +30,11 @@ #define SR_KEMIP_INT (1<<0) /* type integer */ #define SR_KEMIP_STR (1<<1) /* type str* */ #define SR_KEMIP_BOOL (1<<2) /* type boolean (0/1) */ -#define SR_KEMIP_XVAL (1<<3) /* type extended value (integer, str*, ...) */ -#define SR_KEMIP_NULL (1<<4) /* type NULL */ -#define SR_KEMIP_DICT (1<<5) /* type dictionary */ -#define SR_KEMIP_ARRAY (1<<6) /* type array */ +#define SR_KEMIP_LONG (1<<3) /* type long integer */ +#define SR_KEMIP_XVAL (1<<4) /* type extended value (integer, str*, ...) */ +#define SR_KEMIP_NULL (1<<5) /* type NULL */ +#define SR_KEMIP_DICT (1<<6) /* type dictionary */ +#define SR_KEMIP_ARRAY (1<<7) /* type array */ #define SR_KEMI_FALSE 0 #define SR_KEMI_TRUE 1 @@ -65,6 +66,7 @@ typedef struct sr_kemi_module { typedef union { int n; + long l; str s; } sr_kemi_val_t; @@ -75,6 +77,7 @@ typedef struct sr_kemi_dict_item int vtype; union { int n; + long l; str s; struct sr_kemi_dict_item *dict; } v; @@ -84,6 +87,7 @@ typedef struct sr_kemi_xval { int vtype; union { int n; + long l; str s; sr_kemi_dict_item_t *dict; } v;

1 0

[kamailio/kamailio] kamailio crashs at startup in musl enviroment (Issue #3281)
by giupand 23 Nov '22

23 Nov '22

### Description  I'm testing kamailio v 5.6.1 in an alpine linux docker with musl libc (x86_64) Version 1.2.3 and I see a kamailio crash just with version option (kamailio --version). The crash occur if I haven't localhost resolution in /etc/hosts. This isn't a canonical situation, but crash occur! Running kamailio with gdb I see that the problem is in freeaddrinfo call in log_init function. #### Reproduction  cat /etc/hosts #127.0.0.1 localhost #::1 localhost ip6-localhost ip6-loopback fe00::0 ip6-localnet ff00::0 ip6-mcastprefix ff02::1 ip6-allnodes ff02::2 ip6-allrouters #172.30.0.3 bd9375eeb5af #2001:db8:1111:2222:0:242:ac1e:3 bd9375eeb5af / # / # kamailio --version Segmentation fault (core dumped) #### Debugging Data  ``` # gdb --args kamailio --version GNU gdb (GDB) 9.2 Copyright (C) 2020 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-alpine-linux-musl". Type "show configuration" for configuration details. For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from kamailio... (gdb) run Starting program: /usr/local/sbin/kamailio --version Program received signal SIGSEGV, Segmentation fault. 0x00007ffff7f9f5ed in freeaddrinfo () from /lib/ld-musl-x86_64.so.1 (gdb) bt #0 0x00007ffff7f9f5ed in freeaddrinfo () from /lib/ld-musl-x86_64.so.1 #1 0x000055555559087d in calc_proc_no () at main.c:1976 #2 0x00007fffffffe8d0 in ?? () #3 0x00007fffffffed58 in ?? () #4 0x000055555561b143 in log_init () at core/dprint.c:483 Backtrace stopped: previous frame inner to this frame (corrupt stack?) ``` ### Possible Solutions  I suppose that log_init function needs a check for info pointer. If info pointer is not NULL, then call freeaddrinfo. I see similar protections in other points of code. ``` void log_init(void) { struct addrinfo hints; struct addrinfo *info = NULL; int gai_result; char hostname[1024]; hostname[1023] = '\0'; gethostname (hostname, 1023); memset (&hints, 0, sizeof (hints)); hints.ai_family = AF_UNSPEC; /*either IPV4 or IPV6 */ hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_CANONNAME; if ((gai_result = getaddrinfo (hostname, 0, &hints, &info)) != 0) { log_fqdn = "?"; } else if (info == NULL) { log_fqdn = "?"; } else { log_fqdn = strdup (info->ai_canonname); } if(info) // add pointer validity freeaddrinfo (info); dprint_init_colors(); } ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.2 (x86_64/linux) 54a9c1 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED 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: 54a9c1 compiled on 09:26:43 Nov 15 2022 with gcc 9.3.0 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3281 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3281(a)github.com>

3 3

git:master:6438573c: core: safety check for freeaddrinfo() param on log_init()
by Daniel-Constantin Mierla 23 Nov '22

23 Nov '22

Module: kamailio Branch: master Commit: 6438573ce2d138d83cc1fa7cd88834c48d623ac6 URL: https://github.com/kamailio/kamailio/commit/6438573ce2d138d83cc1fa7cd88834c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-23T10:51:56+01:00 core: safety check for freeaddrinfo() param on log_init() - GH #3281 --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/6438573ce2d138d83cc1fa7cd88834c… Patch: https://github.com/kamailio/kamailio/commit/6438573ce2d138d83cc1fa7cd88834c… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index ff63fd9ff1..0f1eef773d 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -480,7 +480,9 @@ void log_init(void) log_fqdn = strdup (info->ai_canonname); } - freeaddrinfo (info); + if(info!=NULL) { + freeaddrinfo (info); + } dprint_init_colors(); }

1 0

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

23 Nov '22

Module: kamailio Branch: master Commit: b4270a57ed10b9fcad56170bf808cc01aaeb7d7f URL: https://github.com/kamailio/kamailio/commit/b4270a57ed10b9fcad56170bf808cc0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-11-23T10:46:56+01:00 modules: readme files regenerated - jwt ... [skip ci] --- Modified: src/modules/jwt/README --- Diff: https://github.com/kamailio/kamailio/commit/b4270a57ed10b9fcad56170bf808cc0… Patch: https://github.com/kamailio/kamailio/commit/b4270a57ed10b9fcad56170bf808cc0… --- diff --git a/src/modules/jwt/README b/src/modules/jwt/README index 4c266bbd01..c4c9610f31 100644 --- a/src/modules/jwt/README +++ b/src/modules/jwt/README @@ -30,7 +30,8 @@ Daniel-Constantin Mierla 4. Functions 4.1. jwt_generate(prvkey, alg, claims, [headers]) - 4.2. jwt_verify(pubkey, alg, claims, jwtval) + 4.2. jwt_verify(pubkeypath, alg, claims, jwtval) + 4.3. jwt_verify_key(pubkeyval, alg, claims, jwtval) 5. Variables @@ -41,7 +42,8 @@ Daniel-Constantin Mierla 1.1. Set key_mode parameter 1.2. jwt_generate usage 1.3. jwt_verify usage - 1.4. $jwt(name) usage + 1.4. jwt_verify_key usage + 1.5. $jwt(name) usage Chapter 1. Admin Guide @@ -60,7 +62,8 @@ Chapter 1. Admin Guide 4. Functions 4.1. jwt_generate(prvkey, alg, claims, [headers]) - 4.2. jwt_verify(pubkey, alg, claims, jwtval) + 4.2. jwt_verify(pubkeypath, alg, claims, jwtval) + 4.3. jwt_verify_key(pubkeyval, alg, claims, jwtval) 5. Variables @@ -110,7 +113,8 @@ modparam("jwt", "key_mode", 1) 4. Functions 4.1. jwt_generate(prvkey, alg, claims, [headers]) - 4.2. jwt_verify(pubkey, alg, claims, jwtval) + 4.2. jwt_verify(pubkeypath, alg, claims, jwtval) + 4.3. jwt_verify_key(pubkeyval, alg, claims, jwtval) 4.1. jwt_generate(prvkey, alg, claims, [headers]) @@ -141,12 +145,12 @@ modparam("jwt", "key_mode", 1) "caller='$fU';callee='$tU';callid='$ci';index=100"); ... -4.2. jwt_verify(pubkey, alg, claims, jwtval) +4.2. jwt_verify(pubkeypath, alg, claims, jwtval) Verify the JWT. The parameters are: - * pubkey - path to public key + * pubkeypath - path to public key file * alg - the algoritm to build the signature, as supported by the libjwt (e.g., RS256, HS256, ES256, ...) * claims - the list of claims to be checked they are in the JWT, in @@ -166,6 +170,31 @@ modparam("jwt", "key_mode", 1) } ... +4.3. jwt_verify_key(pubkeyval, alg, claims, jwtval) + + Verify the JWT. + + The parameters are: + * pubkeyval - public key value + * alg - the algoritm to build the signature, as supported by the + libjwt (e.g., RS256, HS256, ES256, ...) + * claims - the list of claims to be checked they are in the JWT, in + the format "name1=value1;name2=value2;..." (same as the SIP + parameters format, see also the description of claims parameter for + jwt_generate()). + * jwtval - the value of the JWT to verify + + This function can be used from ANY_ROUTE. + + Example 1.4. jwt_verify_key usage +... + if(!jwt_verify_key("...", "RS256", + "caller='$fU';callee='$tU';callid='$ci';index=100", + "$var(jwt)") { + xwarn("failed to verify jwt\n"); + } +... + 5. Variables 5.1. $jwt(key) @@ -178,7 +207,7 @@ modparam("jwt", "key_mode", 1) * val - the value of JWT after a successful jwt_generate(). * status - the status of verification after a failed jwt_verify(). - Example 1.4. $jwt(name) usage + Example 1.5. $jwt(name) usage ... jwt_generate("/path/to/prvkey.pem", "RS256", "caller='$fU';callee='$tU';callid='$ci';index=100");

1 0

[kamailio/kamailio] jwt_mod.c HS256 secret inside a file kdata.len is off by one (Issue #3282)
by momoterraw 23 Nov '22

23 Nov '22

In my use case I use HS256 so its a shared secret normally using a string with environment variable or something, not a key file. The jwt mod expects a file to load up the secret/key. So I just create a file with the secret inside the file, but I keep getting. ``` failed to decode jwt value ``` After digging into the source and trying to debug. It looks like when it's handing secret in a file the kdata.len is off by one. This is the dirty fix for me. ``` diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 233a0709..a67d0b89 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -509,7 +509,7 @@ static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, } } - ret = jwt_decode(&jwt, jwtval->s, (unsigned char*)kdata.s, (size_t)kdata.len); + ret = jwt_decode(&jwt, jwtval->s, (unsigned char*)kdata.s, (size_t)kdata.len-1); if (ret!=0 || jwt==NULL) { LM_ERR("failed to decode jwt value\n"); goto error; ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3282 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3282(a)github.com>

3 4

git:master:8d33363b: jwt: docs for jwt_verify_key(...)
by Daniel-Constantin Mierla 23 Nov '22

23 Nov '22

Module: kamailio Branch: master Commit: 8d33363b5ec93ebd0068f270af23be9095950775 URL: https://github.com/kamailio/kamailio/commit/8d33363b5ec93ebd0068f270af23be9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-23T10:39:18+01:00 jwt: docs for jwt_verify_key(...) --- Modified: src/modules/jwt/doc/jwt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8d33363b5ec93ebd0068f270af23be9… Patch: https://github.com/kamailio/kamailio/commit/8d33363b5ec93ebd0068f270af23be9… --- diff --git a/src/modules/jwt/doc/jwt_admin.xml b/src/modules/jwt/doc/jwt_admin.xml index a72c518efe6..f247b43b46d 100644 --- a/src/modules/jwt/doc/jwt_admin.xml +++ b/src/modules/jwt/doc/jwt_admin.xml @@ -142,7 +142,7 @@ modparam("jwt", "key_mode", 1) <section id="jwt.f.jwt_verify"> <title> - <function moreinfo="none">jwt_verify(pubkey, alg, claims, jwtval)</function> + <function moreinfo="none">jwt_verify(pubkeypath, alg, claims, jwtval)</function> </title> <para> Verify the JWT. @@ -153,7 +153,7 @@ modparam("jwt", "key_mode", 1) <itemizedlist> <listitem> <para> - pubkey - path to public key + pubkeypath - path to public key file </para> </listitem> <listitem> @@ -188,6 +188,58 @@ modparam("jwt", "key_mode", 1) xwarn("failed to verify jwt\n"); } ... +</programlisting> + </example> + </section> + + <section id="jwt.f.jwt_verify_key"> + <title> + <function moreinfo="none">jwt_verify_key(pubkeyval, alg, claims, jwtval)</function> + </title> + <para> + Verify the JWT. + </para> + <para> + The parameters are: + </para> + <itemizedlist> + <listitem> + <para> + pubkeyval - public key value + </para> + </listitem> + <listitem> + <para> + alg - the algoritm to build the signature, as supported by the + libjwt (e.g., RS256, HS256, ES256, ...) + </para> + </listitem> + <listitem> + <para> + claims - the list of claims to be checked they are in the JWT, in the format + "name1=value1;name2=value2;..." (same as the SIP parameters format, + see also the description of claims parameter for jwt_generate()). + </para> + </listitem> + <listitem> + <para> + jwtval - the value of the JWT to verify + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>jwt_verify_key</function> usage</title> + <programlisting format="linespecific"> +... + if(!jwt_verify_key("...", "RS256", + "caller='$fU';callee='$tU';callid='$ci';index=100", + "$var(jwt)") { + xwarn("failed to verify jwt\n"); + } +... </programlisting> </example> </section>

1 0

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/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 } } };

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/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); } /**

1 0

← Newer
1
...
14
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