<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14188] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14188">14188</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-07-09 19:49:35 -0500 (Thu, 09 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Wed Jul 8 10:39:37 CDT 2009 Pekka Pessi <first.last@nokia.com>
* auth_client.c: auc_credentials() now accepts realm with quotes or semicolons
Ignore-this: 945190725010fa3e5ebc833d38f7c578
Initial patch by Jerry Richards.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibssofiasipupdate">freeswitch/trunk/libs/sofia-sip/.update</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuaiptsecauth_clientc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuaiptsectest_auth_digestc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/test_auth_digest.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibssofiasipupdate"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/.update (14187 => 14188)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/.update 2009-07-10 00:48:37 UTC (rev 14187)
+++ freeswitch/trunk/libs/sofia-sip/.update 2009-07-10 00:49:35 UTC (rev 14188)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Thu Jul 9 19:47:01 CDT 2009
</del><ins>+Thu Jul 9 19:47:51 CDT 2009
</ins></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuaiptsecauth_clientc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c (14187 => 14188)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c 2009-07-10 00:48:37 UTC (rev 14187)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c 2009-07-10 00:49:35 UTC (rev 14188)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> #include <sofia-sip/auth_digest.h>
</span><span class="cx">
</span><span class="cx"> #include <sofia-sip/base64.h>
</span><ins>+#include <sofia-sip/bnf.h>
</ins><span class="cx"> #include <sofia-sip/su_uniqueid.h>
</span><span class="cx"> #include <sofia-sip/su_string.h>
</span><span class="cx">
</span><span class="lines">@@ -311,11 +312,24 @@
</span><span class="cx"> s0 = s = su_strdup(NULL, data);
</span><span class="cx">
</span><span class="cx"> /* Parse authentication data */
</span><del>- /* Data is string like "Basic:\"agni\":user1:secret" */
</del><ins>+ /* Data is string like "Basic:\"agni\":user1:secret"
+ or "Basic:\"[fe80::204:23ff:fea7:d60a]\":user1:secret" (IPv6)
+ or "Basic:\"Use \\\"interesting\\\" username and password here:\":user1:secret"
+ */
</ins><span class="cx"> if (s && (s = strchr(scheme = s, ':')))
</span><span class="cx"> *s++ = 0;
</span><del>- if (s && (s = strchr(realm = s, ':')))
- *s++ = 0;
</del><ins>+ if (s) {
+ if (*s == '"') {
+ realm = s;
+ s += span_quoted(s);
+ if (*s == ':')
+ *s++ = 0;
+ else
+ realm = NULL, s = NULL;
+ }
+ else
+ s = NULL;
+ }
</ins><span class="cx"> if (s && (s = strchr(user = s, ':')))
</span><span class="cx"> *s++ = 0;
</span><span class="cx"> if (s && (s = strchr(pass = s, ':')))
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuaiptsectest_auth_digestc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/test_auth_digest.c (14187 => 14188)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/test_auth_digest.c 2009-07-10 00:48:37 UTC (rev 14187)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/test_auth_digest.c 2009-07-10 00:49:35 UTC (rev 14188)
</span><span class="lines">@@ -1168,6 +1168,54 @@
</span><span class="cx"> END();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+int
+test_auth_client(void)
+{
+ BEGIN();
+
+ {
+ char challenge[] =
+ PROTOCOL " 401 Unauthorized\r\n"
+ "Call-ID:0e3dc2b2-dcc6-1226-26ac-258b5ce429ab\r\n"
+ "CSeq:32439043 REGISTER\r\n"
+ "From:surf3.ims3.so.noklab.net <sip:surf3@ims3.so.noklab.net>;tag=I8hFdg0H3OK\r\n"
+ "To:<sip:surf3@ims3.so.noklab.net>\r\n"
+ "Via:SIP/2.0/UDP 10.21.36.70:23800;branch=z9hG4bKJjKGu9vIHqf;received=10.21.36.70;rport\r\n"
+ "WWW-Authenticate:DIGEST algorithm=MD5,nonce=\"h7wIpP+atU+/+Zau5UwLMA==\",realm=\"[::1]\"\r\n"
+ "Proxy-Authenticate:DIGEST algorithm=MD5,nonce=\"h7wIpP+atU+/+Zau5UwLMA==\",realm=\"\\\"realm\\\"\"\r\n"
+ "Content-Length:0\r\n"
+ "Security-Server:digest\r\n"
+ "r\n";
+
+ su_home_t *home;
+ msg_t *msg;
+ sip_t *sip;
+ auth_client_t *aucs = NULL;
+
+ TEST_1(home = su_home_new(sizeof(*home)));
+
+ TEST_1(msg = read_message(MSG_DO_EXTRACT_COPY, challenge));
+ TEST_1(sip = sip_object(msg));
+
+ TEST_1(aucs == NULL);
+ TEST(auc_challenge(&aucs, home, sip->sip_www_authenticate,
+ sip_authorization_class), 1);
+ TEST_1(aucs != NULL);
+
+ TEST(auc_credentials(&aucs, home, "Digest:\"[::1]\":user:pass"), 1);
+
+ TEST(auc_challenge(&aucs, home, sip->sip_proxy_authenticate,
+ sip_proxy_authorization_class), 1);
+
+ TEST(auc_credentials(&aucs, home, "Digest:\"\\\"realm\\\"\":user:pass"), 1);
+
+ msg_destroy(msg);
+ su_home_unref(home);
+ }
+
+ END();
+}
+
</ins><span class="cx"> #if HAVE_FLOCK
</span><span class="cx"> #include <sys/file.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -1353,7 +1401,7 @@
</span><span class="cx">
</span><span class="cx"> retval |= test_digest();
</span><span class="cx"> retval |= test_digest_client();
</span><del>-
</del><ins>+ retval |= test_auth_client();
</ins><span class="cx"> retval |= test_module_io();
</span><span class="cx">
</span><span class="cx"> su_deinit();
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>