sr-dev May 2024

sr-dev@lists.kamailio.org

15 participants
166 discussions

[kamailio/kamailio] Added new auth module function auth_algorithm (PR #3849)

by juha-h

#### 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 Added new Added new auth module function auth_algorithm that can be used to dynamically override algorithm parameter value. #### Note I was not able to test check README, because of this error: ``` /usr/src/orig/kamailio$ make modules-readme modules=modules/auth make -C src/ modules-readme make[1]: Entering directory '/usr/src/orig/kamailio/src' make --no-print-directory -C doc auth.txt xsltproc --novalid \ --nonet \ --novalid \ --stringparam output "auth.d" \ ../../../../doc/docbook/dep.xsl auth.xml xsltproc --novalid \ --xinclude \ ../../../../doc/docbook/txt.xsl auth.xml | lynx -nolist -stdin -dump > auth.txt error : Unknown IO error warning: failed to load external entity "http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" compilation error: file ../../../../doc/docbook/txt.xsl line 6 element import xsl:import : unable to load http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3849 -- Commit Summary -- * Added new auth module function auth_algorithm -- File Changes -- M src/modules/auth/auth_mod.c (37) M src/modules/auth/doc/auth_functions.xml (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3849.patch https://github.com/kamailio/kamailio/pull/3849.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3849 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3849(a)github.com>

6 months, 1 week

git:master:18e4d38e: auth: export auth_algorithm(...) to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 18e4d38e4d57ce88cbe16eec4cfb2a5a1b5554a4 URL: https://github.com/kamailio/kamailio/commit/18e4d38e4d57ce88cbe16eec4cfb2a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-14T18:13:04+02:00 auth: export auth_algorithm(...) to kemi --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/18e4d38e4d57ce88cbe16eec4cfb2a5… Patch: https://github.com/kamailio/kamailio/commit/18e4d38e4d57ce88cbe16eec4cfb2a5… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index b2854d468bf..2fcb9169f26 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -488,12 +488,9 @@ int w_has_credentials(sip_msg_t *msg, char *realm, char *s2) /** * */ -int w_auth_algorithm(sip_msg_t *msg, char *alg, char *s2) +static int ki_auth_algorithm(sip_msg_t *msg, str *alg) { - if(fixup_get_svalue(msg, (gparam_t *)alg, &auth_algorithm) < 0) { - LM_ERR("failed to get algorithm value\n"); - return -1; - } + auth_algorithm = *alg; if(strcmp(auth_algorithm.s, "MD5") == 0) { hash_hex_len = HASHHEXLEN; @@ -512,6 +509,21 @@ int w_auth_algorithm(sip_msg_t *msg, char *alg, char *s2) return 1; } +/** + * + */ +int w_auth_algorithm(sip_msg_t *msg, char *alg, char *s2) +{ + str salg = str_init(""); + + if(fixup_get_svalue(msg, (gparam_t *)alg, &salg) < 0) { + LM_ERR("failed to get algorithm value\n"); + return -1; + } + + return ki_auth_algorithm(msg, &salg); +} + #ifdef USE_NC /** * Calls auth_check_hdr_md5 with the update_nonce flag set to false. @@ -1384,6 +1396,11 @@ static sr_kemi_t sr_kemi_auth_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("auth"), str_init("auth_algorithm"), + SR_KEMIP_INT, ki_auth_algorithm, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

6 months, 1 week

git:master:4a7aa098: modules: readme files regenerated - auth ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 4a7aa098281b608177c5da61e7a47067463267bf URL: https://github.com/kamailio/kamailio/commit/4a7aa098281b608177c5da61e7a4706… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-05-14T18:01:11+02:00 modules: readme files regenerated - auth ... [skip ci] --- Modified: src/modules/auth/README --- Diff: https://github.com/kamailio/kamailio/commit/4a7aa098281b608177c5da61e7a4706… Patch: https://github.com/kamailio/kamailio/commit/4a7aa098281b608177c5da61e7a4706… --- diff --git a/src/modules/auth/README b/src/modules/auth/README index 5d759fe2438..826c0b04dcc 100644 --- a/src/modules/auth/README +++ b/src/modules/auth/README @@ -57,6 +57,7 @@ Daniel-Constantin Mierla 4.7. pv_proxy_authenticate(realm, passwd, flags) 4.8. pv_auth_check(realm, passwd, flags, checks) 4.9. auth_get_www_authenticate(realm, flags, pvdest) + 4.10. auth_algorithm(algorithm) List of Examples @@ -86,6 +87,7 @@ Daniel-Constantin Mierla 1.24. pv_proxy_authenticate usage 1.25. pv_auth_check usage 1.26. auth_get_www_authenticate + 1.27. auth_algorithm example Chapter 1. Admin Guide @@ -126,6 +128,7 @@ Chapter 1. Admin Guide 4.7. pv_proxy_authenticate(realm, passwd, flags) 4.8. pv_auth_check(realm, passwd, flags, checks) 4.9. auth_get_www_authenticate(realm, flags, pvdest) + 4.10. auth_algorithm(algorithm) 1. Overview @@ -686,6 +689,7 @@ modparam("auth", "add_authinfo_hdr", yes) 4.7. pv_proxy_authenticate(realm, passwd, flags) 4.8. pv_auth_check(realm, passwd, flags, checks) 4.9. auth_get_www_authenticate(realm, flags, pvdest) + 4.10. auth_algorithm(algorithm) 4.1. consume_credentials() @@ -926,3 +930,14 @@ if (auth_get_www_authenticate("$fd", "0", "$var(wauth)")) { xlog("www authenticate header is [$var(wauth)]\n"); } ... + +4.10. auth_algorithm(algorithm) + + Set hash algorithm used for digest authentication thus overriding + algorithm parameter. Possible values are the same as those of algorithm + parameter. The parameter may be a pseudo variable. + + Example 1.27. auth_algorithm example +... +auth_algorithm("$alg"); +...

6 months, 1 week

git:master:3763e9c8: auth: new function auth_algorithm(...) to dynamically override algorithm

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3763e9c826640402c798d4581d0b2f1b13e4519b URL: https://github.com/kamailio/kamailio/commit/3763e9c826640402c798d4581d0b2f1… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-14T17:52:29+02:00 auth: new function auth_algorithm(...) to dynamically override algorithm - GH #3849 --- Modified: src/modules/auth/auth_mod.c Modified: src/modules/auth/doc/auth_functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/3763e9c826640402c798d4581d0b2f1… Patch: https://github.com/kamailio/kamailio/commit/3763e9c826640402c798d4581d0b2f1… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index 534ad9e20f7..b2854d468bf 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -70,11 +70,17 @@ static int mod_init(void); * Remove used credentials from a SIP message header */ int w_consume_credentials(struct sip_msg *msg, char *s1, char *s2); + /* * Check for credentials with given realm */ int w_has_credentials(struct sip_msg *msg, char *s1, char *s2); +/* + * Set authentication algorithm + */ +int w_auth_algorithm(struct sip_msg *msg, char *alg, char *s2); + static int pv_proxy_authenticate( struct sip_msg *msg, char *realm, char *passwd, char *flags); static int pv_www_authenticate( @@ -170,6 +176,8 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE}, {"pv_auth_check", (cmd_function)w_pv_auth_check, 4, fixup_pv_auth_check, 0, REQUEST_ROUTE}, + {"auth_algorithm", w_auth_algorithm, 1, fixup_spve_null, 0, + REQUEST_ROUTE}, {"bind_auth_s", (cmd_function)bind_auth_s, 0, 0, 0}, {0, 0, 0, 0, 0, 0} @@ -477,6 +485,33 @@ int w_has_credentials(sip_msg_t *msg, char *realm, char *s2) return ki_has_credentials(msg, &srealm); } +/** + * + */ +int w_auth_algorithm(sip_msg_t *msg, char *alg, char *s2) +{ + if(fixup_get_svalue(msg, (gparam_t *)alg, &auth_algorithm) < 0) { + LM_ERR("failed to get algorithm value\n"); + return -1; + } + + if(strcmp(auth_algorithm.s, "MD5") == 0) { + hash_hex_len = HASHHEXLEN; + calc_HA1 = calc_HA1_md5; + calc_response = calc_response_md5; + } else if(strcmp(auth_algorithm.s, "SHA-256") == 0) { + hash_hex_len = HASHHEXLEN_SHA256; + calc_HA1 = calc_HA1_sha256; + calc_response = calc_response_sha256; + } else { + LM_ERR("Invalid algorithm provided." + " Possible values are \"\", \"MD5\" or \"SHA-256\"\n"); + return -1; + } + + return 1; +} + #ifdef USE_NC /** * Calls auth_check_hdr_md5 with the update_nonce flag set to false. diff --git a/src/modules/auth/doc/auth_functions.xml b/src/modules/auth/doc/auth_functions.xml index 4b6f19ac05b..6a789e9e5b4 100644 --- a/src/modules/auth/doc/auth_functions.xml +++ b/src/modules/auth/doc/auth_functions.xml @@ -412,5 +412,21 @@ if (auth_get_www_authenticate("$fd", "0", "$var(wauth)")) { </programlisting> </example> </section> + <section id="auth.f.auth_algorithm"> + <title><function>auth_algorithm(algorithm)</function></title> + <para> + Set hash algorithm used for digest authentication thus overriding + algorithm parameter. Possible values are the same as those of + algorithm parameter. The parameter may be a pseudo variable. + </para> + <example> + <title>auth_algorithm example</title> + <programlisting> +... +auth_algorithm("$alg"); +... + </programlisting> + </example> + </section> </section>

6 months, 1 week

[kamailio/kamailio] db_mysql: failed build on CentOS 7 (Issue #3809)

by sergey-safarov

### Description I can see this error during db_mysql compilation on CentOS 7 ``` CC (gcc) [M db_mysql.so] km_dbase.o CC (gcc) [M db_mysql.so] km_val.o CC (gcc) [M db_mysql.so] km_row.o CC (gcc) [M db_mysql.so] km_my_con.o km_my_con.c: In function 'db_mysql_new_connection': km_my_con.c:183:15: error: 'MYSQL_OPT_SSL_CA' undeclared (first use in this function) ptr->con, MYSQL_OPT_SSL_CA, (const void *)db_mysql_opt_ssl_ca); ^ km_my_con.c:183:15: note: each undeclared identifier is reported only once for each function it appears in make[2]: *** [km_my_con.o] Error 1 make[1]: *** [modules] Error 1 make[1]: Leaving directory `/root/rpmbuild/BUILD/kamailio-5.8.1/src' make: *** [every-module] Error 2 ``` This for 5.8.1 release. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3809 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3809(a)github.com>

6 months, 1 week

[kamailio/kamailio] db_mysql: fixed build on CentOS 7 (PR #3847)

by sergey-safarov

#### 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: - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #3809 #### Description fixed build on CentOS 7 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3847 -- Commit Summary -- * db_mysql: fixed build on CentOS 7 -- File Changes -- M src/modules/db_mysql/km_my_con.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3847.patch https://github.com/kamailio/kamailio/pull/3847.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3847 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3847(a)github.com>

6 months, 1 week

git:master:767b3fae: db_mysql: fixed build on CentOS 7

by Victor Seva

Module: kamailio Branch: master Commit: 767b3faee3af450d6482b919c81431ea6d707807 URL: https://github.com/kamailio/kamailio/commit/767b3faee3af450d6482b919c81431e… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-05-13T08:36:52+02:00 db_mysql: fixed build on CentOS 7 --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/767b3faee3af450d6482b919c81431e… Patch: https://github.com/kamailio/kamailio/commit/767b3faee3af450d6482b919c81431e… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 4c756db66ff..561a0037223 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -178,9 +178,16 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) } #endif /* MYSQL_VERSION_ID */ #endif /* MARIADB_BASE_VERSION */ + +#ifdef MYSQL_OPT_SSL_CA if(db_mysql_opt_ssl_ca) mysql_options( ptr->con, MYSQL_OPT_SSL_CA, (const void *)db_mysql_opt_ssl_ca); +#else + LM_WARN("opt_ssl_ca option not supported by mysql version (value %s) - " + "ignoring\n", + db_mysql_opt_ssl_ca); +#endif /* MYSQL_OPT_SSL_CA */ #ifdef KSR_MYSQL_OPT_RECONNECT /* set reconnect flag if enabled */

6 months, 1 week

git:master:d1f377ff: sipcapture: use local static buffers for ip address and port

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d1f377ff23f491bfd5162cb7bf510759440dd8e5 URL: https://github.com/kamailio/kamailio/commit/d1f377ff23f491bfd5162cb7bf51075… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-10T12:45:25+02:00 sipcapture: use local static buffers for ip address and port - GH #3835 --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/d1f377ff23f491bfd5162cb7bf51075… Patch: https://github.com/kamailio/kamailio/commit/d1f377ff23f491bfd5162cb7bf51075… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index cbe79698704..db7ea912e11 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -264,6 +264,8 @@ int parsing_hepv3_message(char *buf, unsigned int len) int totelem = 0; int chunk_vendor = 0, chunk_type = 0, chunk_length = 0; int total_length = 0; + static char ipbuf1[IP_ADDR_MAX_STR_SIZE]; + static char portbuf1[INT2STR_MAX_LEN]; hg = (struct hep_generic_recv *)pkg_malloc(sizeof(struct hep_generic_recv)); @@ -484,13 +486,14 @@ int parsing_hepv3_message(char *buf, unsigned int len) si->flags = 0; si->addr_info_lst = 0; - si->address_str.s = ip_addr2a(&si->address); + si->address_str.len = + ip_addr2sbuf(&si->address, ipbuf1, sizeof(ipbuf1) - 1); + ipbuf1[si->address_str.len] = 0; + si->address_str.s = ipbuf1; - si->address_str.len = strlen(si->address_str.s); - - si->port_no_str.s = int2str(si->port_no, &tmp_len); + si->port_no_str.s = + int2strbuf(si->port_no, portbuf1, INT2STR_MAX_LEN, &tmp_len); si->port_no_str.len = tmp_len; - si->address_str.len = strlen(si->address_str.s); si->name.len = si->address_str.len; si->name.s = si->address_str.s;

6 months, 2 weeks

git:master:9b087fd6: tcpops: reformat exported structures

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9b087fd618ab6c5cbd6a29c352b09c7198f1b594 URL: https://github.com/kamailio/kamailio/commit/9b087fd618ab6c5cbd6a29c352b09c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-10T08:17:17+02:00 tcpops: reformat exported structures --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9b087fd618ab6c5cbd6a29c352b09c7… Patch: https://github.com/kamailio/kamailio/commit/9b087fd618ab6c5cbd6a29c352b09c7…

6 months, 2 weeks

Proposing 6.0.x for next stable release series

by Daniel-Constantin Mierla

Hello, I am proposing to switch the development version to target 6.0.x as next major series. I have pushed a new mode for receiving UDP traffic via a multi-threaded process, useful when having to deal with a rather large set of UDP sockets. While it is built reusing some existing components (async workers group and sworker design), it changes substantially how the core can deal with the sip traffic. Similar approach might be added for TCP (TLS), but right now this transport is already using a single pool of works for all sockets, so it doesn't faces the same issues as with UDP for large number of sockets. The old way of handling UDP traffic is not removed, it is still the default, the new one needs testing, of course. Furthermore, the socket global parameter (which is an alternative to listen) can now take a port range to the bind field, simplifying the config when Kamailio has to listen on large number on consecutive ports. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com

6 months, 2 weeks

← Newer
1
...
7
8
9
10
11
12
13
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2024