sr-dev January 2023

sr-dev@lists.kamailio.org

14 participants
280 discussions

[kamailio/kamailio] Permissions module `reload_delta` is not scoped to individual tables. (Issue #3318)
by Ben Kaufman 06 Jan '23

06 Jan '23

### Description The permissions module has two reload RPC commands, `permissions.addressReload` which reloads the `address` table, and `permissions.trustedReload`, which reloads the `trusted` table. The module parameter `reload_delta` exists to prevent concurrent reloading of a single table: > ##### 3.25. reload_delta (int) > The number of seconds that have to be waited before executing a new RPC reload. By default there is a rate limiting of maximum one reload in five seconds. > > If set to 0, no rate limit is configured. Note carefully: use this configuration only in tests environments because executing two RPC reloads of the same table at the same time can cause to kamailio to crash. If one of the reload rpc commands is issues (i.e. `permissions.addressReload`), then the OTHER reload command (`permissions.trustedReload`) will be blocked, despite acting against two separate tables. ### Troubleshooting Reproduced the issue. #### Reproduction _(DB config for permissions module omitted for brevity)_ ``` loadmodule "rtimer.so" loadmodule "permissions.so" loadmodule "jsonrpcs" modparamx("rtimer", "timer", "name=permissions_reload;mode=0;interval=300") modparam("rtimer", "exec", "timer=permissions_reload;route=RELOAD_PERMISSIONS") route[RELOAD_PERMISSIONS] { xnotice("Reloading trusted records\n"); jsonrpc_exec('{"jsonrpc": "2.0", "method": "permissions.trustedReload", "id": 1}'); xalert("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); xnotice("Reloading addresses\n"); jsonrpc_exec('{"jsonrpc": "2.0", "method": "permissions.addressReload", "id": 1}'); xalert("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); } ``` #### Debugging Data The above config yields output like this: ``` 2(8) NOTICE: <script>: Reloading trusted records 2(8) ALERT: <script>: jsonrpc response code: 200 - the body is: { "jsonrpc": "2.0", "result": "Reload OK", "id": 1 } 2(8) NOTICE: <script>: Reloading addresses 2(8) ERROR: permissions [rpc.c:42]: rpc_check_reload(): ongoing reload 2(8) ALERT: <script>: jsonrpc response code: 500 - the body is: { "jsonrpc": "2.0", "error": { "code": 500, "message": "ongoing reload" }, "id": 1 } ``` ### Possible Solutions Ideally each reload would be tracked separately. This could possibly involve separate `reload_delta` parameters for each table (although it seems excessive to change the interface). It's also possible that this behavior is by design, in which case, clarification of the documentation for the `reload_delta` parameter would be nice. ### Additional Information Problem occurs in kamailio 5.6.2. Likely within all version since the `reload_delta` parameter was added. * **Operating System**: Tested in Alpine, but OS seems irrelevant. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3318 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3318(a)github.com>

4 8

git:master:2442d074: jansson: avoid warning when long and long long have same size
by Daniel-Constantin Mierla 06 Jan '23

06 Jan '23

Module: kamailio Branch: master Commit: 2442d0748ef079c2152461792c64fc391e4def83 URL: https://github.com/kamailio/kamailio/commit/2442d0748ef079c2152461792c64fc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T09:27:05+01:00 jansson: avoid warning when long and long long have same size --- Modified: src/modules/jansson/jansson_utils.c --- Diff: https://github.com/kamailio/kamailio/commit/2442d0748ef079c2152461792c64fc3… Patch: https://github.com/kamailio/kamailio/commit/2442d0748ef079c2152461792c64fc3… --- diff --git a/src/modules/jansson/jansson_utils.c b/src/modules/jansson/jansson_utils.c index 813757030b..27ca34c9bb 100644 --- a/src/modules/jansson/jansson_utils.c +++ b/src/modules/jansson/jansson_utils.c @@ -111,7 +111,8 @@ int jansson_to_xval(sr_xval_t *val, char** freeme, json_t* v) { }else if(json_is_integer(v)) { #if JSON_INTEGER_IS_LONG_LONG long long value = json_integer_value(v); - if ((value > LONG_MAX) || (value < LONG_MIN)) { + if ((sizeof(long) < sizeof(long long)) + && ((value > LONG_MAX) || (value < LONG_MIN))) { char* svalue = NULL; if (asprintf(&svalue, "%"JSON_INTEGER_FORMAT, value) < 0) { ERR("asprintf failed\n");

1 0

git:master:e638232f: jansson: use JSON_INTEGER_IS_LONG_LONG macro for type of json integer field
by Daniel-Constantin Mierla 06 Jan '23

06 Jan '23

Module: kamailio Branch: master Commit: e638232ff51793d683868a4cc7beba8014fcba47 URL: https://github.com/kamailio/kamailio/commit/e638232ff51793d683868a4cc7beba8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T08:03:27+01:00 jansson: use JSON_INTEGER_IS_LONG_LONG macro for type of json integer field --- Modified: src/modules/jansson/jansson_utils.c --- Diff: https://github.com/kamailio/kamailio/commit/e638232ff51793d683868a4cc7beba8… Patch: https://github.com/kamailio/kamailio/commit/e638232ff51793d683868a4cc7beba8… --- diff --git a/src/modules/jansson/jansson_utils.c b/src/modules/jansson/jansson_utils.c index f7afa4980c1..813757030b0 100644 --- a/src/modules/jansson/jansson_utils.c +++ b/src/modules/jansson/jansson_utils.c @@ -109,6 +109,7 @@ int jansson_to_xval(sr_xval_t *val, char** freeme, json_t* v) { val->v.s.s = value; val->v.s.len = strlen(value); }else if(json_is_integer(v)) { +#if JSON_INTEGER_IS_LONG_LONG long long value = json_integer_value(v); if ((value > LONG_MAX) || (value < LONG_MIN)) { char* svalue = NULL; @@ -124,6 +125,10 @@ int jansson_to_xval(sr_xval_t *val, char** freeme, json_t* v) { val->type = SR_XTYPE_LONG; val->v.l = (long)value; } +#else + val->type = SR_XTYPE_LONG; + val->v.l = (long)json_integer_value(v); +#endif }else if(json_is_null(v)) { val->type = SR_XTYPE_NULL; }else {

1 0

git:master:10c0c188: modules: readme files regenerated - permissions ... [skip ci]
by Kamailio Dev 05 Jan '23

05 Jan '23

Module: kamailio Branch: master Commit: 10c0c1889be5b1aed27a41a87c45b5c5e8a92cf3 URL: https://github.com/kamailio/kamailio/commit/10c0c1889be5b1aed27a41a87c45b5c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-01-05T15:01:40+01:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/10c0c1889be5b1aed27a41a87c45b5c… Patch: https://github.com/kamailio/kamailio/commit/10c0c1889be5b1aed27a41a87c45b5c… --- diff --git a/src/modules/permissions/README b/src/modules/permissions/README index 86823d3ce1..41da6798a2 100644 --- a/src/modules/permissions/README +++ b/src/modules/permissions/README @@ -1069,6 +1069,10 @@ if (allow_trusted("$si", "any", "$ai")) { Parameters: none + This RPC command is exported with "RPC_EXEC_DELTA" flag, therefore its + execution rate can be restricted to specific time intervals by setting + the "rpc_exec_delta" core parameter. + 5.2. permissions.addressDump Causes the permissions module to dump the contents of cache memory @@ -1113,6 +1117,10 @@ if (allow_trusted("$si", "any", "$ai")) { Parameters: none + This RPC command is exported with "RPC_EXEC_DELTA" flag, therefore its + execution rate can be restricted to specific time intervals by setting + the "rpc_exec_delta" core parameter. + 5.8. permissions.trustedDump Causes the permissions module to dump contents of the trusted database diff --git a/src/modules/tls/README b/src/modules/tls/README index 006ec9f3cc..3fb1520c10 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -1643,6 +1643,10 @@ verify_client = optional_no_ca are not terminated and they continue to use the old certificates. The new configuration will be used for new connections. + This RPC command is exported with "RPC_EXEC_DELTA" flag, therefore its + execution rate can be restricted to specific time intervals by setting + the "rpc_exec_delta" core parameter. + Parameters: * None.

1 0

git:master:09bbe96a: permissions: docs - note that rpc reload commands are exported with RPC_EXEC_DELTA flag
by Daniel-Constantin Mierla 05 Jan '23

05 Jan '23

Module: kamailio Branch: master Commit: 09bbe96a32f70ff7328eac431ea2efb48a3a8175 URL: https://github.com/kamailio/kamailio/commit/09bbe96a32f70ff7328eac431ea2efb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-05T15:00:17+01:00 permissions: docs - note that rpc reload commands are exported with RPC_EXEC_DELTA flag --- Modified: src/modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/09bbe96a32f70ff7328eac431ea2efb… Patch: https://github.com/kamailio/kamailio/commit/09bbe96a32f70ff7328eac431ea2efb… --- diff --git a/src/modules/permissions/doc/permissions_admin.xml b/src/modules/permissions/doc/permissions_admin.xml index 9336112cec..745a1de115 100644 --- a/src/modules/permissions/doc/permissions_admin.xml +++ b/src/modules/permissions/doc/permissions_admin.xml @@ -1330,6 +1330,11 @@ if (allow_trusted("$si", "any", "$ai")) { paramenter. By default is allowed maximum one reload in five seconds. </para> <para>Parameters: <emphasis>none</emphasis></para> + <para> + This RPC command is exported with "RPC_EXEC_DELTA" flag, therefore its + execution rate can be restricted to specific time intervals by setting + the "rpc_exec_delta" core parameter. + </para> </section> <section id ="permissions.r.addressDump"> @@ -1413,6 +1418,11 @@ if (allow_trusted("$si", "any", "$ai")) { paramenter. By default is allowed maximum one reload in five seconds. </para> <para>Parameters: <emphasis>none</emphasis></para> + <para> + This RPC command is exported with "RPC_EXEC_DELTA" flag, therefore its + execution rate can be restricted to specific time intervals by setting + the "rpc_exec_delta" core parameter. + </para> </section> <section id ="permissions.r.trustedDump"> <title>

1 0

git:master:5d9ed676: tls: docs - note that rpc reload command is exported with RPC_EXEC_DELTA flag
by Daniel-Constantin Mierla 05 Jan '23

05 Jan '23

Module: kamailio Branch: master Commit: 5d9ed676dad76729253ee734d20a805e2a0dcc5c URL: https://github.com/kamailio/kamailio/commit/5d9ed676dad76729253ee734d20a805… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-05T14:59:37+01:00 tls: docs - note that rpc reload command is exported with RPC_EXEC_DELTA flag --- Modified: src/modules/tls/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/5d9ed676dad76729253ee734d20a805… Patch: https://github.com/kamailio/kamailio/commit/5d9ed676dad76729253ee734d20a805… --- diff --git a/src/modules/tls/doc/rpc.xml b/src/modules/tls/doc/rpc.xml index 8f3070648b..30c67d5c8f 100644 --- a/src/modules/tls/doc/rpc.xml +++ b/src/modules/tls/doc/rpc.xml @@ -58,6 +58,11 @@ terminated and they continue to use the old certificates. The new configuration will be used for new connections. </para> + <para> + This RPC command is exported with "RPC_EXEC_DELTA" flag, therefore its + execution rate can be restricted to specific time intervals by setting + the "rpc_exec_delta" core parameter. + </para> <para>Parameters: </para> <itemizedlist> <listitem><para>

1 0

git:master:a71a6ed6: core: rpc - support for executing commands with a delta interval limit
by Daniel-Constantin Mierla 05 Jan '23

05 Jan '23

Module: kamailio Branch: master Commit: a71a6ed626266db8265a7a88375be5ef3b2be495 URL: https://github.com/kamailio/kamailio/commit/a71a6ed626266db8265a7a88375be5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-04T10:18:51+01:00 core: rpc - support for executing commands with a delta interval limit - RPC_EXEC_DELTA flag has to be set on RPC command export --- Modified: src/core/rpc.h Modified: src/core/rpc_lookup.c Modified: src/core/rpc_lookup.h --- Diff: https://github.com/kamailio/kamailio/commit/a71a6ed626266db8265a7a88375be5e… Patch: https://github.com/kamailio/kamailio/commit/a71a6ed626266db8265a7a88375be5e…

2 1

[kamailio/kamailio] Topos: Added support for Call-ID mask (PR #3322)
by Harish S 05 Jan '23

05 Jan '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3322 -- Commit Summary -- * Add receive-from option * Update rtpengine.c * Update rtpengine.c * Update rtpengine.c * Update rtpengine.c * Update received-from=IP * Update received-from * Merge branch 'kamailio:master' into master * topos:Addde support for Call-ID mask -- File Changes -- M src/modules/topos/doc/topos_admin.xml (54) M src/modules/topos/topos_mod.c (7) A src/modules/topos/tps_mask.c (189) A src/modules/topos/tps_mask.h (36) M src/modules/topos/tps_msg.c (174) M src/modules/topos/tps_msg.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3322.patch https://github.com/kamailio/kamailio/pull/3322.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3322 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3322(a)github.com>

2 6

git:master:d0b1d6cc: permissions: set the RPC_EXEC_DELTA flag for RPC reload commands
by Daniel-Constantin Mierla 05 Jan '23

05 Jan '23

Module: kamailio Branch: master Commit: d0b1d6cc15b1c4e98ac65e4d90c6f53f2da63218 URL: https://github.com/kamailio/kamailio/commit/d0b1d6cc15b1c4e98ac65e4d90c6f53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-05T13:16:27+01:00 permissions: set the RPC_EXEC_DELTA flag for RPC reload commands --- Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/d0b1d6cc15b1c4e98ac65e4d90c6f53… Patch: https://github.com/kamailio/kamailio/commit/d0b1d6cc15b1c4e98ac65e4d90c6f53… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 6f1b36cf23..cffa419d4e 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -1031,8 +1031,8 @@ static const char* rpc_test_uri_doc[2] = { }; rpc_export_t permissions_rpc[] = { - {"permissions.trustedReload", rpc_trusted_reload, rpc_trusted_reload_doc, 0}, - {"permissions.addressReload", rpc_address_reload, rpc_address_reload_doc, 0}, + {"permissions.trustedReload", rpc_trusted_reload, rpc_trusted_reload_doc, RPC_EXEC_DELTA}, + {"permissions.addressReload", rpc_address_reload, rpc_address_reload_doc, RPC_EXEC_DELTA}, {"permissions.trustedDump", rpc_trusted_dump, rpc_trusted_dump_doc, 0}, {"permissions.addressDump", rpc_address_dump, rpc_address_dump_doc, RET_ARRAY}, {"permissions.subnetDump", rpc_subnet_dump, rpc_subnet_dump_doc, RET_ARRAY},

1 0

git:master:bb0c0867: core: replaced RET_ARRAY flag with RPC_RET_ARRAY
by Daniel-Constantin Mierla 05 Jan '23

05 Jan '23

Module: kamailio Branch: master Commit: bb0c08676ccf33fabd7a0de27129c2ad98ac2208 URL: https://github.com/kamailio/kamailio/commit/bb0c08676ccf33fabd7a0de27129c2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-05T12:22:31+01:00 core: replaced RET_ARRAY flag with RPC_RET_ARRAY --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/bb0c08676ccf33fabd7a0de27129c2a… Patch: https://github.com/kamailio/kamailio/commit/bb0c08676ccf33fabd7a0de27129c2a…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2023