sr-dev June 2022

sr-dev@lists.kamailio.org

20 participants
281 discussions

git:master:9b1a3a6b: db_cluster: docs - more suggestive db url examples

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9b1a3a6b9a3e6a24d646e62ba74811cfdf553dae URL: https://github.com/kamailio/kamailio/commit/9b1a3a6b9a3e6a24d646e62ba74811c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-15T11:29:33+02:00 db_cluster: docs - more suggestive db url examples --- Modified: src/modules/db_cluster/doc/db_cluster_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9b1a3a6b9a3e6a24d646e62ba74811c… Patch: https://github.com/kamailio/kamailio/commit/9b1a3a6b9a3e6a24d646e62ba74811c… --- diff --git a/src/modules/db_cluster/doc/db_cluster_admin.xml b/src/modules/db_cluster/doc/db_cluster_admin.xml index 17e812f18f2..247ac178d48 100644 --- a/src/modules/db_cluster/doc/db_cluster_admin.xml +++ b/src/modules/db_cluster/doc/db_cluster_admin.xml @@ -204,9 +204,10 @@ modparam("db_cluster", "max_query_length", 5) <programlisting format="linespecific"> ... modparam("db_cluster", "connection", - "c1=>&defaultdb;1") + "c1=>mysql://kamailio:kamailiorw@localhost/kamailio1") modparam("db_cluster", "connection", - "c2=>&defaultdb;2") + "c2=>mysql://kamailio:kamailiorw@remotehost/kamailio2") + modparam("db_cluster", "cluster", "k1=>c1=9r9p;c2=9r9p") modparam("acc", "db_url", "cluster://k1")

2 years, 5 months

[kamailio/kamailio] Kamailio 5.5.4 siputils doesn't validate long Austrian numbers as valid e164 (Issue #3117)

by Simone de Blasiis

### Description When using the [is_e164 function](https://kamailio.org/docs/modules/5.5.x/modules/siputils.html#sip… on a long Austrian number it doesn't seem to return true even if it's in e164 format. #### Reproduction The number in question, with some digits obfuscated for privacy, is +4322367108xxxxxx. I can confirm that the number exists and is a valid one. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.4 (x86_64/linux) 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: unknown compiled with gcc 10.2.1 ``` * **Operating System**: ``` No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 11 (bullseye) Release: 11 Codename: bullseye Linux kamailio-primary 5.10.0-14-amd64 #1 SMP Debian 5.10.113-1 (2022-04-29) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3117 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3117(a)github.com>

2 years, 5 months

[kamailio/kamailio] crash related to functions in cfg file parser for invalid cfg (#2239)

by Henning Westerholt

Against current git master. ``` henning@static:~/repositories/kamailio$ cat etc/crash-4.cfg #!KAMAILIO loadmodule "sl.so" request_route { switch (1) { case -1: send_reply("404", "Not Found"); case -2: send_reply("405",("Method Not Allowed"); exit; } ``` > $ ./src/kamailio -f etc/crash-4.cfg -L src/modules/ -Y /tmp -E -d > 0(2278) CRITICAL: <core> [core/cfg.y:3549]: yyerror_at(): parse error in config file /home/henning/repositories/kamailio/etc/crash-4.cfg, line 10, column 43: syntax error > 0(2278) CRITICAL: <core> [core/cfg.y:3549]: yyerror_at(): parse error in config file /home/henning/repositories/kamailio/etc/crash-4.cfg, line 10, column 43: '('')' expected (function call) > Segmentation fault (core dumped) > henning@static:~/repositories/kamailio$ gdb src/kamailio core > Reading symbols from src/kamailio...done. > [New LWP 2278] > Core was generated by `./src/kamailio -f etc/crash-4.cfg -L src/modules/ -Y /tmp -E -d'. > Program terminated with signal SIGSEGV, Segmentation fault. > #0 0x00005580cdbd131e in append_action (a=0x7fad84db9300, b=0x7fad84db97f8) at core/route_struct.c:147 > 147 for(t=a; t->next; t=t->next); > (gdb) bt > #0 0x00005580cdbd131e in append_action (a=0x7fad84db9300, b=0x7fad84db97f8) at core/route_struct.c:147 > #1 0x00005580cdf9208b in yyparse () at core/cfg.y:2428 > #2 0x00005580cdb96c11 in main (argc=9, argv=0x7ffc2d9f6a68) at main.c:2309 > (gdb) f 0 > #0 0x00005580cdbd131e in append_action (a=0x7fad84db9300, b=0x7fad84db97f8) at core/route_struct.c:147 > 147 for(t=a; t->next; t=t->next); > (gdb) p a > $1 = (struct action *) 0x7fad84db9300 > (gdb) p b > $2 = (struct action *) 0x7fad84db97f8 > (gdb) p t > $3 = (struct action *) 0x80 > (gdb) p a->next > $4 = (struct action *) 0x80 > (gdb) p *t > Cannot access memory at address 0x80 -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2239

2 years, 5 months

git:master:f0cea1a7: core: stop at the first config error on startup

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f0cea1a7c03e400b4398795c2d8b0f7e45d1dfb5 URL: https://github.com/kamailio/kamailio/commit/f0cea1a7c03e400b4398795c2d8b0f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-14T11:46:39+02:00 core: stop at the first config error on startup - continuing to look for more errors to print them on one check can end up in crashing because some internal interpreter structure may not be filled properly - new cli option --all-errors that can be used to enable printing details for more detected config errors --- Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/f0cea1a7c03e400b4398795c2d8b0f7… Patch: https://github.com/kamailio/kamailio/commit/f0cea1a7c03e400b4398795c2d8b0f7… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 713b6789b0..acf5e8c490 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -3854,6 +3854,9 @@ static void yyerror_at(struct cfg_pos* p, char* format, ...) LM_CRIT("parse error in config file %s, line %d, column %d: %s\n", p->fname, p->s_line, p->s_col, s); cfg_errors++; + if(ksr_all_errors==0) { + ksr_exit(-1); + } } diff --git a/src/core/globals.h b/src/core/globals.h index a4857cbf0c..03eb1ef897 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -213,6 +213,7 @@ extern int rt_timer2_policy; /* "slow" timer, SCHED_OTHER */ extern int http_reply_parse; extern int _sr_ip_free_bind; extern int ksr_verbose_startup; +extern int ksr_all_errors; extern int ksr_route_locks_size; extern str _ksr_xavp_via_params; extern str _ksr_xavp_via_fields; diff --git a/src/main.c b/src/main.c index cb0c92e357..e919a23274 100644 --- a/src/main.c +++ b/src/main.c @@ -206,6 +206,7 @@ Options:\n\ --modparam=modname:paramname:type:value set the module parameter\n\ type has to be 's' for string value and 'i' for int value, \n\ example: --modparam=corex:alias_subdomains:s:" NAME ".org\n\ + --all-errors Print details about all config errors that can be detected\n\ -M nr Size of private memory allocated, in Megabytes\n\ -n processes Number of child processes to fork per interface\n\ (default: 8)\n" @@ -482,6 +483,7 @@ int child_rank = 0; int ser_kill_timeout=DEFAULT_SER_KILL_TIMEOUT; int ksr_verbose_startup = 0; +int ksr_all_errors = 0; /* cfg parsing */ int cfg_errors=0; @@ -2018,6 +2020,7 @@ int main(int argc, char** argv) {"debug", required_argument, 0, KARGOPTVAL + 8}, {"cfg-print", no_argument, 0, KARGOPTVAL + 9}, {"atexit", required_argument, 0, KARGOPTVAL + 10}, + {"all-errors", no_argument, 0, KARGOPTVAL + 11}, {0, 0, 0, 0 } }; @@ -2128,6 +2131,9 @@ int main(int argc, char** argv) goto error; } break; + case KARGOPTVAL+11: + ksr_all_errors = 1; + break; default: if (c == 'h' || (optarg && strcmp(optarg, "-h") == 0)) { @@ -2317,6 +2323,7 @@ int main(int argc, char** argv) case KARGOPTVAL+8: case KARGOPTVAL+9: case KARGOPTVAL+10: + case KARGOPTVAL+11: break; /* long options */

2 years, 5 months

git:master:649b421c: modules: readme files regenerated - siputils ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 649b421cf6b8b9dbec5bf632b612214d3918899b URL: https://github.com/kamailio/kamailio/commit/649b421cf6b8b9dbec5bf632b612214… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-14T10:31:17+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/649b421cf6b8b9dbec5bf632b612214… Patch: https://github.com/kamailio/kamailio/commit/649b421cf6b8b9dbec5bf632b612214…

2 years, 5 months

git:master:96c49c5a: siputils: docs - proper module name in examples

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 96c49c5adc22bd80eca465cea619c20f926bb3ef URL: https://github.com/kamailio/kamailio/commit/96c49c5adc22bd80eca465cea619c20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-14T10:27:06+02:00 siputils: docs - proper module name in examples --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/96c49c5adc22bd80eca465cea619c20… Patch: https://github.com/kamailio/kamailio/commit/96c49c5adc22bd80eca465cea619c20… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index ce9b87cff1..d6480000b7 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -201,7 +201,7 @@ modparam("siputils", "options_support", "100rel") <example> <title>rpid_prefix parameter example</title> <programlisting format="linespecific"> -modparam("auth", "rpid_prefix", "Whatever <") +modparam("siputils", "rpid_prefix", "Whatever <") </programlisting> </example> </section> @@ -218,7 +218,7 @@ modparam("auth", "rpid_prefix", "Whatever <") <example> <title>rpid_suffix parameter example</title> <programlisting format="linespecific"> -modparam("auth", "rpid_suffix", "@1.2.3.4>") +modparam("siputils", "rpid_suffix", "@1.2.3.4>") </programlisting> </example> </section> @@ -240,7 +240,7 @@ modparam("auth", "rpid_suffix", "@1.2.3.4>") <example> <title>rpid_avp parameter example</title> <programlisting format="linespecific"> -modparam("auth", "rpid_avp", "$avp(myrpid)") +modparam("siputils", "rpid_avp", "$avp(myrpid)") </programlisting> </example> </section>

2 years, 5 months

git:master:badb945a: siputils: docs for e164_max_len param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: badb945afc11cde49b3c5d26be7c63f8d64d4dcd URL: https://github.com/kamailio/kamailio/commit/badb945afc11cde49b3c5d26be7c63f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-14T10:25:15+02:00 siputils: docs for e164_max_len param --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/badb945afc11cde49b3c5d26be7c63f… Patch: https://github.com/kamailio/kamailio/commit/badb945afc11cde49b3c5d26be7c63f… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 73178847ad0..ce9b87cff10 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -244,6 +244,21 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") </programlisting> </example> </section> + <section id="siputils.p.e164_max_len"> + <title><varname>e164_max_len</varname> (int)</title> + <para> + The maximum length for checking e164 numbers, including the leading '+'. + </para> + <para> + Default value is <quote>16</quote>. + </para> + <example> + <title>e164_max_len parameter example</title> + <programlisting format="linespecific"> +modparam("siputils", "e164_max_len", 20) +</programlisting> + </example> + </section> </section> <section>

2 years, 5 months

git:master:0b629dfc: siputils: added e164_max_len modparam

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0b629dfc66ec7a2f5620ba253f8a932e3f164b07 URL: https://github.com/kamailio/kamailio/commit/0b629dfc66ec7a2f5620ba253f8a932… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-14T10:20:59+02:00 siputils: added e164_max_len modparam - specify the max length for e164 number check, includting the leading '+' - GH #3117 --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/0b629dfc66ec7a2f5620ba253f8a932… Patch: https://github.com/kamailio/kamailio/commit/0b629dfc66ec7a2f5620ba253f8a932… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 792cfca94a..d9730ddad1 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -48,6 +48,8 @@ #include "../../core/mod_fix.h" #include "checks.h" +extern int e164_max_len; + /** * return 1 (true) if the SIP message type is request */ @@ -661,7 +663,7 @@ int siputils_e164_check(str* _user) int i; char c; - if ((_user->len > 2) && (_user->len < 17) && ((_user->s)[0] == '+')) { + if ((_user->len > 2) && (_user->len <= e164_max_len) && ((_user->s)[0] == '+')) { for (i = 1; i < _user->len; i++) { c = (_user->s)[i]; if (c < '0' || c > '9') return -1; diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 2e7ddeb7c0..e7c5e3dcfc 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -89,6 +89,9 @@ str rpid_suffix = {DEF_RPID_SUFFIX, sizeof(DEF_RPID_SUFFIX) - 1}; /*! Definition of AVP containing rpid value */ char* rpid_avp_param = DEF_RPID_AVP; +/* max length for e164 number including the leading '+' */ +int e164_max_len = 16; + /* for options functionality */ str opt_accept = str_init(ACPT_DEF); str opt_accept_enc = str_init(ACPT_ENC_DEF); @@ -217,6 +220,7 @@ static param_export_t params[] = { {"rpid_prefix", PARAM_STR, &rpid_prefix }, {"rpid_suffix", PARAM_STR, &rpid_suffix }, {"rpid_avp", PARAM_STRING, &rpid_avp_param }, + {"e164_max_len", PARAM_INT, &e164_max_len }, {0, 0, 0} };

2 years, 5 months

git:master:93dccff9: modules: readme files regenerated - auth ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 93dccff9391e1336e1a37add1d07b4058b7593e8 URL: https://github.com/kamailio/kamailio/commit/93dccff9391e1336e1a37add1d07b40… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-14T10:01:27+02:00 modules: readme files regenerated - auth ... [skip ci] --- Modified: src/modules/auth/README --- Diff: https://github.com/kamailio/kamailio/commit/93dccff9391e1336e1a37add1d07b40… Patch: https://github.com/kamailio/kamailio/commit/93dccff9391e1336e1a37add1d07b40… --- diff --git a/src/modules/auth/README b/src/modules/auth/README index 25c448901d..f846d752d9 100644 --- a/src/modules/auth/README +++ b/src/modules/auth/README @@ -836,6 +836,7 @@ if (!auth_check("$fd", "subscriber", "1")) { + 4 - build challenge header with qop=auth and add it to avp + 8 - build challenge header with qop=auth-int and add it to avp + 16 - build challenge header with stale=true + + 32 - don't invalidate nc on authentication failure * method - the method to be used for authentication. This parameter is optional and if not set is the first "word" on the request-line.

2 years, 5 months

[kamailio/kamailio] auth: Add flag for not invalidating nc on auth failure (PR #3133)

by Jon Bergli Heier

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This change modifies `pv_www_authenticate` and related functions to add flag 32. If the flag is set and `nonce_count` is enabled then we skip updating nc in `pre_auth`. On success we call `check_nonce` once more to do the nc update. This can be used to chain calls to authenticate against multiple passwords. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3133 -- Commit Summary -- * auth: Add flag for not invalidating nc on auth failure -- File Changes -- M src/modules/auth/api.c (16) M src/modules/auth/api.h (3) M src/modules/auth/auth_mod.c (31) M src/modules/auth/doc/auth_functions.xml (4) M src/modules/auth/nc.c (4) M src/modules/auth/nc.h (2) M src/modules/auth/nonce.c (4) M src/modules/auth/nonce.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3133.patch https://github.com/kamailio/kamailio/pull/3133.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3133 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3133(a)github.com>

2 years, 5 months

← Newer
1
...
20
21
22
23
24
25
26
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2022