sr-dev March 2021

sr-dev@lists.kamailio.org

28 participants
489 discussions

git:master:305a2ff2: crypto: small copy/paste fix in docs

by Henning Westerholt

Module: kamailio Branch: master Commit: 305a2ff281ffb4320b9a685d96fc8cac5d82ba33 URL: https://github.com/kamailio/kamailio/commit/305a2ff281ffb4320b9a685d96fc8ca… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-03-30T20:51:43Z crypto: small copy/paste fix in docs --- Modified: src/modules/crypto/doc/crypto_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/305a2ff281ffb4320b9a685d96fc8ca… Patch: https://github.com/kamailio/kamailio/commit/305a2ff281ffb4320b9a685d96fc8ca… --- diff --git a/src/modules/crypto/doc/crypto_admin.xml b/src/modules/crypto/doc/crypto_admin.xml index e3c9d747fd..42385aeb98 100644 --- a/src/modules/crypto/doc/crypto_admin.xml +++ b/src/modules/crypto/doc/crypto_admin.xml @@ -206,7 +206,7 @@ modparam("crypto", "key_derivation", 0) </example> </section> <section id="crypto.p.init_vector"> - <title><varname>netio_key</varname> (str)</title> + <title><varname>init_vector</varname> (str)</title> <para> The initialization vector used for the cryptographic operations. This needs to be a Base64 encoded value with 16 bytes lengths.

3 years, 8 months

git:master:588eeeb2: modules: readme files regenerated - crypto ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 588eeeb2c56a98de3bb3fe09b0360f1dc53d811a URL: https://github.com/kamailio/kamailio/commit/588eeeb2c56a98de3bb3fe09b0360f1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-30T22:46:12+02:00 modules: readme files regenerated - crypto ... [skip ci] --- Modified: src/modules/crypto/README --- Diff: https://github.com/kamailio/kamailio/commit/588eeeb2c56a98de3bb3fe09b0360f1… Patch: https://github.com/kamailio/kamailio/commit/588eeeb2c56a98de3bb3fe09b0360f1…

3 years, 8 months

git:master:b08fd55d: crypto: add two new parameters to provide interoperability with existing crypto libraries

by Henning Westerholt

Module: kamailio Branch: master Commit: b08fd55ddd598115a3b69afc630403a582d239f2 URL: https://github.com/kamailio/kamailio/commit/b08fd55ddd598115a3b69afc630403a… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-03-30T20:39:06Z crypto: add two new parameters to provide interoperability with existing crypto libraries - add two new parameters to provide interoperability with existing crypto libraries - key_derivation: specify the mode of the key derivation - init_vector: specify the source of the initialization vector - this can e.g. used to decrypt data coming from a Java middle-ware application or from a PostgreSQL database encrypt function --- Modified: src/modules/crypto/crypto_aes.c Modified: src/modules/crypto/crypto_aes.h Modified: src/modules/crypto/crypto_evcb.c Modified: src/modules/crypto/crypto_mod.c Modified: src/modules/crypto/doc/crypto_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b08fd55ddd598115a3b69afc630403a… Patch: https://github.com/kamailio/kamailio/commit/b08fd55ddd598115a3b69afc630403a…

3 years, 8 months

[kamailio/kamailio] {s.encode.hexa} transformation does not work as expected (#2690)

by iamonte

We have found an issue in version 5.2 To reproduce it ``` $var(x) = "wg48D8NPIJ5JEfkgqhuu+Q=="; $var(decode64) = $(var(x){s.decode.base64}); $var(encode16) = $(var(decode64){s.encode.hexa}); ``` after these line the value of encode16 must be 'c20e3c0fc34f209e4911f920aa1baef9' Looking inside the module pv, file pv_trans.c, line 347, we realized that the code is not correct because the shift operation keeps the sign, `_tr_buffer[j++] = fourbits2char[val->rs.s[i] >> 4];` we saw that if we modifies the previous line with the following `_tr_buffer[j++] = fourbits2char[(unsigned char)(val->rs.s[i]) >> 4];` the function works as expected -- 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/2690

3 years, 8 months

git:master:edd28844: modules: readme files regenerated - http_async_client ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: edd2884441ac75d96f6a0a7d53e8c738e5300ecf URL: https://github.com/kamailio/kamailio/commit/edd2884441ac75d96f6a0a7d53e8c73… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-30T14:16:16+02:00 modules: readme files regenerated - http_async_client ... [skip ci] --- Modified: src/modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/edd2884441ac75d96f6a0a7d53e8c73… Patch: https://github.com/kamailio/kamailio/commit/edd2884441ac75d96f6a0a7d53e8c73…

3 years, 8 months

[kamailio/kamailio] http_async_client: add curl_follow_redirect parameter (#2694)

by Tristan Mahé

- add curl_follow_redirect mod parameter to set CURLOPT_FOLLOWLOCATION to tell libcurl to follow 3xx responses.   #### 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  Add curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L) on curl init to tell libcurl to follow redirects if needed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2694 -- Commit Summary -- * http_async_client: add curl_follow_redirect parameter -- File Changes -- M src/modules/http_async_client/doc/http_async_client_admin.xml (20) M src/modules/http_async_client/http_async_client_mod.c (2) M src/modules/http_async_client/http_multi.c (3) M src/modules/http_async_client/http_multi.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2694.patch https://github.com/kamailio/kamailio/pull/2694.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/2694

3 years, 8 months

git:master:14a39965: http_async_client: add curl_follow_redirect parameter

by gled

Module: kamailio Branch: master Commit: 14a399652bb813f77da13956eb47e1f16c5d6b8f URL: https://github.com/kamailio/kamailio/commit/14a399652bb813f77da13956eb47e1f… Author: gled <gled(a)remote-shell.net> Committer: gled <gled(a)remote-shell.net> Date: 2021-03-26T17:17:09-07:00 http_async_client: add curl_follow_redirect parameter - add curl_follow_redirect mod parameter to set CURLOPT_FOLLOWLOCATION to tell libcurl to follow 3xx responses. - write the doc in doc subfolder for the curl_follow_redirect param --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml Modified: src/modules/http_async_client/http_async_client_mod.c Modified: src/modules/http_async_client/http_multi.c Modified: src/modules/http_async_client/http_multi.h --- Diff: https://github.com/kamailio/kamailio/commit/14a399652bb813f77da13956eb47e1f… Patch: https://github.com/kamailio/kamailio/commit/14a399652bb813f77da13956eb47e1f… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index 1efe0a1f33..4e4701fcb3 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -200,6 +200,26 @@ modparam("http_async_client", "curl_verbose", 1) </programlisting> </example> </section> + <section> + <title><varname>curl_follow_redirect</varname> (integer)</title> + <para> + If defined to a non-zero value, will tell curl to follow HTTP 3xx redirects. + </para> + <para> + <emphasis> + Default value is 0 (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>curl_follow_redirect</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("http_async_client", "curl_follow_redirect", 1) +... +</programlisting> + </example> + </section> + <section> <title><varname>memory_manager</varname> (string)</title> <para> diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index 7f56f98a56..f369cf083d 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -74,6 +74,7 @@ int tls_version = 0; // Use default SSL version in HTTPS requests (see curl/curl int tls_verify_host = 1; // By default verify host in HTTPS requests int tls_verify_peer = 1; // By default verify peer in HTTPS requests int curl_verbose = 0; +int curl_follow_redirect = 0; char* tls_client_cert = NULL; // client SSL certificate path, defaults to NULL char* tls_client_key = NULL; // client SSL certificate key path, defaults to NULL char* tls_ca_path = NULL; // certificate authority dir path, defaults to NULL @@ -150,6 +151,7 @@ static param_export_t params[]={ {"tls_verify_host", INT_PARAM, &tls_verify_host}, {"tls_verify_peer", INT_PARAM, &tls_verify_peer}, {"curl_verbose", INT_PARAM, &curl_verbose}, + {"curl_follow_redirect", INT_PARAM, &curl_follow_redirect}, {"tls_client_cert", PARAM_STRING, &tls_client_cert}, {"tls_client_key", PARAM_STRING, &tls_client_key}, {"tls_ca_path", PARAM_STRING, &tls_ca_path}, diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index c4351b1b94..7baf153140 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -462,6 +462,9 @@ int new_request(str *query, http_m_params_t *query_params, http_multi_cbe_t cb, curl_easy_setopt(cell->easy, CURLOPT_VERBOSE, 1L); curl_easy_setopt(cell->easy, CURLOPT_DEBUGFUNCTION, debug_cb); } + if (curl_follow_redirect) { + curl_easy_setopt(cell->easy, CURLOPT_FOLLOWLOCATION, 1L); + } curl_easy_setopt(cell->easy, CURLOPT_ERRORBUFFER, cell->error); curl_easy_setopt(cell->easy, CURLOPT_PRIVATE, cell); curl_easy_setopt(cell->easy, CURLOPT_SSL_VERIFYPEER, cell->params.tls_verify_peer); diff --git a/src/modules/http_async_client/http_multi.h b/src/modules/http_async_client/http_multi.h index 0e63811df7..2a99b8cb36 100644 --- a/src/modules/http_async_client/http_multi.h +++ b/src/modules/http_async_client/http_multi.h @@ -58,6 +58,7 @@ extern stat_var *errors; extern stat_var *timeouts; extern int tls_version; extern int curl_verbose; +extern int curl_follow_redirect; void set_curl_mem_callbacks(void); int init_http_multi();

3 years, 8 months

git:master:0183de31: Merge pull request #2694 from gled-rs/http_async_follow_redirect

by GitHub

Module: kamailio Branch: master Commit: 0183de317d0d2578e83061fc7541afde37ec4853 URL: https://github.com/kamailio/kamailio/commit/0183de317d0d2578e83061fc7541afd… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-03-30T14:04:06+02:00 Merge pull request #2694 from gled-rs/http_async_follow_redirect http_async_client: add curl_follow_redirect parameter --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml Modified: src/modules/http_async_client/http_async_client_mod.c Modified: src/modules/http_async_client/http_multi.c Modified: src/modules/http_async_client/http_multi.h --- Diff: https://github.com/kamailio/kamailio/commit/0183de317d0d2578e83061fc7541afd… Patch: https://github.com/kamailio/kamailio/commit/0183de317d0d2578e83061fc7541afd… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index 1efe0a1f33..4e4701fcb3 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -200,6 +200,26 @@ modparam("http_async_client", "curl_verbose", 1) </programlisting> </example> </section> + <section> + <title><varname>curl_follow_redirect</varname> (integer)</title> + <para> + If defined to a non-zero value, will tell curl to follow HTTP 3xx redirects. + </para> + <para> + <emphasis> + Default value is 0 (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>curl_follow_redirect</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("http_async_client", "curl_follow_redirect", 1) +... +</programlisting> + </example> + </section> + <section> <title><varname>memory_manager</varname> (string)</title> <para> diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index 7f56f98a56..f369cf083d 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -74,6 +74,7 @@ int tls_version = 0; // Use default SSL version in HTTPS requests (see curl/curl int tls_verify_host = 1; // By default verify host in HTTPS requests int tls_verify_peer = 1; // By default verify peer in HTTPS requests int curl_verbose = 0; +int curl_follow_redirect = 0; char* tls_client_cert = NULL; // client SSL certificate path, defaults to NULL char* tls_client_key = NULL; // client SSL certificate key path, defaults to NULL char* tls_ca_path = NULL; // certificate authority dir path, defaults to NULL @@ -150,6 +151,7 @@ static param_export_t params[]={ {"tls_verify_host", INT_PARAM, &tls_verify_host}, {"tls_verify_peer", INT_PARAM, &tls_verify_peer}, {"curl_verbose", INT_PARAM, &curl_verbose}, + {"curl_follow_redirect", INT_PARAM, &curl_follow_redirect}, {"tls_client_cert", PARAM_STRING, &tls_client_cert}, {"tls_client_key", PARAM_STRING, &tls_client_key}, {"tls_ca_path", PARAM_STRING, &tls_ca_path}, diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index c4351b1b94..7baf153140 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -462,6 +462,9 @@ int new_request(str *query, http_m_params_t *query_params, http_multi_cbe_t cb, curl_easy_setopt(cell->easy, CURLOPT_VERBOSE, 1L); curl_easy_setopt(cell->easy, CURLOPT_DEBUGFUNCTION, debug_cb); } + if (curl_follow_redirect) { + curl_easy_setopt(cell->easy, CURLOPT_FOLLOWLOCATION, 1L); + } curl_easy_setopt(cell->easy, CURLOPT_ERRORBUFFER, cell->error); curl_easy_setopt(cell->easy, CURLOPT_PRIVATE, cell); curl_easy_setopt(cell->easy, CURLOPT_SSL_VERIFYPEER, cell->params.tls_verify_peer); diff --git a/src/modules/http_async_client/http_multi.h b/src/modules/http_async_client/http_multi.h index 0e63811df7..2a99b8cb36 100644 --- a/src/modules/http_async_client/http_multi.h +++ b/src/modules/http_async_client/http_multi.h @@ -58,6 +58,7 @@ extern stat_var *errors; extern stat_var *timeouts; extern int tls_version; extern int curl_verbose; +extern int curl_follow_redirect; void set_curl_mem_callbacks(void); int init_http_multi();

3 years, 8 months

git:5.4:8d6c2b96: path: set dst udp uri length for decoding received value in alias format

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 8d6c2b96e83fc58f7159957ea86d5f91c00808ba URL: https://github.com/kamailio/kamailio/commit/8d6c2b96e83fc58f7159957ea86d5f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-30T12:00:32+02:00 path: set dst udp uri length for decoding received value in alias format (cherry picked from commit f90640f7cec45a359e996493ae91b1a45d2603e7) --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/8d6c2b96e83fc58f7159957ea86d5f9… Patch: https://github.com/kamailio/kamailio/commit/8d6c2b96e83fc58f7159957ea86d5f9… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index 137c73b720..836cef33b7 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -441,10 +441,13 @@ void path_rr_callback(struct sip_msg *_m, str *r_param, void *cb_param) p += 10; memcpy(p, sproto.s, sproto.len); p += sproto.len; - *p = '\0'; - dst_uri.len = p - dst_uri_buf; - break; + } else { + /* go back one byte to overwrite ';' */ + p--; } + *p = '\0'; + dst_uri.len = p - dst_uri_buf; + break; } else { LM_ERR("invalid number of separators (%d)\n", n); goto done;

3 years, 8 months

git:master:f90640f7: path: set dst udp uri length for decoding received value in alias format

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f90640f7cec45a359e996493ae91b1a45d2603e7 URL: https://github.com/kamailio/kamailio/commit/f90640f7cec45a359e996493ae91b1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-30T11:58:53+02:00 path: set dst udp uri length for decoding received value in alias format --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/f90640f7cec45a359e996493ae91b1a… Patch: https://github.com/kamailio/kamailio/commit/f90640f7cec45a359e996493ae91b1a… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index a8d95c2e51..c90aa93900 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -465,10 +465,13 @@ void path_rr_callback(struct sip_msg *_m, str *r_param, void *cb_param) p += 10; memcpy(p, sproto.s, sproto.len); p += sproto.len; - *p = '\0'; - dst_uri.len = p - dst_uri_buf; - break; + } else { + /* go back one byte to overwrite ';' */ + p--; } + *p = '\0'; + dst_uri.len = p - dst_uri_buf; + break; } else { LM_ERR("invalid number of separators (%d)\n", n); goto done;

3 years, 8 months

← Newer
1
...
11
12
13
14
15
16
17
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2021