<!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>[14917] 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/14917">14917</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-06-25 14:56:18 -0700 (Thu, 25 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix digest nonce timeout. Make sure digest OPTIONS request uri is properly quoted.</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 (14916 => 14917)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/request.py 2015-06-25 21:55:01 UTC (rev 14916)
+++ CalDAVTester/trunk/src/request.py 2015-06-25 21:56:18 UTC (rev 14917)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx"> import re
</span><span class="cx"> import src.xmlDefs
</span><span class="cx"> import time
</span><ins>+import urllib
+import urlparse
</ins><span class="cx"> import uuid
</span><span class="cx">
</span><span class="cx"> algorithms = {
</span><span class="lines">@@ -228,16 +230,20 @@
</span><span class="cx">
</span><span class="cx"> def gethttpdigestauth(self, si, wwwauthorize=None):
</span><span class="cx">
</span><del>- # Check the nonce cache to see if we've used this user before
</del><ins>+ # Check the nonce cache to see if we've used this user before, or if the nonce is more than 5 minutes old
</ins><span class="cx"> user = [self.user, si.user][self.user == ""]
</span><span class="cx"> pswd = [self.pswd, si.pswd][self.pswd == ""]
</span><span class="cx"> details = None
</span><del>- if user in self.manager.digestCache:
</del><ins>+ if user in self.manager.digestCache and self.manager.digestCache[user]["max-nonce-time"] < time.time():
</ins><span class="cx"> details = self.manager.digestCache[user]
</span><span class="cx"> else:
</span><ins>+ # Redo digest auth from scratch to get a new nonce etc
</ins><span class="cx"> http = SmartHTTPConnection(si.host, si.port, si.ssl, si.afunix)
</span><span class="cx"> try:
</span><del>- http.request("OPTIONS", self.getURI(si))
</del><ins>+ puri = list(urlparse.urlparse(self.getURI(si)))
+ puri[2] = urllib.quote(puri[2])
+ quri = urlparse.urlunparse(puri)
+ http.request("OPTIONS", quri)
</ins><span class="cx">
</span><span class="cx"> response = http.getresponse()
</span><span class="cx">
</span><span class="lines">@@ -262,6 +268,7 @@
</span><span class="cx"> for (k, v) in [p.split('=', 1) for p in parts]:
</span><span class="cx"> details[k.strip()] = unq(v.strip())
</span><span class="cx">
</span><ins>+ details["max-nonce-time"] = time.time() + 600
</ins><span class="cx"> self.manager.digestCache[user] = details
</span><span class="cx"> break
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>