Changeset 1370

Timestamp:

Jun 18, 2007 11:01:42 AM (17 years ago)

Author:

bennylp

Message:

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

File:

• pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c (modified) (5 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c

@@ -70 +70 @@
                                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)
@@ -89 +90 @@
         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);
@@ -222 +223 @@
         /* 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)) {
@@ -240 +241 @@
 
         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 {
@@ -329 +330 @@
 {
     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;
 }