sr-dev April 2023

sr-dev@lists.kamailio.org

15 participants
260 discussions

Re: hooking mechanism for routing blocks

by Henning Westerholt

(also added sr-dev) Hello, It probably not exactly what you are looking for, but a common way for modules to provide "hooks" towards the configuration for later extensions is about the event_route facility. You can find many of this event routes used from modules (on simple example is dispatcher module). Inter-module communication or usage is usually facilitated by an API export from the providing module, and an API import/binding on the consuming module. Examples here are the usrloc and registrar modules. The sl module API is also used from many other modules to send messages. Cheers, Henning -----Original Message----- From: Valentin Christoph <Christoph.Valentin(a)kontron.com> Sent: Montag, 24. April 2023 15:44 To: Kamailio (SER) - Users Mailing List <sr-users(a)lists.kamailio.org> Subject: [SR-Users] hooking mechanism for routing blocks Dear all, I am looking for some hooking mechanism for user defined routing blocks. Is something like this already available? 1) a common part of the routing configuration shall not (or only slightly) be changed, after some hooks have been implemented Something like a function "engage_hooks()" of some "hook_module"? : Routing config that should not be changed by application developers engage_hooks(HOOK_TYPE); Routing config that should not be changed by application developers : 2) one application developer may "hook" new parts of the routing configuration into this, by modparam("hook_module", "hook", "name=MY_RB;type=HOOK_TYPE;prio=50); : : Route [MY_RB] { Do something at hook HOOK_TYPE; } : : 3) another application developer might want to "hook" into the same HOOK_TYPE with a higher priority modparam("hook_module", "hook", "name=ANOTHER_RB;type=HOOK_TYPE;prio=20); : : Route [ANOTHER_RB] { Do another thing with higher priority at hook HOOK_TYPE } : : Kr, Christoph __________________________________________________________ Kamailio - Users Mailing List - Non Commercial Discussions To unsubscribe send an email to sr-users-leave(a)lists.kamailio.org Important: keep the mailing list in the recipients, do not reply only to the sender! Edit mailing list options or unsubscribe:

1 year

git:master:f16ba6d4: auth: exported auth_get_www_authenticate() to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f16ba6d4a5305be84d5a2b9d1e6c6a15368c8c76 URL: https://github.com/kamailio/kamailio/commit/f16ba6d4a5305be84d5a2b9d1e6c6a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-26T20:36:36+02:00 auth: exported auth_get_www_authenticate() to kemi --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f16ba6d4a5305be84d5a2b9d1e6c6a1… Patch: https://github.com/kamailio/kamailio/commit/f16ba6d4a5305be84d5a2b9d1e6c6a1… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index 5538ffb4f03..8e74d33dd4e 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -1260,6 +1260,43 @@ static int fixup_auth_get_www_authenticate(void **param, int param_no) return 0; } +/** + * + */ +static int ki_auth_get_www_authenticate(sip_msg_t* msg, str* realm, + int flags, str *pvdst) +{ + str hf = {0}; + pv_spec_t *pvs; + pv_value_t val; + int ret; + + pvs = pv_cache_get(pvdst); + if(pvs==NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", pvdst->len, pvdst->s); + return -1; + } + + ret = auth_challenge_helper(NULL, realm, flags, + HDR_AUTHORIZATION_T, &hf); + + if(ret<0) + return ret; + + val.rs.s = pv_get_buffer(); + val.rs.len = 0; + if(hf.s!=NULL) { + memcpy(val.rs.s, hf.s, hf.len); + val.rs.len = hf.len; + val.rs.s[val.rs.len] = '\0'; + pkg_free(hf.s); + } + val.flags = PV_VAL_STR; + pvs->setf(msg, &pvs->pvp, (int)EQ_T, &val); + + return (ret==0)?1:ret; +} + /** * */ @@ -1295,6 +1332,11 @@ static sr_kemi_t sr_kemi_auth_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("auth"), str_init("auth_get_www_authenticate"), + SR_KEMIP_INT, ki_auth_get_www_authenticate, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 year

git:master:1f802a96: tls: fix formatting in tls_select.c

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1f802a96f0ce4c376d64be65bca27994bb2742cb URL: https://github.com/kamailio/kamailio/commit/1f802a96f0ce4c376d64be65bca2799… Author: Marcus Orchard <contactmarcusorchard(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-26T20:20:51+02:00 tls: fix formatting in tls_select.c --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/1f802a96f0ce4c376d64be65bca2799… Patch: https://github.com/kamailio/kamailio/commit/1f802a96f0ce4c376d64be65bca2799… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index 943b7221556..745c005f3ea 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -318,7 +318,7 @@ static int get_version(str* res, sip_msg_t* msg) res->s = buf; res->len = version.len; tcpconn_put(c); - return 0; + return 0; err: if (c) tcpconn_put(c); @@ -1894,7 +1894,3 @@ sr_kemi_xval_t* ki_tls_cget_attr(sip_msg_t* msg, str *aname) sr_kemi_xval_null(&_ksr_kemi_tls_xval, SR_KEMI_XVAL_NULL_EMPTY); return &_ksr_kemi_tls_xval; } - - - -

1 year

git:master:7fd502fe: tls: get san entries by index

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7fd502fe433695b798249404cae144365d08b9c7 URL: https://github.com/kamailio/kamailio/commit/7fd502fe433695b798249404cae1443… Author: root <contactmarcusorchard(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-26T20:20:51+02:00 tls: get san entries by index - adds count pv and sel for DNS, EMAIL, IP, URI - adds ability to access SAN entries by index fix #3400 --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/7fd502fe433695b798249404cae1443… Patch: https://github.com/kamailio/kamailio/commit/7fd502fe433695b798249404cae1443…

1 year

[kamailio/kamailio] TLS Module does not expose all entries in the subject alternative name (Issue #3400)

by Marcus Orchard

### Description Have a certificate with the following Subject Alternative Name value: DNS:www.company.net, DNS:company.com, DNS: company.net Calling `$tls_peer_san_hostname` (and the other pv's/select that reference SAN) only returns `www.company.net` (first entry) This does not support the spec which allows multiple entries (rfc2459 I believe). ### Troubleshooting Logged values of different SAN back select and pseudovariables and only appears to return the first entries. #### Reproduction Create a self signed certificate with multiple alt names (I used this as a guide: https://support.citrix.com/article/CTX135602/how-to-create-a-selfsigned-san…) Updated my Kamailio config to log different tls pv and selects (eg tls_peer_san_hostname, @tls.peer.dns select, but others as well) Confirm only one value is provided. #### Debugging Data ``` [www.company.net] is the only value present in the corresponding variables ``` ### Possible Solutions Update variables to provide access to SAN entries to return all the values Create new variable to provide access to all SAN entries ### Additional Information https://www.kamailio.org/wiki/cookbooks/5.1.x/pseudovariables#tls_peer_san_… http://www.kamailio.org/wiki/cookbooks/5.2.x/selects#tlspeerdns -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3400 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3400(a)github.com>

1 year

[kamailio/kamailio] tls: get san entries by index (PR #3408)

by Marcus Orchard

- adds count pv and sel for DNS, EMAIL, IP, URI - adds ability to access SAN entries by index fix #3400  #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3400 #### Description Fix issue #3400 that describes that tls module cannot properly handle certificates with multiple SAN entries. Add ability to access SAN entries by index. Add ability to get count of supported SAN entries by type of entry. If index is not provided will return first entry (current behavior to remain backwards compatible. Tested by creating a self signed SAN cert with 3 DNS entries and confirmed expected results for: $(tls_peer_san_hostname[2]) $(tls_peer_san_hostname); $tls_peer_san_count(DNS) $tls_peer_san_count(URI) $tls_peer_san_count(EMAIL) $tls_peer_san_count(IP) $sel(tls.peer.dns[1]) $sel(tls.peer.dns) $sel(tls.peer.count[\"DNS\"]) $(tls_peer_san_ip[0]) $(tls_peer_san_uri) $sel(tls.peer.ip[0]) $sel(tls.peer.count[\"EMAIL\"]) $(tls_my_san_hostname[2]) $(tls_my_san_hostname) $tls_my_san_count(DNS) $tls_my_san_count(URI) $tls_my_san_count(EMAIL) $tls_my_san_count(IP) $sel(tls.my.dns[1]) $sel(tls.my.dns) $sel(tls.my.count[\"DNS\"] $(tls_my_san_ip[0])] $(tls_my_san_uri) $sel(tls.my.ip[0]) $sel(tls.my.count[\"EMAIL\"]) Also repeated the test with a self signed cert with 3 DNS entries, 1 IP entry, 1 EMAIL entry and 1 URI entry You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3408 -- Commit Summary -- * tls: get san entries by index -- File Changes -- M src/modules/tls/tls_select.c (314) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3408.patch https://github.com/kamailio/kamailio/pull/3408.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3408 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3408(a)github.com>

1 year

git:master:42351ec9: lost: P-A-I parsing with display name fixed (#3426)

by Wolfgang Kampichler

Module: kamailio Branch: master Commit: 42351ec91b38ce3f8eff51978d00010f54481924 URL: https://github.com/kamailio/kamailio/commit/42351ec91b38ce3f8eff51978d00010… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2023-04-26T17:56:23+02:00 lost: P-A-I parsing with display name fixed (#3426) - this fix improves P-Asserted-Identity parsing to properly extract the uri from the header value. The uri (sip/tel) is used as identity for HELD requests. --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/42351ec91b38ce3f8eff51978d00010… Patch: https://github.com/kamailio/kamailio/commit/42351ec91b38ce3f8eff51978d00010… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index f86fcaf015..6f50329574 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -477,50 +477,45 @@ p_lost_geolist_t lost_get_geolocation_header(struct sip_msg *msg, int *items) */ char *lost_get_pai_header(struct sip_msg *msg, int *lgth) { - p_id_body_t *p_body; - - char *tmp = NULL; + to_body_t *p_pai; char *res = NULL; - int len = 0; *lgth = 0; - if(parse_pai_header(msg) == -1) { - - LM_DBG("failed to parse P-A-I header\n"); - - return res; - } + if((parse_pai_header(msg) == 0) && (msg->pai) && (msg->pai->parsed)) { + /* return the first header entry */ + p_pai = get_pai(msg)->id; + if((p_pai->parsed_uri.user.s == NULL) + && (parse_uri(p_pai->uri.s, p_pai->uri.len, &p_pai->parsed_uri) + < 0)) { + + LM_DBG("failed to parse P-A-I header\n"); + + return res; + } + } else { + + LM_DBG("P-A-I header not found or failed to parse\n"); - if(msg->pai == NULL || get_pai(msg) == NULL) { - LM_ERR("P-A-I header not found\n"); return res; } - p_body = get_pai(msg); - /* warning in case multiple P-A-I headers were found and use first */ - if(p_body->num_ids > 1) { - LM_WARN("multiple P-A-I headers found, selecting first!\n"); + /* warning in case multiple P-A-I headers were found */ + if(get_pai(msg)->num_ids > 1) { + LM_WARN("multiple P-A-I headers found, selected first!\n"); } - LM_DBG("P-A-I body: [%.*s]\n", p_body->id->body.len, p_body->id->body.s); + LM_DBG("P-A-I uri: [%.*s]\n", p_pai->uri.len, p_pai->uri.s); - /* accept any identity string (body), but remove <..> if present */ - tmp = p_body->id->body.s; - len = p_body->id->body.len; - if(tmp[0] == '<' && tmp[len - 1] == '>') { - tmp++; - len -= 2; - } /* allocate memory, copy and \0 terminate string */ - res = (char *)pkg_malloc((len + 1) * sizeof(char)); + res = (char *)pkg_malloc((p_pai->uri.len + 1) * sizeof(char)); if(res == NULL) { PKG_MEM_ERROR; return res; } else { - memset(res, 0, len); - memcpy(res, tmp, len); - res[len] = '\0'; + memset(res, 0, p_pai->uri.len); + memcpy(res, p_pai->uri.s, p_pai->uri.len); + res[p_pai->uri.len] = '\0'; *lgth = strlen(res); }

1 year

[kamailio/kamailio] sanity: implement reserved char check in the header and values (Issue #3421)

by sergey-safarov

### Description Our partner sending a call with this header ``` From: "COVER JERRY & M" <sip:+12099283442@206.147.236.174:5060;otg=TLMNCAXFDS0_3887>;tag=gK0c7f90e2 ``` According [RFC3261](https://www.rfc-editor.org/rfc/rfc3261#section-25.1) ``` Several rules are incorporated from RFC 2396 [5] but are updated to make them compliant with RFC 2234 [10]. These include: reserved = ";" / "/" / "?" / ":" / "@" / "&" / "=" / "+" / "$" / "," unreserved = alphanum / mark mark = "-" / "_" / "." / "!" / "~" / "*" / "'" / "(" / ")" escaped = "%" HEXDIG HEXDIG ``` Also ``` SIP follows the requirements and guidelines of RFC 2396 [5] when defining the set of characters that must be escaped in a SIP URI, and uses its ""%" HEX HEX" mechanism for escaping. From RFC 2396 [5]: The set of characters actually reserved within any given URI component is defined by that component. In general, a character is reserved if the semantics of the URI changes if the character is replaced with its escaped US-ASCII encoding [5]. Excluded US- ASCII characters (RFC 2396 [5]), such as space and control characters and characters used as URI delimiters, also MUST be escaped. URIs MUST NOT contain unescaped space and control characters. ``` And ``` Expanding the hname and hvalue tokens in Section 25 show that all URI reserved characters in header field names and values MUST be escaped. ``` For now, looks like `the sanity` module does not check reserver char usage. This ticket was created to collect recommendations for feature implementation. Should be checked headers? Maybe a similar check is already present in the code and you can provide a reference? Unscaped reserved char usage in "From", "To", "P-Asserted-Identity" and "Remote-Party-ID" for display name breaking SIP message (for example the "lost" module cannot parse properly "From" header). Should such be implemented in the Kamailio core also? ### Expected behavior One of these expected: 1) Kamailio drop a message with reserved char usage in the header names and values. For TCP and TLS transport drop connection; 2) sanity module allows checking reserved char usage in the header names and values. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3421 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3421(a)github.com>

1 year

git:master:5a2df203: modules: readme files regenerated - call_control ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 5a2df203a244e79a1868910da312f765091d22f5 URL: https://github.com/kamailio/kamailio/commit/5a2df203a244e79a1868910da312f76… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-04-25T22:16:28+02:00 modules: readme files regenerated - call_control ... [skip ci] --- Modified: src/modules/call_control/README Modified: src/modules/cfgutils/README Modified: src/modules/janssonrpcc/README Modified: src/modules/jsonrpcs/README Modified: src/modules/jwt/README Modified: src/modules/kazoo/README Modified: src/modules/keepalive/README Modified: src/modules/kemix/README Modified: src/modules/kex/README --- Diff: https://github.com/kamailio/kamailio/commit/5a2df203a244e79a1868910da312f76… Patch: https://github.com/kamailio/kamailio/commit/5a2df203a244e79a1868910da312f76…

1 year

git:master:4c8276fc: kex: typos

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4c8276fcf268a690ea671c4ddeaad1f89e293565 URL: https://github.com/kamailio/kamailio/commit/4c8276fcf268a690ea671c4ddeaad1f… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-25T22:11:28+02:00 kex: typos --- Modified: src/modules/kex/core_stats.c Modified: src/modules/kex/doc/kex_admin.xml Modified: src/modules/kex/kex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4c8276fcf268a690ea671c4ddeaad1f… Patch: https://github.com/kamailio/kamailio/commit/4c8276fcf268a690ea671c4ddeaad1f… --- diff --git a/src/modules/kex/core_stats.c b/src/modules/kex/core_stats.c index 565ce4e77d7..816ae39a90f 100644 --- a/src/modules/kex/core_stats.c +++ b/src/modules/kex/core_stats.c @@ -409,7 +409,7 @@ struct rpc_list_params { /** - * Satistic getter RPC callback. + * Statistic getter RPC callback. */ static void rpc_get_grp_vars_cbk(void* p, str* g, str* n, counter_handle_t h) { @@ -644,7 +644,7 @@ static void rpc_stats_fetchn_statistics(rpc_t* rpc, void* ctx) } /** - * Satistic reset/clear-er RPC callback.. + * Statistic reset/clear-er RPC callback.. */ static void rpc_reset_or_clear_grp_vars_cbk(void* p, str* g, str* n, counter_handle_t h) diff --git a/src/modules/kex/doc/kex_admin.xml b/src/modules/kex/doc/kex_admin.xml index 34484bc4ec8..5c597e97047 100644 --- a/src/modules/kex/doc/kex_admin.xml +++ b/src/modules/kex/doc/kex_admin.xml @@ -88,7 +88,7 @@ setsflag("$var(flag)"); <section id="kex.f.issflagset"> <title><function moreinfo="none">issflagset(flag)</function></title> <para> - Return true of the script flag is set. + Return true if the script flag is set. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -179,7 +179,7 @@ setbflag("$var(flag)", "1"); <section id="kex.f.isbflagset"> <title><function moreinfo="none">isbflagset(flag [, branch])</function></title> <para> - Return true of the branch flag is set. + Return true if the branch flag is set. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -762,7 +762,7 @@ resetdebug(); </title> <para>Print the list of available internal statistics.</para> <para>NOTE: the result is an array of strings that have the list of - statistics formated like "name = value", being propagated over the time + statistics formatted like "name = value", being propagated over the time from the MI variant. Use "stats.fetch" or "stats.fetchn"commands to have a more JSON-friendly output.</para> <para>Parameters: <emphasis>statsid</emphasis> - which statistics to @@ -785,7 +785,7 @@ resetdebug(); <para>Print the list of available internal statistics with a more json friendly output. Each printed statistic is a field in the output structure: {"statsgroup.statsname" : "statsvalue"}. The value is - represented as string to accomodate large numbers.</para> + represented as string to accommodate large numbers.</para> <para>Parameters: <emphasis>statsid</emphasis> - which statistics to be printed. If set to 'all' then all statistics are printed; if set to 'statsgroup:' then all statistics in the group are printed; diff --git a/src/modules/kex/kex_mod.c b/src/modules/kex/kex_mod.c index e46e85b5cf4..1927c7343d3 100644 --- a/src/modules/kex/kex_mod.c +++ b/src/modules/kex/kex_mod.c @@ -141,7 +141,7 @@ static int mod_init(void) register_pkg_proc_stats(); pkg_proc_stats_init_rpc(); - /* per module memmory debugging RPC command */ + /* per module memory debugging RPC command */ mod_stats_init_rpc(); return 0;

1 year

← Newer
1
...
11
12
13
14
15
16
17
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2023