<!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>[10165] 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/10165">10165</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2012-12-12 17:46:20 -0800 (Wed, 12 Dec 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Strict-Transport-Security is no longer tied to RedirectHTTPToHTTPS, and max-age is configurable, defaulting to 1 week.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertapcaldavpy">CalendarServer/trunk/calendarserver/tap/caldav.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertaptesttest_caldavpy">CalendarServer/trunk/calendarserver/tap/test/test_caldav.py</a></li>
<li><a href="#CalendarServertrunktwextweb2channelhttppy">CalendarServer/trunk/twext/web2/channel/http.py</a></li>
<li><a href="#CalendarServertrunktwextweb2testtest_httppy">CalendarServer/trunk/twext/web2/test/test_http.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertapcaldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/caldav.py (10164 => 10165)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py 2012-12-12 23:59:38 UTC (rev 10164)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2012-12-13 01:46:20 UTC (rev 10165)
</span><span class="lines">@@ -874,6 +874,22 @@
</span><span class="cx"> def requestFactory(*args, **kw):
</span><span class="cx"> return SSLRedirectRequest(site=underlyingSite, *args, **kw)
</span><span class="cx">
</span><ins>+ # Add the Strict-Transport-Security header to all secured requests
+ # if enabled.
+ if config.StrictTransportSecuritySeconds:
+ previousRequestFactory = requestFactory
+ def requestFactory(*args, **kw):
+ request = previousRequestFactory(*args, **kw)
+ def responseFilter(ignored, response):
+ ignored, secure = request.chanRequest.getHostInfo()
+ if secure:
+ response.headers.addRawHeader("Strict-Transport-Security",
+ "max-age={max_age:d}"
+ .format(max_age=config.StrictTransportSecuritySeconds))
+ return response
+ request.addResponseFilter(responseFilter)
+ return request
+
</ins><span class="cx"> httpFactory = LimitingHTTPFactory(
</span><span class="cx"> requestFactory,
</span><span class="cx"> maxRequests=config.MaxRequests,
</span><span class="lines">@@ -894,6 +910,9 @@
</span><span class="cx"> connectionService.setName(CalDAVService.connectionServiceName)
</span><span class="cx"> connectionService.setServiceParent(service)
</span><span class="cx">
</span><ins>+ # For calendarserver.tap.test.test_caldav.BaseServiceMakerTests.getSite():
+ connectionService.underlyingSite = underlyingSite
+
</ins><span class="cx"> if config.InheritFDs or config.InheritSSLFDs:
</span><span class="cx"> # Inherit sockets to call accept() on them individually.
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertaptesttest_caldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/test/test_caldav.py (10164 => 10165)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/test/test_caldav.py 2012-12-12 23:59:38 UTC (rev 10164)
+++ CalendarServer/trunk/calendarserver/tap/test/test_caldav.py 2012-12-13 01:46:20 UTC (rev 10165)
</span><span class="lines">@@ -380,9 +380,10 @@
</span><span class="cx"> # NOTE: in a database 'single' configuration, PostgresService
</span><span class="cx"> # will prevent the HTTP services from actually getting added to
</span><span class="cx"> # the hierarchy until the hierarchy has started.
</span><del>- lambda x: hasattr(x, 'args')
</del><ins>+ # 'underlyingSite' assigned in caldav.py
+ lambda x: hasattr(x, 'underlyingSite')
</ins><span class="cx"> ):
</span><del>- return listeningService.args[1].protocolArgs['requestFactory']
</del><ins>+ return listeningService.underlyingSite
</ins><span class="cx"> raise RuntimeError("No site found.")
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwextweb2channelhttppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/web2/channel/http.py (10164 => 10165)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/web2/channel/http.py 2012-12-12 23:59:38 UTC (rev 10164)
+++ CalendarServer/trunk/twext/web2/channel/http.py 2012-12-13 01:46:20 UTC (rev 10165)
</span><span class="lines">@@ -76,26 +76,11 @@
</span><span class="cx"> self.transport.loseConnection()
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> class SSLRedirectRequest(Request):
</span><span class="cx"> """
</span><span class="cx"> An L{SSLRedirectRequest} prevents processing if the request is over plain
</span><span class="cx"> HTTP; instead, it redirects to HTTPS.
</span><del>-
- If the request is already secured, it instead sets the
- Strict-Transport-Security header as documented by the U{HTTP Strict
- Transport Security specification
- <http://tools.ietf.org/html/draft-ietf-websec-strict-transport-sec-02>}.
-
- @ivar maxAge: the number of seconds that a client must wait after receiving
- an HTTPS response, before they may attempt to make an HTTP request
- again.
-
- @type maxAge: C{int}
</del><span class="cx"> """
</span><del>-
- maxAge = 600
-
</del><span class="cx"> def process(self):
</span><span class="cx"> ignored, secure = self.chanRequest.getHostInfo()
</span><span class="cx"> if not secure:
</span><span class="lines">@@ -116,15 +101,6 @@
</span><span class="cx"> return super(SSLRedirectRequest, self).process()
</span><span class="cx">
</span><span class="cx">
</span><del>- def writeResponse(self, response):
- """
- Response filter to add HSTS header.
- """
- response.headers.addRawHeader("Strict-Transport-Security",
- "max-age={max_age:d}"
- .format(max_age=self.maxAge))
- return super(SSLRedirectRequest, self).writeResponse(response)
-
</del><span class="cx"> # >%
</span><span class="cx">
</span><span class="cx"> PERSIST_NO_PIPELINE, PERSIST_PIPELINE = (1,2)
</span></span></pre></div>
<a id="CalendarServertrunktwextweb2testtest_httppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/web2/test/test_http.py (10164 => 10165)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/web2/test/test_http.py 2012-12-12 23:59:38 UTC (rev 10164)
+++ CalendarServer/trunk/twext/web2/test/test_http.py 2012-12-13 01:46:20 UTC (rev 10165)
</span><span class="lines">@@ -742,18 +742,6 @@
</span><span class="cx"> cxn.client.loseConnection()
</span><span class="cx"> self.assertDone(cxn)
</span><span class="cx">
</span><del>-
- def test_http1_1_sts(self):
- """
- L{SSLRedirectRequest} uses strict transport security, and will set the
- appropriate header.
- """
- self.requestClass = TestSSLRedirectRequest
- return self.testHTTP1_1_chunking(
- "Strict-Transport-Security: max-age=600"
- )
-
-
</del><span class="cx"> def testHTTP1_1_expect_continue(self):
</span><span class="cx"> cxn = self.connect()
</span><span class="cx"> cmds = [[]]
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (10164 => 10165)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2012-12-12 23:59:38 UTC (rev 10164)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2012-12-13 01:46:20 UTC (rev 10165)
</span><span class="lines">@@ -250,6 +250,8 @@
</span><span class="cx"> "RedirectHTTPToHTTPS" : False, # If True, all nonSSL requests redirected to an SSL Port
</span><span class="cx"> "SSLMethod" : "SSLv3_METHOD", # SSLv2_METHOD, SSLv3_METHOD, SSLv23_METHOD, TLSv1_METHOD
</span><span class="cx"> "SSLCiphers" : "ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM",
</span><ins>+ "StrictTransportSecuritySeconds" : 7 * 24 * 60 * 60, # max-age value for
+ # Strict-Transport-Security header; set to 0 to disable header.
</ins><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # Network address configuration information
</span></span></pre>
</div>
</div>
</body>
</html>