sr-dev July 2018

sr-dev@lists.kamailio.org

17 participants
229 discussions

git:master:85270635: permissions: docs - elaborated more the help for allow_trusted()
by Daniel-Constantin Mierla 11 Jul '18

11 Jul '18

Module: kamailio Branch: master Commit: 852706359470d586238e7df2c1aec2511e272d04 URL: https://github.com/kamailio/kamailio/commit/852706359470d586238e7df2c1aec25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-11T11:38:58+02:00 permissions: docs - elaborated more the help for allow_trusted() --- Modified: src/modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/852706359470d586238e7df2c1aec25… Patch: https://github.com/kamailio/kamailio/commit/852706359470d586238e7df2c1aec25… --- diff --git a/src/modules/permissions/doc/permissions_admin.xml b/src/modules/permissions/doc/permissions_admin.xml index 500dc48627..935620c0df 100644 --- a/src/modules/permissions/doc/permissions_admin.xml +++ b/src/modules/permissions/doc/permissions_admin.xml @@ -1185,12 +1185,12 @@ if ($var(group) != -1) { </section> <section id ="permissions.f.allow_trusted"> <title> - <function moreinfo="none">allow_trusted([src_ip_pvar, proto_pvar, uri_pvar])</function> + <function moreinfo="none">allow_trusted([src_ip_pvar, proto_pvar, furi_pvar])</function> </title> <para> Checks based either on request's source address and transport protocol or source address and transport protocol given - in pvar arguments, and From URI of request (or uri_pvar if provided) + in pvar arguments, and From URI of request (or furi_pvar if provided) if request can be trusted without authentication. Returns <quote>1</quote> if a match is found as described in <xref linkend="sec-trusted-requests"/> @@ -1200,9 +1200,14 @@ if ($var(group) != -1) { matching peer to AVP peer_tag_avp. </para> <para> - Source address, transport protocol and uri given in pvar - arguments must be in string format. Valid transport - protocol values are (ignoring case) "any", "udp, "tcp", "tls", + NOTE: source IP is matched using string comparison. Be careful if the + IP can have different forms, for a safer alternative for matching IP + addresses, look at allow_source_address or allow_address(). + </para> + <para> + Source address, transport protocol and uri given in the + arguments must be in string format and they can contain script variables. + Valid transport protocol values are (ignoring case) "any", "udp, "tcp", "tls", "ws", "wss" and "sctp". </para> <para> @@ -1214,11 +1219,15 @@ if ($var(group) != -1) { ... if (allow_trusted()) { t_relay(); -}; +} ... if (allow_trusted("$si", "$proto")) { t_relay(); -}; +} +... +if (allow_trusted("$si", "any", "$ai")) { + t_relay(); +} ... </programlisting> </example>

1 0

git:master:a9dbc22d: permissions: set from uri buffer to empty if not a sip message
by Daniel-Constantin Mierla 11 Jul '18

11 Jul '18

Module: kamailio Branch: master Commit: a9dbc22d9203a91b8eb465fea3b897f38593383a URL: https://github.com/kamailio/kamailio/commit/a9dbc22d9203a91b8eb465fea3b897f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-11T11:30:48+02:00 permissions: set from uri buffer to empty if not a sip message - adjustments after merging GH #1584 - avoid using garbage content from the declaration of the buffer - renamed parameter name to properly suggest is From header URI, given that R-URI is also part of matching --- Modified: src/modules/permissions/hash.c Modified: src/modules/permissions/trusted.c Modified: src/modules/permissions/trusted.h --- Diff: https://github.com/kamailio/kamailio/commit/a9dbc22d9203a91b8eb465fea3b897f… Patch: https://github.com/kamailio/kamailio/commit/a9dbc22d9203a91b8eb465fea3b897f…

1 0

git:master:581f80a0: modules: readme files regenerated - permissions ... [skip ci]
by Kamailio Dev 11 Jul '18

11 Jul '18

Module: kamailio Branch: master Commit: 581f80a09af73fd917834b5bcbca6143016b419d URL: https://github.com/kamailio/kamailio/commit/581f80a09af73fd917834b5bcbca614… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-11T10:47:04+02:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/581f80a09af73fd917834b5bcbca614… Patch: https://github.com/kamailio/kamailio/commit/581f80a09af73fd917834b5bcbca614… --- diff --git a/src/modules/permissions/README b/src/modules/permissions/README index 631fdeae79..6e2e3b972d 100644 --- a/src/modules/permissions/README +++ b/src/modules/permissions/README @@ -78,7 +78,7 @@ Emmanuel Schmidbauer 4.8. allow_source_address([group_id]) 4.9. allow_source_address_group() 4.10. allow_address_group(addr, port) - 4.11. allow_trusted([src_ip_pvar, proto_pvar]) + 4.11. allow_trusted([src_ip_pvar, proto_pvar, uri_pvar]) 5. RPC Commands @@ -183,7 +183,7 @@ Chapter 1. Admin Guide 4.8. allow_source_address([group_id]) 4.9. allow_source_address_group() 4.10. allow_address_group(addr, port) - 4.11. allow_trusted([src_ip_pvar, proto_pvar]) + 4.11. allow_trusted([src_ip_pvar, proto_pvar, uri_pvar]) 5. RPC Commands @@ -342,7 +342,7 @@ Chapter 1. Admin Guide * transport protocol is either "ANY" or equal to the transport protocol of request or the transport protocol given in pvar, and * regular expression is either empty (NULL in database) or matches - the From URI of request. + the request's From (or optionally provided) URI. Otherwise the request is rejected. @@ -715,7 +715,7 @@ modparam("permissions", "load_backends", 1) 4.8. allow_source_address([group_id]) 4.9. allow_source_address_group() 4.10. allow_address_group(addr, port) - 4.11. allow_trusted([src_ip_pvar, proto_pvar]) + 4.11. allow_trusted([src_ip_pvar, proto_pvar, uri_pvar]) 4.1. allow_routing() @@ -948,19 +948,19 @@ if ($var(group) != -1) { }; ... -4.11. allow_trusted([src_ip_pvar, proto_pvar]) +4.11. allow_trusted([src_ip_pvar, proto_pvar, uri_pvar]) Checks based either on request's source address and transport protocol or source address and transport protocol given in pvar arguments, and - From URI of request if request can be trusted without authentication. - Returns “1” if a match is found as described in Section 1.5, “Trusted - Requests” and “-1” otherwise. If a match is found and peer_tag_avp has - been defined, adds a non-NULL tag column value of the matching peer to - AVP peer_tag_avp. - - Source address and transport protocol given in pvar arguments must be - in string format. Valid transport protocol values are (ignoring case) - "any", "udp, "tcp", "tls", "ws", "wss" and "sctp". + From URI of request (or uri_pvar if provided) if request can be trusted + without authentication. Returns “1” if a match is found as described in + Section 1.5, “Trusted Requests” and “-1” otherwise. If a match is found + and peer_tag_avp has been defined, adds a non-NULL tag column value of + the matching peer to AVP peer_tag_avp. + + Source address, transport protocol and uri given in pvar arguments must + be in string format. Valid transport protocol values are (ignoring + case) "any", "udp, "tcp", "tls", "ws", "wss" and "sctp". This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.

1 0

git:master:ad2425c3: Merge pull request #1584 from rromrrom/allow_trusted_3
by GitHub 11 Jul '18

11 Jul '18

Module: kamailio Branch: master Commit: ad2425c34e1ced6e044db28d996d1211cd75e294 URL: https://github.com/kamailio/kamailio/commit/ad2425c34e1ced6e044db28d996d121… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-07-11T10:41:54+02:00 Merge pull request #1584 from rromrrom/allow_trusted_3 permissions: Improve From pattern matching in kamailio permissions moâ¦ --- Modified: src/modules/permissions/doc/permissions_admin.xml Modified: src/modules/permissions/hash.c Modified: src/modules/permissions/hash.h Modified: src/modules/permissions/permissions.c Modified: src/modules/permissions/trusted.c Modified: src/modules/permissions/trusted.h --- Diff: https://github.com/kamailio/kamailio/commit/ad2425c34e1ced6e044db28d996d121… Patch: https://github.com/kamailio/kamailio/commit/ad2425c34e1ced6e044db28d996d121…

1 0

git:master:caaef045: permissions: Improve From pattern matching in kamailio permissions module
by Roman Romanchenko 11 Jul '18

11 Jul '18

Module: kamailio Branch: master Commit: caaef0457e3c5e061ee961588394a1105e0c5850 URL: https://github.com/kamailio/kamailio/commit/caaef0457e3c5e061ee961588394a11… Author: Roman Romanchenko <rromanchenko(a)sipwise.com> Committer: Roman Romanchenko <rromanchenko(a)sipwise.com> Date: 2018-07-11T11:17:49+03:00 permissions: Improve From pattern matching in kamailio permissions module - allow_trusted() now can take optional parameter of value to match. - provided parameter will be used instead of From header in match_res() and match_hash_table() - documentation extended with 3-arguments allow_trusted() function description --- Modified: src/modules/permissions/doc/permissions_admin.xml Modified: src/modules/permissions/hash.c Modified: src/modules/permissions/hash.h Modified: src/modules/permissions/permissions.c Modified: src/modules/permissions/trusted.c Modified: src/modules/permissions/trusted.h --- Diff: https://github.com/kamailio/kamailio/commit/caaef0457e3c5e061ee961588394a11… Patch: https://github.com/kamailio/kamailio/commit/caaef0457e3c5e061ee961588394a11…

1 0

[kamailio/kamailio] permissions: Improve From pattern matching in kamailio permissions mo… (#1584)
by rromrrom 11 Jul '18

11 Jul '18

…dule - allow_trusted() now can take optional parameter of value to match. - provided parameter will be used instead of From header in match_res() and match_hash_table() - documentation extended with 3-arguments allow_trusted() function description   #### Pre-Submission Checklist    - [ ] 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/1584 -- Commit Summary -- * permissions: Improve From pattern matching in kamailio permissions module -- File Changes -- M src/modules/permissions/doc/permissions_admin.xml (8) M src/modules/permissions/hash.c (22) M src/modules/permissions/hash.h (4) M src/modules/permissions/permissions.c (2) M src/modules/permissions/trusted.c (98) M src/modules/permissions/trusted.h (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1584.patch https://github.com/kamailio/kamailio/pull/1584.diff -- 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/pull/1584

2 4

git:master:bfb1f5a6: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 10 Jul '18

10 Jul '18

Module: kamailio Branch: master Commit: bfb1f5a6879cc35ff638987bd2552ee1a24904c7 URL: https://github.com/kamailio/kamailio/commit/bfb1f5a6879cc35ff638987bd2552ee… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-10T10:17:10+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/bfb1f5a6879cc35ff638987bd2552ee… Patch: https://github.com/kamailio/kamailio/commit/bfb1f5a6879cc35ff638987bd2552ee…

1 0

git:master:a60734e5: textops: documentation for replace_str(...)
by Daniel-Constantin Mierla 10 Jul '18

10 Jul '18

Module: kamailio Branch: master Commit: a60734e552d2520fdd0253d5413c507c2e2974d7 URL: https://github.com/kamailio/kamailio/commit/a60734e552d2520fdd0253d5413c507… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-10T10:03:14+02:00 textops: documentation for replace_str(...) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a60734e552d2520fdd0253d5413c507… Patch: https://github.com/kamailio/kamailio/commit/a60734e552d2520fdd0253d5413c507… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 966169d2dd..3e62d7ac44 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -395,7 +395,45 @@ replace_body_all("openser", "&kamailio; SIP Proxy"); ... # strip the whole body from the message: if(has_body() && replace_body_atonce("^.+$", "")) - remove_hf("Content-Type"); + remove_hf("Content-Type"); +... +</programlisting> + </example> + </section> + + <section id="textops.f.replace_str"> + <title> + <function moreinfo="none">replace_str(match, repl, mode)</function> + </title> + <para> + Replaces the first or all occurrence of 'match' with 'repl' by doing + string comparison for matching. It is applied over headers and message + body (not over the first line). + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>match</emphasis> - string to be matched. + </para> + </listitem> + <listitem> + <para><emphasis>repl</emphasis> - string to be used as replacement. + </para> + </listitem> + <listitem> + <para><emphasis>mode</emphasis> - 'f' - replace only first match; + 'a' - replace all matches. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>replace_str</function> usage</title> + <programlisting format="linespecific"> +... +replace_str("&kamailio;", "&kamailio; SIP Proxy", "a"); ... </programlisting> </example>

1 0

git:master:5cdf195d: textops: added replace_str(match, repl, mode)
by Daniel-Constantin Mierla 10 Jul '18

10 Jul '18

Module: kamailio Branch: master Commit: 5cdf195d709dc0235170961af2003b70bcc2ecb6 URL: https://github.com/kamailio/kamailio/commit/5cdf195d709dc0235170961af2003b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-10T09:56:02+02:00 textops: added replace_str(match, repl, mode) - replace a string with another in the message buffer after the first line. The parameter mode coltrols if first ("f") match or all ("a") should be replaced - alternative to replace() that avoids regexp overhead when bare string can be matched --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/5cdf195d709dc0235170961af2003b7… Patch: https://github.com/kamailio/kamailio/commit/5cdf195d709dc0235170961af2003b7… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index b4b3de4e11..c2c43ce284 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -88,6 +88,7 @@ MODULE_VERSION static int search_body_f(struct sip_msg*, char*, char*); static int search_hf_f(struct sip_msg*, char*, char*, char*); static int replace_f(struct sip_msg*, char*, char*); +static int replace_str_f(struct sip_msg*, char*, char*, char*); static int replace_body_f(struct sip_msg*, char*, char*); static int replace_all_f(struct sip_msg*, char*, char*); static int replace_body_all_f(struct sip_msg*, char*, char*); @@ -178,6 +179,9 @@ static cmd_export_t cmds[]={ {"replace", (cmd_function)replace_f, 2, fixup_regexp_none, fixup_free_regexp_none, ANY_ROUTE}, + {"replace_str", (cmd_function)replace_str_f, 3, + fixup_spve_all, fixup_free_spve_all, + ANY_ROUTE}, {"replace_body", (cmd_function)replace_body_f, 2, fixup_regexp_none, fixup_free_regexp_none, ANY_ROUTE}, @@ -779,6 +783,99 @@ static int ki_replace(sip_msg_t* msg, str* sre, str* sval) return ret; } +static char *textops_strfind(str *mbuf, str *mkey) +{ + char *sp; + + // Sanity check + if(!(mbuf && mkey && mbuf->len >= mkey->len)) + return NULL; + + for(sp = mbuf->s; sp <= mbuf->s + mbuf->len - mkey->len; sp++) { + if(*sp == mkey->s[0] && strncmp(sp, mkey->s, mkey->len) == 0) { + return sp; + } + } + + return NULL; +} + +static int ki_replace_str(sip_msg_t* msg, str* mkey, str* rval, str *rmode) +{ + sr_lump_t* l; + char* s; + str mbuf; + char *mp; + char rpos; + + if(mkey==NULL || rval==NULL) { + return -1; + } + if(mkey->s==NULL || mkey->len<=0) { + return 1; + } + + if(rmode==NULL || rmode->s==NULL || rmode->s[0]=='f' || rmode->s[0]=='F') { + rpos = 'f'; + } else { + rpos = 'a'; + } + + mbuf.s = get_header(msg); + mbuf.len = msg->len - (mbuf.s - msg->buf); + + while((mp=textops_strfind(&mbuf, mkey))!=NULL) { + + if ((l=del_lump(msg, mp - msg->buf, mkey->len, 0))==0) { + return -1; + } + s=pkg_malloc(rval->len+1); + if (s==0){ + LM_ERR("memory allocation failure\n"); + return -1; + } + memcpy(s, rval->s, rval->len); + if (insert_new_lump_after(l, s, rval->len, 0)==0){ + LM_ERR("could not insert new lump\n"); + pkg_free(s); + return -1; + } + + if(rpos=='f') { + return 1; + } + + mbuf.s = mp + mkey->len; + mbuf.len = msg->len - (mbuf.s - msg->buf); + } + + return 1; +} + +static int replace_str_f(sip_msg_t* msg, char* pmkey, char* prval, char* prmode) +{ + str mkey; + str rval; + str rmode; + + if(fixup_get_svalue(msg, (gparam_t*)pmkey, &mkey)<0) { + LM_ERR("failed to get the matching string parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)prval, &rval)<0) { + LM_ERR("failed to get the replacement string parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)prmode, &rmode)<0) { + LM_ERR("failed to get the replacement mode parameter\n"); + return -1; + } + + return ki_replace_str(msg, &mkey, &rval, &rmode); +} + static int replace_body_helper(sip_msg_t* msg, regex_t *re, str *val) { struct lump* l; @@ -4243,6 +4340,11 @@ static sr_kemi_t sr_kemi_textops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textops"), str_init("replace_str"), + SR_KEMIP_INT, ki_replace_str, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("textops"), str_init("replace_all"), SR_KEMIP_INT, ki_replace_all, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:acb90b66: app_jsdt: restore JS stack after executing a function
by Daniel-Constantin Mierla 09 Jul '18

09 Jul '18

Module: kamailio Branch: master Commit: acb90b6634e65a21c655e9bb94c1af00c138e6d4 URL: https://github.com/kamailio/kamailio/commit/acb90b6634e65a21c655e9bb94c1af0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-09T15:41:59+02:00 app_jsdt: restore JS stack after executing a function --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/acb90b6634e65a21c655e9bb94c1af0… Patch: https://github.com/kamailio/kamailio/commit/acb90b6634e65a21c655e9bb94c1af0… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index ff9f2ad19d..224d54bfe6 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -770,6 +770,7 @@ int app_jsdt_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, int ret; str txt; sip_msg_t *bmsg; + duk_idx_t jtop; if(_sr_J_env.JJ==NULL) { LM_ERR("js loading state not initialized (call: %s)\n", func); @@ -779,7 +780,8 @@ int app_jsdt_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, jsdt_kemi_reload_script(); LM_DBG("executing js function: [[%s]]\n", func); - LM_DBG("js top index is: %d\n", duk_get_top(_sr_J_env.JJ)); + jtop = duk_get_top(_sr_J_env.JJ); + LM_DBG("js top index is: %d\n", (int)jtop); duk_get_global_string(_sr_J_env.JJ, func); if(!duk_is_function(_sr_J_env.JJ, -1)) { @@ -789,8 +791,10 @@ int app_jsdt_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, duk_get_type(_sr_J_env.JJ, -1)); txt.s = (char*)duk_to_string(_sr_J_env.JJ, -1); LM_ERR("error from JS: %s\n", (txt.s)?txt.s:"unknown"); + duk_set_top(_sr_J_env.JJ, jtop); return -1; } else { + duk_set_top(_sr_J_env.JJ, jtop); return 1; } } @@ -840,15 +844,16 @@ int app_jsdt_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, LM_ERR("error from js: unknown\n"); } } - duk_pop(_sr_J_env.JJ); if(n==1) { + duk_set_top(_sr_J_env.JJ, jtop); return 1; } else { LM_ERR("error executing: %s (err: %d)\n", func, ret); + duk_set_top(_sr_J_env.JJ, jtop); return -1; } } - duk_pop(_sr_J_env.JJ); + duk_set_top(_sr_J_env.JJ, jtop); return 1; }

1 0

← Newer
1
...
15
16
17
18
19
20
21
22
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2018