sr-dev April 2023

sr-dev@lists.kamailio.org

15 participants
266 discussions

git:master:7fd502fe: tls: get san entries by index
by Daniel-Constantin Mierla 26 Apr '23

26 Apr '23

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 0

[kamailio/kamailio] TLS Module does not expose all entries in the subject alternative name (Issue #3400)
by Marcus Orchard 26 Apr '23

26 Apr '23

### 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>

4 3

[kamailio/kamailio] tls: get san entries by index (PR #3408)
by Marcus Orchard 26 Apr '23

26 Apr '23

- 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>

3 7

git:master:42351ec9: lost: P-A-I parsing with display name fixed (#3426)
by Wolfgang Kampichler 26 Apr '23

26 Apr '23

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 0

[kamailio/kamailio] sanity: implement reserved char check in the header and values (Issue #3421)
by sergey-safarov 26 Apr '23

26 Apr '23

### 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>

3 4

git:master:5a2df203: modules: readme files regenerated - call_control ... [skip ci]
by Kamailio Dev 25 Apr '23

25 Apr '23

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 0

git:master:4c8276fc: kex: typos
by Daniel-Constantin Mierla 25 Apr '23

25 Apr '23

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 0

git:master:79fc3f1f: kemix: update Kamailio URLs to HTTP â HTTPS
by Daniel-Constantin Mierla 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: 79fc3f1fc9561f43146a107c824d1d97d3a8b021 URL: https://github.com/kamailio/kamailio/commit/79fc3f1fc9561f43146a107c824d1d9… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-25T22:11:28+02:00 kemix: update Kamailio URLs to HTTP �� HTTPS --- Modified: src/modules/kemix/doc/kemix_admin.xml Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/79fc3f1fc9561f43146a107c824d1d9… Patch: https://github.com/kamailio/kamailio/commit/79fc3f1fc9561f43146a107c824d1d9… --- diff --git a/src/modules/kemix/doc/kemix_admin.xml b/src/modules/kemix/doc/kemix_admin.xml index 0743d7765c5..f28467dc170 100644 --- a/src/modules/kemix/doc/kemix_admin.xml +++ b/src/modules/kemix/doc/kemix_admin.xml @@ -30,8 +30,8 @@ <itemizedlist> <listitem> <para> - <ulink url="http://kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/"> - http://kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/</ulink> + <ulink url="https://kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/"> + https://kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/</ulink> </para> </listitem> </itemizedlist> diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index e6bff3841cf..c710d50ffcf 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -75,7 +75,7 @@ static sr_kemi_xval_t* ki_kx_get_ruri(sip_msg_t *msg) } if(msg->first_line.type == SIP_REPLY) { - /* REPLY doesnt have a ruri */ + /* REPLY doesn't have a ruri */ sr_kemi_xval_null(&_sr_kemi_kx_xval, 0); return &_sr_kemi_kx_xval; } @@ -108,7 +108,7 @@ static sr_kemi_xval_t* ki_kx_get_ouri(sip_msg_t *msg) } if(msg->first_line.type == SIP_REPLY) { - /* REPLY doesnt have a ruri */ + /* REPLY doesn't have a ruri */ sr_kemi_xval_null(&_sr_kemi_kx_xval, 0); return &_sr_kemi_kx_xval; }

1 0

git:master:e7c8dcb9: keepalive: typos
by Daniel-Constantin Mierla 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: e7c8dcb9507fbd44cc1d00132b433a2d91705a48 URL: https://github.com/kamailio/kamailio/commit/e7c8dcb9507fbd44cc1d00132b433a2… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-25T22:11:28+02:00 keepalive: typos --- Modified: src/modules/keepalive/doc/keepalive_admin.xml Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/e7c8dcb9507fbd44cc1d00132b433a2… Patch: https://github.com/kamailio/kamailio/commit/e7c8dcb9507fbd44cc1d00132b433a2…

1 0

git:master:67a01aa6: kazoo: typos
by Daniel-Constantin Mierla 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: 67a01aa6757f19397438457c6665d338f6804f24 URL: https://github.com/kamailio/kamailio/commit/67a01aa6757f19397438457c6665d33… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-25T22:11:28+02:00 kazoo: typos --- Modified: src/modules/kazoo/doc/kazoo_admin.xml Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/67a01aa6757f19397438457c6665d33… Patch: https://github.com/kamailio/kamailio/commit/67a01aa6757f19397438457c6665d33… --- diff --git a/src/modules/kazoo/doc/kazoo_admin.xml b/src/modules/kazoo/doc/kazoo_admin.xml index 2d47ce83c1e..4128e8c834c 100644 --- a/src/modules/kazoo/doc/kazoo_admin.xml +++ b/src/modules/kazoo/doc/kazoo_admin.xml @@ -371,7 +371,7 @@ modparam("kazoo", "consume_messages_on_reconnect", 0) <section> <title><varname>single_consumer_on_reconnect</varname>(int)</title> <para>When the main loop receives a message from rabbitmq it will defer the - execution to a worker in a round-robin manner. this parameter allows to use the + execution to a worker in a round-robin manner. This parameter allows to use the same worker when kazoo reconnects to rabbitmq.</para> <para> <emphasis>Default value is 1.</emphasis> diff --git a/src/modules/kazoo/kazoo.c b/src/modules/kazoo/kazoo.c index 46f1f098b21..989d637bf22 100644 --- a/src/modules/kazoo/kazoo.c +++ b/src/modules/kazoo/kazoo.c @@ -176,7 +176,7 @@ static param_export_t params[] = { {"node_hostname", PARAM_STR, &dbk_node_hostname}, {"amqp_connection", PARAM_STRING|USE_FUNC_PARAM,(void*)kz_amqp_add_connection}, {"amqp_max_channels", INT_PARAM, &dbk_channels}, - {"amqp_timmer_process_interval", INT_PARAM, &kz_timer_ms}, + {"amqp_timer_process_interval", INT_PARAM, &kz_timer_ms}, {"amqp_consumer_ack_timeout_micro", INT_PARAM, &kz_ack_tv.tv_usec}, {"amqp_consumer_ack_timeout_sec", INT_PARAM, &kz_ack_tv.tv_sec}, {"amqp_interprocess_timeout_micro", INT_PARAM, &kz_sock_tv.tv_usec}, diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 873d6fe421c..1604cea612e 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2353,10 +2353,10 @@ int add_amqp_headers (char * headers, amqp_basic_properties_t * props ) if (header_value != NULL) { num_headers++; } else { - LM_ERR("Header-Value cant be parsed - skipping!\n"); + LM_ERR("Header-Value can't be parsed - skipping!\n"); } } else { - LM_ERR("Header-Name cant be parsed - skipping!\n"); + LM_ERR("Header-Name can't be parsed - skipping!\n"); } kv_pair_str = strtok_r(NULL, headers_delim, &header_saveptr); }

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2023