kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-26 19:57:42 +00:00
Code Issues Projects Releases Wiki Activity

mupdate

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7448 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-01-31 22:40:48 +00:00
parent 20f4d12c8b
commit e54f420f6f
1 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/mod/endpoints/mod_sofia/sofia_reg.c
View File

@ -783,7 +783,7 @@ auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t co
char bigdigest[2 * SU_MD5_DIGEST_SIZE + 1]; char bigdigest[2 * SU_MD5_DIGEST_SIZE + 1];
char *username, *realm, *nonce, *uri, *qop, *cnonce, *nc, *response, *input = NULL, *input2 = NULL; char *username, *realm, *nonce, *uri, *qop, *cnonce, *nc, *response, *input = NULL, *input2 = NULL;
auth_res_t ret = AUTH_FORBIDDEN; auth_res_t ret = AUTH_FORBIDDEN;
int cnt = 0, first = 0; int first = 0;
const char *passwd = NULL; const char *passwd = NULL;
const char *a1_hash = NULL; const char *a1_hash = NULL;
char *sql; char *sql;
@ -812,28 +812,20 @@ auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t co
if (!strcasecmp(var, "username")) { if (!strcasecmp(var, "username")) {
username = strdup(val); username = strdup(val);
cnt++;
} else if (!strcasecmp(var, "realm")) { } else if (!strcasecmp(var, "realm")) {
realm = strdup(val); realm = strdup(val);
cnt++;
} else if (!strcasecmp(var, "nonce")) { } else if (!strcasecmp(var, "nonce")) {
nonce = strdup(val); nonce = strdup(val);
cnt++;
} else if (!strcasecmp(var, "uri")) { } else if (!strcasecmp(var, "uri")) {
uri = strdup(val); uri = strdup(val);
cnt++;
} else if (!strcasecmp(var, "qop")) { } else if (!strcasecmp(var, "qop")) {
qop = strdup(val); qop = strdup(val);
cnt++;
} else if (!strcasecmp(var, "cnonce")) { } else if (!strcasecmp(var, "cnonce")) {
cnonce = strdup(val); cnonce = strdup(val);
cnt++;
} else if (!strcasecmp(var, "response")) { } else if (!strcasecmp(var, "response")) {
response = strdup(val); response = strdup(val);
cnt++;
} else if (!strcasecmp(var, "nc")) { } else if (!strcasecmp(var, "nc")) {
nc = strdup(val); nc = strdup(val);
cnt++;
} }
} }
@ -842,7 +834,7 @@ auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t co
} }
} }
if (cnt != 8) { if (!(username && realm && nonce && uri && response)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Authorization header!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Authorization header!\n");
ret = AUTH_STALE; ret = AUTH_STALE;
goto end; goto end;
@ -878,10 +870,17 @@ auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t co
switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_realm", realm); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_realm", realm);
switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_nonce", nonce); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_nonce", nonce);
switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_uri", uri); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_uri", uri);
if (qop) {
switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_qop", qop); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_qop", qop);
}
if (cnonce) {
switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_cnonce", cnonce); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_cnonce", cnonce);
switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_response", response); }
if (nc) {
switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_nc", nc); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_nc", nc);
}
switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_response", response);
switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_method", (sip && sip->sip_request) ? sip->sip_request->rq_method_name : NULL); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_method", (sip && sip->sip_request) ? sip->sip_request->rq_method_name : NULL);
@ -964,7 +963,14 @@ auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t co
su_md5_deinit(&ctx); su_md5_deinit(&ctx);
} }
if ((input2 = switch_mprintf("%q:%q:%q:%q:%q:%q", a1_hash, nonce, nc, cnonce, qop, uridigest))) { if (nc && cnonce && qop) {
input2 = switch_mprintf("%q:%q:%q:%q:%q:%q", a1_hash, nonce, nc, cnonce, qop, uridigest);
} else {
input2 = switch_mprintf("%q:%q:%q", a1_hash, nonce, uridigest);
}
switch_assert(input2);
memset(&ctx, 0, sizeof(ctx)); memset(&ctx, 0, sizeof(ctx));
su_md5_init(&ctx); su_md5_init(&ctx);
su_md5_strupdate(&ctx, input2); su_md5_strupdate(&ctx, input2);
@ -986,7 +992,7 @@ auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t co
ret = AUTH_FORBIDDEN; ret = AUTH_FORBIDDEN;
} }
}
skip_auth: skip_auth: