[CalendarServer-changes] [3502] CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest. patch

source_changes at macosforge.org source_changes at macosforge.org
Wed Dec 10 11:04:56 PST 2008


Revision: 3502
          http://trac.macosforge.org/projects/calendarserver/changeset/3502
Author:   wsanchez at apple.com
Date:     2008-12-10 11:04:56 -0800 (Wed, 10 Dec 2008)
Log Message:
-----------
twisted.web2.auth.digest in caldavd generates an opaque with a newline in the middle

Modified Paths:
--------------
    CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch

Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch	2008-12-10 18:50:14 UTC (rev 3501)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch	2008-12-10 19:04:56 UTC (rev 3502)
@@ -35,15 +35,18 @@
  }
  
  # DigestCalcHA1
-@@ -228,7 +237,7 @@
+@@ -228,9 +237,9 @@
          # Now, what we do is encode the nonce, client ip and a timestamp
          # in the opaque value with a suitable digest
          key = "%s,%s,%s" % (nonce, clientip, str(int(self._getTime())))
 -        digest = md5.new(key + self.privateKey).hexdigest()
 +        digest = md5(key + self.privateKey).hexdigest()
          ekey = key.encode('base64')
-         return "%s-%s" % (digest, ekey.strip('\n'))
+-        return "%s-%s" % (digest, ekey.strip('\n'))
++        return "%s-%s" % (digest, ekey.replace('\n', ''))
  
+     def verifyOpaque(self, opaque, nonce, clientip):
+         """
 @@ -274,7 +283,7 @@
                  'Invalid response, incompatible opaque/nonce too old')
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081210/53ea148d/attachment.html>


More information about the calendarserver-changes mailing list