Module: kamailio
Branch: master
Commit: 01ec19f73a7257a83bd9abb9a02c12e2c3d225e0
URL: https://github.com/kamailio/kamailio/commit/01ec19f73a7257a83bd9abb9a02c12e…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2024-03-21T07:21:27+01:00
secsipid: note that get url function is doing caching
- use get url function in example for verify
---
Modified: src/modules/secsipid/doc/secsipid_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/01ec19f73a7257a83bd9abb9a02c12e…
Patch: https://github.com/kamailio/kamailio/commit/01ec19f73a7257a83bd9abb9a02c12e…
---
diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml
index c43ccf3c637..f8f2e823a21 100644
--- a/src/modules/secsipid/doc/secsipid_admin.xml
+++ b/src/modules/secsipid/doc/secsipid_admin.xml
@@ -338,7 +338,7 @@ request_route {
...
request_route {
...
- http_client_query("https://provider.com/stir-shaken/cert.pem", "$var(pubkey)");
+ secsipid_get_url("https://provider.com/stir-shaken/cert.pem", "$var(pubkey)");
if(secsipid_verify("$hdr(Identity)", "$var(pubkey)", "A")) { ... }
...
}
@@ -356,7 +356,8 @@ request_route {
<function moreinfo="none">secsipid_get_url(url, ovar)</function>
</title>
<para>
- Get the content of a URL and store the result in a variable.
+ Get the content of a URL and store the result in a variable. The result
+ is cached by libsecsipid, if caching is enabled.
</para>
<para>
The url parameters can contain pseudo-variables and ovar has to be
<!-- Kamailio Pull Request Template -->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [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:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [ ] PR should be backported to stable branches
- [x] Tested changes locally
- [x] Related to issue #3720
#### Description
Fixing R-RURI and adding necessary headers when creating fake_msg in xhttp_mod.c for successful message validation and the ability to perform various kamailio functions from event_route[xhttp:request].
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3723
-- Commit Summary --
* xhttp: fix execution of async functions
-- File Changes --
M src/modules/xhttp/xhttp_mod.c (39)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3723.patchhttps://github.com/kamailio/kamailio/pull/3723.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3723
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/3723(a)github.com>
Module: kamailio
Branch: master
Commit: eca79b066984d8bd219c19a8c0dccb4955503bfc
URL: https://github.com/kamailio/kamailio/commit/eca79b066984d8bd219c19a8c0dccb4…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2024-03-20T16:16:11+01:00
modules: readme files regenerated - pvtpl ... [skip ci]
---
Modified: src/modules/pvtpl/README
---
Diff: https://github.com/kamailio/kamailio/commit/eca79b066984d8bd219c19a8c0dccb4…
Patch: https://github.com/kamailio/kamailio/commit/eca79b066984d8bd219c19a8c0dccb4…
---
diff --git a/src/modules/pvtpl/README b/src/modules/pvtpl/README
index 4ed20d00202..5bf5553aa97 100644
--- a/src/modules/pvtpl/README
+++ b/src/modules/pvtpl/README
@@ -30,12 +30,15 @@ Daniel-Constantin Mierla
4. Functions
- 4.1. pvtpl_apply(tplname, res)
+ 4.1. pvtpl_render(tplname, res)
+
+ 5. Template File
List of Examples
1.1. Set tpl parameter
- 1.2. gcrypt_aes_encrypt usage
+ 1.2. pvtpl_render usage
+ 1.3. Template file
Chapter 1. Admin Guide
@@ -53,7 +56,9 @@ Chapter 1. Admin Guide
4. Functions
- 4.1. pvtpl_apply(tplname, res)
+ 4.1. pvtpl_render(tplname, res)
+
+ 5. Template File
1. Overview
@@ -101,18 +106,33 @@ modparam("pvtpl", "tpl", "name=tpl2;fpath=/etc/kamailio/tpl2.pvtpl;bsize=256;")
4. Functions
- 4.1. pvtpl_apply(tplname, res)
+ 4.1. pvtpl_render(tplname, res)
-4.1. pvtpl_apply(tplname, res)
+4.1. pvtpl_render(tplname, res)
- Encrypts the text with the key using AES256 ECB encryption algorithm.
- The result is encoded in base64 format and stored in res. The parameter
- res must be a read-write variables. The parameters text and key can be
- static strings or strings with variables (dynamic strings).
+ Render the template 'tplname' using config variables, setting the
+ result in the variable specified by 'res'.
This function can be used from ANY_ROUTE.
- Example 1.2. gcrypt_aes_encrypt usage
+ Example 1.2. pvtpl_render usage
+...
+pvtpl_render("t1", "$var(out)");
+...
+
+5. Template File
+
+ The template file can contain text and config variables that are
+ evaluate when running pvtpl_render() functions.
+
+ The templates files are loaded at startup and prepared for runtime. It
+ is no option to reload the template files.
+
+ Example 1.3. Template file
...
-gcrypt_aes_encrypt("$rb", "my-secret-key", "$var(encrypted)");
+{
+ "from": "$fu",
+ "to": "$tu",
+ "x" : $var(x)
+}
...
### Description
Since 5.7.4, the `htable.seti` RPC command returns error 500. This seems to occur whenever an integer value is passed. If the integer is passed as a decimal (eg. `1.0` or `1.`) the error disappears. Also reproducible with latest master.
### Troubleshooting
Bisecting shows the offending commit to be https://github.com/kamailio/kamailio/commit/dc59286c26e9799f86e698a9698c9da…. Reverting this commit fixes the 500 error but reintroduces the previous error referenced in the commit.
#### Reproduction
```
$ kamcmd htable.seti rconfig foo 1
error: 500 - Not enough parameters (htable name, key name and value)
```
#### Log Messages
No messages in the kamailio log when the error occurs. The RPC command responds with
```
error: 500 - Not enough parameters (htable name, key name and value)
```
### Possible Solutions
A workaround is to pass the value as a decimal value, eg. `1.0`. Any decimals are ignored since the value is treated as an integer.
For XMLRPC this can be worked around by explicitly passing the value as an integer (passing the value as `i/1`).
### Additional Information
```
version: kamailio 5.9.0-dev0 (x86_64/linux) f6f9d9
flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, 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_SEND_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: f6f9d9
compiled on 11:57:50 Mar 5 2024 with gcc 13.2.1
```
* **Operating System**:
Reproduced on the following:
```
Linux jon 6.6.2-arch1-1 #1 SMP PREEMPT_DYNAMIC Mon, 20 Nov 2023 23:18:21 +0000 x86_64 GNU/Linux
```
```
Linux ip-10-105-240-190 4.9.0-19-amd64 #1 SMP Debian 4.9.320-2 (2022-06-30) x86_64 GNU/Linux
```
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/3774
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/issues/3774(a)github.com>
Module: kamailio
Branch: 5.8
Commit: 7bcef8ef487a713f5b6c6fadb7a3166ed41fb136
URL: https://github.com/kamailio/kamailio/commit/7bcef8ef487a713f5b6c6fadb7a3166…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2024-03-20T13:31:25+01:00
modules: readme files regenerated - modules ... [skip ci]
---
Modified: src/modules/dispatcher/README
---
Diff: https://github.com/kamailio/kamailio/commit/7bcef8ef487a713f5b6c6fadb7a3166…
Patch: https://github.com/kamailio/kamailio/commit/7bcef8ef487a713f5b6c6fadb7a3166…
---
diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README
index 79fc82ec175..209d77f4c87 100644
--- a/src/modules/dispatcher/README
+++ b/src/modules/dispatcher/README
@@ -1489,9 +1489,16 @@ if(ds_list_exists("10")) {
ignoring the protocol (value 2). If parameter is 0, all ip, port
and proto are matched and active status is ignored. If bit one is
set, then port is ignored. If bit two is set, then protocol is
- ignored. If bit three is set, then state must be active. The
- parameter can be an integer or a variable holding an integer value.
- It must be provided if the uri parameter is provided.
+ ignored. If bit three is set, then state must be active. If bit
+ four is set, then socket/sockname be matched. If bit five is set,
+ then try to find the most closest target from all dispatcher
+ targets with the mandatory ip and combination of local socket,
+ protocol, port, the weighted search result is combined from bit
+ flags of matched components: ip - 1, port - 2, protocol - 4, local
+ socket - 8, the target with the maximum value of flags combination
+ will be selected. The parameter can be an integer or a variable
+ holding an integer value. It must be provided if the uri parameter
+ is provided.
* uri (optional) - if parameter is empty or missing, the matching is
done against source IP, port and protocol. Otherwise the value has
to be a valid SIP URI, used to match against addresses in the