<!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>[14800] CalendarServer/trunk/txweb2/dav</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/14800">14800</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-05-19 06:31:00 -0700 (Tue, 19 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Show x-forwarded-for info in error log when authentication fails.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxweb2davresourcepy">CalendarServer/trunk/txweb2/dav/resource.py</a></li>
<li><a href="#CalendarServertrunktxweb2davtesttest_resourcepy">CalendarServer/trunk/txweb2/dav/test/test_resource.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxweb2davresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/resource.py (14799 => 14800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txweb2/dav/resource.py 2015-05-19 09:18:40 UTC (rev 14799)
+++ CalendarServer/trunk/txweb2/dav/resource.py 2015-05-19 13:31:00 UTC (rev 14800)
</span><span class="lines">@@ -1088,7 +1088,12 @@
</span><span class="cx">
</span><span class="cx"> def translateUnauthenticated(f):
</span><span class="cx"> f.trap(UnauthorizedLogin, LoginFailed)
</span><del>- log.info("Authentication failed: %s" % (f.value,))
</del><ins>+ ips = [request.remoteAddr.host, ]
+ fwdHeaders = request.headers.getRawHeaders("x-forwarded-for", "")
+ for hdr in fwdHeaders:
+ ips.append("fwd={}".format(hdr))
+ ips = ", ".join(ips)
+ log.info("Authentication failed: %s, client: %s" % (f.value, ips,))
</ins><span class="cx"> d = UnauthorizedResponse.makeResponse(
</span><span class="cx"> request.credentialFactories, request.remoteAddr
</span><span class="cx"> )
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davtesttest_resourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/test/test_resource.py (14799 => 14800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txweb2/dav/test/test_resource.py 2015-05-19 09:18:40 UTC (rev 14799)
+++ CalendarServer/trunk/txweb2/dav/test/test_resource.py 2015-05-19 13:31:00 UTC (rev 14800)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import DeferredList, waitForDeferred, deferredGenerator, succeed
</span><span class="cx"> from twisted.cred.portal import Portal
</span><ins>+from twisted.python.log import addObserver, removeObserver
</ins><span class="cx"> from txweb2 import responsecode
</span><span class="cx"> from txweb2.http import HTTPError
</span><span class="cx"> from txweb2.auth import basic
</span><span class="lines">@@ -341,6 +342,32 @@
</span><span class="cx"> return d
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_badUsernameOrPassword_XForwarded(self):
+ class FakeLogObserver(object):
+ messages = []
+ def emit(self, eventDict):
+ if "log_legacy" in eventDict:
+ self.messages.append(eventDict["log_legacy"])
+
+ blo = FakeLogObserver()
+ addObserver(blo.emit)
+ self.addCleanup(lambda: removeObserver(blo.emit))
+
+ request = SimpleRequest(self.site, "GET", "/protected")
+ request.headers.setHeader(
+ "authorization",
+ ("basic", "gooduser:badpass".encode("base64"))
+ )
+ request.headers.setRawHeaders("x-forwarded-for", ("10.0.1.1",))
+ d = self.assertFailure(self.checkSecurity(request), HTTPError)
+ def expectWwwAuth(err):
+ self.failUnless(err.response.headers.hasHeader("WWW-Authenticate"),
+ "No WWW-Authenticate header present.")
+ self.assertTrue("fwd=10.0.1.1" in str(blo.messages[0]))
+ d.addCallback(self.assertErrorResponse, responsecode.UNAUTHORIZED, expectWwwAuth)
+ return d
+
+
</ins><span class="cx"> def test_lacksPrivileges(self):
</span><span class="cx"> request = SimpleRequest(self.site, "GET", "/protected")
</span><span class="cx"> request.headers.setHeader(
</span></span></pre>
</div>
</div>
</body>
</html>