<!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>[15390] 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/15390">15390</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-12-14 13:48:55 -0800 (Mon, 14 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix cases where non-ascii in HTTP requests result in no access log entries.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserveraccesslogpy">CalendarServer/trunk/calendarserver/accesslog.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertesttest_accesslogpy">CalendarServer/trunk/calendarserver/test/test_accesslog.py</a></li>
<li><a href="#CalendarServertrunktxdavdpsclientpy">CalendarServer/trunk/txdav/dps/client.py</a></li>
<li><a href="#CalendarServertrunktxdavdpstesttest_clientpy">CalendarServer/trunk/txdav/dps/test/test_client.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserveraccesslogpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/accesslog.py (15389 => 15390)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/accesslog.py 2015-12-14 20:48:17 UTC (rev 15389)
+++ CalendarServer/trunk/calendarserver/accesslog.py 2015-12-14 21:48:55 UTC (rev 15390)
</span><span class="lines">@@ -262,6 +262,8 @@
</span><span class="cx"> if self.shouldRotate() and allowrotate:
</span><span class="cx"> self.flush()
</span><span class="cx"> self.rotate()
</span><ins>+ if isinstance(message, unicode):
+ message = message.encode("utf-8")
</ins><span class="cx"> self.f.write(message + "\n")
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertesttest_accesslogpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/test/test_accesslog.py (15389 => 15390)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/test/test_accesslog.py 2015-12-14 20:48:17 UTC (rev 15389)
+++ CalendarServer/trunk/calendarserver/test/test_accesslog.py 2015-12-14 21:48:55 UTC (rev 15390)
</span><span class="lines">@@ -15,7 +15,9 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> from twisted.trial.unittest import TestCase
</span><del>-from calendarserver.accesslog import SystemMonitor
</del><ins>+from calendarserver.accesslog import SystemMonitor, \
+ RotatingFileAccessLoggingObserver
+from twistedcaldav.stdconfig import DEFAULT_CONFIG #@UnusedImport
</ins><span class="cx">
</span><span class="cx"> class AccessLog(TestCase):
</span><span class="cx"> """
</span><span class="lines">@@ -36,3 +38,18 @@
</span><span class="cx">
</span><span class="cx"> monitor.stop()
</span><span class="cx"> self.assertNotEqual(monitor.items["cpu count"], 0)
</span><ins>+
+
+ def test_unicodeLog(self):
+ """
+ Make sure L{RotatingFileAccessLoggingObserver} handles non-ascii data properly.
+ """
+
+ logpath = self.mktemp()
+ observer = RotatingFileAccessLoggingObserver(logpath)
+ observer.start()
+ observer.accessLog(u"Can\u2019 log this")
+ observer.stop()
+
+ with open(logpath) as f:
+ self.assertIn("log this", f.read())
</ins></span></pre></div>
<a id="CalendarServertrunktxdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/client.py (15389 => 15390)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/client.py 2015-12-14 20:48:17 UTC (rev 15389)
+++ CalendarServer/trunk/txdav/dps/client.py 2015-12-14 21:48:55 UTC (rev 15390)
</span><span class="lines">@@ -446,11 +446,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def verifyPlaintextPassword(self, password):
</span><ins>+ if isinstance(password, unicode):
+ password = password.encode("utf-8")
</ins><span class="cx"> return self.service._call(
</span><span class="cx"> VerifyPlaintextPasswordCommand,
</span><span class="cx"> lambda x: x['authenticated'],
</span><span class="cx"> uid=self.uid.encode("utf-8"),
</span><del>- password=password.encode("utf-8")
</del><ins>+ password=password,
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpstesttest_clientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/test/test_client.py (15389 => 15390)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/test/test_client.py 2015-12-14 20:48:17 UTC (rev 15389)
+++ CalendarServer/trunk/txdav/dps/test/test_client.py 2015-12-14 21:48:55 UTC (rev 15390)
</span><span class="lines">@@ -340,7 +340,8 @@
</span><span class="cx"> def test_verifyPlaintextPassword(self):
</span><span class="cx"> expectations = (
</span><span class="cx"> (testPassword, True), # Correct
</span><del>- ("wrong", False) # Incorrect
</del><ins>+ ("wrong", False), # Incorrect
+ ("wrong\xc3\xa5", False), # Incorrect
</ins><span class="cx"> )
</span><span class="cx"> record = (
</span><span class="cx"> yield self.directory.recordWithShortName(
</span></span></pre>
</div>
</div>
</body>
</html>