sr-dev August 2022

sr-dev@lists.kamailio.org

16 participants
280 discussions

[kamailio/kamailio] Pepelux/secfilter (PR #3217)
by Jose Luis Verdeguer 15 Aug '22

15 Aug '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] 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  Fixed an error in an example in the docfile You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3217 -- Commit Summary -- * secfilter: machine-parsable data structure for RPC printing data * secfilter: updated samples [skip ci] * secfilter: fix examples [skip ci] -- File Changes -- M src/modules/secfilter/doc/secfilter_admin.xml (121) M src/modules/secfilter/secfilter_rpc.c (383) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3217.patch https://github.com/kamailio/kamailio/pull/3217.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3217 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3217(a)github.com>

1 1

git:master:8f30f438: secfilter: fix examples [skip ci]
by Jose Luis Verdeguer 15 Aug '22

15 Aug '22

Module: kamailio Branch: master Commit: 8f30f438f9ba6ab9a2d7bde1cfa4d186e2fe0d6f URL: https://github.com/kamailio/kamailio/commit/8f30f438f9ba6ab9a2d7bde1cfa4d18… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2022-08-15T20:33:29+02:00 secfilter: fix examples [skip ci] --- Modified: src/modules/secfilter/doc/secfilter_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8f30f438f9ba6ab9a2d7bde1cfa4d18… Patch: https://github.com/kamailio/kamailio/commit/8f30f438f9ba6ab9a2d7bde1cfa4d18… --- diff --git a/src/modules/secfilter/doc/secfilter_admin.xml b/src/modules/secfilter/doc/secfilter_admin.xml index 9daa67d952..fff4ca3b2c 100644 --- a/src/modules/secfilter/doc/secfilter_admin.xml +++ b/src/modules/secfilter/doc/secfilter_admin.xml @@ -812,8 +812,6 @@ <programlisting format="linespecific"> ... -User-agent -========== { User-Agent: { Blacklisted: {

1 0

git:master:252562b8: modules: readme files regenerated - xhttp ... [skip ci]
by Kamailio Dev 15 Aug '22

15 Aug '22

Module: kamailio Branch: master Commit: 252562b8fce76cb01cde993b530509e89baae95a URL: https://github.com/kamailio/kamailio/commit/252562b8fce76cb01cde993b530509e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-15T20:31:14+02:00 modules: readme files regenerated - xhttp ... [skip ci] --- Modified: src/modules/xhttp/README --- Diff: https://github.com/kamailio/kamailio/commit/252562b8fce76cb01cde993b530509e… Patch: https://github.com/kamailio/kamailio/commit/252562b8fce76cb01cde993b530509e… --- diff --git a/src/modules/xhttp/README b/src/modules/xhttp/README index 781ac41392..9a59c839aa 100644 --- a/src/modules/xhttp/README +++ b/src/modules/xhttp/README @@ -131,11 +131,15 @@ Chapter 1. Admin Guide 3.2. Kamailio Core Settings - SIP requires a Content-Length header for TCP transport. But most HTTP - clients do not set the content length for normal GET requests. - Therefore, the core must be configured to allow incoming requests - without content length header: - * tcp_accept_no_cl=yes + Related core settings: + * tcp_accept_no_cl=yes - SIP requires the Content-Length header for + TCP transport. But most HTTP clients do not set the content length + for normal GET requests. Therefore, the core must be configured to + allow incoming requests without content length header. + * http_reply_parse=yes - various Kamailio modules may parse what it + is sent out (e.g., for replication, topology management). In such + case errors are printed if the outgoing message is not SIP and this + parameter is not set. 3.3. External Libraries or Applications

1 0

git:master:36b0da00: xhttp: docs - listed http_reply_parse core setting
by Daniel-Constantin Mierla 15 Aug '22

15 Aug '22

Module: kamailio Branch: master Commit: 36b0da00b9fc08be9e855d5dd4cc878b6e3c88bf URL: https://github.com/kamailio/kamailio/commit/36b0da00b9fc08be9e855d5dd4cc878… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-15T20:18:02+02:00 xhttp: docs - listed http_reply_parse core setting --- Modified: src/modules/xhttp/doc/xhttp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/36b0da00b9fc08be9e855d5dd4cc878… Patch: https://github.com/kamailio/kamailio/commit/36b0da00b9fc08be9e855d5dd4cc878… --- diff --git a/src/modules/xhttp/doc/xhttp_admin.xml b/src/modules/xhttp/doc/xhttp_admin.xml index 507283b90f4..f0e6d3fdeb8 100644 --- a/src/modules/xhttp/doc/xhttp_admin.xml +++ b/src/modules/xhttp/doc/xhttp_admin.xml @@ -85,13 +85,23 @@ <section> <title>&kamailio; Core Settings</title> <para> - SIP requires a Content-Length header for TCP transport. But most HTTP clients do not - set the content length for normal GET requests. Therefore, the core must be configured - to allow incoming requests without content length header: + Related core settings: <itemizedlist> <listitem> <para> - <emphasis>tcp_accept_no_cl=yes</emphasis> + <emphasis>tcp_accept_no_cl=yes</emphasis> - SIP requires the + Content-Length header for TCP transport. But most HTTP clients + do not set the content length for normal GET requests. Therefore, + the core must be configured to allow incoming requests without + content length header. + </para> + </listitem> + <listitem> + <para> + <emphasis>http_reply_parse=yes</emphasis> - various Kamailio + modules may parse what it is sent out (e.g., for replication, + topology management). In such case errors are printed if the + outgoing message is not SIP and this parameter is not set. </para> </listitem> </itemizedlist>

1 0

db_postgres / DB1_BLOB / sipcapture HOMER issue
by Daniel Pocock 15 Aug '22

15 Aug '22

Hi all, I was doing some tests with HOMER and a PostgreSQL backend The HOMER schema creates the msg column as varchar(1500) CREATE TABLE IF NOT EXISTS rtcp_capture ( id BIGSERIAL NOT NULL, date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, micro_ts bigint NOT NULL DEFAULT '0', correlation_id varchar(256) NOT NULL DEFAULT '', source_ip varchar(60) NOT NULL DEFAULT '', source_port integer NOT NULL DEFAULT 0, destination_ip varchar(60) NOT NULL DEFAULT '', destination_port integer NOT NULL DEFAULT 0, proto integer NOT NULL DEFAULT 0, family smallint DEFAULT NULL, type integer NOT NULL DEFAULT 0, node varchar(125) NOT NULL DEFAULT '', msg varchar(1500) NOT NULL DEFAULT '', PRIMARY KEY (id,date) ); The sipcapture.c source code says that msg is DB1_BLOB https://github.com/kamailio/kamailio/blob/master/src/modules/sipcapture/sip… db_keys[11] = &msg_column; db_vals[11].type = DB1_BLOB; db_vals[11].nul = 0; When the Kamailio PostgreSQL module db_postgres tries to store DB1_BLOB, it converts the message text into a hex string and stores that string like this: '0x7b2273656e6465725f696e666f726d6174696f6e223a7b226e74705f74696d657374616d705f736563223a3338333033312c226e74705f74696d657374616d705f75736563223a32333237332c226f6374657473223a3136343030302c227274705f74696d657374616d70223a323132353238323231342c227061636b657473223a313032357d2c2273737263223a323330343334323235382c2274797065223a3230302c227265706f72745f626c6f636b73223a5b7b22736f757263655f73737263223a333737363636373030392c22686967686573745f7365715f6e6f223a31363739332c226672616374696f6e5f6c6f7374223a302c2269615f6a6974746572223a31372c227061636b6574735f6c6f7374223a302c226c7372223a3837363937393735352c22646c7372223a35303234397d5d2c227265706f72745f636f756e74223a317d' I tried changing the msg column type to bytea (blob) and Kamailio is still doing the same thing, storing a hex string into the column. Then I changed the column back to varchar(1500) and I modified sipcapture.c to use DB1_STR. With this change it is working OK. However, I suspect that the support for DB1_BLOB conversions may need to be reviewed in src/modules/db_postgres/km_val.c Regards, Daniel -- https://danielpocock.com Follow with RSS: https://danielpocock.com/rss.xml

3 2

[kamailio/kamailio] [stirshaken] add identity header in reply messages or to a separate variable (#2770)
by sergei lavrov 14 Aug '22

14 Aug '22

### Description I'm unable to add the generated `Identity` value to reply message when `kamailio` acts as a redirect server and replies with `302 Moved Temporarily` instead of relaying `INVITE`. This code doesn't work, i.e. no `Identity` header in `302 Moved Temporarily` message: ``` if (stirshaken_add_identity($var(x5u), $var(attest), $var(origtn_val), $var(desttn_val), $var(origid)) == 1) { append_branch("sip:$rU@127.0.0.1:6060"); sl_send_reply("302", "Moved Temporarily"); exit; } ``` ### Expected behavior It would be nice if the `stirshaken_add_identity_*` functions would add the generated `Identity` header to the reply messages too, or store the generated `Identity` header in a separate variable, like `$identity`, for the future processing. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2770

4 10

git:master:c09ede1b: core: different logging for IPv4 and IPv6 for socket option setting
by Henning Westerholt 14 Aug '22

14 Aug '22

Module: kamailio Branch: master Commit: c09ede1ba7d600da37e7c0007f128a72b34250a4 URL: https://github.com/kamailio/kamailio/commit/c09ede1ba7d600da37e7c0007f128a7… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-14T09:01:57Z core: different logging for IPv4 and IPv6 for socket option setting --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/c09ede1ba7d600da37e7c0007f128a7… Patch: https://github.com/kamailio/kamailio/commit/c09ede1ba7d600da37e7c0007f128a7… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index 1eefb13c42..7c501f0dab 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -336,13 +336,13 @@ int udp_init(struct socket_info* sock_info) if (addr->s.sa_family==AF_INET){ if(setsockopt(sock_info->socket, SOL_IP, IP_RECVERR, (void*)&optval, sizeof(optval)) ==-1){ - LM_ERR("setsockopt: %s\n", strerror(errno)); + LM_ERR("IPV4 setsockopt: %s\n", strerror(errno)); goto error; } } else if (addr->s.sa_family==AF_INET6){ if(setsockopt(sock_info->socket, SOL_IPV6, IPV6_RECVERR, (void*)&optval, sizeof(optval)) ==-1){ - LM_ERR("setsockopt: %s\n", strerror(errno)); + LM_ERR("IPv6 setsockopt: %s\n", strerror(errno)); goto error; } } @@ -354,7 +354,7 @@ int udp_init(struct socket_info* sock_info) optval= (pmtu_discovery) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; if(setsockopt(sock_info->socket, IPPROTO_IP, IP_MTU_DISCOVER, (void*)&optval, sizeof(optval)) ==-1){ - LM_ERR("setsockopt: %s\n", strerror(errno)); + LM_ERR("IPv4 setsockopt: %s\n", strerror(errno)); goto error; } } else if (addr->s.sa_family==AF_INET6){ @@ -365,7 +365,7 @@ int udp_init(struct socket_info* sock_info) if(setsockopt(sock_info->socket, IPPROTO_IPV6, IPV6_MTU_DISCOVER, (void*)&optval, sizeof(optval)) ==-1){ - LM_ERR("setsockopt: %s\n", strerror(errno)); + LM_ERR("IPv6 setsockopt: %s\n", strerror(errno)); goto error; } }

1 0

git:master:990bdfe5: core: also set pmtu_discovery core parameter for IPv6, GH #3141
by Henning Westerholt 14 Aug '22

14 Aug '22

Module: kamailio Branch: master Commit: 990bdfe56b9d8e2d2d297b87998065e137d4e203 URL: https://github.com/kamailio/kamailio/commit/990bdfe56b9d8e2d2d297b87998065e… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-14T08:56:12Z core: also set pmtu_discovery core parameter for IPv6, GH #3141 - also set pmtu_discovery core parameter for IPv6 - based on a patch from Rick van Rein <rick(a)openfortress.nl> - probably to be extended further --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/990bdfe56b9d8e2d2d297b87998065e… Patch: https://github.com/kamailio/kamailio/commit/990bdfe56b9d8e2d2d297b87998065e… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index bffdda1b01..1eefb13c42 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -329,22 +329,45 @@ int udp_init(struct socket_info* sock_info) } #if defined (__OS_linux) && defined(UDP_ERRORS) + /* Ask for the ability to recvmsg (...,MSG_ERRQUEUE) for immediate + * resend when hitting Path MTU limits. */ optval=1; /* enable error receiving on unconnected sockets */ - if(setsockopt(sock_info->socket, SOL_IP, IP_RECVERR, + if (addr->s.sa_family==AF_INET){ + if(setsockopt(sock_info->socket, SOL_IP, IP_RECVERR, (void*)&optval, sizeof(optval)) ==-1){ - LM_ERR("setsockopt: %s\n", strerror(errno)); - goto error; + LM_ERR("setsockopt: %s\n", strerror(errno)); + goto error; + } + } else if (addr->s.sa_family==AF_INET6){ + if(setsockopt(sock_info->socket, SOL_IPV6, IPV6_RECVERR, + (void*)&optval, sizeof(optval)) ==-1){ + LM_ERR("setsockopt: %s\n", strerror(errno)); + goto error; + } } #endif #if defined (__OS_linux) - /* if pmtu_discovery=1 then set DF bit and do Path MTU discovery - * disabled by default */ - optval= (pmtu_discovery) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; - if(setsockopt(sock_info->socket, IPPROTO_IP, IP_MTU_DISCOVER, - (void*)&optval, sizeof(optval)) ==-1){ - LM_ERR("setsockopt: %s\n", strerror(errno)); - goto error; + if (addr->s.sa_family==AF_INET){ + /* If pmtu_discovery=1 then set DF bit and do Path MTU discovery + * disabled by default. Specific to IPv4. */ + optval= (pmtu_discovery) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; + if(setsockopt(sock_info->socket, IPPROTO_IP, IP_MTU_DISCOVER, + (void*)&optval, sizeof(optval)) ==-1){ + LM_ERR("setsockopt: %s\n", strerror(errno)); + goto error; + } + } else if (addr->s.sa_family==AF_INET6){ + /* IPv6 never fragments but sends ICMPv6 Packet too Big, + * If pmtu_discovery=1 then set DF bit and do Path MTU discovery + * disabled by default. Specific to IPv6. */ + optval= (pmtu_discovery) ? IPV6_PMTUDISC_DO : IPV6_PMTUDISC_DONT; + if(setsockopt(sock_info->socket, IPPROTO_IPV6, + IPV6_MTU_DISCOVER, + (void*)&optval, sizeof(optval)) ==-1){ + LM_ERR("setsockopt: %s\n", strerror(errno)); + goto error; + } } #endif

1 0

git:master:43d92797: tls_wolfssl: wolfSSL â update to v5.4.0-stable
by S-P Chan 13 Aug '22

13 Aug '22

Module: kamailio Branch: master Commit: 43d927970f4be565284f53e986171eb3512c6b63 URL: https://github.com/kamailio/kamailio/commit/43d927970f4be565284f53e986171eb… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2022-08-13T21:52:30+08:00 tls_wolfssl: wolfSSL â update to v5.4.0-stable - the upstream commit also fixes GCC warnings so we don't have to workaround with -Wno-xxxxxx --- Modified: misc/external/wolfssl/wolfssl Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/43d927970f4be565284f53e986171eb… Patch: https://github.com/kamailio/kamailio/commit/43d927970f4be565284f53e986171eb… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl index e722c15be86..57aac1c50b4 160000 --- a/misc/external/wolfssl/wolfssl +++ b/misc/external/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit e722c15be860794179082a05d09e6a90dc77ccf0 +Subproject commit 57aac1c50b45275c7a99eca32ad985998b292dc8 diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index f6a27f7f34e..a04edc40b4d 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -23,7 +23,7 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: ./autogen.sh; \ fi; \ if [ ! -f "Makefile" ]; then \ - env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -fPIC -Wno-error=array-bounds -Wno-error=stringop-overflow" ./configure \ + env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -fPIC" ./configure \ --enable-all --enable-pkcs11 --enable-static --enable-aligndata=no \ --disable-shared --disable-examples \ --prefix=$(CURDIR)/$(WOLFSSL_PREFIX) \

1 0

git:master:9a35ce57: modules: readme files regenerated - secfilter ... [skip ci]
by Kamailio Dev 12 Aug '22

12 Aug '22

Module: kamailio Branch: master Commit: 9a35ce57270d259f60a116322d17a411c58bcb4f URL: https://github.com/kamailio/kamailio/commit/9a35ce57270d259f60a116322d17a41… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-12T16:31:16+02:00 modules: readme files regenerated - secfilter ... [skip ci] --- Modified: src/modules/secfilter/README --- Diff: https://github.com/kamailio/kamailio/commit/9a35ce57270d259f60a116322d17a41… Patch: https://github.com/kamailio/kamailio/commit/9a35ce57270d259f60a116322d17a41… --- diff --git a/src/modules/secfilter/README b/src/modules/secfilter/README index 7cbabac6c8..435db783fa 100644 --- a/src/modules/secfilter/README +++ b/src/modules/secfilter/README @@ -663,67 +663,72 @@ d in the user-agent header ($ua)"); ... User-agent ========== -[+] Blacklisted - ----------- - 0001 -> friendly-scanner - 0002 -> pplsip - 0003 -> sipcli - 0004 -> sundayddr - 0005 -> iWar - 0006 -> sipsak - 0007 -> VaxSIPUserAgent - 0008 -> SimpleSIP - 0009 -> SIP Call - 0010 -> Ozeki - 0011 -> VoIPSec - 0012 -> SIPScan - 0013 -> Conaito - 0014 -> UsaAirport - 0015 -> PortSIP VoIP SDK - 0016 -> zxcvfdf11 - 0017 -> fdgddfg546df4g8d5f - -[+] Whitelisted - ----------- - 0001 -> my custom ua +{ + User-Agent: { + Blacklisted: { + Value: friendly-scanner + Value: pplsip + Value: sipcli + Value: sundayddr + Value: iWar + Value: sipsak + Value: VaxSIPUserAgent + Value: SimpleSIP + Value: SIP Call + Value: Ozeki + Value: VoIPSec + Value: SIPScan + Value: Conaito + Value: UsaAirport + Value: PortSIP VoIP SDK + Value: zxcvfdf11 + Value: fdgddfg546df4g8d5f + Value: siptest + Value: Nmap NSE + } + Whitelisted: { + Value: my custom ua + } + } +} ... 7.2. Statistics Example 1.25. kamcmd secfilter.stats ... -Blocked messages (blacklist) -============================ -[+] By user-agent : 1256 -[+] By country : 45 -[+] By from domain : 0 -[+] By to domain : 0 -[+] By contact domain: 1 -[+] By IP address : 2552 -[+] By from name : 0 -[+] By to name : 0 -[+] By contact name : 0 -[+] By from user : 316 -[+] By to user : 134 -[+] By contact user : 0 - -Allowed messages (whitelist) -============================ -[+] By user-agent : 0 -[+] By country : 478 -[+] By from domain : 0 -[+] By to domain : 0 -[+] By contact domain: 0 -[+] By IP address : 0 -[+] By from name : 0 -[+] By to name : 0 -[+] By contact name : 0 -[+] By from user : 0 -[+] By to user : 0 -[+] By contact user : 0 - -Other blocked messages -====================== -[+] Destinations : 0 -[+] SQL injection : 213 +{ + Blacklist: { + User-Agent: 1256 + Country: 45 + From-Domain: 0 + To-Domain: 0 + Contact-Domain: 1 + IP-Address: 2552 + From-Name: 0 + To-Name: 0 + Contact-Name: 0 + From-User: 316 + To-User: 0134 + Contact-User: 0 + } + Whitelist: { + User-Agent: 0 + Country: 478 + From-Domain: 0 + To-Domain: 0 + Contact-Domain: 0 + IP-Address: 0 + From-Name: 0 + To-Name: 0 + Contact-Name: 0 + From-User: 0 + To-User: 0 + Contact-User: 0 + } + Other: { + Destination: 0 + SQL-Injection: 213 + } +} ...

1 0

← Newer
1
...
21
22
23
24
25
26
27
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2022