<!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>[14345] CalDAVTester/trunk/src/request.py</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">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14345">14345</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-01-26 13:13:27 -0800 (Mon, 26 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix digest auth with qop value present.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunksrcrequestpy">CalDAVTester/trunk/src/request.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunksrcrequestpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/request.py (14344 => 14345)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/request.py 2015-01-26 18:53:22 UTC (rev 14344)
+++ CalDAVTester/trunk/src/request.py 2015-01-26 21:13:27 UTC (rev 14345)
</span><span class="lines">@@ -140,6 +140,8 @@
</span><span class="cx"> be used to determine a satisfactory output or not.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ nc = {} # Keep track of nonce count
+
</ins><span class="cx"> def __init__(self, manager):
</span><span class="cx"> self.manager = manager
</span><span class="cx"> self.host = self.manager.server_info.host
</span><span class="lines">@@ -245,7 +247,7 @@
</span><span class="cx">
</span><span class="cx"> wwwauthorize = response.msg.getheaders("WWW-Authenticate")
</span><span class="cx"> for item in wwwauthorize:
</span><del>- if not item.startswith("digest "):
</del><ins>+ if not item.lower().startswith("digest "):
</ins><span class="cx"> continue
</span><span class="cx"> wwwauthorize = item[7:]
</span><span class="cx"> def unq(s):
</span><span class="lines">@@ -263,9 +265,18 @@
</span><span class="cx"> break
</span><span class="cx">
</span><span class="cx"> if details:
</span><ins>+ if details.get('qop'):
+ if self.nc.get(details.get('nonce')) is None:
+ self.nc[details.get('nonce')] = 1
+ else:
+ self.nc[details.get('nonce')] += 1
+ details['nc'] = "%08x" % self.nc[details.get('nonce')]
+ if details.get('cnonce') is None:
+ details['cnonce'] = "D4AAE4FF-ADA1-4149-BFE2-B506F9264318"
+
</ins><span class="cx"> digest = calcResponse(
</span><del>- calcHA1(details.get('algorithm'), user, details.get('realm'), pswd, details.get('nonce'), details.get('cnonce')),
- details.get('algorithm'), details.get('nonce'), details.get('nc'), details.get('cnonce'), details.get('qop'), self.method, self.getURI(si), None
</del><ins>+ calcHA1(details.get('algorithm', 'md5'), user, details.get('realm'), pswd, details.get('nonce'), details.get('cnonce')),
+ details.get('algorithm', 'md5'), details.get('nonce'), details.get('nc'), details.get('cnonce'), details.get('qop'), self.method, self.getURI(si), None
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if details.get('qop'):
</span><span class="lines">@@ -273,7 +284,7 @@
</span><span class="cx"> 'Digest username="%s", realm="%s", '
</span><span class="cx"> 'nonce="%s", uri="%s", '
</span><span class="cx"> 'response=%s, algorithm=%s, cnonce="%s", qop=%s, nc=%s' %
</span><del>- (user, details.get('realm'), details.get('nonce'), self.getURI(si), digest, details.get('algorithm'), details.get('cnonce'), details.get('qop'), details.get('nc'),)
</del><ins>+ (user, details.get('realm'), details.get('nonce'), self.getURI(si), digest, details.get('algorithm', 'md5'), details.get('cnonce'), details.get('qop'), details.get('nc'),)
</ins><span class="cx"> )
</span><span class="cx"> else:
</span><span class="cx"> response = (
</span></span></pre>
</div>
</div>
</body>
</html>