diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-04 19:48:44 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-04 19:48:44 +0000 |
| commit | 3e90af0756b0b9d92f25ef279b1704a1bc4d3dbd (patch) | |
| tree | ec68a8ca0b0802dfa6a89d8f69faf3aa50a77b05 | |
| parent | e886e63da67a407b28dca3173d9ce55facc091f8 (diff) | |
Additional updates to AST-2009-001
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.1.1@199209 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_iax2.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 1407efe15..5a8d1aff7 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -602,7 +602,8 @@ struct chan_iax2_pvt { /*! Default parkinglot */ AST_STRING_FIELD(parkinglot); ); - + /*! AUTHREJ all AUTHREP frames */ + int authrej; /*! permitted authentication methods */ int authmethods; /*! permitted encryption methods */ @@ -6218,6 +6219,18 @@ static int check_access(int callno, struct sockaddr_in *sin, struct iax_ies *ies ast_string_field_set(iaxs[callno], secret, user->secret); res = 0; user = user_unref(user); + } else { + /* user was not found, but we should still fake an AUTHREQ. + * Set authmethods to the last known authmethod used by the system + * Set a fake secret, it's not looked at, just required to attempt authentication. + * Set authrej so the AUTHREP is rejected without even looking at its contents */ + iaxs[callno]->authmethods = last_authmethod ? last_authmethod : (IAX_AUTH_MD5 | IAX_AUTH_PLAINTEXT); + ast_string_field_set(iaxs[callno], secret, "badsecret"); + iaxs[callno]->authrej = 1; + if (!ast_strlen_zero(iaxs[callno]->username)) { + /* only send the AUTHREQ if a username was specified. */ + res = 0; + } } ast_set2_flag(iaxs[callno], iax2_getpeertrunk(*sin), IAX_TRUNK); return res; @@ -6328,6 +6341,9 @@ static int authenticate_verify(struct chan_iax2_pvt *p, struct iax_ies *ies) .name = p->username, }; + if (p->authrej) { + return res; + } user = ao2_find(users, &tmp_user, OBJ_POINTER); if (user) { if (ast_test_flag(p, IAX_MAXAUTHREQ)) { |