sysmocom/pjproject
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed ticket #231: Add the ability to respond to any realms in SIP authentication

Browse source 
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@1370 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Benny Prijono 2007-06-18 11:01:42 +00:00
parent 1e2dbe6bdb
commit c09f47e48b
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pjsip/src/pjsip/sip_auth_client.c
View file

@ -69,6 +69,7 @@ void pjsip_auth_create_digest( pj_str_t *result,
const pj_str_t *cnonce,
const pj_str_t *qop,
const pj_str_t *uri,
const pj_str_t *realm,
const pjsip_cred_info *cred_info,
const pj_str_t *method)
{
@ -88,7 +89,7 @@ void pjsip_auth_create_digest( pj_str_t *result,
pj_md5_init(&pms);
MD5_APPEND( &pms, cred_info->username.ptr, cred_info->username.slen);
MD5_APPEND( &pms, ":", 1);
MD5_APPEND( &pms, cred_info->realm.ptr, cred_info->realm.slen);
MD5_APPEND( &pms, realm->ptr, realm->slen);
MD5_APPEND( &pms, ":", 1);
MD5_APPEND( &pms, cred_info->data.ptr, cred_info->data.slen);
pj_md5_final(&pms, digest);
@ -221,7 +222,7 @@ static pj_status_t respond_digest( pj_pool_t *pool,
/* Convert digest to string and store in chal->response. */
pjsip_auth_create_digest( &cred->response, &cred->nonce, NULL, NULL,
NULL, uri, cred_info, method);
NULL, uri, &chal->realm, cred_info, method);
} else if (has_auth_qop(pool, &chal->qop)) {
/* Server requires quality of protection.
@ -239,8 +240,8 @@ static pj_status_t respond_digest( pj_pool_t *pool,
}
pjsip_auth_create_digest( &cred->response, &cred->nonce, &cred->nc,
cnonce, &pjsip_AUTH_STR, uri, cred_info,
method );
cnonce, &pjsip_AUTH_STR, uri, &chal->realm,
cred_info, method );
} else {
/* Server requires quality protection that we don't support. */
@ -328,11 +329,27 @@ static const pjsip_cred_info* auth_find_cred( const pjsip_auth_clt_sess *sess,
const pj_str_t *auth_scheme)
{
unsigned i;
int wildcard = -1;
PJ_UNUSED_ARG(auth_scheme);
for (i=0; i<sess->cred_cnt; ++i) {
if (pj_stricmp(&sess->cred_info[i].realm, realm) == 0)
return &sess->cred_info[i];
else if (sess->cred_info[i].realm.slen == 1 &&
sess->cred_info[i].realm.ptr[0] == '*')
{
wildcard = i;
}
}
/* No matching realm. See if we have credential with wildcard ('*')
* as the realm.
*/
if (wildcard != -1)
return &sess->cred_info[wildcard];
/* Nothing is suitable */
return NULL;
}