sr-dev December 2015

sr-dev@lists.kamailio.org

30 participants
230 discussions

git:master:f703effa: auth_radius: support for not appending realm to the username passed to RADIUS

by Phil Lavin

Module: kamailio Branch: master Commit: f703effa2e2d6c6f426374d07d57636ecf248fd2 URL: https://github.com/kamailio/kamailio/commit/f703effa2e2d6c6f426374d07d57636… Author: Phil Lavin <phil.lavin(a)synety.com> Committer: Phil Lavin <phil.lavin(a)synety.com> Date: 2015-12-30T09:04:33Z auth_radius: support for not appending realm to the username passed to RADIUS - Implement append_realm_to_username parameter in auth_radius which allows the unmolested digest username to be passed to RADIUS in the User-Name attribute. This is required for some RADIUS implementations. --- Modified: modules/auth_radius/authrad_mod.c Modified: modules/auth_radius/authrad_mod.h Modified: modules/auth_radius/doc/auth_radius.xml Modified: modules/auth_radius/doc/auth_radius_admin.xml Modified: modules/auth_radius/sterman.c --- Diff: https://github.com/kamailio/kamailio/commit/f703effa2e2d6c6f426374d07d57636… Patch: https://github.com/kamailio/kamailio/commit/f703effa2e2d6c6f426374d07d57636… --- diff --git a/modules/auth_radius/authrad_mod.c b/modules/auth_radius/authrad_mod.c index f4a9eac..94ca865 100644 --- a/modules/auth_radius/authrad_mod.c +++ b/modules/auth_radius/authrad_mod.c @@ -66,6 +66,7 @@ static int service_type = -1; int use_ruri_flag = -1; int ar_radius_avps_mode = 0; +int append_realm_to_username = 1; static char *auth_extra_str = 0; struct extra_attr *auth_extra = 0; @@ -95,6 +96,7 @@ static param_export_t params[] = { {"use_ruri_flag", INT_PARAM, &use_ruri_flag }, {"auth_extra", PARAM_STRING, &auth_extra_str }, {"radius_avps_mode", INT_PARAM, &ar_radius_avps_mode }, + {"append_realm_to_username", INT_PARAM, &append_realm_to_username }, {0, 0, 0} }; diff --git a/modules/auth_radius/authrad_mod.h b/modules/auth_radius/authrad_mod.h index c6561d3..ac8fe01 100644 --- a/modules/auth_radius/authrad_mod.h +++ b/modules/auth_radius/authrad_mod.h @@ -41,6 +41,7 @@ extern struct extra_attr *auth_extra; extern int use_ruri_flag; extern int ar_radius_avps_mode; +extern int append_realm_to_username; extern auth_api_s_t auth_api; diff --git a/modules/auth_radius/doc/auth_radius.xml b/modules/auth_radius/doc/auth_radius.xml index 5ae4e28..fd02edc 100644 --- a/modules/auth_radius/doc/auth_radius.xml +++ b/modules/auth_radius/doc/auth_radius.xml @@ -38,6 +38,11 @@ <surname>Janak</surname> <email>jan(a)iptel.org</email> </editor> + <editor> + <firstname>Phil</firstname> + <surname>Lavin</surname> + <email>phil.lavin(a)synety.com</email> + </editor> </authorgroup> <copyright> <year>2002</year> diff --git a/modules/auth_radius/doc/auth_radius_admin.xml b/modules/auth_radius/doc/auth_radius_admin.xml index 7977162..0475d57 100644 --- a/modules/auth_radius/doc/auth_radius_admin.xml +++ b/modules/auth_radius/doc/auth_radius_admin.xml @@ -206,6 +206,23 @@ modparam("auth_radius", "radius_avps_mode", 1) </programlisting> </example> </section> + <section id="auth_radius.p.append_realm_to_username"> + <title><varname>append_realm_to_username</varname> (integer)</title> + <para> + If set to 1, the username passed to the RADIUS server will have the + digest realm appended to it, if no domain is provided in the digest + username. + </para> + <para> + Default value is 1. + </para> + <example> + <title><varname>append_realm_to_username</varname> parameter usage</title> + <programlisting format="linespecific"> +modparam("auth_radius", "append_realm_to_username", 0) + </programlisting> + </example> + </section> </section> <section> diff --git a/modules/auth_radius/sterman.c b/modules/auth_radius/sterman.c index 88eef1d..f95fdbc 100644 --- a/modules/auth_radius/sterman.c +++ b/modules/auth_radius/sterman.c @@ -243,7 +243,7 @@ int radius_authorize_sterman(struct sip_msg* _msg, dig_cred_t* _cred, str* _meth * Add all the user digest parameters according to the qop defined. * Most devices tested only offer support for the simplest digest. */ - if (_cred->username.domain.len) { + if (_cred->username.domain.len || !append_realm_to_username) { if (!rc_avpair_add(rh, &send, attrs[A_USER_NAME].v, _cred->username.whole.s, _cred->username.whole.len, 0)) { LM_ERR("unable to add User-Name attribute\n"); goto err;

8 years, 10 months

[kamailio] auth_radius: support for not appending realm to the username passed to RADIUS (#457)

by Phil Lavin

- Implement append_realm_to_username parameter in auth_radius which allows the unmolested digest username to be passed to RADIUS in the User-Name attribute. This is required for some RADIUS implementations. This is the same PR as #456 except based on master You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/457 -- Commit Summary -- * auth_radius: support for not appending realm to the username passed to RADIUS -- File Changes -- M modules/auth_radius/authrad_mod.c (2) M modules/auth_radius/authrad_mod.h (1) M modules/auth_radius/doc/auth_radius.xml (5) M modules/auth_radius/doc/auth_radius_admin.xml (17) M modules/auth_radius/sterman.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/457.patch https://github.com/kamailio/kamailio/pull/457.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/457

8 years, 10 months

[kamailio] auth_radius: support for not appending realm to the username passed to RADIUS (#456)

by Phil Lavin

- Implement append_realm_to_username parameter in auth_radius which allows the unmolested digest username to be passed to RADIUS in the User-Name attribute. This is required for some RADIUS implementations. Apologies if this doesn't belong in the 4.3 branch - this is what the commit is based off and tested on. Let me know if I should move it elsewhere... You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/456 -- Commit Summary -- * auth_radius: support for not appending realm to the username passed to RADIUS -- File Changes -- M modules/auth_radius/authrad_mod.c (12) M modules/auth_radius/authrad_mod.h (1) M modules/auth_radius/doc/auth_radius.xml (5) M modules/auth_radius/doc/auth_radius_admin.xml (17) M modules/auth_radius/sterman.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/456.patch https://github.com/kamailio/kamailio/pull/456.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/456

8 years, 10 months

git:master:d83a56bc: tm: don't free tm cell still linked in wait timer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d83a56bcdfeb8ffc75166a62e11ceb4c057c3ce5 URL: https://github.com/kamailio/kamailio/commit/d83a56bcdfeb8ffc75166a62e11ceb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-30T00:29:49+01:00 tm: don't free tm cell still linked in wait timer - wait timer should do the free - friendlier handling of situation when modules binding to tm do inconsistent unref operations --- Modified: modules/tm/h_table.c Modified: modules/tm/t_funcs.c Modified: modules/tm/t_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/d83a56bcdfeb8ffc75166a62e11ceb4… Patch: https://github.com/kamailio/kamailio/commit/d83a56bcdfeb8ffc75166a62e11ceb4… --- diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 105230c..ea38de0 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -40,6 +40,7 @@ #include "t_reply.h" #include "t_cancel.h" #include "t_stats.h" +#include "t_funcs.h" #include "h_table.h" #include "../../fix_lumps.h" /* free_via_clen_lump */ #include "timer.h" @@ -129,6 +130,11 @@ void free_cell_helper(tm_cell_t* dead_cell, int silent, const char *fname, unsig if(likely(silent==0)) { LM_WARN("removed cell %p is still linked in hash table (%s:%u)\n", dead_cell, fname, fline); + if(t_on_wait(dead_cell)) { + LM_WARN("cell %p is still linked in wait timer (%s:%u)" + " - skip freeing now\n", dead_cell, fname, fline); + return; + } } unlink_timers(dead_cell); remove_from_hash_table_unsafe(dead_cell); diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index cec58e0..e498713 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -150,6 +150,12 @@ void put_on_wait( struct cell *Trans ) } +int t_on_wait(tm_cell_t *Trans) +{ + if(Trans->wait_timer.prev!=NULL || Trans->wait_timer.next!=NULL) + return 1; + return 0; +} /* WARNING: doesn't work from failure route (deadlock, uses t_reply => * tries to get the reply lock again) */ diff --git a/modules/tm/t_funcs.h b/modules/tm/t_funcs.h index 173851b..b7b653e 100644 --- a/modules/tm/t_funcs.h +++ b/modules/tm/t_funcs.h @@ -190,6 +190,7 @@ int get_ip_and_port_from_uri( str* uri , unsigned int *param_ip, void put_on_wait( struct cell *Trans ); +int t_on_wait(tm_cell_t *Trans); int t_relay_to( struct sip_msg *p_msg ,

8 years, 10 months

git:master:f0b5fa74: tsilo: init and safety check for t value before unref

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f0b5fa7415d81cfc6df1e4dd51cd508898df5419 URL: https://github.com/kamailio/kamailio/commit/f0b5fa7415d81cfc6df1e4dd51cd508… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-29T23:48:39+01:00 tsilo: init and safety check for t value before unref --- Modified: modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/f0b5fa7415d81cfc6df1e4dd51cd508… Patch: https://github.com/kamailio/kamailio/commit/f0b5fa7415d81cfc6df1e4dd51cd508… --- diff --git a/modules/tsilo/ts_append.c b/modules/tsilo/ts_append.c index 3c47663..db47fdf 100644 --- a/modules/tsilo/ts_append.c +++ b/modules/tsilo/ts_append.c @@ -82,7 +82,7 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { } int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str *uri) { - struct cell *t; + struct cell *t=0; struct cell *orig_t; struct sip_msg *orig_msg; int ret; @@ -130,7 +130,7 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str * done: /* unref the transaction which had been referred by t_lookup_ident() call. * Restore the original transaction (if any) */ - _tmb.unref_cell(t); + if(t) _tmb.unref_cell(t); _tmb.t_sett(orig_t, T_BR_UNDEFINED); return ret;

8 years, 10 months

git:master:27495c7c: tm: silent mode when freeing transactions at shutdown

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 27495c7c34bf963e403c0f711daf9b76076d2ec3 URL: https://github.com/kamailio/kamailio/commit/27495c7c34bf963e403c0f711daf9b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-29T23:39:18+01:00 tm: silent mode when freeing transactions at shutdown - they are still linked in tm hash table as it should be, so no warn message for that case --- Modified: modules/tm/h_table.c Modified: modules/tm/h_table.h --- Diff: https://github.com/kamailio/kamailio/commit/27495c7c34bf963e403c0f711daf9b7… Patch: https://github.com/kamailio/kamailio/commit/27495c7c34bf963e403c0f711daf9b7… --- diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 5aee155..105230c 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -115,7 +115,7 @@ unsigned int transaction_count( void ) -void free_cell_helper( struct cell* dead_cell, const char *fname, unsigned int fline ) +void free_cell_helper(tm_cell_t* dead_cell, int silent, const char *fname, unsigned int fline ) { char *b; int i; @@ -126,8 +126,10 @@ void free_cell_helper( struct cell* dead_cell, const char *fname, unsigned int f LM_DBG("freeing transaction %p from %s:%u\n", dead_cell, fname, fline); if(dead_cell->prev_c!=NULL && dead_cell->next_c!=NULL) { - LM_WARN("removed cell %p is still linked in hash table (%s:%u)\n", + if(likely(silent==0)) { + LM_WARN("removed cell %p is still linked in hash table (%s:%u)\n", dead_cell, fname, fline); + } unlink_timers(dead_cell); remove_from_hash_table_unsafe(dead_cell); } @@ -437,7 +439,7 @@ void free_hash_table( ) /* delete all synonyms at hash-collision-slot i */ clist_foreach_safe(&_tm_table->entries[i], p_cell, tmp_cell, next_c){ - free_cell(p_cell); + free_cell_silent(p_cell); } } shm_free(_tm_table); diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 7cda34e..0cbe24c 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -553,8 +553,9 @@ struct s_table* tm_get_table(void); struct s_table* init_hash_table(void); void free_hash_table(void); -void free_cell_helper( struct cell* dead_cell, const char *fname, unsigned int fline); -#define free_cell(t) free_cell_helper((t), __FILE__, __LINE__) +void free_cell_helper(tm_cell_t* dead_cell, int silent, const char *fname, unsigned int fline); +#define free_cell(t) free_cell_helper((t), 0, __FILE__, __LINE__) +#define free_cell_silent(t) free_cell_helper((t), 1, __FILE__, __LINE__) struct cell* build_cell( struct sip_msg* p_msg );

8 years, 10 months

git:master:1bd8d471: permissions: regeneration of readme file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1bd8d47148f375462d895ab5bac77eacc965f9c5 URL: https://github.com/kamailio/kamailio/commit/1bd8d47148f375462d895ab5bac77ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-28T23:25:01+01:00 permissions: regeneration of readme file --- Modified: modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/1bd8d47148f375462d895ab5bac77ea… Patch: https://github.com/kamailio/kamailio/commit/1bd8d47148f375462d895ab5bac77ea…

8 years, 10 months

git:master:dcb11629: permissions: documentation for max_subnets parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dcb116290209a6b42020a925bc657005c8e3048b URL: https://github.com/kamailio/kamailio/commit/dcb116290209a6b42020a925bc65700… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-28T23:24:38+01:00 permissions: documentation for max_subnets parameter --- Modified: modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dcb116290209a6b42020a925bc65700… Patch: https://github.com/kamailio/kamailio/commit/dcb116290209a6b42020a925bc65700… --- diff --git a/modules/permissions/doc/permissions_admin.xml b/modules/permissions/doc/permissions_admin.xml index a38e304..6b33e81 100644 --- a/modules/permissions/doc/permissions_admin.xml +++ b/modules/permissions/doc/permissions_admin.xml @@ -772,6 +772,26 @@ modparam("permissions", "peer_tag_mode", 1) </programlisting> </example> </section> + <section id ="permissions.p.max_subnets"> + <title><varname>max_subnets</varname> (int)</title> + <para> + The maximum number of subnet addresses to be loaded from + address table. + </para> + <para> + <emphasis> + Default value is <quote>512</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>max_subnets</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("permissions", "max_subnets", 1024) +... +</programlisting> + </example> + </section> </section> <section>

8 years, 10 months

git:master:46b10dfe: permissions: max_subnets - new parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 46b10dfe1941ab70676a10d5f61d749fd74dfa3c URL: https://github.com/kamailio/kamailio/commit/46b10dfe1941ab70676a10d5f61d749… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-28T23:19:14+01:00 permissions: max_subnets - new parameter - specify the max size for address subnets array - default value: 512 - if there are more subnet records in address tables than the value of max_subnets, increase it --- Modified: modules/permissions/hash.c Modified: modules/permissions/hash.h Modified: modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/46b10dfe1941ab70676a10d5f61d749… Patch: https://github.com/kamailio/kamailio/commit/46b10dfe1941ab70676a10d5f61d749… --- diff --git a/modules/permissions/hash.c b/modules/permissions/hash.c index 2aee8b8..cfc81fe 100644 --- a/modules/permissions/hash.c +++ b/modules/permissions/hash.c @@ -44,6 +44,9 @@ static int_str tag_avp; extern int peer_tag_mode; +extern int _perm_max_subnets; + +#define PERM_MAX_SUBNETS _perm_max_subnets /* * Parse and set tag AVP specs diff --git a/modules/permissions/hash.h b/modules/permissions/hash.h index cfb6813..0ae7854 100644 --- a/modules/permissions/hash.h +++ b/modules/permissions/hash.h @@ -176,8 +176,6 @@ int addr_hash_table_rpc_print(struct addr_list** table, rpc_t* rpc, void* c); void empty_addr_hash_table(struct addr_list** hash_table); -#define PERM_MAX_SUBNETS 512 - /* * Structure used to store a subnet diff --git a/modules/permissions/permissions.c b/modules/permissions/permissions.c index 724e4e8..f4133f6 100644 --- a/modules/permissions/permissions.c +++ b/modules/permissions/permissions.c @@ -88,6 +88,8 @@ str port_col = str_init("port"); /* Name of port column */ static int check_all_branches = 1; +int _perm_max_subnets = 512; + /* * Convert the name of the files into table index */ @@ -178,6 +180,7 @@ static param_export_t params[] = { {"ip_addr_col", PARAM_STR, &ip_addr_col }, {"mask_col", PARAM_STR, &mask_col }, {"port_col", PARAM_STR, &port_col }, + {"max_subnets", PARAM_INT, &_perm_max_subnets }, {0, 0, 0} };

8 years, 10 months

git:master:82d7e06b: permissions: max size of subnet array set to 512

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 82d7e06b09f02a2e6dab9f171586f9cd6f636f5b URL: https://github.com/kamailio/kamailio/commit/82d7e06b09f02a2e6dab9f171586f9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-28T23:11:59+01:00 permissions: max size of subnet array set to 512 - was 128, which can be insufficient for large interconnect --- Modified: modules/permissions/hash.h --- Diff: https://github.com/kamailio/kamailio/commit/82d7e06b09f02a2e6dab9f171586f9c… Patch: https://github.com/kamailio/kamailio/commit/82d7e06b09f02a2e6dab9f171586f9c… --- diff --git a/modules/permissions/hash.h b/modules/permissions/hash.h index 1823084..cfb6813 100644 --- a/modules/permissions/hash.h +++ b/modules/permissions/hash.h @@ -176,7 +176,7 @@ int addr_hash_table_rpc_print(struct addr_list** table, rpc_t* rpc, void* c); void empty_addr_hash_table(struct addr_list** hash_table); -#define PERM_MAX_SUBNETS 128 +#define PERM_MAX_SUBNETS 512 /*

8 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2015