sr-dev October 2023

sr-dev@lists.kamailio.org

15 participants
286 discussions

git:master:a2468e66: secsipid_proc: Makefile - look for secsipid include and libs in localbase

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a2468e66f530822094569cf847796d91b17d4be9 URL: https://github.com/kamailio/kamailio/commit/a2468e66f530822094569cf847796d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-31T14:54:54+01:00 secsipid_proc: Makefile - look for secsipid include and libs in localbase - done when pkg-config cannot find libsecsipid install details --- Modified: src/modules/secsipid_proc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/a2468e66f530822094569cf847796d9… Patch: https://github.com/kamailio/kamailio/commit/a2468e66f530822094569cf847796d9… --- diff --git a/src/modules/secsipid_proc/Makefile b/src/modules/secsipid_proc/Makefile index 259766b151a..f3997dfe115 100644 --- a/src/modules/secsipid_proc/Makefile +++ b/src/modules/secsipid_proc/Makefile @@ -18,8 +18,8 @@ endif endif ifeq ($(BUILDER),) - DEFS+= -I. - LIBS = -L. -lsecsipid -lpthread + DEFS +=-I$(LOCALBASE)/include -I$(SYSBASE)/include + LIBS +=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -lsecsipid -lpthread else DEFS+= $(shell pkg-config --cflags secsipid-1) LIBS = $(shell pkg-config --libs secsipid-1) -lpthread

1 year, 1 month

git:master:f4d8235e: secsipid: fix build errors for older versions of secsipid lib

by Victor Seva

Module: kamailio Branch: master Commit: f4d8235e5da98e7b99fdc1431505b44ee1672f63 URL: https://github.com/kamailio/kamailio/commit/f4d8235e5da98e7b99fdc1431505b44… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-31T12:21:10+01:00 secsipid: fix build errors for older versions of secsipid lib --- Modified: src/modules/secsipid/secsipid_mod.c Modified: src/modules/secsipid_proc/secsipid_proc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f4d8235e5da98e7b99fdc1431505b44… Patch: https://github.com/kamailio/kamailio/commit/f4d8235e5da98e7b99fdc1431505b44… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index ee169b3154c..b8c80382ac1 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -750,6 +750,7 @@ static int w_secsipid_sign( static int ki_secsipid_sign_prvkey( sip_msg_t *msg, str *sheaders, str *spayload, str *keydata) { +#if SECSIPID_VERSION >= 0x1030000 str ibody = STR_NULL; if(secsipid_libopt_list_used == 0) { @@ -776,7 +777,6 @@ static int ki_secsipid_sign_prvkey( free(_secsipid_data.value.s); } _secsipid_data.value = ibody; - return 1; error: @@ -784,6 +784,10 @@ static int ki_secsipid_sign_prvkey( free(ibody.s); } return -1; +#else + LM_ERR("secsipid < 1.3.0, SecSIPIDSignJSONHPPrvKey not supported\n"); + return -1; +#endif } /** diff --git a/src/modules/secsipid_proc/secsipid_proc_mod.c b/src/modules/secsipid_proc/secsipid_proc_mod.c index 82aaac33ea1..02a8b6eb44e 100644 --- a/src/modules/secsipid_proc/secsipid_proc_mod.c +++ b/src/modules/secsipid_proc/secsipid_proc_mod.c @@ -38,7 +38,9 @@ MODULE_VERSION int secsipid_proc_bind(secsipid_papi_t *papi) { papi->SecSIPIDSignJSONHP = SecSIPIDSignJSONHP; +#if SECSIPID_VERSION >= 0x1030000 papi->SecSIPIDSignJSONHPPrvKey = SecSIPIDSignJSONHPPrvKey; +#endif papi->SecSIPIDGetIdentity = SecSIPIDGetIdentity; papi->SecSIPIDGetIdentityPrvKey = SecSIPIDGetIdentityPrvKey; papi->SecSIPIDCheck = SecSIPIDCheck;

1 year, 1 month

Re: [kamailio/kamailio] secsipid: new config function to sign providing private key data (c8d56ed)

by Victor Seva

``` secsipid_proc_mod.c: In function 'secsipid_proc_bind': secsipid_proc_mod.c:41:42: error: 'SecSIPIDSignJSONHPPrvKey' undeclared (first use in this function); did you mean 'SecSIPIDSignJSONHP'? 41 | papi->SecSIPIDSignJSONHPPrvKey = SecSIPIDSignJSONHPPrvKey; | ^~~~~~~~~~~~~~~~~~~~~~~~ | SecSIPIDSignJSONHP secsipid_proc_mod.c:41:42: note: each undeclared identifier is reported only once for each function it appears in ``` This broke bookworm bullseye and jammy builds: https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/2517/console -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/c8d56ed3afa19c29279e54fffd40b98… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/c8d56ed3afa19c29279e54fffd40b9810bb0d67c/131337436(a)github.com>

1 year, 1 month

[kamailio/kamailio] microhttpd: cannot build on CentOS 8 (Issue #3618)

by sergey-safarov

cannot build `microhttpd` module on CentOS 8 ``` CC (gcc) [M memcached.so] memcached.o CC (gcc) [M memcached.so] mcd_var.o LD (gcc) [M memcached.so] memcached.so CC (gcc) [M microhttpd.so] microhttpd_mod.o microhttpd_mod.c:418:24: error: return type is an incomplete type static enum MHD_Result ksr_microhttpd_request(void *cls, ^~~~~~~~~~~~~~~~~~~~~~ microhttpd_mod.c: In function 'ksr_microhttpd_request': microhttpd_mod.c:434:10: warning: 'return' with a value, in function returning void return MHD_YES; ^~~~~~~ microhttpd_mod.c:418:24: note: declared here static enum MHD_Result ksr_microhttpd_request(void *cls, ^~~~~~~~~~~~~~~~~~~~~~ microhttpd_mod.c:459:10: warning: 'return' with a value, in function returning void return MHD_NO; ^~~~~~ microhttpd_mod.c:418:24: note: declared here static enum MHD_Result ksr_microhttpd_request(void *cls, ^~~~~~~~~~~~~~~~~~~~~~ microhttpd_mod.c:474:12: warning: 'return' with a value, in function returning void return MHD_NO; ^~~~~~ microhttpd_mod.c:418:24: note: declared here static enum MHD_Result ksr_microhttpd_request(void *cls, ^~~~~~~~~~~~~~~~~~~~~~ microhttpd_mod.c:481:10: warning: 'return' with a value, in function returning void return MHD_NO; ^~~~~~ microhttpd_mod.c:418:24: note: declared here static enum MHD_Result ksr_microhttpd_request(void *cls, ^~~~~~~~~~~~~~~~~~~~~~ microhttpd_mod.c:484:9: warning: 'return' with a value, in function returning void return MHD_YES; ^~~~~~~ microhttpd_mod.c:418:24: note: declared here static enum MHD_Result ksr_microhttpd_request(void *cls, ^~~~~~~~~~~~~~~~~~~~~~ microhttpd_mod.c: In function 'microhttpd_server_run': microhttpd_mod.c:510:17: warning: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Wincompatible-pointer-types] NULL, NULL, &ksr_microhttpd_request, KSR_MICROHTTPD_PAGE, ^~~~~~~~~~~~~~~~~~~~~~~ In file included from microhttpd_mod.c:29: /usr/include/microhttpd.h:2148:1: note: expected 'MHD_AccessHandlerCallback' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'void (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'void (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} MHD_start_daemon (unsigned int flags, ^~~~~~~~~~~~~~~~ microhttpd_mod.c:515:17: warning: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Wincompatible-pointer-types] NULL, NULL, &ksr_microhttpd_request, KSR_MICROHTTPD_PAGE, ^~~~~~~~~~~~~~~~~~~~~~~ In file included from microhttpd_mod.c:29: /usr/include/microhttpd.h:2148:1: note: expected 'MHD_AccessHandlerCallback' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'void (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'void (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} MHD_start_daemon (unsigned int flags, ^~~~~~~~~~~~~~~~ make[2]: *** [../../Makefile.rules:100: microhttpd_mod.o] Error 1 make[1]: *** [Makefile:508: modules] Error 1 make[1]: Leaving directory '/root/rpmbuild/BUILD/kamailio-5.8.0-dev1/src' make: *** [Makefile:34: every-module] Error 2 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3618 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3618(a)github.com>

1 year, 1 month

[kamailio/kamailio] Add function `secsipid_sign_privkey` to SECSIPID module (Issue #3620)

by Ben Kaufman

### Description Add a function `secsipid_sign_privkey(sheaders, spaypload, keyData)` that accepts a pseudovariable with the PEM data analagous to the difference between the following functions: - `secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath)` - `secsipid_build_identity_prvkey(origTN, destTN, attest, origID, x5u, keyData)` With the difference being that ``secsipid_build_identity()` takes a key file as it's argument, and ``secsipid_build_identity_privkey()` allows having the key data in a pseudovariable. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3620 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3620(a)github.com>

1 year, 1 month

New Module For Kamailio (RTSP)

by Mojtaba

Hi All, I'm going to release a new module that I've been developing, Real Time Streaming is a protocol to connect to camera devices to record video. Using this module, you can connect to all kinds of cameras and map them to internal numbers. When you call these numbers, the recorded video will appear on your video call station and change between cameras by DTMF. In addition, This module is used for video surveillance solutions. Please let me know your ideas on this. I am looking forward to hearing new ideas in this regard. With best regards --Mojtaba Esfandiari.S

1 year, 1 month

git:master:9b63c3a7: modules: readme files regenerated - secsipid ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 9b63c3a7400bb255f102c786b914ea241e68bbab URL: https://github.com/kamailio/kamailio/commit/9b63c3a7400bb255f102c786b914ea2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-10-30T13:33:19+01:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/9b63c3a7400bb255f102c786b914ea2… Patch: https://github.com/kamailio/kamailio/commit/9b63c3a7400bb255f102c786b914ea2… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index c2af1a471ac..5883eaa100c 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -49,6 +49,7 @@ Daniel-Constantin Mierla origID, x5u, keyData) 4.8. secsipid_sign(sheaders, spaypload, keyPath) + 4.9. secsipid_sign_prvkey(sheaders, spaypload, keyData) 5. Installation @@ -68,7 +69,8 @@ Daniel-Constantin Mierla 1.12. secsipid_build_identity usage 1.13. secsipid_build_identity_prvkey usage 1.14. secsipid_sign usage - 1.15. Libsecsipid Usage + 1.15. secsipid_sign_prvkey usage + 1.16. Libsecsipid Usage Chapter 1. Admin Guide @@ -105,6 +107,7 @@ Chapter 1. Admin Guide origID, x5u, keyData) 4.8. secsipid_sign(sheaders, spaypload, keyPath) + 4.9. secsipid_sign_prvkey(sheaders, spaypload, keyData) 5. Installation @@ -243,6 +246,7 @@ modparam("secsipid", "libopt", "CacheExpires=0") x5u, keyData) 4.8. secsipid_sign(sheaders, spaypload, keyPath) + 4.9. secsipid_sign_prvkey(sheaders, spaypload, keyData) 4.1. secsipid_check_identity(keyPath) @@ -439,6 +443,30 @@ request_route { } ... +4.9. secsipid_sign_prvkey(sheaders, spaypload, keyData) + + Build Identity value using the private key given by "keyData" to sign + the JWT body. The sheaders and spayload have to be string + representation of JSON headers and payload to be signed. On success, + the Indentity value is stored in variable $secsipid(val). It also sets + $secsipid(ret) to the return value of the libsecsipid functions. + + The parameters can contain pseudo-variables. + + This function can be used from ANY_ROUTE. + + Example 1.15. secsipid_sign_prvkey usage +... +request_route { + ... + if(secsipid_sign_prvkey("_JSON_HEADERS_", "_JSON_PAYLOAD_", + "_PRIVATE_KEY_")) { + xinfo("Identity value: $secsipid(val)\n"); + } + ... +} +... + 5. Installation The module needs "secsipdi_proc.so" module that depends on @@ -453,7 +481,7 @@ request_route { installed and its environment configured, then run the following commands: - Example 1.15. Libsecsipid Usage + Example 1.16. Libsecsipid Usage ... export GO111MODULE=off go get https://github.com/asipto/secsipidx

1 year, 1 month

git:master:1cfd694e: secsipid: docs for secsipid_sign_prvkey()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1cfd694e3bad62e9c4fc31073fcebe7707c5968c URL: https://github.com/kamailio/kamailio/commit/1cfd694e3bad62e9c4fc31073fcebe7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-30T13:27:49+01:00 secsipid: docs for secsipid_sign_prvkey() --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1cfd694e3bad62e9c4fc31073fcebe7… Patch: https://github.com/kamailio/kamailio/commit/1cfd694e3bad62e9c4fc31073fcebe7… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 97306c649b3..7ea74f525a0 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -460,6 +460,39 @@ request_route { ... } ... +</programlisting> + </example> + </section> + <section id="secsipid.f.secsipid_sign_prvkey"> + <title> + <function moreinfo="none">secsipid_sign_prvkey(sheaders, spaypload, keyData)</function> + </title> + <para> + Build Identity value using the private key given by "keyData" to sign the JWT body. + The sheaders and spayload have to be string representation of JSON + headers and payload to be signed. On success, the Indentity value is + stored in variable $secsipid(val). It also sets $secsipid(ret) to + the return value of the libsecsipid functions. + </para> + <para> + The parameters can contain pseudo-variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>secsipid_sign_prvkey</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + if(secsipid_sign_prvkey("_JSON_HEADERS_", "_JSON_PAYLOAD_", + "_PRIVATE_KEY_")) { + xinfo("Identity value: $secsipid(val)\n"); + } + ... +} +... </programlisting> </example> </section>

1 year, 1 month

git:master:c8d56ed3: secsipid: new config function to sign providing private key data

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c8d56ed3afa19c29279e54fffd40b9810bb0d67c URL: https://github.com/kamailio/kamailio/commit/c8d56ed3afa19c29279e54fffd40b98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-30T13:11:03+01:00 secsipid: new config function to sign providing private key data --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c8d56ed3afa19c29279e54fffd40b98… Patch: https://github.com/kamailio/kamailio/commit/c8d56ed3afa19c29279e54fffd40b98… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 4e41c272d5a..ee169b3154c 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -66,6 +66,8 @@ static int w_secsipid_build_identity_prvkey(sip_msg_t *msg, char *porigtn, char *pkeydata); static int w_secsipid_sign( sip_msg_t *msg, char *phdrs, char *ppayload, char *pkeypath); +static int w_secsipid_sign_prvkey( + sip_msg_t *msg, char *phdrs, char *ppayload, char *pkeydata); static int w_secsipid_get_url(sip_msg_t *msg, char *purl, char *pout); static int secsipid_libopt_param(modparam_t type, void *val); @@ -102,6 +104,8 @@ static cmd_export_t cmds[]={ fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"secsipid_sign", (cmd_function)w_secsipid_sign, 3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {"secsipid_sign_prvkey", (cmd_function)w_secsipid_sign_prvkey, 3, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"secsipid_get_url", (cmd_function)w_secsipid_get_url, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} @@ -740,6 +744,77 @@ static int w_secsipid_sign( return ki_secsipid_sign(msg, &shdrs, &spayload, &keypath); } +/** + * + */ +static int ki_secsipid_sign_prvkey( + sip_msg_t *msg, str *sheaders, str *spayload, str *keydata) +{ + str ibody = STR_NULL; + + if(secsipid_libopt_list_used == 0) { + str_list_t *sit; + for(sit = secsipid_libopt_list; sit != NULL; sit = sit->next) { + _secsipid_papi.SecSIPIDOptSetV(sit->s.s); + } + secsipid_libopt_list_used = 1; + } + + ibody.len = _secsipid_papi.SecSIPIDSignJSONHPPrvKey( + sheaders->s, spayload->s, keydata->s, &ibody.s); + + _secsipid_data.ret = ibody.len; + + if(ibody.len <= 0) { + LM_ERR("failed to get identity value (%d)\n", ibody.len); + goto error; + } + + LM_DBG("identity value: %.*s\n", ibody.len, ibody.s); + + if(_secsipid_data.value.s) { + free(_secsipid_data.value.s); + } + _secsipid_data.value = ibody; + + return 1; + +error: + if(ibody.s) { + free(ibody.s); + } + return -1; +} + +/** + * + */ +static int w_secsipid_sign_prvkey( + sip_msg_t *msg, char *phdrs, char *ppayload, char *pkeydata) +{ + str shdrs = STR_NULL; + str spayload = STR_NULL; + str keydata = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t *)phdrs, &shdrs) < 0) { + LM_ERR("failed to get JSON headers parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t *)ppayload, &spayload) < 0) { + LM_ERR("failed to get JSON payload parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t *)pkeydata, &keydata) < 0) { + LM_ERR("failed to get keydata parameter\n"); + return -1; + } + + return ki_secsipid_sign_prvkey(msg, &shdrs, &spayload, &keydata); +} + + /** * */ @@ -961,6 +1036,16 @@ static sr_kemi_t sr_kemi_secsipid_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR } }, + { str_init("secsipid"), str_init("secsipid_sign"), + SR_KEMIP_INT, ki_secsipid_sign, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("secsipid"), str_init("secsipid_sign_prvkey"), + SR_KEMIP_INT, ki_secsipid_sign_prvkey, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("secsipid"), str_init("secsipid_get_val"), SR_KEMIP_XVAL, ki_secsipid_get_val, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 year, 1 month

git:master:57de8b62: secsipid_proc: updates for latest libsecsipid API

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 57de8b62025a3dedced7c3783b29f8c3517fdc36 URL: https://github.com/kamailio/kamailio/commit/57de8b62025a3dedced7c3783b29f8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-30T13:03:47+01:00 secsipid_proc: updates for latest libsecsipid API - bind SecSIPIDSignJSONHPPrvKey(...) --- Modified: src/modules/secsipid_proc/libsecsipid.h Modified: src/modules/secsipid_proc/secsipid.h Modified: src/modules/secsipid_proc/secsipid_proc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/57de8b62025a3dedced7c3783b29f8c… Patch: https://github.com/kamailio/kamailio/commit/57de8b62025a3dedced7c3783b29f8c…

1 year, 1 month

← Newer
1
...
12
13
14
15
16
17
18
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2023