sr-dev September 2021

sr-dev@lists.kamailio.org

18 participants
306 discussions

git:master:bc06c9f9: misctest: added memory module parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bc06c9f9ca546a6892c9a59f10fd0a963b46c737 URL: https://github.com/kamailio/kamailio/commit/bc06c9f9ca546a6892c9a59f10fd0a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T15:23:17+02:00 misctest: added memory module parameter - control if it should do initialization for memory testing --- Modified: src/modules/misctest/doc/misctest_params.xml Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bc06c9f9ca546a6892c9a59f10fd0a9… Patch: https://github.com/kamailio/kamailio/commit/bc06c9f9ca546a6892c9a59f10fd0a9… --- diff --git a/src/modules/misctest/doc/misctest_params.xml b/src/modules/misctest/doc/misctest_params.xml index 9bb0a10bfa..db19e29a26 100644 --- a/src/modules/misctest/doc/misctest_params.xml +++ b/src/modules/misctest/doc/misctest_params.xml @@ -12,6 +12,25 @@ </sectioninfo> <title>Parameters</title> + <section id="misctest.p.memory"> + <title><varname>memory</varname></title> + <para> + Initialize for memory testing. Set it to 1 to prepare the memory + testing. + </para> + <para> + Default: 0 (off). + </para> + <example> + <title> + Set <varname>memory</varname> in the config file + </title> + <programlisting> +modparam("misctest", "memory", 1) + </programlisting> + </example> + </section> + <section id="misctest.p.mem_check_content"> <title><varname>mem_check_content</varname></title> <para> diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index e26320ef93..2ce3187812 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -37,6 +37,7 @@ static int mt_mem_free_f(struct sip_msg *, char *, char *); static int mod_init(void); static void mod_destroy(void); +static int misctest_memory = 0; /* clang-format off */ static cmd_export_t cmds[]={ @@ -87,6 +88,7 @@ static rpc_export_t mt_rpc[]; /* clang-format off */ static param_export_t params[]={ + {"memory", PARAM_INT, &misctest_memory}, {"mem_check_content", PARAM_INT, &default_mt_cfg.mem_check_content}, {0,0,0} }; @@ -172,21 +174,23 @@ static int mod_init(void) goto error; } - alloc_lst = shm_malloc(sizeof(*alloc_lst)); - if(alloc_lst == 0) - goto error; - alloc_lst->chunks = 0; - atomic_set_long(&alloc_lst->size, 0); - atomic_set_int(&alloc_lst->no, 0); - if(lock_init(&alloc_lst->lock) == 0) - goto error; - rndt_lst = shm_malloc(sizeof(*rndt_lst)); - if(rndt_lst == 0) - goto error; - rndt_lst->tests = 0; - atomic_set_int(&rndt_lst->last_id, 0); - if(lock_init(&rndt_lst->lock) == 0) - goto error; + if(misctest_memory!=0) { + alloc_lst = shm_malloc(sizeof(*alloc_lst)); + if(alloc_lst == 0) + goto error; + alloc_lst->chunks = 0; + atomic_set_long(&alloc_lst->size, 0); + atomic_set_int(&alloc_lst->no, 0); + if(lock_init(&alloc_lst->lock) == 0) + goto error; + rndt_lst = shm_malloc(sizeof(*rndt_lst)); + if(rndt_lst == 0) + goto error; + rndt_lst->tests = 0; + atomic_set_int(&rndt_lst->last_id, 0); + if(lock_init(&rndt_lst->lock) == 0) + goto error; + } return 0; error: return -1; @@ -195,17 +199,19 @@ static int mod_init(void) static void mod_destroy() { - if(rndt_lst) { - mem_destroy_all_tests(); - lock_destroy(&rndt_lst->lock); - shm_free(rndt_lst); - rndt_lst = 0; - } - if(alloc_lst) { - mem_unleak(-1); - lock_destroy(&alloc_lst->lock); - shm_free(alloc_lst); - alloc_lst = 0; + if(misctest_memory!=0) { + if(rndt_lst) { + mem_destroy_all_tests(); + lock_destroy(&rndt_lst->lock); + shm_free(rndt_lst); + rndt_lst = 0; + } + if(alloc_lst) { + mem_unleak(-1); + lock_destroy(&alloc_lst->lock); + shm_free(alloc_lst); + alloc_lst = 0; + } } }

2 years, 10 months

git:master:76e6033f: core: catch empty string on parsing params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 76e6033ff14fec0f2db0b387803b4c5815a91163 URL: https://github.com/kamailio/kamailio/commit/76e6033ff14fec0f2db0b387803b4c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T14:56:36+02:00 core: catch empty string on parsing params --- Modified: src/core/parser/parse_param.c --- Diff: https://github.com/kamailio/kamailio/commit/76e6033ff14fec0f2db0b387803b4c5… Patch: https://github.com/kamailio/kamailio/commit/76e6033ff14fec0f2db0b387803b4c5… --- diff --git a/src/core/parser/parse_param.c b/src/core/parser/parse_param.c index b80ffbdcc0..5452cbe50b 100644 --- a/src/core/parser/parse_param.c +++ b/src/core/parser/parse_param.c @@ -584,7 +584,7 @@ int parse_params2( memset(_h, 0, sizeof(param_hooks_t)); *_p = 0; - if(!_s->s) { /* no parameters at all -- we're done */ + if(!_s->s || _s->len<=0) { /* no parameters at all -- we're done */ LM_DBG("empty uri params, skipping\n"); return 0; }

2 years, 10 months

git:master:01aa8666: modules/malloc_test: renamed module to misctest

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 01aa8666c1419689b009e82fc23ff12d3a165715 URL: https://github.com/kamailio/kamailio/commit/01aa8666c1419689b009e82fc23ff12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T14:52:50+02:00 modules/malloc_test: renamed module to misctest - generic name to include tests not related to memory --- Added: src/modules/misctest/Makefile Added: src/modules/misctest/README Added: src/modules/misctest/doc/Makefile Added: src/modules/misctest/doc/misctest.xml Added: src/modules/misctest/doc/misctest_functions.xml Added: src/modules/misctest/doc/misctest_params.xml Added: src/modules/misctest/doc/misctest_rpc.xml Added: src/modules/misctest/misctest_mod.c Removed: src/modules/malloc_test/Makefile Removed: src/modules/malloc_test/README Removed: src/modules/malloc_test/doc/Makefile Removed: src/modules/malloc_test/doc/malloc_test.xml Removed: src/modules/malloc_test/doc/malloc_test_functions.xml Removed: src/modules/malloc_test/doc/malloc_test_params.xml Removed: src/modules/malloc_test/doc/malloc_test_rpc.xml Removed: src/modules/malloc_test/malloc_test.c --- Diff: https://github.com/kamailio/kamailio/commit/01aa8666c1419689b009e82fc23ff12… Patch: https://github.com/kamailio/kamailio/commit/01aa8666c1419689b009e82fc23ff12…

2 years, 10 months

git:master:5fa78d73: malloc_test: removed svn id - clang formatted code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5fa78d73b30cb5e221446abd63b84f90bc00927d URL: https://github.com/kamailio/kamailio/commit/5fa78d73b30cb5e221446abd63b84f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T14:35:38+02:00 malloc_test: removed svn id - clang formatted code --- Modified: src/modules/malloc_test/malloc_test.c --- Diff: https://github.com/kamailio/kamailio/commit/5fa78d73b30cb5e221446abd63b84f9… Patch: https://github.com/kamailio/kamailio/commit/5fa78d73b30cb5e221446abd63b84f9…

2 years, 10 months

git:master:f7690117: core: parser - ensure content lenght value does not exceed max int

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f769011743feccde0fbca8531ab4e1b3563bf155 URL: https://github.com/kamailio/kamailio/commit/f769011743feccde0fbca8531ab4e1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T13:51:32+02:00 core: parser - ensure content lenght value does not exceed max int --- Modified: src/core/parser/parse_content.c --- Diff: https://github.com/kamailio/kamailio/commit/f769011743feccde0fbca8531ab4e1b… Patch: https://github.com/kamailio/kamailio/commit/f769011743feccde0fbca8531ab4e1b… --- diff --git a/src/core/parser/parse_content.c b/src/core/parser/parse_content.c index 34cdd40e36..ee56e09b7a 100644 --- a/src/core/parser/parse_content.c +++ b/src/core/parser/parse_content.c @@ -233,6 +233,10 @@ char* parse_content_length(char* const buffer, const char* const end, size = 0; number = 0; while (p<end && *p>='0' && *p<='9') { + if(number >= INT_MAX/10) { + LM_ERR("content lenght value is too large\n"); + goto error; + } number = number*10 + (*p)-'0'; size ++; p++;

2 years, 10 months

git:master:116ef944: core: parser - free local unused param structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 116ef94420bf6ed9e0ae3bc08a612d8d0c4aa0a7 URL: https://github.com/kamailio/kamailio/commit/116ef94420bf6ed9e0ae3bc08a612d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T13:21:33+02:00 core: parser - free local unused param structure --- Modified: src/core/parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/116ef94420bf6ed9e0ae3bc08a612d8… Patch: https://github.com/kamailio/kamailio/commit/116ef94420bf6ed9e0ae3bc08a612d8… --- diff --git a/src/core/parser/parse_addr_spec.c b/src/core/parser/parse_addr_spec.c index 8bbbdefa72..604791c7b0 100644 --- a/src/core/parser/parse_addr_spec.c +++ b/src/core/parser/parse_addr_spec.c @@ -555,6 +555,9 @@ static char *parse_to_param(char *const buffer, const char *const end, saved_status, (int)(tmp - buffer), ZSW(buffer)); goto error; } + if(newparam) { + pkg_free(newparam); + } *returned_status = saved_status; return tmp;

2 years, 10 months

git:master:baed515e: core: parse content length - consider multi line header format

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: baed515e8aed8e5b505ff716eb57d0c60e582632 URL: https://github.com/kamailio/kamailio/commit/baed515e8aed8e5b505ff716eb57d0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T13:01:55+02:00 core: parse content length - consider multi line header format - safety checks for log message when not parsing the message buffer --- Modified: src/core/parser/parse_content.c --- Diff: https://github.com/kamailio/kamailio/commit/baed515e8aed8e5b505ff716eb57d0c… Patch: https://github.com/kamailio/kamailio/commit/baed515e8aed8e5b505ff716eb57d0c… --- diff --git a/src/core/parser/parse_content.c b/src/core/parser/parse_content.c index 007217df96..34cdd40e36 100644 --- a/src/core/parser/parse_content.c +++ b/src/core/parser/parse_content.c @@ -219,6 +219,10 @@ char* parse_content_length(char* const buffer, const char* const end, int size; p = buffer; + if(buffer>=end) { + LM_ERR("empty input buffer: %p - %p\n", buffer, end); + goto error; + } /* search the begining of the number */ while ( p<end && (*p==' ' || *p=='\t' || (*p=='\n' && (*(p+1)==' '||*(p+1)=='\t')) )) @@ -235,20 +239,40 @@ char* parse_content_length(char* const buffer, const char* const end, } if (p==end || size==0) goto error; - /* now we should have only spaces at the end */ - while ( p<end && (*p==' ' || *p=='\t' || - (*p=='\n' && (*(p+1)==' '||*(p+1)=='\t')) )) - p++; - if (p==end) - goto error; - /* the header ends proper? */ - if ( (*(p++)!='\n') && (*(p-1)!='\r' || *(p++)!='\n' ) ) - goto error; + do { + /* only spaces till the end-of-header */ + while (p<end && (*p==' ' || *p=='\t')) p++; + if (p==end) + goto error; + /* EOH with \n or \r\n */ + if(*p=='\n') { + p++; + } else if (p+1<end && *p=='\r' && *(p+1)=='\n') { + p += 2; + } else { + /* no valid EOH */ + goto error; + } + if(p<end) { + /* multi line header body */ + if(*p==' ' || *p=='\t') { + p++; + if (p==end) + goto error; + } else { + break; + } + } + } while(p<end); *length = number; return p; error: - LM_ERR("parse error near char [%d][%c]\n", *p, *p); + if(p<end) { + LM_ERR("parse error near char [%d][%c]\n", *p, *p); + } else { + LM_ERR("parse error over the end of input: %p - %p\n", buffer, end); + } return 0; }

2 years, 10 months

git:5.5:c01b0d94: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.5 Commit: c01b0d942b9e26e2ce0cf266abdee6eb63e8e55e URL: https://github.com/kamailio/kamailio/commit/c01b0d942b9e26e2ce0cf266abdee6e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-06T10:46:31+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/c01b0d942b9e26e2ce0cf266abdee6e… Patch: https://github.com/kamailio/kamailio/commit/c01b0d942b9e26e2ce0cf266abdee6e… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 734dc7435d..86dde8f336 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -549,17 +549,17 @@ Revoking a certificate and using a CRL require the certificate file and list of CA certificates per a regular TLS configuration. -AWS CloudHSM Example +Thales Luna Example -------------------- ... -# Example for AWS CloudHSM (SafeNet Luna) +# Example for Thales Luna modparam("tls", "engine", "gem") -modparam("tls", "engine_config", "/usr/local/etc/kamailio/luna.conf") -modparam("tls", "engine_algorithms", "ALL) +modparam("tls", "engine_config", "/usr/local/etc/kamailio/thales.cnf") +modparam("tls", "engine_algorithms", "EC") ... -/usr/local/etc/kamailio/luna.cnf is a OpenSSL config format file used to +/usr/local/etc/kamailio/thales.cnf is a OpenSSL config format file used to bootstrap the engine, e.g., pass the PIN. ... @@ -570,11 +570,12 @@ kamailio = openssl_init engines = engine_section [ engine_section ] -# gem is the name of the SafeNet Luna OpenSSL engine +# gem is the name of the Thales Luna OpenSSL engine gem = gem_section [ gem_section ] -# from SafeNet documentation +# from Thales documentation +dynamic_path = /usr/lib64/engines-1.1/gem.so ENGINE_INIT = 0:20:21:password=1234-ABCD-5678-EFGH ...

2 years, 10 months

git:master:f1e87166: modules: readme files regenerated - tls ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: f1e87166d097bde903594aecfff2e562c1496e4f URL: https://github.com/kamailio/kamailio/commit/f1e87166d097bde903594aecfff2e56… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-06T10:46:15+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/f1e87166d097bde903594aecfff2e56… Patch: https://github.com/kamailio/kamailio/commit/f1e87166d097bde903594aecfff2e56… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 4b634e24e6..127cfa7601 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -545,17 +545,17 @@ Revoking a certificate and using a CRL require the certificate file and list of CA certificates per a regular TLS configuration. -AWS CloudHSM Example +Thales Luna Example -------------------- ... -# Example for AWS CloudHSM (SafeNet Luna) +# Example for Thales Luna modparam("tls", "engine", "gem") -modparam("tls", "engine_config", "/usr/local/etc/kamailio/luna.conf") -modparam("tls", "engine_algorithms", "ALL) +modparam("tls", "engine_config", "/usr/local/etc/kamailio/thales.cnf") +modparam("tls", "engine_algorithms", "EC") ... -/usr/local/etc/kamailio/luna.cnf is a OpenSSL config format file used to +/usr/local/etc/kamailio/thales.cnf is a OpenSSL config format file used to bootstrap the engine, e.g., pass the PIN. ... @@ -566,11 +566,12 @@ kamailio = openssl_init engines = engine_section [ engine_section ] -# gem is the name of the SafeNet Luna OpenSSL engine +# gem is the name of the Thales Luna OpenSSL engine gem = gem_section [ gem_section ] -# from SafeNet documentation +# from Thales documentation +dynamic_path = /usr/lib64/engines-1.1/gem.so ENGINE_INIT = 0:20:21:password=1234-ABCD-5678-EFGH ...

2 years, 10 months

git:5.5:ad5af6d3: tls: fix OpenSSL engine in child processes

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: ad5af6d3acd648e6bd57b923083cc26d3a3d0f57 URL: https://github.com/kamailio/kamailio/commit/ad5af6d3acd648e6bd57b923083cc26… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T10:35:01+02:00 tls: fix OpenSSL engine in child processes tls_init.c calls OPENSSL_init_ssl(); this initializes the global engine linked-list and this cannot be reset in the child. To avoid linked-list corruption we manually instantiate the engine object required for loading private keys instead of relying on CONF_modules_load_file(). Updates to doc/. Addresses #2839 (cherry picked from commit 238ef139bfbe145fb93e5c4b0730de58040d2265) --- Modified: src/modules/tls/doc/hsm_howto.xml Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ad5af6d3acd648e6bd57b923083cc26… Patch: https://github.com/kamailio/kamailio/commit/ad5af6d3acd648e6bd57b923083cc26…

2 years, 10 months

← Newer
1
...
24
25
26
27
28
29
30
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2021