kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Select user by more logical grounds when no user is specified (bug #1458, sorta)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2723 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-04-21 00:33:09 +00:00
parent c984a64f3e
commit 0134d2cc85
1 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
channels/chan_iax2.c
View File

@@ -3191,7 +3191,8 @@ static int check_access(int callno, struct sockaddr_in *sin, struct iax_ies *ies
/* Start pessimistic */ /* Start pessimistic */
int res = -1; int res = -1;
int version = 2; int version = 2;
struct iax2_user *user; struct iax2_user *user, *best = NULL;
int bestscore = 0;
int gotcapability=0; int gotcapability=0;
if (!iaxs[callno]) if (!iaxs[callno])
return res; return res;
@@ -3240,11 +3241,45 @@ static int check_access(int callno, struct sockaddr_in *sin, struct iax_ies *ies
&& ast_apply_ha(user->ha, sin) /* Access is permitted from this IP */ && ast_apply_ha(user->ha, sin) /* Access is permitted from this IP */
&& (!strlen(iaxs[callno]->context) || /* No context specified */ && (!strlen(iaxs[callno]->context) || /* No context specified */
apply_context(user->contexts, iaxs[callno]->context))) { /* Context is permitted */ apply_context(user->contexts, iaxs[callno]->context))) { /* Context is permitted */
break; if (strlen(iaxs[callno]->username)) {
/* Exact match, stop right now. */
best = user;
break;
} else if (!strlen(user->secret)) {
/* No required authentication */
if (user->ha) {
/* There was host authentication and we passed, bonus! */
if (bestscore < 4) {
bestscore = 4;
best = user;
}
} else {
/* No host access, but no secret, either, not bad */
if (bestscore < 3) {
bestscore = 3;
best = user;
}
}
} else {
if (user->ha) {
/* Authentication, but host access too, eh, it's something.. */
if (bestscore < 2) {
bestscore = 2;
best = user;
}
} else {
/* Authentication and no host access... This is our baseline */
if (bestscore < 1) {
bestscore = 1;
best = user;
}
}
}
} }
user = user->next; user = user->next;
} }
ast_mutex_unlock(&userl.lock); ast_mutex_unlock(&userl.lock);
user = best;
#ifdef MYSQL_FRIENDS #ifdef MYSQL_FRIENDS
if (!user && mysql && strlen(iaxs[callno]->username) && (strlen(iaxs[callno]->username) < 128)) { if (!user && mysql && strlen(iaxs[callno]->username) && (strlen(iaxs[callno]->username) < 128)) {
user = mysql_user(iaxs[callno]->username); user = mysql_user(iaxs[callno]->username);