<!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>[15144] CalDAVClientLibrary/trunk</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/15144">15144</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-09-22 11:03:08 -0700 (Tue, 22 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Need pycalendar project reference. Fix digest auth with algo=md5-sess.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVClientLibrarytrunkproject">CalDAVClientLibrary/trunk/.project</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibraryprotocolhttpauthenticationdigestpy">CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/authentication/digest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVClientLibrarytrunkproject"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/.project (15143 => 15144)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/.project 2015-09-22 14:17:15 UTC (rev 15143)
+++ CalDAVClientLibrary/trunk/.project 2015-09-22 18:03:08 UTC (rev 15144)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <name>CalDAVClientLibrary</name>
</span><span class="cx"> <comment></comment>
</span><span class="cx"> <projects>
</span><ins>+ <project>pycalendar</project>
</ins><span class="cx"> <project>PyKerberos</project>
</span><span class="cx"> </projects>
</span><span class="cx"> <buildSpec>
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibraryprotocolhttpauthenticationdigestpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/authentication/digest.py (15143 => 15144)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/authentication/digest.py 2015-09-22 14:17:15 UTC (rev 15143)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/authentication/digest.py 2015-09-22 18:03:08 UTC (rev 15144)
</span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx"> from caldavclientlibrary.protocol.http.definitions import headers
</span><span class="cx"> from StringIO import StringIO
</span><span class="cx"> import hashlib
</span><ins>+import uuid
</ins><span class="cx">
</span><span class="cx"> class Digest(Authenticator):
</span><span class="cx">
</span><span class="lines">@@ -49,8 +50,8 @@
</span><span class="cx"> os.write(" uri=\"%s\"," % (request.getURL(),))
</span><span class="cx"> if "qop" in self.fields:
</span><span class="cx"> os.write(" qop=auth,")
</span><del>- os.write(" nc=\"%s\"" % (self.fields['nc'],))
- os.write(" cnonce=\"%s\"" % (self.fields['cnonce'],))
</del><ins>+ os.write(" nc=%s," % (self.fields['nc'],))
+ os.write(" cnonce=\"%s\"," % (self.fields['cnonce'],))
</ins><span class="cx"> os.write(" response=\"%s\"" % (self.response,))
</span><span class="cx">
</span><span class="cx"> if "algorithm" in self.fields:
</span><span class="lines">@@ -161,29 +162,46 @@
</span><span class="cx"> return HA1.encode('hex')
</span><span class="cx">
</span><span class="cx">
</span><ins>+ # DigestCalcHA2
+ @staticmethod
+ def calcHA2(algo, pszMethod, pszDigestUri, pszQop, pszHEntity):
+ """
+ Compute H(A2) from RFC 2617.
+
+ @param pszAlg: The name of the algorithm to use to calculate the digest.
+ Currently supported are md5, md5-sess, and sha.
+ @param pszMethod: The request method.
+ @param pszDigestUri: The request URI.
+ @param pszQop: The Quality-of-Protection value.
+ @param pszHEntity: The hash of the entity body or C{None} if C{pszQop} is
+ not C{'auth-int'}.
+ @return: The hash of the A2 value for the calculation of the response
+ digest.
+ """
+ m = Digest.algorithms[algo]()
+ m.update(pszMethod)
+ m.update(":")
+ m.update(pszDigestUri)
+ if pszQop == "auth-int":
+ m.update(":")
+ m.update(pszHEntity)
+ HA2 = m.digest()
+
+ return HA2.encode('hex')
+
+
</ins><span class="cx"> # DigestCalcResponse
</span><span class="cx"> @staticmethod
</span><span class="cx"> def calcResponse(
</span><span class="cx"> HA1,
</span><ins>+ HA2,
</ins><span class="cx"> algo,
</span><span class="cx"> pszNonce,
</span><span class="cx"> pszNonceCount,
</span><span class="cx"> pszCNonce,
</span><span class="cx"> pszQop,
</span><del>- pszMethod,
- pszDigestUri,
- pszHEntity,
</del><span class="cx"> ):
</span><span class="cx"> m = Digest.algorithms[algo]()
</span><del>- m.update(pszMethod)
- m.update(":")
- m.update(pszDigestUri)
- if pszQop == "auth-int":
- m.update(":")
- m.update(pszHEntity)
- HA2 = m.digest().encode('hex')
-
- m = Digest.algorithms[algo]()
</del><span class="cx"> m.update(HA1)
</span><span class="cx"> m.update(":")
</span><span class="cx"> m.update(pszNonce)
</span><span class="lines">@@ -201,21 +219,36 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def generateResponse(self, request):
</span><del>- self.response = Digest.calcResponse(
- Digest.calcHA1(
- self.fields.get("algorithm", "md5"),
- self.fields.get("username", ""),
- self.fields.get("realm", ""),
- self.fields.get("password", ""),
- self.fields.get("nonce", ""),
- self.fields.get("cnonce", ""),
- ),
</del><ins>+
+ if self.fields.get("qop", ""):
+ self.clientCount += 1
+ self.fields["cnonce"] = str(uuid.uuid4())
+ self.fields["nc"] = "%08x" % self.clientCount
+ else:
+ self.fields["cnonce"] = ""
+ self.fields["nc"] = ""
+
+ HA1 = Digest.calcHA1(
</ins><span class="cx"> self.fields.get("algorithm", "md5"),
</span><ins>+ self.fields.get("username", ""),
+ self.fields.get("realm", ""),
+ self.fields.get("password", ""),
</ins><span class="cx"> self.fields.get("nonce", ""),
</span><del>- self.fields.get("nc", ""),
</del><span class="cx"> self.fields.get("cnonce", ""),
</span><del>- self.fields.get("qop", ""),
</del><ins>+ )
+ HA2 = Digest.calcHA2(
+ self.fields.get("algorithm", "md5"),
</ins><span class="cx"> request.method,
</span><span class="cx"> request.url,
</span><ins>+ self.fields.get("qop", ""),
</ins><span class="cx"> None,
</span><span class="cx"> )
</span><ins>+ self.response = Digest.calcResponse(
+ HA1,
+ HA2,
+ self.fields.get("algorithm", "md5"),
+ self.fields.get("nonce", ""),
+ self.fields.get("nc", ""),
+ self.fields.get("cnonce", ""),
+ self.fields.get("qop", ""),
+ )
</ins></span></pre>
</div>
</div>
</body>
</html>