May 2013 - sr-dev - kamailio.org

[tracker] Task opened: modules/debugger: be able to log assign actions (Attachment added)
by sip-router 28 May '13

28 May '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Víctor Seva (linuxmaniac) Attached to Project - sip-router Summary - modules/debugger: be able to log assign actions Task Type - Feature Request Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Implementing the idea: "From what Andreas suggesting, printing the value of variables as they are assigned is missing, probably can be added by hooking in the interpreter when doing the assignment operation." [0] [0] http://lists.sip-router.org/pipermail/sr-users/2013-April/077628.html I had to change some things on core to be able to get this working: - lvalue.[c/h]: from pv_spec_t to pv_spec_t* ( in order to be able to search for the name of a var with the pointer) - cfg.y: use pv_cache_get() to get the pv_spec_t* - lvalue.[c/h]: add callback to log_assign - pvapi.c|pvar.h: add helper function pv_cache_get_name(pv_spec_t*) to get the name of a pvar on cache Please, review if these changes are the right thing to do in this case. On module debugger there is a cache of logged vars in order to not call pv_cache_get_name() over a over again. One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=299 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: misc_radius: updated readme
by Daniel-Constantin Mierla 28 May '13

28 May '13

Module: sip-router Branch: master Commit: 8cba441b17c75cd078a499c24268c8a60c6b1771 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8cba441… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 28 15:48:22 2013 +0200 misc_radius: updated readme - from a patch by Victor V. Kustov --- modules/misc_radius/README | 51 +++++++++++++++++++------ modules/misc_radius/doc/misc_radius_admin.xml | 34 +++++++++++++++- 2 files changed, 70 insertions(+), 15 deletions(-) diff --git a/modules/misc_radius/README b/modules/misc_radius/README index 50d6008..ed2a47c 100644 --- a/modules/misc_radius/README +++ b/modules/misc_radius/README @@ -59,11 +59,12 @@ Daniel-Constantin Mierla 1.10. uri_extra parameter usage 1.11. use_sip_uri_host parameter usage 1.12. common_response parameter usage - 1.13. radius_load_caller_avps() usage - 1.14. radius_load_callee_avps() usage - 1.15. radius_is_user_in() usage - 1.16. radius_does_uri_exist() usage - 1.17. radius_does_uri_user_exist() usage + 1.13. radius response with common_response value 1 + 1.14. radius_load_caller_avps() usage + 1.15. radius_load_callee_avps() usage + 1.16. radius_is_user_in() usage + 1.17. radius_does_uri_exist() usage + 1.18. radius_does_uri_user_exist() usage Chapter 1. Admin Guide @@ -293,13 +294,39 @@ modparam("misc_radius", "use_sip_uri_host", 1) 3.11. common_response (integer) Set it to 1 if you need common radius response attributes to be added - as AVPs. + as AVPs in radius_load_caller_avps and radius_load_callee_avps with + name as radius attribute name and value as radius attribute value. Default value is "0". Example 1.12. common_response parameter usage ... -modparam("misc_radius", "common_response", 21) +modparam("misc_radius", "common_response", 1) +... +radius_load_caller_avps($fU); +... + + Example 1.13. radius response with common_response value 1 +... + Sending Access-Accept of id 60 to 192.168.25.32 port 59736 + Session-Timeout = 4261674 + next-hop-ip = "SIP/00111222333444@cisco-out" + SIP-AVP = "email:sr-users@lists.sip-router.org session-timeout#161 next-hop- +ip:h323/0001111@myvoip-gate.kamailio.org" + session-protocol = "SIP" +... + +$avp(Session-Timeout) has integer value 4261674 +$avp(next-hop-ip) has string value "SIP/005555777888@cisco-out" +$avp(session-protocol) has string value "SIP" +$avp(SIP-AVP) has string value "email:sr-users@lists.sip-router.org session-tim +eout#161 next-hop-ip:h323/0001111@myvoip-gate.kamailio.org" + +... + When recieving negative response, check appropriate avp's: + $avp(Reply-Message) = "Not enough money on deposit '-89.83'. Rejected" + $avp(Filter-Id) = "neg_deposit" +... 4. Functions @@ -317,7 +344,7 @@ modparam("misc_radius", "common_response", 21) This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.13. radius_load_caller_avps() usage + Example 1.14. radius_load_caller_avps() usage ... radius_load_caller_avps("$fU@$fd"); # take caller from From URI ... @@ -332,7 +359,7 @@ radius_load_caller_avps("$au@$ar"); # take caller from Authorization This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.14. radius_load_callee_avps() usage + Example 1.15. radius_load_callee_avps() usage ... radius_load_callee_avps("$rU@$rd"); # take callee from Request-URI ... @@ -347,7 +374,7 @@ radius_load_callee_avps("$rU@$rd"); # take callee from Request-URI This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, and LOCAL_ROUTE. - Example 1.15. radius_is_user_in() usage + Example 1.16. radius_is_user_in() usage ... radius_is_user_in("$rU@$rd", "1"); # take user from Request-URI ... @@ -362,7 +389,7 @@ radius_is_user_in("$au@$ar", "group_x");# take user from credentials This function can be used from REQUEST_ROUTE and LOCAL_ROUTE. - Example 1.16. radius_does_uri_exist() usage + Example 1.17. radius_does_uri_exist() usage ... if (radius_does_uri_exist()) ... # check Request-URI ... @@ -379,7 +406,7 @@ if (radius_does_uri_exist("$avp(i:99)")) ... # check URI in $avp(i:99) This function can be used from REQUEST_ROUTE and LOCAL_ROUTE. - Example 1.17. radius_does_uri_user_exist() usage + Example 1.18. radius_does_uri_user_exist() usage ... if (radius_does_uri_user_exist()) ... # check Request-URI userpart ... diff --git a/modules/misc_radius/doc/misc_radius_admin.xml b/modules/misc_radius/doc/misc_radius_admin.xml index aff0973..950d8d4 100644 --- a/modules/misc_radius/doc/misc_radius_admin.xml +++ b/modules/misc_radius/doc/misc_radius_admin.xml @@ -307,7 +307,9 @@ modparam("misc_radius", "use_sip_uri_host", 1) <title><varname>common_response</varname> (integer)</title> <para> Set it to 1 if you need common radius response attributes to - be added as AVPs. + be added as AVPs in <function moreinfo="none">radius_load_caller_avps</function> + and <function moreinfo="none">radius_load_callee_avps</function> + with name as radius attribute name and value as radius attribute value. </para> <para> Default value is <quote>0</quote>. @@ -316,9 +318,35 @@ modparam("misc_radius", "use_sip_uri_host", 1) <title><varname>common_response</varname> parameter usage</title> <programlisting format="linespecific"> ... -modparam("misc_radius", "common_response", 21) +modparam("misc_radius", "common_response", 1) +... +radius_load_caller_avps($fU); +... </programlisting> - </example> + </example> + <example> + <title>radius response with <varname>common_response</varname> value 1</title> + <programlisting format="linespecific"> +... + Sending Access-Accept of id 60 to 192.168.25.32 port 59736 + Session-Timeout = 4261674 + next-hop-ip = "SIP/00111222333444@cisco-out" + SIP-AVP = "email:sr-users@lists.sip-router.org session-timeout#161 next-hop-ip:h323/0001111@myvoip-gate.kamailio.org" + session-protocol = "SIP" +... + +$avp(Session-Timeout) has integer value 4261674 +$avp(next-hop-ip) has string value "SIP/005555777888@cisco-out" +$avp(session-protocol) has string value "SIP" +$avp(SIP-AVP) has string value "email:sr-users@lists.sip-router.org session-timeout#161 next-hop-ip:h323/0001111@myvoip-gate.kamailio.org" + +... + When recieving negative response, check appropriate avp's: + $avp(Reply-Message) = "Not enough money on deposit '-89.83'. Rejected" + $avp(Filter-Id) = "neg_deposit" +... +</programlisting> + </example> </section> </section>

1 0

git:master: misc_radius: handle IPv4 returned attributes
by Daniel-Constantin Mierla 28 May '13

28 May '13

Module: sip-router Branch: master Commit: 355490abd8c6e82a45cb96338ceca938c99ed744 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=355490a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 28 15:43:27 2013 +0200 misc_radius: handle IPv4 returned attributes - populate attributes for negative replies when common_response is set - patch by Victor V. Kustov --- modules/misc_radius/functions.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/modules/misc_radius/functions.c b/modules/misc_radius/functions.c index 7a2468b..4292999 100644 --- a/modules/misc_radius/functions.c +++ b/modules/misc_radius/functions.c @@ -192,21 +192,23 @@ static void generate_avps(struct attr *attrs, VALUE_PAIR* received) } /* Macro to add extra attribute */ -#define ADD_EXTRA_AVPAIR(_attrs, _attr, _val, _len) \ - do { \ - if ((_len) != 0) { \ - if ((_len) == -1) { \ - if (_attrs[_attr].t != PW_TYPE_INTEGER) { \ - LM_ERR("attribute %d is not of type integer\n", \ - _attrs[_attr].v); \ - goto error; \ - } \ - } \ +#define ADD_EXTRA_AVPAIR(_attrs, _attr, _val, _len) \ + do { \ + if ((_len) != 0) { \ + if ((_len) == -1) { \ + if (_attrs[_attr].t != PW_TYPE_INTEGER) { \ + if (_attrs[_attr].t != PW_TYPE_IPADDR) { \ + LM_ERR("attribute %d is not of type integer or ipaddr\n", \ + _attrs[_attr].v); \ + goto error; \ + } \ + } \ + } \ if (!rc_avpair_add( rh, &send, _attrs[_attr].v, _val, _len, 0)) { \ LM_ERR("failed to add %s, %d\n", _attrs[_attr].n, _attr); \ - goto error; \ - } \ - } \ + goto error; \ + } \ + } \ }while(0) @@ -274,6 +276,7 @@ int radius_load_caller_avps(struct sip_msg* _m, char* _caller, char* _s2) return 1; } else { rc_avpair_free(send); + if (common_response) generate_avps_rad(received); rc_avpair_free(received); #ifdef REJECT_RC if (res == REJECT_RC) { @@ -359,6 +362,7 @@ int radius_load_callee_avps(struct sip_msg* _m, char* _callee, char* _s2) return 1; } else { rc_avpair_free(send); + if (common_response) generate_avps_rad(received); rc_avpair_free(received); #ifdef REJECT_RC if (res == REJECT_RC) {

1 0

Re: [sr-dev] [SR-Users] Via header, branch parameter and syn_branch
by Henning Westerholt 28 May '13

28 May '13

Am Donnerstag, 23. Mai 2013, 11:12:20 schrieb Richard Brady: > The syn_branch global parameter results in the use of a "synonym" > branch parameter in the Via header for statelessly forwarded requests > as a performance optimisation. > > This was originally done by setting branch=0 which, while not strictly > compliant with 3261 (8.1.1.7 and 16.6 item 8), would not cause any > problems with a downstream proxy or UA compliant to either 3261 or > 2543 since it does not contain the cookie and is therefore > self-evidently not guaranteed to be unique. > > Then a patch was added (commit ebb3b08) to change it from branch=0 to > branch=z9hG4bKcydzigwkX which includes the cookie, thus declaring > itself to be unique when it clearly is not. > > This takes the optimisation too far as it deliberately misleads > downstream proxies with regard to the uniqueness of the parameter and > breaks the mechanism in 17.2.3 for identifying unreliable (non-unique) > branch parameters for transaction matching which should then fall back > to header inspection but does not. The result is that unrelated > requests can be identified as duplicates of each other. > > Also note 3261 section 16.11 on Stateless Proxy behaviour: "The > requirement for unique branch IDs across space and time applies to > stateless proxies as well." > > Has the commit above introduced a bug and should it be reverted? > > And should the next major release have a default of syn_branch=0? > Since with syn_branch=1 the branch=0 version has been known to cause > interop issues in the past (see below) and I can confirm the > branch=z9hG4bKcydzigwkX version causes interop issues in the present. Hello Richard, syn_branch=0 should be made the default, this is what we use as default since years in our backend. The performance concerns that were the reason for introducing it long ago are nowadays not valid anymore (even on embedded systems). I would suggest to remove this parameter completely, one less if/else case in the module code and also a a parameter less to document and learn for our users. Henning

2 2

git:master: modules/auth_ephemeral: new module for ephemeral credential based authentication
by Peter Dunkley 28 May '13

28 May '13

Module: sip-router Branch: master Commit: 0bea7f63afa0fd544ad93465db94ddef4ed67a00 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0bea7f6… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon May 27 00:25:03 2013 +0100 modules/auth_ephemeral: new module for ephemeral credential based authentication --- modules/auth_ephemeral/Makefile | 41 +++ modules/auth_ephemeral/README | 250 ++++++++++++++ modules/auth_ephemeral/autheph_mod.c | 168 ++++++++++ modules/auth_ephemeral/autheph_mod.h | 31 ++ modules/auth_ephemeral/authorize.c | 346 ++++++++++++++++++++ modules/auth_ephemeral/authorize.h | 42 +++ modules/auth_ephemeral/doc/Makefile | 4 + modules/auth_ephemeral/doc/auth_ephemeral.xml | 30 ++ .../auth_ephemeral/doc/auth_ephemeral_admin.xml | 306 +++++++++++++++++ 9 files changed, 1218 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=0be…

2 2

Modules linking with OpenSSL
by Peter Dunkley 28 May '13

28 May '13

I created another module that links with OpenSSL. The current list of (non-obsolete) modules that link with OpenSSL is: - websocket - auth_ephemeral - tls - stun - outbound - osp - auth_identity FYI, for the modules I've created the usage of OpenSSL is: - websocket: SHA1() is used to create the key in the WebSocket handshake response. - auth_ephemeral: HMAC(EVP_sha1(), ...) is used to calculate the password based on the username and secret key and openssl/sha.h is included for "#define SHA_DIGEST_LENGTH" - outbound: HMAC(EVP_sha1(), ...) is used to encode the flow token and RAND_bytes() is used to get cryptographically strong pseudo-random bytes for the secret key - stun: not sure about this as a lot of the code was copied from core -- Peter Dunkley Technical Director Crocodile RCS Ltd

5 5

git:master: modules/auth_ephemeral: updated to use SHA1_DIGEST_LENGTH #define from openssl/sha.h
by Peter Dunkley 27 May '13

27 May '13

Module: sip-router Branch: master Commit: 6a92939ee4b7db6216814dc88e57eccefabb05af URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a92939… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue May 28 00:46:26 2013 +0100 modules/auth_ephemeral: updated to use SHA1_DIGEST_LENGTH #define from openssl/sha.h --- modules/auth_ephemeral/authorize.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/modules/auth_ephemeral/authorize.c b/modules/auth_ephemeral/authorize.c index 788d2af..4e9f35a 100644 --- a/modules/auth_ephemeral/authorize.c +++ b/modules/auth_ephemeral/authorize.c @@ -21,6 +21,7 @@ * */ #include <openssl/hmac.h> +#include <openssl/sha.h> #include "../../basex.h" #include "../../dprint.h" @@ -34,10 +35,6 @@ #include "autheph_mod.h" #include "authorize.h" -#if !defined(SHA_DIGEST_LENGTH) -#define SHA_DIGEST_LENGTH (20) -#endif - static inline int get_ha1(struct username* _username, str* _domain, str* _secret, char* _ha1) {

1 0

git:master: modules/auth_ephemeral: tidied up the headers and tidied up more debug
by Peter Dunkley 27 May '13

27 May '13

Module: sip-router Branch: master Commit: ec893a2c6cb5c0fd21207cbf0ffab09f65418df2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec893a2… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue May 28 00:27:37 2013 +0100 modules/auth_ephemeral: tidied up the headers and tidied up more debug --- modules/auth_ephemeral/autheph_mod.h | 7 +++++++ modules/auth_ephemeral/authorize.c | 9 --------- modules/auth_ephemeral/authorize.h | 9 --------- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/modules/auth_ephemeral/autheph_mod.h b/modules/auth_ephemeral/autheph_mod.h index 31f5d05..da89d59 100644 --- a/modules/auth_ephemeral/autheph_mod.h +++ b/modules/auth_ephemeral/autheph_mod.h @@ -26,6 +26,13 @@ #include "../../str.h" #include "../../modules/auth/api.h" +struct secret +{ + str secret_key; + struct secret *next; +}; +extern struct secret *secret_list; + extern auth_api_s_t eph_auth_api; #endif /* AUTHEPH_MOD_H */ diff --git a/modules/auth_ephemeral/authorize.c b/modules/auth_ephemeral/authorize.c index 9d2dd65..788d2af 100644 --- a/modules/auth_ephemeral/authorize.c +++ b/modules/auth_ephemeral/authorize.c @@ -228,8 +228,6 @@ int autheph_check(struct sip_msg* _m, char* _realm) return AUTH_ERROR; } - LM_DBG("realm [%.*s]\n", srealm.len, srealm.s); - if(_m->REQ_METHOD==METHOD_REGISTER) return digest_authenticate(_m, &srealm, HDR_AUTHORIZATION_T, &_m->first_line.u.request.method); @@ -265,8 +263,6 @@ int autheph_www(struct sip_msg* _m, char* _realm) return AUTH_ERROR; } - LM_DBG("realm [%.*s]\n", srealm.len, srealm.s); - return digest_authenticate(_m, &srealm, HDR_AUTHORIZATION_T, &_m->first_line.u.request.method); } @@ -311,9 +307,6 @@ int autheph_www2(struct sip_msg* _m, char* _realm, char *_method) return AUTH_ERROR; } - LM_DBG("realm [%.*s] method [%.*s]\n", srealm.len, srealm.s, - smethod.len, smethod.s); - return digest_authenticate(_m, &srealm, HDR_AUTHORIZATION_T, &smethod); } @@ -344,8 +337,6 @@ int autheph_proxy(struct sip_msg* _m, char* _realm) return AUTH_ERROR; } - LM_DBG("realm [%.*s]\n", srealm.len, srealm.s); - return digest_authenticate(_m, &srealm, HDR_PROXYAUTH_T, &_m->first_line.u.request.method); } diff --git a/modules/auth_ephemeral/authorize.h b/modules/auth_ephemeral/authorize.h index 1f2906d..c884f68 100644 --- a/modules/auth_ephemeral/authorize.h +++ b/modules/auth_ephemeral/authorize.h @@ -23,17 +23,8 @@ #ifndef AUTHORIZE_H #define AUTHORIZE_H -#include "../../str.h" #include "../../parser/msg_parser.h" -struct secret -{ - str secret_key; - struct secret *next; -}; - -extern struct secret *secret_list; - int autheph_check(struct sip_msg* _m, char* _realm); int autheph_www(struct sip_msg* _m, char* _realm); int autheph_www2(struct sip_msg* _m, char* _realm, char *_method);

1 0

git:master: modules/auth_ephemeral: updated to handle usernames from the web-service that just consist of timestamps
by Peter Dunkley 27 May '13

27 May '13

Module: sip-router Branch: master Commit: ba2a6ac4230dd9169943f55a9c06af3faa694356 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba2a6ac… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue May 28 00:20:20 2013 +0100 modules/auth_ephemeral: updated to handle usernames from the web-service that just consist of timestamps - tidied up the diagnostic output --- modules/auth_ephemeral/README | 10 ++++-- modules/auth_ephemeral/authorize.c | 31 +++++++++++-------- .../auth_ephemeral/doc/auth_ephemeral_admin.xml | 12 ++++--- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/modules/auth_ephemeral/README b/modules/auth_ephemeral/README index 932c886..a28fea5 100644 --- a/modules/auth_ephemeral/README +++ b/modules/auth_ephemeral/README @@ -104,7 +104,7 @@ Chapter 1. Admin Guide The request should contain the following parameters: * service - specifies the desired service (msrp, sip, etc) - * username - a user identifier for the service + * username - an optional user identifier for the service * ttl - an optional TTL request for the lifetime of the credentials, in seconds. @@ -114,9 +114,11 @@ GET /?service=sip&username=foobar;&ttl=86400; 1.1.2. Response The response should include the following parameters: - * username - the username to use, which is a combination of the - username parameter from the request, with a timestamp in time_t - format, colon-separated. + * username - the username to use with the service, which is a + combination of the username parameter from the request and a + timestamp in time_t format, colon-separated. If a username was not + included in the request this parameter will just include the + timestamp. * password - the password to use; this value is computed from the secret key and the returned username value, by performing base64(hmac-sha1(secret key, returned username)). diff --git a/modules/auth_ephemeral/authorize.c b/modules/auth_ephemeral/authorize.c index ea7152f..9d2dd65 100644 --- a/modules/auth_ephemeral/authorize.c +++ b/modules/auth_ephemeral/authorize.c @@ -46,7 +46,6 @@ static inline int get_ha1(struct username* _username, str* _domain, unsigned char password[base64_enc_len(hmac_len)]; str spassword; - LM_INFO("using secret: %.*s\n", _secret->len, _secret->s); if (HMAC(EVP_sha1(), _secret->s, _secret->len, (unsigned char *) _username->whole.s, _username->whole.len, hmac_sha1, &hmac_len) == NULL) { @@ -57,11 +56,11 @@ static inline int get_ha1(struct username* _username, str* _domain, spassword.len = base64_enc(hmac_sha1, hmac_len, password, base64_enc_len(hmac_len)); spassword.s = (char *) password; - LM_INFO("calculated password: %.*s\n", spassword.len, spassword.s); + LM_DBG("calculated password: %.*s\n", spassword.len, spassword.s); eph_auth_api.calc_HA1(HA_MD5, &_username->whole, _domain, &spassword, 0, 0, _ha1); - LM_INFO("HA1 string calculated: %s\n", _ha1); + LM_DBG("calculated HA1: %s\n", _ha1); return 0; } @@ -73,6 +72,8 @@ static int do_auth(struct sip_msg* msg, struct hdr_field *h, str *realm, char ha1[256]; auth_body_t *cred = (auth_body_t*) h->parsed; + LM_DBG("secret: %.*s\n", secret->len, secret->s); + ret = get_ha1(&cred->digest.username, realm, secret, ha1); if (ret < 0) { @@ -101,12 +102,10 @@ static int do_auth(struct sip_msg* msg, struct hdr_field *h, str *realm, static int verify_timestamp(str* username) { - int pos = 0; + int pos = 0, cur_time = (int) time(NULL); unsigned int expires; str time_str = {0, 0}; - LM_INFO("username: %.*s\n", username->len, username->s); - while (pos < username->len && username->s[pos] != ':') pos++; @@ -117,19 +116,19 @@ static int verify_timestamp(str* username) } else { - LM_ERR("unable to extract timestamp from username\n"); - return -1; + time_str.s = username->s; + time_str.len = username->len; } - LM_INFO("username timestamp: %.*s\n", time_str.len, time_str.s); - + LM_DBG("username timestamp: %.*s\n", time_str.len, time_str.s); if (str2int(&time_str, &expires) < 0) { LM_ERR("unable to convert timestamp to int\n"); return -1; } - if ((int) time(NULL) > expires) + LM_DBG("current time: %d\n", cur_time); + if (cur_time > expires) { LM_WARN("username has expired\n"); return -1; @@ -144,6 +143,10 @@ static int digest_authenticate(struct sip_msg* msg, str *realm, struct hdr_field* h; int ret; struct secret *secret_struct = secret_list; + str username; + + LM_DBG("realm: %.*s\n", realm->len, realm->s); + LM_DBG("method: %.*s\n", method->len, method->s); ret = eph_auth_api.pre_auth(msg, realm, hftype, &h, NULL); switch(ret) { @@ -175,8 +178,10 @@ static int digest_authenticate(struct sip_msg* msg, str *realm, return AUTH_OK; } - if (verify_timestamp(&((auth_body_t*) h->parsed)->digest.username.whole) - < 0) + username = ((auth_body_t *) h->parsed)->digest.username.whole; + LM_DBG("username: %.*s\n", username.len, username.s); + + if (verify_timestamp(&username) < 0) { LM_ERR("invalid timestamp in username\n"); return AUTH_ERROR; diff --git a/modules/auth_ephemeral/doc/auth_ephemeral_admin.xml b/modules/auth_ephemeral/doc/auth_ephemeral_admin.xml index 678320b..ba2c282 100644 --- a/modules/auth_ephemeral/doc/auth_ephemeral_admin.xml +++ b/modules/auth_ephemeral/doc/auth_ephemeral_admin.xml @@ -56,8 +56,8 @@ (msrp, sip, etc)</para> </listitem> <listitem> - <para><emphasis>username</emphasis> - a user identifier for the - service</para> + <para><emphasis>username</emphasis> - an optional user identifier for + the service</para> </listitem> <listitem> <para><emphasis>ttl</emphasis> - an optional TTL request for the @@ -77,9 +77,11 @@ GET /?service=sip&username=foobar;&ttl=86400; The response should include the following parameters: <itemizedlist> <listitem> - <para><emphasis>username</emphasis> - the username to use, which is a - combination of the username parameter from the request, with a timestamp - in time_t format, colon-separated.</para> + <para><emphasis>username</emphasis> - the username to use with the + service, which is a combination of the username parameter from the + request and a timestamp in time_t format, colon-separated. If a username + was not included in the request this parameter will just include the + timestamp.</para> </listitem> <listitem> <para><emphasis>password</emphasis> - the password to use; this value is

1 0

git:master: modules/usrloc: added two new rpc commands ul.users and ul. contacts
by Juha Heinanen 27 May '13

27 May '13

Module: sip-router Branch: master Commit: d0d298070fdbb015a96f209fa3c925ba71e3a37b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d0d2980… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon May 27 13:54:23 2013 +0300 modules/usrloc: added two new rpc commands ul.users and ul.contacts - for accessing number of different AoRs and contacts in a location table --- modules/usrloc/README | 22 +++++++ modules/usrloc/doc/usrloc_admin.xml | 31 ++++++++++ modules/usrloc/ul_rpc.c | 111 +++++++++++++++++++++++++++++++++++ 3 files changed, 164 insertions(+), 0 deletions(-) diff --git a/modules/usrloc/README b/modules/usrloc/README index 05b8535..02227b0 100644 --- a/modules/usrloc/README +++ b/modules/usrloc/README @@ -87,6 +87,8 @@ Bogdan-Andrei Iancu 6.4. ul.rm_contact table AOR contact 6.5. ul.flush 6.6. ul.add + 6.7. ul.users + 6.8. ul.contacts 7. Statistics @@ -221,6 +223,8 @@ Chapter 1. Admin Guide 6.4. ul.rm_contact table AOR contact 6.5. ul.flush 6.6. ul.add + 6.7. ul.users + 6.8. ul.contacts 7. Statistics @@ -836,6 +840,8 @@ modparam("usrloc", "db_ops_ruid", 1) 6.4. ul.rm_contact table AOR contact 6.5. ul.flush 6.6. ul.add + 6.7. ul.users + 6.8. ul.contacts 6.1. ul.dump @@ -892,6 +898,22 @@ modparam("usrloc", "db_ops_ruid", 1) * cflags - per branch flags of the contact * methods - mask with supported requests of the contact +6.7. ul.users + + Tell number of different users (AoRs) in a location table. + + Parameters: + * table name - location table where the users are looked for, for + example, location. + +6.8. ul.contacts + + Tell number of contacts in a location table. + + Parameters: + * table name - location table where the contacts are looked for, for + example, location. + 7. Statistics 7.1. users diff --git a/modules/usrloc/doc/usrloc_admin.xml b/modules/usrloc/doc/usrloc_admin.xml index 78be5e8..7745ffe 100644 --- a/modules/usrloc/doc/usrloc_admin.xml +++ b/modules/usrloc/doc/usrloc_admin.xml @@ -1157,6 +1157,37 @@ modparam("usrloc", "db_ops_ruid", 1) </para></listitem> </itemizedlist> </section> + + <section> + <title> + <function moreinfo="none">ul.users</function> + </title> + <para> + Tell number of different users (AoRs) in a location table. + </para> + <para>Parameters: </para> + <itemizedlist> + <listitem><para> + <emphasis>table name</emphasis> - location table where the users are looked for, for example, location. + </para></listitem> + </itemizedlist> + </section> + + <section> + <title> + <function moreinfo="none">ul.contacts</function> + </title> + <para> + Tell number of contacts in a location table. + </para> + <para>Parameters: </para> + <itemizedlist> + <listitem><para> + <emphasis>table name</emphasis> - location table where the contacts are looked for, for example, location. + </para></listitem> + </itemizedlist> + </section> + </section> diff --git a/modules/usrloc/ul_rpc.c b/modules/usrloc/ul_rpc.c index 7c10584..e0ebaf4 100644 --- a/modules/usrloc/ul_rpc.c +++ b/modules/usrloc/ul_rpc.c @@ -637,6 +637,115 @@ static const char* ul_rpc_add_doc[2] = { 0 }; +#define QUERY_LEN 256 + +static void ul_rpc_users(rpc_t* rpc, void* ctx) +{ + str table = {0, 0}; + char query[QUERY_LEN]; + str query_str; + db1_res_t* res; + int count; + + if (db_mode == NO_DB) { + rpc->fault(ctx, 500, "Command is not supported in db_mode=0"); + return; + } + + if (rpc->scan(ctx, "S", &table) != 1) { + rpc->fault(ctx, 500, "Not enough parameters (table to lookup)"); + return; + } + + if (user_col.len + domain_col.len + table.len + 32 > QUERY_LEN) { + rpc->fault(ctx, 500, "Too long database query"); + return; + } + + if (!DB_CAPABILITY(ul_dbf, DB_CAP_RAW_QUERY)) { + rpc->fault(ctx, 500, "Database does not support raw queries"); + return; + } + if (ul_dbf.use_table(ul_dbh, &table) < 0) { + rpc->fault(ctx, 500, "Failed to use table"); + return; + } + + memset(query, 0, QUERY_LEN); + query_str.len = snprintf(query, QUERY_LEN, + "SELECT COUNT(DISTINCT %.*s, %.*s) FROM %.*s", + user_col.len, user_col.s, + domain_col.len, domain_col.s, + table.len, table.s); + query_str.s = query; + if (ul_dbf.raw_query(ul_dbh, &query_str, &res) < 0) { + rpc->fault(ctx, 500, "Failed to query AoR count"); + return; + } + + count = (int)VAL_INT(ROW_VALUES(RES_ROWS(res))); + ul_dbf.free_result(ul_dbh, res); + + rpc->add(ctx, "d", count); +} + +static const char* ul_rpc_users_doc[2] = { + "Tell number of different users (AoRs) in database table (db_mode!=0 only)", + 0 +}; + +static void ul_rpc_contacts(rpc_t* rpc, void* ctx) +{ + str table = {0, 0}; + char query[QUERY_LEN]; + str query_str; + db1_res_t* res; + int count; + + if (db_mode == NO_DB) { + rpc->fault(ctx, 500, "Command is not supported in db_mode=0"); + return; + } + + if (rpc->scan(ctx, "S", &table) != 1) { + rpc->fault(ctx, 500, "Not enough parameters (table to lookup)"); + return; + } + + if (table.len + 22 > QUERY_LEN) { + rpc->fault(ctx, 500, "Too long database query"); + return; + } + + if (!DB_CAPABILITY(ul_dbf, DB_CAP_RAW_QUERY)) { + rpc->fault(ctx, 500, "Database does not support raw queries"); + return; + } + if (ul_dbf.use_table(ul_dbh, &table) < 0) { + rpc->fault(ctx, 500, "Failed to use table"); + return; + } + + memset(query, 0, QUERY_LEN); + query_str.len = snprintf(query, QUERY_LEN, "SELECT COUNT(*) FROM %.*s", + table.len, table.s); + query_str.s = query; + if (ul_dbf.raw_query(ul_dbh, &query_str, &res) < 0) { + rpc->fault(ctx, 500, "Failed to query contact count"); + return; + } + + count = (int)VAL_INT(ROW_VALUES(RES_ROWS(res))); + ul_dbf.free_result(ul_dbh, res); + + rpc->add(ctx, "d", count); +} + +static const char* ul_rpc_contacts_doc[2] = { + "Tell number of contacts in database table (db_mode=3 only)", + 0 +}; + rpc_export_t ul_rpc[] = { {"ul.dump", ul_rpc_dump, ul_rpc_dump_doc, 0}, {"ul.lookup", ul_rpc_lookup, ul_rpc_lookup_doc, 0}, @@ -644,6 +753,8 @@ rpc_export_t ul_rpc[] = { {"ul.rm_contact", ul_rpc_rm_contact, ul_rpc_rm_contact_doc, 0}, {"ul.flush", ul_rpc_flush, ul_rpc_flush_doc, 0}, {"ul.add", ul_rpc_add, ul_rpc_add_doc, 0}, + {"ul.users", ul_rpc_users, ul_rpc_users_doc, 0}, + {"ul.contacts", ul_rpc_contacts, ul_rpc_contacts_doc, 0}, {0, 0, 0, 0} };

3 7