sr-dev March 2019

sr-dev@lists.kamailio.org

28 participants
322 discussions

[kamailio/kamailio] AUTH_USERNAME_EXPIRED auth api return code (#1910)

by juha-h

This pull request adds AUTH_USERNAME_EXPIRED auth api return code and uses it in ephemeral authentication when username has expired. Script can then tell the user about the expiration with a suitable response. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1910 -- Commit Summary -- * - added AUTH_USERNAME_EXPIRED auth api return code and used it in auth -- File Changes -- M src/modules/auth/api.h (1) M src/modules/auth_ephemeral/authorize.c (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1910.patch https://github.com/kamailio/kamailio/pull/1910.diff -- 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/pull/1910

5 years, 8 months

git:master:4489b19f: Merge pull request #1910 from kamailio/auth_username_expired

by GitHub

Module: kamailio Branch: master Commit: 4489b19fe3c3d82442c98323a348cca69ef520cc URL: https://github.com/kamailio/kamailio/commit/4489b19fe3c3d82442c98323a348cca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-03-28T17:14:43+01:00 Merge pull request #1910 from kamailio/auth_username_expired AUTH_USERNAME_EXPIRED auth api return code --- Modified: src/modules/auth/api.h Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/4489b19fe3c3d82442c98323a348cca… Patch: https://github.com/kamailio/kamailio/commit/4489b19fe3c3d82442c98323a348cca… --- diff --git a/src/modules/auth/api.h b/src/modules/auth/api.h index 9730b409ed..33d131840a 100644 --- a/src/modules/auth/api.h +++ b/src/modules/auth/api.h @@ -39,6 +39,7 @@ */ typedef enum auth_cfg_result { AUTH_USER_MISMATCH = -8, /*!< Auth user != From/To user */ + AUTH_USERNAME_EXPIRED = -7, /*!< Ephemeral auth username expired */ AUTH_NONCE_REUSED = -6, /*!< Returned if nonce is used more than once */ AUTH_NO_CREDENTIALS = -5, /*!< Credentials missing */ AUTH_STALE_NONCE = -4, /*!< Stale nonce */ diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index 745f12d7ab..216332b321 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -203,7 +203,7 @@ int autheph_verify_timestamp(str *_username) if (cur_time > expires) { LM_WARN("username has expired\n"); - return -1; + return AUTH_USERNAME_EXPIRED; } return 0; @@ -255,10 +255,16 @@ static inline int digest_authenticate(struct sip_msg *_m, str *_realm, username = ((auth_body_t *) h->parsed)->digest.username.whole; LM_DBG("username: %.*s\n", username.len, username.s); - if (autheph_verify_timestamp(&username) < 0) + int res = autheph_verify_timestamp(&username); + if (res < 0) { - LM_ERR("invalid timestamp in username\n"); - return AUTH_ERROR; + if (res == -1) + { + LM_ERR("invalid timestamp in username\n"); + return AUTH_ERROR; + } else { + return AUTH_USERNAME_EXPIRED; + } } SECRET_LOCK; @@ -489,10 +495,16 @@ int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) return AUTH_ERROR; } - if (autheph_verify_timestamp(susername) < 0) + int res = autheph_verify_timestamp(susername); + if (res < 0) { - LM_ERR("invalid timestamp in username\n"); - return AUTH_ERROR; + if (res == -1) + { + LM_ERR("invalid timestamp in username\n"); + return AUTH_ERROR; + } else { + return AUTH_USERNAME_EXPIRED; + } } LM_DBG("username: %.*s\n", susername->len, susername->s);

5 years, 8 months

git:master:95c18631: - added AUTH_USERNAME_EXPIRED auth api return code and used it in auth

by Juha Heinanen

Module: kamailio Branch: master Commit: 95c18631032c5510d4dc1e6b7aa815256ff3e688 URL: https://github.com/kamailio/kamailio/commit/95c18631032c5510d4dc1e6b7aa8152… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2019-03-27T11:10:16+02:00 - added AUTH_USERNAME_EXPIRED auth api return code and used it in auth ephemeral authentication, when username is expired --- Modified: src/modules/auth/api.h Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/95c18631032c5510d4dc1e6b7aa8152… Patch: https://github.com/kamailio/kamailio/commit/95c18631032c5510d4dc1e6b7aa8152… --- diff --git a/src/modules/auth/api.h b/src/modules/auth/api.h index 9730b409ed..33d131840a 100644 --- a/src/modules/auth/api.h +++ b/src/modules/auth/api.h @@ -39,6 +39,7 @@ */ typedef enum auth_cfg_result { AUTH_USER_MISMATCH = -8, /*!< Auth user != From/To user */ + AUTH_USERNAME_EXPIRED = -7, /*!< Ephemeral auth username expired */ AUTH_NONCE_REUSED = -6, /*!< Returned if nonce is used more than once */ AUTH_NO_CREDENTIALS = -5, /*!< Credentials missing */ AUTH_STALE_NONCE = -4, /*!< Stale nonce */ diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index 745f12d7ab..216332b321 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -203,7 +203,7 @@ int autheph_verify_timestamp(str *_username) if (cur_time > expires) { LM_WARN("username has expired\n"); - return -1; + return AUTH_USERNAME_EXPIRED; } return 0; @@ -255,10 +255,16 @@ static inline int digest_authenticate(struct sip_msg *_m, str *_realm, username = ((auth_body_t *) h->parsed)->digest.username.whole; LM_DBG("username: %.*s\n", username.len, username.s); - if (autheph_verify_timestamp(&username) < 0) + int res = autheph_verify_timestamp(&username); + if (res < 0) { - LM_ERR("invalid timestamp in username\n"); - return AUTH_ERROR; + if (res == -1) + { + LM_ERR("invalid timestamp in username\n"); + return AUTH_ERROR; + } else { + return AUTH_USERNAME_EXPIRED; + } } SECRET_LOCK; @@ -489,10 +495,16 @@ int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) return AUTH_ERROR; } - if (autheph_verify_timestamp(susername) < 0) + int res = autheph_verify_timestamp(susername); + if (res < 0) { - LM_ERR("invalid timestamp in username\n"); - return AUTH_ERROR; + if (res == -1) + { + LM_ERR("invalid timestamp in username\n"); + return AUTH_ERROR; + } else { + return AUTH_USERNAME_EXPIRED; + } } LM_DBG("username: %.*s\n", susername->len, susername->s);

5 years, 8 months

git:master:47cde53e: app_lua: use lua_getstack() to init structure for debug info

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 47cde53eb257898c25212523d013bd7e74a30b28 URL: https://github.com/kamailio/kamailio/commit/47cde53eb257898c25212523d013bd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-28T05:07:56+01:00 app_lua: use lua_getstack() to init structure for debug info --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/47cde53eb257898c25212523d013bd7… Patch: https://github.com/kamailio/kamailio/commit/47cde53eb257898c25212523d013bd7… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index ee655c3e54..bd3773e46c 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1946,14 +1946,25 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) ms = TICKS_TO_MS(get_ticks_raw()) - ms; if(ms >= cfg_get(core, core_cfg, latency_limit_action) && is_printable(cfg_get(core, core_cfg, latency_log))) { - lua_getinfo(L, "nSl", &dinfo); - LOG(cfg_get(core, core_cfg, latency_log), - "alert - action KSR.%s%s%s(...)" - " took too long [%u ms] (%s:%d - %s [%s])\n", - (ket->mname.len>0)?ket->mname.s:"", - (ket->mname.len>0)?".":"", ket->fname.s, ms, - dinfo.short_src, dinfo.currentline, - (dinfo.name?dinfo.name:"<unknown>"), dinfo.what); + memset(&dinfo, 0, sizeof(lua_Debug)); + if(lua_getstack(L, 0, &dinfo)==0 + && lua_getinfo(L, "nSl", &dinfo)==0) { + LOG(cfg_get(core, core_cfg, latency_log), + "alert - action KSR.%s%s%s(...)" + " took too long [%u ms] (%s:%d - %s [%s])\n", + (ket->mname.len>0)?ket->mname.s:"", + (ket->mname.len>0)?".":"", ket->fname.s, ms, + (dinfo.short_src[0])?dinfo.short_src:"<unknown>", + dinfo.currentline, + (dinfo.name)?dinfo.name:"<unknown>", + (dinfo.what)?dinfo.what:"<unknown>"); + } else { + LOG(cfg_get(core, core_cfg, latency_log), + "alert - action KSR.%s%s%s(...)" + " took too long [%u ms]\n", + (ket->mname.len>0)?ket->mname.s:"", + (ket->mname.len>0)?".":"", ket->fname.s, ms); + } } }

5 years, 8 months

git:master:5b81ee81: tls: use OPENSSL_init_ssl() for libssl 1.1

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5b81ee816d77f4b2874bacb0c322de3bdefb074e URL: https://github.com/kamailio/kamailio/commit/5b81ee816d77f4b2874bacb0c322de3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-27T12:16:30+01:00 tls: use OPENSSL_init_ssl() for libssl 1.1 --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/5b81ee816d77f4b2874bacb0c322de3… Patch: https://github.com/kamailio/kamailio/commit/5b81ee816d77f4b2874bacb0c322de3… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index a7f9ad7dd2..1046d38d3f 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -627,7 +627,13 @@ int tls_mod_pre_init_h(void) return 0; } 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); +#else + LM_DBG("preparing tls env for modules initialization (libssl <=1.0)\n"); SSL_library_init(); +#endif SSL_load_error_strings(); tls_mod_preinitialized=1; return 0;

5 years, 8 months

[kamailio/kamailio] IPOPS detailed_ip_type: wrong for PRIVATE IP (#1906)

by homer5000

### Description I use the detailed_ipv4_type func from the ipops module for determine the source IP of the request: ``` # check src ip if (detailed_ip_type("$si", "$var(src_t)")) { xlog("L_INFO","Sourece IP address ($si) is of detailed type: $var(src_t)\n"); ... ``` When $si = 172.22.32.140 detailed_ip_type return PUBLIC, but it is PRIVATE. #### Log Messages ``` INFO: <script>: Sourece IP address (172.22.32.140) is of detailed type: PUBLIC ``` ### Additional Information Maybe the reason is here: modules / ipops / detailed_ip_type.c ``` (Lucian Balaceanu 2016-09-01 18:39:55 +0300 48) { 0xac100000, "PRIVATE", 0xfffe0000 }, // 172.16/12 ``` Maybe fffe should be fff0 - it's /15 now.. so 172.16 and 172.17 only match. -- 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/1906

5 years, 8 months

git:5.2:8816f9d5: ipops: Fixed mask for 172.16.0.0/12 network (#1907)

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 8816f9d53ceab84dbe97df50ce2dbe8526756b01 URL: https://github.com/kamailio/kamailio/commit/8816f9d53ceab84dbe97df50ce2dbe8… Author: sergey-safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-03-27T08:45:06+01:00 ipops: Fixed mask for 172.16.0.0/12 network (#1907) (cherry picked from commit 1b6332fe565d97695a1eb84172e6f19f26381101) --- Modified: src/modules/ipops/detailed_ip_type.c --- Diff: https://github.com/kamailio/kamailio/commit/8816f9d53ceab84dbe97df50ce2dbe8… Patch: https://github.com/kamailio/kamailio/commit/8816f9d53ceab84dbe97df50ce2dbe8… --- diff --git a/src/modules/ipops/detailed_ip_type.c b/src/modules/ipops/detailed_ip_type.c index 529645e990..90fbbee203 100644 --- a/src/modules/ipops/detailed_ip_type.c +++ b/src/modules/ipops/detailed_ip_type.c @@ -45,7 +45,7 @@ static ip4_node IPv4ranges[IPv4RANGES_SIZE] = { { 0xc0a80000, "PRIVATE", 0xffff0000 }, // 192.168/16 { 0xa9fe0000, "LINK-LOCAL", 0xffff0000 }, // 169.254/16 { 0xc6120000, "RESERVED", 0xfffe0000 }, // 198.18/15 - { 0xac100000, "PRIVATE", 0xfffe0000 }, // 172.16/12 + { 0xac100000, "PRIVATE", 0xfff00000 }, // 172.16/12 { 0x64400000, "SHARED", 0xffc00000 }, // 100.64/10 { 0x7f000000, "LOOPBACK", 0xff000000 }, // 127.0/8 { 0x0a000000, "PRIVATE", 0xff000000 }, // 10/8

5 years, 8 months

git:5.1:de236478: ipops: Fixed mask for 172.16.0.0/12 network (#1907)

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: de2364784f5c7b257ff796a83d12f3bb2d130308 URL: https://github.com/kamailio/kamailio/commit/de2364784f5c7b257ff796a83d12f3b… Author: sergey-safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-03-27T08:45:10+01:00 ipops: Fixed mask for 172.16.0.0/12 network (#1907) (cherry picked from commit 1b6332fe565d97695a1eb84172e6f19f26381101) --- Modified: src/modules/ipops/detailed_ip_type.c --- Diff: https://github.com/kamailio/kamailio/commit/de2364784f5c7b257ff796a83d12f3b… Patch: https://github.com/kamailio/kamailio/commit/de2364784f5c7b257ff796a83d12f3b… --- diff --git a/src/modules/ipops/detailed_ip_type.c b/src/modules/ipops/detailed_ip_type.c index 529645e990..90fbbee203 100644 --- a/src/modules/ipops/detailed_ip_type.c +++ b/src/modules/ipops/detailed_ip_type.c @@ -45,7 +45,7 @@ static ip4_node IPv4ranges[IPv4RANGES_SIZE] = { { 0xc0a80000, "PRIVATE", 0xffff0000 }, // 192.168/16 { 0xa9fe0000, "LINK-LOCAL", 0xffff0000 }, // 169.254/16 { 0xc6120000, "RESERVED", 0xfffe0000 }, // 198.18/15 - { 0xac100000, "PRIVATE", 0xfffe0000 }, // 172.16/12 + { 0xac100000, "PRIVATE", 0xfff00000 }, // 172.16/12 { 0x64400000, "SHARED", 0xffc00000 }, // 100.64/10 { 0x7f000000, "LOOPBACK", 0xff000000 }, // 127.0/8 { 0x0a000000, "PRIVATE", 0xff000000 }, // 10/8

5 years, 8 months

[kamailio/kamailio] ipops: Fixed mask for 172.16.0.0/12 network (#1907)

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 - [x] Related to issue #1906 #### Description Fixed typo in 172.16.0.0/12 network mask You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1907 -- Commit Summary -- * ipops: Fixed mask for 172.16.0.0/12 network -- File Changes -- M src/modules/ipops/detailed_ip_type.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1907.patch https://github.com/kamailio/kamailio/pull/1907.diff -- 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/pull/1907

5 years, 8 months

git:master:1b6332fe: ipops: Fixed mask for 172.16.0.0/12 network (#1907)

by Henning Westerholt

Module: kamailio Branch: master Commit: 1b6332fe565d97695a1eb84172e6f19f26381101 URL: https://github.com/kamailio/kamailio/commit/1b6332fe565d97695a1eb84172e6f19… Author: sergey-safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-03-27T08:43:42+01:00 ipops: Fixed mask for 172.16.0.0/12 network (#1907) --- Modified: src/modules/ipops/detailed_ip_type.c --- Diff: https://github.com/kamailio/kamailio/commit/1b6332fe565d97695a1eb84172e6f19… Patch: https://github.com/kamailio/kamailio/commit/1b6332fe565d97695a1eb84172e6f19… --- diff --git a/src/modules/ipops/detailed_ip_type.c b/src/modules/ipops/detailed_ip_type.c index 529645e990..90fbbee203 100644 --- a/src/modules/ipops/detailed_ip_type.c +++ b/src/modules/ipops/detailed_ip_type.c @@ -45,7 +45,7 @@ static ip4_node IPv4ranges[IPv4RANGES_SIZE] = { { 0xc0a80000, "PRIVATE", 0xffff0000 }, // 192.168/16 { 0xa9fe0000, "LINK-LOCAL", 0xffff0000 }, // 169.254/16 { 0xc6120000, "RESERVED", 0xfffe0000 }, // 198.18/15 - { 0xac100000, "PRIVATE", 0xfffe0000 }, // 172.16/12 + { 0xac100000, "PRIVATE", 0xfff00000 }, // 172.16/12 { 0x64400000, "SHARED", 0xffc00000 }, // 100.64/10 { 0x7f000000, "LOOPBACK", 0xff000000 }, // 127.0/8 { 0x0a000000, "PRIVATE", 0xff000000 }, // 10/8

5 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2019