June 2023 - sr-dev - kamailio.org

git:master:75b41baa: rtpengine: fix build failed on specific distribution
by Daniel-Constantin Mierla 21 Jun '23

21 Jun '23

Module: kamailio Branch: master Commit: 75b41baad06bbd7f57fa8e1f71c608852df7494b URL: https://github.com/kamailio/kamailio/commit/75b41baad06bbd7f57fa8e1f71c6088… Author: Joey Golan <joey(a)synchapp.io> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-21T08:07:05+02:00 rtpengine: fix build failed on specific distribution Fix clang-format-checker errors --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/75b41baad06bbd7f57fa8e1f71c6088… Patch: https://github.com/kamailio/kamailio/commit/75b41baad06bbd7f57fa8e1f71c6088…

1 0

git:master:17da2e83: rtpengine: Fix rfuchs's PR comments
by Daniel-Constantin Mierla 21 Jun '23

21 Jun '23

Module: kamailio Branch: master Commit: 17da2e8344fc5f010ae08277a89b4b122dd8c56b URL: https://github.com/kamailio/kamailio/commit/17da2e8344fc5f010ae08277a89b4b1… Author: Joey Golan <joey(a)synchapp.io> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-21T08:07:05+02:00 rtpengine: Fix rfuchs's PR comments --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/17da2e8344fc5f010ae08277a89b4b1… Patch: https://github.com/kamailio/kamailio/commit/17da2e8344fc5f010ae08277a89b4b1…

1 0

git:master:26f6e57c: Register a new worker process for dtmf event listener
by Daniel-Constantin Mierla 21 Jun '23

21 Jun '23

Module: kamailio Branch: master Commit: 26f6e57c8ffdf06e6837bb54396cd955bad8402a URL: https://github.com/kamailio/kamailio/commit/26f6e57c8ffdf06e6837bb54396cd95… Author: Joey Golan <joey(a)synchapp.io> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-21T08:07:05+02:00 Register a new worker process for dtmf event listener --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/26f6e57c8ffdf06e6837bb54396cd95… Patch: https://github.com/kamailio/kamailio/commit/26f6e57c8ffdf06e6837bb54396cd95…

1 0

git:master:44745cab: rtpengine: support receiving dtmf events from rtpengine and raise an event
by Daniel-Constantin Mierla 21 Jun '23

21 Jun '23

Module: kamailio Branch: master Commit: 44745cabfe78875dffa68f398402117f9a83be27 URL: https://github.com/kamailio/kamailio/commit/44745cabfe78875dffa68f398402117… Author: Joey Golan <joey(a)synchapp.io> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-21T08:07:05+02:00 rtpengine: support receiving dtmf events from rtpengine and raise an event --- Modified: src/modules/rtpengine/doc/rtpengine.xml Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/44745cabfe78875dffa68f398402117… Patch: https://github.com/kamailio/kamailio/commit/44745cabfe78875dffa68f398402117…

1 0

[kamailio/kamailio] wrong source address usage (Issue #3486)
by sergey-safarov 20 Jun '23

20 Jun '23

### Description When Kamailio listening IP address is assigned to a secondary network interface and this card does not use for the default route, then at the L3-network level selected wrong IP address and in the "Recrod-Route" and "Via" headers used correct Kamailio IP. For example in the attached file, frame 5 and fragments in frames 3,4. [invite-from-wrong-ip.pcap.gz](https://github.com/kamailio/kamailio/files/11… ![image](https://github.com/kamailio/kamailio/assets/2562241/68696b29-b37c-4d0a-b349-97054db14727) #### Reproduction Our use case. 1. create a new virtual machine with a random IP address in the AWS cloud; 2. create a new network interface card with a static IP address; 3. attach a new network interface to a virtual machine, in Linux should be configured only one default route via the first network interface with a dynamic IP address; 4. start Kamailio daemon with configured listening TCP/socket with the IP address from the secondary IP card. 5. make a call via Kamailio. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3486 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3486(a)github.com>

2 4

[kamailio/kamailio] tls: openssl 3.0 changes (PR #3482)
by Victor Seva 20 Jun '23

20 Jun '23

#### 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 - [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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issues #3011 #3222 #3259 #### Description investigate changes needed for openssl 3.0 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3482 -- Commit Summary -- * tls: OPENSSL_fork_[prepare|parent|child] deprecated at openssl 3.0 -- File Changes -- M src/modules/tls/tls_init.c (2) M src/modules/tls/tls_mod.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3482.patch https://github.com/kamailio/kamailio/pull/3482.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3482 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3482(a)github.com>

2 6

git:master:c4b04696: tls: disable tls_rand for openssl >= 3.0
by Victor Seva 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: c4b04696a6bfe31fdd65fa56529b0d46f2774067 URL: https://github.com/kamailio/kamailio/commit/c4b04696a6bfe31fdd65fa56529b0d4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-20T12:51:16+02:00 tls: disable tls_rand for openssl >= 3.0 From https://www.openssl.org/docs/man3.0/man3/RAND_set_rand_method.html > All of the functions described on this page are deprecated. > Applications should instead use RAND_set_DRBG_type(3), EVP_RAND(3) and > EVP_RAND(7). --- Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_rand.c Modified: src/modules/tls/tls_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/c4b04696a6bfe31fdd65fa56529b0d4… Patch: https://github.com/kamailio/kamailio/commit/c4b04696a6bfe31fdd65fa56529b0d4… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 9878c0f5178..c966e34b6f8 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -510,7 +510,8 @@ static void mod_destroy(void) int ksr_rand_engine_param(modparam_t type, void *val) { -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L \ + && OPENSSL_VERSION_NUMBER < 0x030000000L str *reng; if(val == NULL) { @@ -678,7 +679,8 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) register_tls_hooks(&tls_h); -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L \ + && OPENSSL_VERSION_NUMBER < 0x030000000L LM_DBG("setting cryptorand random engine\n"); RAND_set_rand_method(RAND_ksr_cryptorand_method()); #endif diff --git a/src/modules/tls/tls_rand.c b/src/modules/tls/tls_rand.c index 297855e5b4a..288642e4ce7 100644 --- a/src/modules/tls/tls_rand.c +++ b/src/modules/tls/tls_rand.c @@ -29,7 +29,8 @@ #include "tls_rand.h" -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L \ + && OPENSSL_VERSION_NUMBER < 0x030000000L #include "../../core/dprint.h" #include "../../core/locking.h" diff --git a/src/modules/tls/tls_rand.h b/src/modules/tls/tls_rand.h index 34d6b2d1ff2..58ddc853acd 100644 --- a/src/modules/tls/tls_rand.h +++ b/src/modules/tls/tls_rand.h @@ -21,7 +21,8 @@ #define _TLS_RAND_H_ #include <openssl/ssl.h> -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L \ + && OPENSSL_VERSION_NUMBER < 0x030000000L #include <openssl/rand.h>

1 0

git:master:a0a9373c: tls: disable engine for openssl >= 3.0
by Victor Seva 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: a0a9373ccb3d3da3a1e9e1335d904fcf013d9ebd URL: https://github.com/kamailio/kamailio/commit/a0a9373ccb3d3da3a1e9e1335d904fc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-20T12:51:16+02:00 tls: disable engine for openssl >= 3.0 From https://www.openssl.org/docs/man3.0/man7/migration_guide.html > The refactoring to support Providers conflicts internally with the APIs > used to support engines, including the ENGINE API and any function that > creates or modifies custom "METHODS" From https://www.openssl.org/docs/man3.0/man3/ENGINE_init.html: > All of the functions described on this page are deprecated. Applications > should instead use the provider APIs. --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/a0a9373ccb3d3da3a1e9e1335d904fc… Patch: https://github.com/kamailio/kamailio/commit/a0a9373ccb3d3da3a1e9e1335d904fc… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index b730ccbd948..4e35f91f8a5 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -30,6 +30,10 @@ #include <openssl/bn.h> #include <openssl/dh.h> +#if OPENSSL_VERSION_NUMBER >= 0x030000000L +#define OPENSSL_NO_ENGINE +#endif + #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> #include "tls_map.h" diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 156eff81c76..9878c0f5178 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -87,6 +87,9 @@ int ksr_rand_engine_param(modparam_t type, void *val); MODULE_VERSION +#if OPENSSL_VERSION_NUMBER >= 0x030000000L +#define OPENSSL_NO_ENGINE +#endif extern str sr_tls_event_callback; str sr_tls_xavp_cfg = {0, 0}; diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 61df0983b00..721c38451fc 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -128,6 +128,9 @@ int tls_run_event_routes(struct tcp_connection *c); #endif /* __SUNPRO_c */ #endif /* TLS_RD_DEBUG */ +#if OPENSSL_VERSION_NUMBER >= 0x030000000L +#define OPENSSL_NO_ENGINE +#endif extern str sr_tls_xavp_cfg;

1 0

git:master:9d6bfb96: tls: OPENSSL_fork_[prepare|parent|child] deprecated at openssl 3.0
by Victor Seva 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: 9d6bfb96528c49e6aaa39aa47be877ca528c3537 URL: https://github.com/kamailio/kamailio/commit/9d6bfb96528c49e6aaa39aa47be877c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-20T12:51:16+02:00 tls: OPENSSL_fork_[prepare|parent|child] deprecated at openssl 3.0 From https://www.openssl.org/docs/man3.0/man3/OPENSSL_fork_prepare.html: > OPENSSL_fork_prepare, OPENSSL_fork_parent, OPENSSL_fork_child have been > deprecated since OpenSSL 3.0. > > These methods are currently unused, and as such, no replacement methods > are required or planned. > > OpenSSL has state that should be reset when a process forks. For > example, the entropy pool used to generate random numbers (and therefore > encryption keys) should not be shared across multiple programs. The > OPENSSL_fork_prepare(), OPENSSL_fork_parent(), and OPENSSL_fork_child() > functions are used to reset this internal state. > > OPENSSL_init_crypto(3) will register these functions with the > appropriate handler, when the OPENSSL_INIT_ATFORK flag is used --- Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9d6bfb96528c49e6aaa39aa47be877c… Patch: https://github.com/kamailio/kamailio/commit/9d6bfb96528c49e6aaa39aa47be877c… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 0a2f13a77b2..cb035ee24fa 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -745,7 +745,7 @@ int tls_h_mod_pre_init_f(void) LM_DBG("preparing tls env for modules initialization\n"); #if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) LM_DBG("preparing tls env for modules initialization (libssl >=1.1)\n"); - OPENSSL_init_ssl(0, NULL); + OPENSSL_init_ssl(OPENSSL_INIT_ATFORK, NULL); #else LM_DBG("preparing tls env for modules initialization (libssl <=1.0)\n"); SSL_library_init(); diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 3f42073b175..156eff81c76 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -452,7 +452,8 @@ static int mod_child(int rank) < 0) return -1; } -#if OPENSSL_VERSION_NUMBER >= 0x010101000L +#if OPENSSL_VERSION_NUMBER >= 0x010101000L \ + && OPENSSL_VERSION_NUMBER < 0x030000000L if(ksr_tls_init_mode & TLS_MODE_FORK_PREPARE) { OPENSSL_fork_prepare(); } @@ -460,7 +461,8 @@ static int mod_child(int rank) return 0; } -#if OPENSSL_VERSION_NUMBER >= 0x010101000L +#if OPENSSL_VERSION_NUMBER >= 0x010101000L \ + && OPENSSL_VERSION_NUMBER < 0x030000000L if(ksr_tls_init_mode & TLS_MODE_FORK_PREPARE) { if(rank == PROC_POSTCHILDINIT) { /*

1 0

git:master:af976a98: modules: readme files regenerated - matrix ... [skip ci]
by Kamailio Dev 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: af976a989b2ed1bfd9090dd9ce09b0a7a8992965 URL: https://github.com/kamailio/kamailio/commit/af976a989b2ed1bfd9090dd9ce09b0a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-06-20T11:32:05+02:00 modules: readme files regenerated - matrix ... [skip ci] --- Modified: src/modules/matrix/README Modified: src/modules/maxfwd/README Modified: src/modules/misc_radius/README Modified: src/modules/msilo/README Modified: src/modules/ndb_cassandra/README Modified: src/modules/ndb_mongodb/README --- Diff: https://github.com/kamailio/kamailio/commit/af976a989b2ed1bfd9090dd9ce09b0a… Patch: https://github.com/kamailio/kamailio/commit/af976a989b2ed1bfd9090dd9ce09b0a…

1 0

[kamailio/kamailio] Typos (PR #3487)
by Дилян Палаузов 20 Jun '23

20 Jun '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3487 -- Commit Summary -- * core: typos * src/Makefile*: typos * lwsc: typos * mangler: typos * matrix: typo * maxfwd: typo * mediaproxy: typos * memcached: typos * misc_radius: typos * misctest: typos * mqtt: typo * msilo: typos * nat_traversal: typo * ndb_cassandra: typos * ndb_mongodb: typo * usrloc: typo * test/misc/code: typos * tools: typos -- File Changes -- M src/Makefile (2) M src/Makefile.defs (14) M src/Makefile.groups (2) M src/Makefile.targets (6) M src/core/async_task.c (6) M src/core/forward.c (2) M src/core/mem/dl_malloc.c (2) M src/core/msg_translator.c (2) M src/core/parser/msg_parser.h (2) M src/core/parser/parse_via.c (2) M src/core/socket_info.c (2) M src/core/tcp_main.c (2) M src/main.c (24) M src/modules/lwsc/api.h (2) M src/modules/lwsc/lwsc_mod.c (2) M src/modules/mangler/contact_ops.c (2) M src/modules/mangler/mangler.c (4) M src/modules/mangler/mangler.cfg (4) M src/modules/mangler/sdp_mangler.c (42) M src/modules/mangler/sdp_mangler.h (6) M src/modules/matrix/doc/matrix_admin.xml (2) M src/modules/maxfwd/doc/maxfwd_admin.xml (2) M src/modules/mediaproxy/mediaproxy.c (6) M src/modules/memcached/doc/memcached_admin.xml (2) M src/modules/memcached/mcd_var.c (2) M src/modules/misc_radius/doc/misc_radius_admin.xml (2) M src/modules/misc_radius/functions.c (2) M src/modules/misctest/misctest_mod.c (4) M src/modules/mqtt/mqtt_dispatch.c (2) M src/modules/msilo/doc/msilo_admin.xml (4) M src/modules/msilo/msilo.c (4) M src/modules/nat_traversal/nat_traversal.c (2) M src/modules/ndb_cassandra/doc/ndb_cassandra_admin.xml (4) M src/modules/ndb_mongodb/doc/ndb_mongodb_admin.xml (2) M src/modules/usrloc/udomain.c (2) M test/misc/code/shoot.c (2) M test/misc/code/shoot2.c (2) M utils/db_berkeley/kambdb_recover.c (14) M utils/kamcmd/kamcmd.8 (2) M utils/kamcmd/kamcmd.c (2) M utils/kamctl/kamctl.base (2) M utils/kamunix/kamunix.8 (8) M utils/pdbt/docs/network_protocol.txt (2) M utils/pdbt/pdbt.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3487.patch https://github.com/kamailio/kamailio/pull/3487.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3487 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3487(a)github.com>

2 7

git: new commits in branch master
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

- URL: https://github.com/kamailio/kamailio/commit/9e4b47f75a572bb7732c90aac4a6b43… Author: �� <git-dpa(a)aegee.org> Date: 2023-06-18T20:14:57+02:00 core: typos - URL: https://github.com/kamailio/kamailio/commit/d61cd534f8ec10a232b8f446f277386… Author: �� <git-dpa(a)aegee.org> Date: 2023-06-18T20:14:57+02:00 src/Makefile*: typos - URL: https://github.com/kamailio/kamailio/commit/854e69f9db966f11d92c630a4000fc2… Author: �� <git-dpa(a)aegee.org> Date: 2023-06-18T20:14:57+02:00 lwsc: typos - URL: https://github.com/kamailio/kamailio/commit/b682bedc8f33ac58297cfead05489e2… Author: �� <git-dpa(a)aegee.org> Date: 2023-06-18T20:14:57+02:00 mangler: typos - URL: https://github.com/kamailio/kamailio/commit/7c97869cb944d6996a8bcf31bd50789… Author: �� <git-dpa(a)aegee.org> Date: 2023-06-18T20:14:57+02:00 matrix: typo - URL: https://github.com/kamailio/kamailio/commit/61b69b2d1b74234e5e78c0c50df6f65… Author: �� <git-dpa(a)aegee.org> Date: 2023-06-18T20:14:57+02:00 maxfwd: typo - URL: https://github.com/kamailio/kamailio/commit/55c5535c5fee881b16b95a2152d08ae… Author: �� <git-dpa(a)aegee.org> Date: 2023-06-18T20:14:57+02:00 mediaproxy: typos - URL: https://github.com/kamailio/kamailio/commit/854ccb898a586837c262a5d64515cf7… Author: �� <git-dpa(a)aegee.org> Date: 2023-06-18T20:14:57+02:00 memcached: typos - URL: https://github.com/kamailio/kamailio/commit/91dd1ea66e735478d44906ee01a4d1d… Author: �� <git-dpa(a)aegee.org> Date: 2023-06-18T20:14:57+02:00 misc_radius: typos - URL: https://github.com/kamailio/kamailio/commit/211ede8351683644d1829feb355ca4a… Author: �� <git-dpa(a)aegee.org> Date: 2023-06-18T20:14:57+02:00 misctest: typos - URL: https://github.com/kamailio/kamailio/commit/c632c5fd6afb37704dde2de96c5a5a8… Author: �� <git-dpa(a)aegee.org> Date: 2023-06-18T20:14:57+02:00 mqtt: typo - URL: https://github.com/kamailio/kamailio/commit/3157cc16d409de71d692ec434411813… Author: �� <git-dpa(a)aegee.org> Date: 2023-06-18T20:14:57+02:00 msilo: typos - URL: https://github.com/kamailio/kamailio/commit/c3919b68e947b6572eef8cd01486af4… Author: �� <git-dpa(a)aegee.org> Date: 2023-06-18T20:14:57+02:00 nat_traversal: typo - URL: https://github.com/kamailio/kamailio/commit/5f3c2fe040c8a9e19b3ea98dc343fa3… Author: �� <git-dpa(a)aegee.org> Date: 2023-06-18T20:14:57+02:00 ndb_cassandra: typos - URL: https://github.com/kamailio/kamailio/commit/c7471291950d24dceaf8b5db131afd3… Author: �� <git-dpa(a)aegee.org> Date: 2023-06-18T20:14:57+02:00 ndb_mongodb: typo - URL: https://github.com/kamailio/kamailio/commit/5888a402285b5edb2c8691a26353028… Author: �� <git-dpa(a)aegee.org> Date: 2023-06-18T20:14:57+02:00 usrloc: typo - URL: https://github.com/kamailio/kamailio/commit/e66c2c96908cb8c2169ace2c31c2a6c… Author: �� <git-dpa(a)aegee.org> Date: 2023-06-18T20:14:57+02:00 test/misc/code: typos - URL: https://github.com/kamailio/kamailio/commit/437b435c86c109bdda213998c6448ed… Author: �� <git-dpa(a)aegee.org> Date: 2023-06-18T20:16:54+02:00 utils: typos - URL: https://github.com/kamailio/kamailio/commit/453a973849cc6eaab2e07d445675a9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T09:31:59+02:00 Merge branch 'master' into typos - URL: https://github.com/kamailio/kamailio/commit/8c934aa97890f288c7f06f4df9acad0… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Date: 2023-06-20T11:22:14+02:00 db_redis: Adding TLS support Enhancing security options by enabling TLS connections and password definition. Added 3 new parameters: * opt_tls: For enabling TLS connections. * ca_path: For specifying a folder containing valid certification chains. * password: For providing DB access password. If opt_tls is provided a temporary SSL context is created to pass it to existing cluster or normal redis context. TLS support is automatically enabled/disabled by checking libhiredis_ssl.so existence. - URL: https://github.com/kamailio/kamailio/commit/5b4d1d9e6160ab7aec8e77ab1a3e536… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Date: 2023-06-20T11:22:14+02:00 ndb_redis: Adding TLS support Checks for the tls parameter in the BD schema and, if it's enabled, creates a temporary TLS conext that is used to initialize the redis context. Adds 1 new parameter: * ca_path: For specifying a folder containing valid certification chains. - URL: https://github.com/kamailio/kamailio/commit/6176c95a17f940c130f6219140593b6… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Date: 2023-06-20T11:22:14+02:00 db_redis: Fixing format Fixing malformed C lines - URL: https://github.com/kamailio/kamailio/commit/23a54de62daf07ace22569baf0a52ee… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Date: 2023-06-20T11:22:14+02:00 db_redis: Missing format fixes Removing spaces from line ends. - URL: https://github.com/kamailio/kamailio/commit/93bcb36ee013e4ab02f71342fa2e216… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Date: 2023-06-20T11:22:14+02:00 ndb_redis: Format fixes Fixing C formatting issues - URL: https://github.com/kamailio/kamailio/commit/3162c80ee54eab842ddebef07c3c567… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Date: 2023-06-20T11:22:14+02:00 db_redis: Fixing build Removing extra declaration outside from WITH_SSL block - URL: https://github.com/kamailio/kamailio/commit/52d1959d6ed141ab7c2a96f1f79d8d6… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Date: 2023-06-20T11:22:14+02:00 db_redis: Fixing Makefile Removing unprotected references to libhiredis_ssl.so - URL: https://github.com/kamailio/kamailio/commit/89c9e4eb5df0ef2a8fe064eed961d9b… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Date: 2023-06-20T11:22:14+02:00 db_redis: Fixing global variables Adding module name prefix to global variables to reduce possible conflicts. - URL: https://github.com/kamailio/kamailio/commit/053c65d731ceca121a64f6c599f8b78… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Date: 2023-06-20T11:22:14+02:00 ndb_redis: Fixing global variables names Adding module name prefixing global variable names to prevent possible conflicts. Also using ca_path info in SSL context creation. - URL: https://github.com/kamailio/kamailio/commit/1cde6d38a5d12950f5c405677ba6522… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Date: 2023-06-20T11:22:14+02:00 ndb_redis: Missing uprotected redisSSLContext Fixing unprotected redisSSLContext reference in redis_client.h - URL: https://github.com/kamailio/kamailio/commit/d0e84ab04921a01bfb980aa6ff5fb8d… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Date: 2023-06-20T11:22:14+02:00 db_redis: Searching SSL support in gcc search library path Checking libhiredis_ssl.so in gcc --print-search-dirs - URL: https://github.com/kamailio/kamailio/commit/6c0bc1d276921fae02c06cadc0d96a8… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Date: 2023-06-20T11:22:14+02:00 ndb_redis: Searching SSL support in gcc search library path Checking libhiredis_ssl.so in gcc --print-search-dirs - URL: https://github.com/kamailio/kamailio/commit/03ae83161307feeb95f36a60ef4f50d… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Date: 2023-06-20T11:22:14+02:00 db_redis: Format fixes Fixing some spaces - URL: https://github.com/kamailio/kamailio/commit/279cf4e805838f897c2b71f2ea8c828… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Date: 2023-06-20T11:22:14+02:00 ndb_redis: Fixing format Fixing some spaces and indentations - URL: https://github.com/kamailio/kamailio/commit/e9cc9fc15b9ebb87d64478be93980e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T11:22:14+02:00 db_redis: Makefile - updated find command for libhiredis_ssl - silent warnings about not existing directories - URL: https://github.com/kamailio/kamailio/commit/50f592c63ae8e91b2ba33323a3b7641… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T11:22:14+02:00 ndb_redis: Makefile - updated find command for libhiredis_ssl - silent warnings about not existing directories - URL: https://github.com/kamailio/kamailio/commit/290f50eede5f22a732e3ab9435682e6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-06-20T11:22:14+02:00 modules: readme files regenerated - db_redis ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/ba2e36551ff4f59afdc5f9d2b46bd9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T11:23:26+02:00 Merge branch 'dilyanpalauzov-typos' * dilyanpalauzov-typos: (35 commits) modules: readme files regenerated - db_redis ... [skip ci] ndb_redis: Makefile - updated find command for libhiredis_ssl db_redis: Makefile - updated find command for libhiredis_ssl ndb_redis: Fixing format db_redis: Format fixes ndb_redis: Searching SSL support in gcc search library path db_redis: Searching SSL support in gcc search library path ndb_redis: Missing uprotected redisSSLContext ndb_redis: Fixing global variables names db_redis: Fixing global variables db_redis: Fixing Makefile db_redis: Fixing build ndb_redis: Format fixes db_redis: Missing format fixes db_redis: Fixing format ndb_redis: Adding TLS support db_redis: Adding TLS support utils: typos test/misc/code: typos usrloc: typo ...

1 0

git:master:d7ae9f14: modules: readme files regenerated - db_redis ... [skip ci]
by Kamailio Dev 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: d7ae9f14502a90301455efbdf776eb785bcbbb50 URL: https://github.com/kamailio/kamailio/commit/d7ae9f14502a90301455efbdf776eb7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-06-20T11:16:33+02:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/d7ae9f14502a90301455efbdf776eb7… Patch: https://github.com/kamailio/kamailio/commit/d7ae9f14502a90301455efbdf776eb7…

1 0

[kamailio/kamailio] Adding TLS support to db_redis (also password support) and ndb_redis (PR #3477)
by joelbax 20 Jun '23

20 Jun '23

#### 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 A couple of commits into db_redis and ndb_redis adding TLS support and also password support to db_redis. This mainly includes checking if proper parameter is provided (for ndb_redis is `tls` option in the DB URL and, for db_redis, a new `opt_tls` parameter) and creates a temporary SSL context that is used to initialise the redis context. Also added `ca_path` parameter to both modules to be able to define a valid folder containing the root certificates used to validate TLS' certificate chain. db_redis is also updated with a `db_pass` parameter to provide a DB access password. TLS support is automatically enabled by checking libhiredis_ssl.so existence in each Makefile and defining a `WITH_SSL` flag that enables all the corresponding code lines. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3477 -- Commit Summary -- * db_redis: Adding TLS support * ndb_redis: Adding TLS support -- File Changes -- M src/modules/db_redis/Makefile (24) M src/modules/db_redis/db_redis_mod.c (13) M src/modules/db_redis/doc/db_redis.xml (5) M src/modules/db_redis/doc/db_redis_admin.xml (59) M src/modules/db_redis/redis_connection.c (98) M src/modules/db_redis/redis_connection.h (6) M src/modules/ndb_redis/Makefile (15) M src/modules/ndb_redis/doc/ndb_redis.xml (5) M src/modules/ndb_redis/doc/ndb_redis_admin.xml (26) M src/modules/ndb_redis/ndb_redis_mod.c (10) M src/modules/ndb_redis/redis_client.c (69) M src/modules/ndb_redis/redis_client.h (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3477.patch https://github.com/kamailio/kamailio/pull/3477.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3477 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3477(a)github.com>

3 17

git:master:d29d435c: ndb_redis: Makefile - updated find command for libhiredis_ssl
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: d29d435cad3ec52f4171035446870ad2fe991858 URL: https://github.com/kamailio/kamailio/commit/d29d435cad3ec52f4171035446870ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T11:04:30+02:00 ndb_redis: Makefile - updated find command for libhiredis_ssl - silent warnings about not existing directories --- Modified: src/modules/ndb_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d29d435cad3ec52f4171035446870ad… Patch: https://github.com/kamailio/kamailio/commit/d29d435cad3ec52f4171035446870ad… --- diff --git a/src/modules/ndb_redis/Makefile b/src/modules/ndb_redis/Makefile index 6b27f72386..ba085ca273 100644 --- a/src/modules/ndb_redis/Makefile +++ b/src/modules/ndb_redis/Makefile @@ -25,7 +25,7 @@ else HIREDISLIBSPATH = $(shell $(HIREDIS_BUILDER) --libs-only-L | cut -c 3-) ifeq ($(HIREDISLIBSPATH),) GCCSEARCHDIRS = $(shell $(CC) -print-search-dirs | grep -Po '^.*libraries: =.*' | cut -d "=" -f2- | tr : ' ') - ifneq ($(shell find $(GCCSEARCHDIRS) libhiredis_ssl.so),) + ifneq ($(shell find $(GCCSEARCHDIRS) -name libhiredis_ssl.so 2>/dev/null),) HIREDISDEFS += -DWITH_SSL HIREDISLIBS += -lhiredis_ssl endif

1 0

git:master:d88d60a0: db_redis: Makefile - updated find command for libhiredis_ssl
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: d88d60a0f3d67f42e4201d6c871bbf993e6fa87b URL: https://github.com/kamailio/kamailio/commit/d88d60a0f3d67f42e4201d6c871bbf9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T11:03:04+02:00 db_redis: Makefile - updated find command for libhiredis_ssl - silent warnings about not existing directories --- Modified: src/modules/db_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d88d60a0f3d67f42e4201d6c871bbf9… Patch: https://github.com/kamailio/kamailio/commit/d88d60a0f3d67f42e4201d6c871bbf9… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index f2231c26aec..815cd056b9d 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -31,7 +31,7 @@ else HIREDISLIBSPATH = $(shell $(HIREDIS_BUILDER) --libs-only-L | cut -c 3-) ifeq ($(HIREDISLIBSPATH),) GCCSEARCHDIRS = $(shell $(CC) -print-search-dirs | grep -Po '^.*libraries: =.*' | cut -d "=" -f2- | tr : ' ') - ifneq ($(shell find $(GCCSEARCHDIRS) libhiredis_ssl.so),) + ifneq ($(shell find $(GCCSEARCHDIRS) -name libhiredis_ssl.so 2>/dev/null),) HIREDISDEFS += -DWITH_SSL HIREDISLIBS += -lhiredis_ssl endif

1 0

git:master:043f31ea: ndb_redis: Fixing format
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: 043f31ea0314c5d1d60a6ce8ce81e626922223c4 URL: https://github.com/kamailio/kamailio/commit/043f31ea0314c5d1d60a6ce8ce81e62… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 ndb_redis: Fixing format Fixing some spaces and indentations --- Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/043f31ea0314c5d1d60a6ce8ce81e62… Patch: https://github.com/kamailio/kamailio/commit/043f31ea0314c5d1d60a6ce8ce81e62… --- diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index 48c04a0bcc..4d0491547d 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -134,7 +134,7 @@ static param_export_t params[] = { {"allowed_timeouts", INT_PARAM, &redis_allowed_timeouts_param}, {"flush_on_reconnect", INT_PARAM, &redis_flush_on_reconnect_param}, {"allow_dynamic_nodes", INT_PARAM, &redis_allow_dynamic_nodes_param}, - {"debug", PARAM_INT, &ndb_redis_debug}, + {"debug", PARAM_INT, &ndb_redis_debug}, #ifdef WITH_SSL {"ca_path", PARAM_STRING, &ndb_redis_ca_path}, #endif diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 39b33d2066..13701438f1 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -140,14 +140,14 @@ int redisc_init(void) pit->body.s); haspass = 1; #ifdef WITH_SSL - } else if(pit->name.len==3 - && strncmp(pit->name.s, "tls", 3) == 0) { + } else if(pit->name.len == 3 + && strncmp(pit->name.s, "tls", 3) == 0) { snprintf(pass, sizeof(pass) - 1, "%.*s", pit->body.len, pit->body.s); if(str2int(&pit->body, &enable_ssl) < 0) enable_ssl = 0; #endif - } else if(pit->name.len == 14 + } else if(pit->name.len == 14 && strncmp(pit->name.s, "sentinel_group", 14) == 0) { snprintf(sentinel_group, sizeof(sentinel_group) - 1, "%.*s", pit->body.len, pit->body.s); @@ -236,8 +236,8 @@ int redisc_init(void) if(enable_ssl) { /* Create SSL context*/ redisInitOpenSSL(); - rsrv->sslCtxRedis = - redisCreateSSLContext(NULL, ndb_redis_ca_path, NULL, NULL, NULL, NULL); + rsrv->sslCtxRedis = redisCreateSSLContext( + NULL, ndb_redis_ca_path, NULL, NULL, NULL, NULL); if(rsrv->sslCtxRedis == NULL) { LM_ERR("Unable to create Redis TLS Context.\n"); } @@ -251,8 +251,8 @@ int redisc_init(void) redisConnectUnixWithTimeout(unix_sock_path, tv_conn); } else { #ifdef WITH_SSL - LOG(ndb_redis_debug, "Connecting to %s %s:%d\n", - (enable_ssl) ?"TLS" :"UDP", addr, port); + LOG(ndb_redis_debug, "Connecting to %s %s:%d\n", + (enable_ssl) ? "TLS" : "UDP", addr, port); #else LOG(ndb_redis_debug, "Connecting to %s:%d\n", addr, port); #endif @@ -500,7 +500,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) #ifdef WITH_SSL } else if(pit->name.len == 3 && strncmp(pit->name.s, "tls", 3) == 0) { snprintf( - pass, sizeof(pass)-1, "%.*s", pit->body.len, pit->body.s); + pass, sizeof(pass) - 1, "%.*s", pit->body.len, pit->body.s); if(str2int(&pit->body, &enable_ssl) < 0) enable_ssl = 0; #endif @@ -598,8 +598,8 @@ int redisc_reconnect_server(redisc_server_t *rsrv) if(enable_ssl) { /* Create SSL context*/ redisInitOpenSSL(); - rsrv->sslCtxRedis = - redisCreateSSLContext(NULL, ndb_redis_ca_path, NULL, NULL, NULL, NULL); + rsrv->sslCtxRedis = redisCreateSSLContext( + NULL, ndb_redis_ca_path, NULL, NULL, NULL, NULL); if(rsrv->sslCtxRedis == NULL) { LM_ERR("Unable to create Redis TLS Context.\n"); }

1 0

git:master:cb96de74: db_redis: Format fixes
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: cb96de742f1d729d01bf9c8c255a12aa089d6974 URL: https://github.com/kamailio/kamailio/commit/cb96de742f1d729d01bf9c8c255a12a… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 db_redis: Format fixes Fixing some spaces --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/cb96de742f1d729d01bf9c8c255a12a… Patch: https://github.com/kamailio/kamailio/commit/cb96de742f1d729d01bf9c8c255a12a… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index 0bf001d1528..5a49346b431 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -150,7 +150,7 @@ int db_redis_connect(km_redis_con_t *con) char hosts[MAX_URL_LENGTH]; char *host_begin; char *host_end; - LM_DBG("connecting to redis cluster at %.*s\n", con->id->url.len, + LM_DBG("connecting to redis cluster at %.*s\n", con->id->url.len, con->id->url.s); host_begin = strstr(con->id->url.s, "redis://"); if(host_begin) { @@ -164,7 +164,8 @@ int db_redis_connect(km_redis_con_t *con) if(db_redis_opt_tls != 0) { /* Create SSL context*/ redisInitOpenSSL(); - ssl = redisCreateSSLContext(NULL, db_redis_ca_path, NULL, NULL, NULL, NULL); + ssl = redisCreateSSLContext( + NULL, db_redis_ca_path, NULL, NULL, NULL, NULL); if(ssl == NULL) { LM_ERR("Unable to create Redis SSL Context.\n"); goto err; @@ -197,7 +198,7 @@ int db_redis_connect(km_redis_con_t *con) #endif status = redisClusterConnect2(con->con); if(status != REDIS_OK) { - LM_ERR("cannot open connection to cluster with hosts: %s, error: %s\n", + LM_ERR("cannot open connection to cluster with hosts: %s, error: %s\n", hosts, con->con->errstr); goto err; } @@ -208,7 +209,8 @@ int db_redis_connect(km_redis_con_t *con) if(db_redis_opt_tls != 0) { /* Create SSL context*/ redisInitOpenSSL(); - ssl = redisCreateSSLContext(NULL, db_redis_ca_path, NULL, NULL, NULL, NULL); + ssl = redisCreateSSLContext( + NULL, db_redis_ca_path, NULL, NULL, NULL, NULL); if(ssl == NULL) { LM_ERR("Unable to create Redis SSL Context.\n"); goto err; @@ -218,7 +220,7 @@ int db_redis_connect(km_redis_con_t *con) con->con = redisConnectWithTimeout(con->id->host, con->id->port, tv); if(!con->con) { - LM_ERR("cannot open connection: %.*s\n", con->id->url.len, + LM_ERR("cannot open connection: %.*s\n", con->id->url.len, con->id->url.s); goto err; }

1 0

git:master:d4192486: ndb_redis: Searching SSL support in gcc search library path
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: d41924862a1729de186a5d1f4adddcfeb7fb7b7d URL: https://github.com/kamailio/kamailio/commit/d41924862a1729de186a5d1f4adddcf… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 ndb_redis: Searching SSL support in gcc search library path Checking libhiredis_ssl.so in gcc --print-search-dirs --- Modified: src/modules/ndb_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d41924862a1729de186a5d1f4adddcf… Patch: https://github.com/kamailio/kamailio/commit/d41924862a1729de186a5d1f4adddcf… --- diff --git a/src/modules/ndb_redis/Makefile b/src/modules/ndb_redis/Makefile index a90e3018b4..6b27f72386 100644 --- a/src/modules/ndb_redis/Makefile +++ b/src/modules/ndb_redis/Makefile @@ -23,10 +23,18 @@ else HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) HIREDISLIBSPATH = $(shell $(HIREDIS_BUILDER) --libs-only-L | cut -c 3-) - ifneq ($(shell ls $(HIREDISLIBSPATH) | grep libhiredis_ssl.so),) - HIREDISDEFS += -DWITH_SSL - HIREDISLIBS += -lhiredis_ssl - endif + ifeq ($(HIREDISLIBSPATH),) + GCCSEARCHDIRS = $(shell $(CC) -print-search-dirs | grep -Po '^.*libraries: =.*' | cut -d "=" -f2- | tr : ' ') + ifneq ($(shell find $(GCCSEARCHDIRS) libhiredis_ssl.so),) + HIREDISDEFS += -DWITH_SSL + HIREDISLIBS += -lhiredis_ssl + endif + else + ifneq ($(shell ls $(HIREDISLIBSPATH) | grep libhiredis_ssl.so),) + HIREDISDEFS += -DWITH_SSL + HIREDISLIBS += -lhiredis_ssl + endif + endif ifeq (,$(findstring hiredis,$(HIREDISDEFS))) DEFS+=-DWITH_HIREDIS_PATH

1 0

git:master:f7a712b3: db_redis: Searching SSL support in gcc search library path
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: f7a712b36918bd9c01256fb2b283754ad9ed7422 URL: https://github.com/kamailio/kamailio/commit/f7a712b36918bd9c01256fb2b283754… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 db_redis: Searching SSL support in gcc search library path Checking libhiredis_ssl.so in gcc --print-search-dirs --- Modified: src/modules/db_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/f7a712b36918bd9c01256fb2b283754… Patch: https://github.com/kamailio/kamailio/commit/f7a712b36918bd9c01256fb2b283754… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index 7d427586e98..f2231c26aec 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -29,10 +29,18 @@ else HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) HIREDISLIBSPATH = $(shell $(HIREDIS_BUILDER) --libs-only-L | cut -c 3-) - ifneq ($(shell ls $(HIREDISLIBSPATH) | grep libhiredis_ssl.so),) + ifeq ($(HIREDISLIBSPATH),) + GCCSEARCHDIRS = $(shell $(CC) -print-search-dirs | grep -Po '^.*libraries: =.*' | cut -d "=" -f2- | tr : ' ') + ifneq ($(shell find $(GCCSEARCHDIRS) libhiredis_ssl.so),) + HIREDISDEFS += -DWITH_SSL + HIREDISLIBS += -lhiredis_ssl + endif + else + ifneq ($(shell ls $(HIREDISLIBSPATH) | grep libhiredis_ssl.so),) HIREDISDEFS += -DWITH_SSL HIREDISLIBS += -lhiredis_ssl - endif + endif + endif ifeq (,$(findstring hiredis,$(HIREDISDEFS))) DEFS+=-DWITH_HIREDIS_PATH

1 0

git:master:77e74b97: ndb_redis: Missing uprotected redisSSLContext
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: 77e74b974249b3c4e2e67cc074cc8ff26d50fde8 URL: https://github.com/kamailio/kamailio/commit/77e74b974249b3c4e2e67cc074cc8ff… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 ndb_redis: Missing uprotected redisSSLContext Fixing unprotected redisSSLContext reference in redis_client.h --- Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/77e74b974249b3c4e2e67cc074cc8ff… Patch: https://github.com/kamailio/kamailio/commit/77e74b974249b3c4e2e67cc074cc8ff… --- diff --git a/src/modules/ndb_redis/redis_client.h b/src/modules/ndb_redis/redis_client.h index 9e1323981da..fd13d712902 100644 --- a/src/modules/ndb_redis/redis_client.h +++ b/src/modules/ndb_redis/redis_client.h @@ -82,7 +82,9 @@ typedef struct redisc_server param_t *attrs; char *spec; redisContext *ctxRedis; +#ifdef WITH_SSL redisSSLContext *sslCtxRedis; +#endif struct redisc_server *next; redisc_piped_cmds_t piped; redisc_srv_disable_t disable;

1 0

git:master:90f97720: ndb_redis: Fixing global variables names
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: 90f977202af2d132fb63f20f76f9ad696a19656e URL: https://github.com/kamailio/kamailio/commit/90f977202af2d132fb63f20f76f9ad6… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 ndb_redis: Fixing global variables names Adding module name prefixing global variable names to prevent possible conflicts. Also using ca_path info in SSL context creation. --- Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/90f977202af2d132fb63f20f76f9ad6… Patch: https://github.com/kamailio/kamailio/commit/90f977202af2d132fb63f20f76f9ad6… --- diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index 11d6cdb9c7..48c04a0bcc 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -55,7 +55,7 @@ int redis_flush_on_reconnect_param = 0; int redis_allow_dynamic_nodes_param = 0; int ndb_redis_debug = L_DBG; #ifdef WITH_SSL -char *ca_path = 0; +char *ndb_redis_ca_path = 0; #endif static int w_redis_cmd3( @@ -136,7 +136,7 @@ static param_export_t params[] = { {"allow_dynamic_nodes", INT_PARAM, &redis_allow_dynamic_nodes_param}, {"debug", PARAM_INT, &ndb_redis_debug}, #ifdef WITH_SSL - {"ca_path", PARAM_STRING, &ca_path}, + {"ca_path", PARAM_STRING, &ndb_redis_ca_path}, #endif {0, 0, 0}}; diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 00b01c9596..39b33d2066 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -63,7 +63,7 @@ extern int redis_flush_on_reconnect_param; extern int redis_allow_dynamic_nodes_param; extern int ndb_redis_debug; #ifdef WITH_SSL -extern char *ca_path; +extern char *ndb_redis_ca_path; #endif /* backwards compatibility with hiredis < 0.12 */ @@ -237,7 +237,7 @@ int redisc_init(void) /* Create SSL context*/ redisInitOpenSSL(); rsrv->sslCtxRedis = - redisCreateSSLContext(NULL, NULL, NULL, NULL, NULL, NULL); + redisCreateSSLContext(NULL, ndb_redis_ca_path, NULL, NULL, NULL, NULL); if(rsrv->sslCtxRedis == NULL) { LM_ERR("Unable to create Redis TLS Context.\n"); } @@ -599,7 +599,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) /* Create SSL context*/ redisInitOpenSSL(); rsrv->sslCtxRedis = - redisCreateSSLContext(NULL, NULL, NULL, NULL, NULL, NULL); + redisCreateSSLContext(NULL, ndb_redis_ca_path, NULL, NULL, NULL, NULL); if(rsrv->sslCtxRedis == NULL) { LM_ERR("Unable to create Redis TLS Context.\n"); }

1 0

git:master:30eec549: db_redis: Fixing global variables
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: 30eec549396899eae32e651ef58d65c4684ab296 URL: https://github.com/kamailio/kamailio/commit/30eec549396899eae32e651ef58d65c… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 db_redis: Fixing global variables Adding module name prefix to global variables to reduce possible conflicts. --- Modified: src/modules/db_redis/db_redis_mod.c Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/30eec549396899eae32e651ef58d65c… Patch: https://github.com/kamailio/kamailio/commit/30eec549396899eae32e651ef58d65c… --- diff --git a/src/modules/db_redis/db_redis_mod.c b/src/modules/db_redis/db_redis_mod.c index 026abeb148..89da232083 100644 --- a/src/modules/db_redis/db_redis_mod.c +++ b/src/modules/db_redis/db_redis_mod.c @@ -31,9 +31,9 @@ #ifdef WITH_SSL int db_redis_opt_tls = 0; -char *ca_path = 0; +char *db_redis_ca_path = 0; #endif -char *db_pass = 0; +char *db_redis_db_pass = 0; MODULE_VERSION @@ -60,9 +60,9 @@ static param_export_t params[] = { {"verbosity", PARAM_INT, &db_redis_verbosity}, #ifdef WITH_SSL {"opt_tls", PARAM_INT, &db_redis_opt_tls}, - {"ca_path", PARAM_STRING, &ca_path}, + {"ca_path", PARAM_STRING, &db_redis_ca_path}, #endif - {"db_pass", PARAM_STRING, &db_pass}, {0, 0, 0}}; + {"db_pass", PARAM_STRING, &db_redis_db_pass}, {0, 0, 0}}; struct module_exports exports = { diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index f38b6698d4..0bf001d152 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -37,9 +37,9 @@ static unsigned int MAX_URL_LENGTH = 1023; extern int db_redis_verbosity; #ifdef WITH_SSL extern int db_redis_opt_tls; -extern char *ca_path; +extern char *db_redis_ca_path; #endif -extern char *db_pass; +extern char *db_redis_db_pass; static void print_query(redis_key_t *query) { @@ -164,7 +164,7 @@ int db_redis_connect(km_redis_con_t *con) if(db_redis_opt_tls != 0) { /* Create SSL context*/ redisInitOpenSSL(); - ssl = redisCreateSSLContext(NULL, ca_path, NULL, NULL, NULL, NULL); + ssl = redisCreateSSLContext(NULL, db_redis_ca_path, NULL, NULL, NULL, NULL); if(ssl == NULL) { LM_ERR("Unable to create Redis SSL Context.\n"); goto err; @@ -208,7 +208,7 @@ int db_redis_connect(km_redis_con_t *con) if(db_redis_opt_tls != 0) { /* Create SSL context*/ redisInitOpenSSL(); - ssl = redisCreateSSLContext(NULL, ca_path, NULL, NULL, NULL, NULL); + ssl = redisCreateSSLContext(NULL, db_redis_ca_path, NULL, NULL, NULL, NULL); if(ssl == NULL) { LM_ERR("Unable to create Redis SSL Context.\n"); goto err; @@ -236,7 +236,7 @@ int db_redis_connect(km_redis_con_t *con) password = con->id->password; if(!password) { - password = db_pass; + password = db_redis_db_pass; } if(password) { reply = redisCommand(con->con, "AUTH %s", password);

1 0

git:master:440e8cba: db_redis: Fixing Makefile
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: 440e8cba9f9e8364e100a68283137da589e6f283 URL: https://github.com/kamailio/kamailio/commit/440e8cba9f9e8364e100a68283137da… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 db_redis: Fixing Makefile Removing unprotected references to libhiredis_ssl.so --- Modified: src/modules/db_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/440e8cba9f9e8364e100a68283137da… Patch: https://github.com/kamailio/kamailio/commit/440e8cba9f9e8364e100a68283137da… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index e3a2abdd09c..7d427586e98 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -20,14 +20,14 @@ endif ifeq ($(HIREDIS_BUILDER),) HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis -I/usr/include/hiredis - HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis_ssl -lhiredis + HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis ifneq ($(shell ls $(LOCALBASE) | grep libhiredis_ssl.so),) HIREDISDEFS += -DWITH_SSL HIREDISLIBS += -lhiredis_ssl endif else HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) - HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) -lhiredis_ssl + HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) HIREDISLIBSPATH = $(shell $(HIREDIS_BUILDER) --libs-only-L | cut -c 3-) ifneq ($(shell ls $(HIREDISLIBSPATH) | grep libhiredis_ssl.so),) HIREDISDEFS += -DWITH_SSL @@ -40,7 +40,7 @@ endif ifeq ($(HIREDISLIBS),-L -lhiredis) HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) /opt/local/include - HIREDISLIBS = -L/opt/local/lib -lhiredis -lhiredis_ssl + HIREDISLIBS = -L/opt/local/lib -lhiredis ifneq ($(shell ls /opt/local/lib | grep libhiredis_ssl.so),) HIREDISDEFS += -DWITH_SSL HIREDISLIBS += -lhiredis_ssl

1 0

git:master:4cca8c77: db_redis: Fixing build
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: 4cca8c777020e5fea49e37940e3c521d766588f9 URL: https://github.com/kamailio/kamailio/commit/4cca8c777020e5fea49e37940e3c521… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 db_redis: Fixing build Removing extra declaration outside from WITH_SSL block --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/4cca8c777020e5fea49e37940e3c521… Patch: https://github.com/kamailio/kamailio/commit/4cca8c777020e5fea49e37940e3c521… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index 1bfc8cdad09..f38b6698d41 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -135,7 +135,6 @@ int db_redis_connect(km_redis_con_t *con) #ifndef WITH_HIREDIS_CLUSTER db = atoi(con->id->database); #endif - redisSSLContext *ssl = NULL; reply = NULL; if(con->con) {

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2023