sr-dev

sr-dev@lists.kamailio.org

20 participants
45158 discussions

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

git:master:a49dcf0c: tls: set RPC_EXEC_DELTA flag for tls.reload rpc command
by Daniel-Constantin Mierla 05 Jan '23

05 Jan '23

Module: kamailio Branch: master Commit: a49dcf0cee005585222dacaa25d5d97e4934245e URL: https://github.com/kamailio/kamailio/commit/a49dcf0cee005585222dacaa25d5d97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-05T11:15:07+01:00 tls: set RPC_EXEC_DELTA flag for tls.reload rpc command - related to GH #3319 --- Modified: src/modules/tls/tls_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/a49dcf0cee005585222dacaa25d5d97… Patch: https://github.com/kamailio/kamailio/commit/a49dcf0cee005585222dacaa25d5d97… --- diff --git a/src/modules/tls/tls_rpc.c b/src/modules/tls/tls_rpc.c index b0e590dede..566191a876 100644 --- a/src/modules/tls/tls_rpc.c +++ b/src/modules/tls/tls_rpc.c @@ -279,7 +279,7 @@ static void tls_options(rpc_t* rpc, void* c) rpc_export_t tls_rpc[] = { - {"tls.reload", tls_reload, tls_reload_doc, 0}, + {"tls.reload", tls_reload, tls_reload_doc, RPC_EXEC_DELTA}, {"tls.list", tls_list, tls_list_doc, RET_ARRAY}, {"tls.info", tls_info, tls_info_doc, 0}, {"tls.options",tls_options, tls_options_doc, 0},

1 0

git:master:cc482ee9: xhttp_rpc: updates to use the new structure from rpc_sarray
by Daniel-Constantin Mierla 04 Jan '23

04 Jan '23

Module: kamailio Branch: master Commit: cc482ee970ef1abd3cabd15aa5907ad995e57cfe URL: https://github.com/kamailio/kamailio/commit/cc482ee970ef1abd3cabd15aa5907ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-04T10:25:05+01:00 xhttp_rpc: updates to use the new structure from rpc_sarray --- Modified: src/modules/xhttp_rpc/xhttp_rpc.c Modified: src/modules/xhttp_rpc/xhttp_rpc_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/cc482ee970ef1abd3cabd15aa5907ad… Patch: https://github.com/kamailio/kamailio/commit/cc482ee970ef1abd3cabd15aa5907ad…

1 0

git:master:6c3cff35: jsonrpcs: check if rpc command has execution limit with delta interval
by Daniel-Constantin Mierla 04 Jan '23

04 Jan '23

Module: kamailio Branch: master Commit: 6c3cff35a2ae2c29a93f0c2bd8507ccbed00464c URL: https://github.com/kamailio/kamailio/commit/6c3cff35a2ae2c29a93f0c2bd8507cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-04T10:26:22+01:00 jsonrpcs: check if rpc command has execution limit with delta interval --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6c3cff35a2ae2c29a93f0c2bd8507cc… Patch: https://github.com/kamailio/kamailio/commit/6c3cff35a2ae2c29a93f0c2bd8507cc… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index a966f6438ee..801eae441f1 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -1271,11 +1271,12 @@ static void mod_destroy(void) */ static int ki_jsonrpcs_dispatch(sip_msg_t* msg) { - rpc_export_t* rpce; + rpc_exportx_t* rpce; jsonrpc_ctx_t* ctx; int ret = 0; srjson_t *nj = NULL; str val; + unsigned int rdata; if(!IS_HTTP(msg)) { LM_DBG("Got non HTTP msg\n"); @@ -1332,20 +1333,26 @@ static int ki_jsonrpcs_dispatch(sip_msg_t* msg) val.s = nj->valuestring; val.len = strlen(val.s); ctx->method = val.s; - rpce = find_rpc_export(ctx->method, 0); - if (!rpce || !rpce->function) { + rpce = rpc_lookupx(val.s, val.len, &rdata); + if (!rpce || !rpce->r.function) { LM_ERR("method callback not found [%.*s]\n", val.len, val.s); jsonrpc_fault(ctx, 500, "Method Not Found"); goto send_reply; } - ctx->flags = rpce->flags; + if (rdata & RPC_EXEC_DELTA) { + LM_ERR("execution of command [%.*s] is limited by delta [%d]\n", + val.len, val.s, ksr_rpc_exec_delta); + jsonrpc_fault(ctx, 500, "Command Executed Too Fast"); + goto send_reply; + } + ctx->flags = rpce->r.flags; nj = srjson_GetObjectItem(ctx->jreq, ctx->jreq->root, "params"); if(nj!=NULL && nj->type!=srjson_Array && nj->type!=srjson_Object) { LM_ERR("params field is not an array or object\n"); goto send_reply; } if(nj!=NULL) ctx->req_node = nj->child; - rpce->function(&func_param, ctx); + rpce->r.function(&func_param, ctx); send_reply: if (!ctx->reply_sent && !(ctx->flags&JSONRPC_DELAYED_REPLY_F)) { @@ -1367,12 +1374,13 @@ static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) int jsonrpc_exec_ex(str *cmd, str *rpath) { - rpc_export_t* rpce; + rpc_exportx_t* rpce; jsonrpc_ctx_t* ctx; int ret; srjson_t *nj = NULL; str val; str scmd; + unsigned int rdata = 0; scmd = *cmd; @@ -1441,20 +1449,26 @@ int jsonrpc_exec_ex(str *cmd, str *rpath) val.s = nj->valuestring; val.len = strlen(val.s); ctx->method = val.s; - rpce = find_rpc_export(ctx->method, 0); - if (!rpce || !rpce->function) { + rpce = rpc_lookupx(val.s, val.len, &rdata); + if (!rpce || !rpce->r.function) { LM_ERR("method callback not found [%.*s]\n", val.len, val.s); jsonrpc_fault(ctx, 500, "Method Not Found"); goto send_reply; } - ctx->flags = rpce->flags; + if (rdata & RPC_EXEC_DELTA) { + LM_ERR("execution of command [%.*s] is limited by delta [%d]\n", + val.len, val.s, ksr_rpc_exec_delta); + jsonrpc_fault(ctx, 500, "Command Executed Too Fast"); + goto send_reply; + } + ctx->flags = rpce->r.flags; nj = srjson_GetObjectItem(ctx->jreq, ctx->jreq->root, "params"); if(nj!=NULL && nj->type!=srjson_Array && nj->type!=srjson_Object) { LM_ERR("params field is not an array or object\n"); goto send_reply; } if(nj!=NULL) ctx->req_node = nj->child; - rpce->function(&func_param, ctx); + rpce->r.function(&func_param, ctx); ret = 1; send_reply:

1 0

git:master:017089c0: core: new rpc command core.echo_delta
by Daniel-Constantin Mierla 04 Jan '23

04 Jan '23

Module: kamailio Branch: master Commit: 017089c04f2d6876fcb43ea494f287e687efc5d9 URL: https://github.com/kamailio/kamailio/commit/017089c04f2d6876fcb43ea494f287e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-04T10:22:00+01:00 core: new rpc command core.echo_delta - example of rpc command exported with RPC_EXEC_DELTA flag --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/017089c04f2d6876fcb43ea494f287e… Patch: https://github.com/kamailio/kamailio/commit/017089c04f2d6876fcb43ea494f287e… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index 3c9f08e332..c89111d39e 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -240,7 +240,7 @@ static void system_listMethods(rpc_t* rpc, void* c) int i; for(i=0; i<rpc_sarray_crt_size; i++){ - if (rpc->add(c, "s", rpc_sarray[i]->name) < 0) return; + if (rpc->add(c, "s", rpc_sarray[i]->r.name) < 0) return; } } @@ -326,6 +326,20 @@ static void core_echo(rpc_t* rpc, void* c) } +static const char* core_echo_delta_doc[] = { + "Returns back its parameters with execution delta limit.", /* Documentation string */ + 0 /* Method signature(s) */ +}; + + +static void core_echo_delta(rpc_t* rpc, void* c) +{ + char* string = 0; + while((rpc->scan(c, "*.s", &string)>0)) + rpc->add(c, "s", string); +} + + static const char* core_version_doc[] = { "Returns the version string of the server.", /* Documentation string */ 0 /* Method signature(s) */ @@ -1114,6 +1128,8 @@ static rpc_export_t core_rpc_methods[] = { RET_ARRAY}, {"core.echo", core_echo, core_echo_doc, RET_ARRAY}, + {"core.echo_delta", core_echo_delta, core_echo_delta_doc, + RET_ARRAY|RPC_EXEC_DELTA}, {"core.version", core_version, core_version_doc, 0 }, {"core.flags", core_flags, core_flags_doc,

1 0

git:master:8b311277: core: export core rpc commands later when shm is initialized
by Daniel-Constantin Mierla 04 Jan '23

04 Jan '23

Module: kamailio Branch: master Commit: 8b3112774fe08f5b6d808ee916431c3331a2e819 URL: https://github.com/kamailio/kamailio/commit/8b3112774fe08f5b6d808ee916431c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-04T10:23:24+01:00 core: export core rpc commands later when shm is initialized --- Modified: src/core/globals.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/8b3112774fe08f5b6d808ee916431c3… Patch: https://github.com/kamailio/kamailio/commit/8b3112774fe08f5b6d808ee916431c3… --- diff --git a/src/core/globals.h b/src/core/globals.h index 8d72807aee..109e4474cf 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -233,6 +233,8 @@ extern char *ksr_stats_namesep; extern str ksr_ipv6_hex_style; extern int ksr_local_rport; +extern int ksr_rpc_exec_delta; + #ifdef USE_DNS_CACHE extern int dns_cache_init; /* if 0, the DNS cache is not initialized at startup */ extern unsigned int dns_timer_interval; /* gc timer interval in s */ diff --git a/src/main.c b/src/main.c index f2ffe02665..07b89604f8 100644 --- a/src/main.c +++ b/src/main.c @@ -2430,7 +2430,6 @@ int main(int argc, char** argv) if (pv_init_api()<0) goto error; if (pv_register_core_vars()!=0) goto error; if (init_rpcs()<0) goto error; - if (register_core_rpcs()!=0) goto error; /* Fix the value of cfg_file variable.*/ if (fix_cfg_file() < 0) goto error; @@ -2762,6 +2761,8 @@ int main(int argc, char** argv) if (pv_reinit_buffer()<0) goto error; + if (register_core_rpcs()!=0) goto error; + if (ksr_route_locks_set_init()<0) goto error;

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