[prev in list] [next in list] [prev in thread] [next in thread]
List: calendarserver-changes
Subject: [CalendarServer-changes] [14348] CalendarServer/trunk
From: source_changes () macosforge ! org
Date: 2015-01-27 18:39:08
Message-ID: 20150127183908.A9635140F01 () svn ! calendarserver ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 14348
http://trac.calendarserver.org//changeset/14348
Author: cdaboo@apple.com
Date: 2015-01-27 10:39:08 -0800 (Tue, 27 Jan 2015)
Log Message:
-----------
DKIM fixes.
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/tools/dkimtool.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/dkim.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py
Modified: CalendarServer/trunk/calendarserver/tools/dkimtool.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/dkimtool.py 2015-01-27 18:38:09 UTC \
(rev 14347)
+++ CalendarServer/trunk/calendarserver/tools/dkimtool.py 2015-01-27 18:39:08 UTC \
(rev 14348) @@ -15,6 +15,7 @@
# limitations under the License.
##
+import os
import sys
from Crypto.PublicKey import RSA
from StringIO import StringIO
@@ -24,9 +25,7 @@
from twisted.python.usage import Options
from twext.python.log import Logger, LogLevel, StandardIOObserver
-from txweb2.client.http import ClientRequest
from txweb2.http_headers import Headers
-from txweb2.stream import MemoryStream
from txdav.caldav.datastore.scheduling.ischedule.dkim import RSA256, DKIMRequest, \
PublicKeyLookup, DKIMVerifier, DKIMVerificationError
@@ -114,19 +113,17 @@
@inlineCallbacks
def _doVerify(options):
# Parse the HTTP file
- verify = open(options["verify"]).read()
- method, uri, headers, stream = _parseRequest(verify)
+ verify = open(os.path.expanduser(options["verify"])).read()
+ _method, _uri, headers, body = _parseRequest(verify)
- request = ClientRequest(method, uri, headers, stream)
-
# Check for local public key
if options["pub-key"]:
- PublicKeyLookup_File.pubkeyfile = options["pub-key"]
+ PublicKeyLookup_File.pubkeyfile = os.path.expanduser(options["pub-key"])
lookup = (PublicKeyLookup_File,)
else:
lookup = None
- dkim = DKIMVerifier(request, lookup)
+ dkim = DKIMVerifier(headers, body, lookup)
if options["fake-time"]:
dkim.time = 0
@@ -162,7 +159,7 @@
name, value = hdr.split(':', 1)
headers.addRawHeader(name, value.strip())
- stream = MemoryStream("".join(body))
+ stream = "".join(body)
return method, uri, headers, stream
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/dkim.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/dkim.py 2015-01-27 \
18:38:09 UTC (rev 14347)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/dkim.py 2015-01-27 \
18:39:08 UTC (rev 14348) @@ -294,8 +294,16 @@
@staticmethod
def canonicalizeBody(data):
- if not data.endswith("\r\n"):
- data += "\r\n"
+ """
+ DKIM simple body canonicalization: remove empty lines at the end
+ and ensure it ends with one \r\n.
+
+ @param data: data to canonicalize
+ @type data: L{str}
+ """
+ while data.endswith("\r\n"):
+ data = data[:-2]
+ data += "\r\n"
return data
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py 2015-01-27 \
18:38:09 UTC (rev 14347)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py 2015-01-27 \
18:39:08 UTC (rev 14348) @@ -389,6 +389,33 @@
self.assertEqual(extracted, result.replace("\n", "\r\n"))
+ def test_canonicalize_body(self):
+ """
+ L{DKIMUtils.canonicalizeBody} correctly canonicalizes bodies.
+ """
+
+ data = (
+ (
+ """Simple""",
+ """Simple\n""",
+ ),
+ (
+ """Simple\n""",
+ """Simple\n""",
+ ),
+ (
+ """Simple\n\n""",
+ """Simple\n""",
+ ),
+ )
+
+ for text, result in data:
+ self.assertEqual(
+ DKIMUtils.canonicalizeBody(text.replace("\n", "\r\n")),
+ result.replace("\n", "\r\n"),
+ )
+
+
@inlineCallbacks
def test_locate_public_key(self):
"""
[Attachment #5 (text/html)]
<!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>[14348] CalendarServer/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/14348">14348</a></dd> <dt>Author</dt> \
<dd>cdaboo@apple.com</dd> <dt>Date</dt> <dd>2015-01-27 10:39:08 -0800 (Tue, 27 Jan \
2015)</dd> </dl>
<h3>Log Message</h3>
<pre>DKIM fixes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolsdkimtoolpy">CalendarServer/trunk/calendarserver/tools/dkimtool.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduledkimpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/dkim.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduletesttest_dkim \
py">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolsdkimtoolpy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/trunk/calendarserver/tools/dkimtool.py (14347 => 14348)</h4> <pre \
class="diff"><span> <span class="info">--- \
CalendarServer/trunk/calendarserver/tools/dkimtool.py 2015-01-27 18:38:09 UTC (rev \
14347)
+++ CalendarServer/trunk/calendarserver/tools/dkimtool.py 2015-01-27 18:39:08 UTC \
(rev 14348) </span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><ins>+import os
</ins><span class="cx"> import sys
</span><span class="cx"> from Crypto.PublicKey import RSA
</span><span class="cx"> from StringIO import StringIO
</span><span class="lines">@@ -24,9 +25,7 @@
</span><span class="cx"> from twisted.python.usage import Options
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger, LogLevel, \
StandardIOObserver </span><del>-from txweb2.client.http import ClientRequest
</del><span class="cx"> from txweb2.http_headers import Headers
</span><del>-from txweb2.stream import MemoryStream
</del><span class="cx">
</span><span class="cx"> from txdav.caldav.datastore.scheduling.ischedule.dkim import \
RSA256, DKIMRequest, \ </span><span class="cx"> PublicKeyLookup, DKIMVerifier, \
DKIMVerificationError </span><span class="lines">@@ -114,19 +113,17 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _doVerify(options):
</span><span class="cx"> # Parse the HTTP file
</span><del>- verify = open(options["verify"]).read()
- method, uri, headers, stream = _parseRequest(verify)
</del><ins>+ verify = open(os.path.expanduser(options["verify"])).read()
+ _method, _uri, headers, body = _parseRequest(verify)
</ins><span class="cx">
</span><del>- request = ClientRequest(method, uri, headers, stream)
-
</del><span class="cx"> # Check for local public key
</span><span class="cx"> if options["pub-key"]:
</span><del>- PublicKeyLookup_File.pubkeyfile = options["pub-key"]
</del><ins>+ PublicKeyLookup_File.pubkeyfile = \
os.path.expanduser(options["pub-key"]) </ins><span class="cx"> \
lookup = (PublicKeyLookup_File,) </span><span class="cx"> else:
</span><span class="cx"> lookup = None
</span><span class="cx">
</span><del>- dkim = DKIMVerifier(request, lookup)
</del><ins>+ dkim = DKIMVerifier(headers, body, lookup)
</ins><span class="cx"> if options["fake-time"]:
</span><span class="cx"> dkim.time = 0
</span><span class="cx">
</span><span class="lines">@@ -162,7 +159,7 @@
</span><span class="cx"> name, value = hdr.split(':', 1)
</span><span class="cx"> headers.addRawHeader(name, value.strip())
</span><span class="cx">
</span><del>- stream = MemoryStream("".join(body))
</del><ins>+ stream = "".join(body)
</ins><span class="cx">
</span><span class="cx"> return method, uri, headers, stream
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduledkimpy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/dkim.py (14347 => \
14348)</h4> <pre class="diff"><span>
<span class="info">--- \
CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/dkim.py 2015-01-27 \
18:38:09 UTC (rev 14347)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/dkim.py 2015-01-27 \
18:39:08 UTC (rev 14348) </span><span class="lines">@@ -294,8 +294,16 @@
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><span class="cx"> def canonicalizeBody(data):
</span><del>- if not data.endswith("\r\n"):
- data += "\r\n"
</del><ins>+ """
+ DKIM simple body canonicalization: remove empty lines at the end
+ and ensure it ends with one \r\n.
+
+ @param data: data to canonicalize
+ @type data: L{str}
+ """
+ while data.endswith("\r\n"):
+ data = data[:-2]
+ data += "\r\n"
</ins><span class="cx"> return data
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduletesttest_dkimpy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py \
(14347 => 14348)</h4> <pre class="diff"><span>
<span class="info">--- \
CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py 2015-01-27 \
18:38:09 UTC (rev 14347)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py 2015-01-27 \
18:39:08 UTC (rev 14348) </span><span class="lines">@@ -389,6 +389,33 @@
</span><span class="cx"> self.assertEqual(extracted, \
result.replace("\n", "\r\n")) </span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_canonicalize_body(self):
+ """
+ L{DKIMUtils.canonicalizeBody} correctly canonicalizes bodies.
+ """
+
+ data = (
+ (
+ """Simple""",
+ """Simple\n""",
+ ),
+ (
+ """Simple\n""",
+ """Simple\n""",
+ ),
+ (
+ """Simple\n\n""",
+ """Simple\n""",
+ ),
+ )
+
+ for text, result in data:
+ self.assertEqual(
+ DKIMUtils.canonicalizeBody(text.replace("\n", \
"\r\n")), + result.replace("\n", \
"\r\n"), + )
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_locate_public_key(self):
</span><span class="cx"> """
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
calendarserver-changes mailing list
calendarserver-changes@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/calendarserver-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic