<!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>[15222] 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/15222">15222</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-10-23 13:39:25 -0700 (Fri, 23 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unit test fixes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverpushtesttest_applepushpy">CalendarServer/trunk/calendarserver/push/test/test_applepush.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertaptesttest_caldavpy">CalendarServer/trunk/calendarserver/tap/test/test_caldav.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertaptesttest_utilpy">CalendarServer/trunk/calendarserver/tap/test/test_util.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsconfigpy">CalendarServer/trunk/calendarserver/tools/config.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminconfigpy">CalendarServer/trunk/calendarserver/webadmin/config.py</a></li>
<li><a href="#CalendarServertrunktxweb2testtest_httppy">CalendarServer/trunk/txweb2/test/test_http.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverpushtesttest_applepushpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/push/test/test_applepush.py (15221 => 15222)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/push/test/test_applepush.py 2015-10-23 20:38:33 UTC (rev 15221)
+++ CalendarServer/trunk/calendarserver/push/test/test_applepush.py 2015-10-23 20:39:25 UTC (rev 15222)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> "PrivateKeyPath" : "caldav.pem",
</span><span class="cx"> "AuthorityChainPath" : "chain.pem",
</span><span class="cx"> "Passphrase" : "",
</span><ins>+ "KeychainIdentity": "org.calendarserver.test",
</ins><span class="cx"> "Topic" : "caldav_topic",
</span><span class="cx"> },
</span><span class="cx"> "CardDAV" : {
</span><span class="lines">@@ -56,6 +57,7 @@
</span><span class="cx"> "PrivateKeyPath" : "carddav.pem",
</span><span class="cx"> "AuthorityChainPath" : "chain.pem",
</span><span class="cx"> "Passphrase" : "",
</span><ins>+ "KeychainIdentity": "org.calendarserver.test",
</ins><span class="cx"> "Topic" : "carddav_topic",
</span><span class="cx"> },
</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 (15221 => 15222)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/test/test_caldav.py 2015-10-23 20:38:33 UTC (rev 15221)
+++ CalendarServer/trunk/calendarserver/tap/test/test_caldav.py 2015-10-23 20:39:25 UTC (rev 15222)
</span><span class="lines">@@ -597,6 +597,7 @@
</span><span class="cx"> pemFile = os.path.join(sourceRoot, "twistedcaldav/test/data/server.pem")
</span><span class="cx"> config.SSLPrivateKey = pemFile
</span><span class="cx"> config.SSLCertificate = pemFile
</span><ins>+ config.SSLKeychainIdentity = "org.calendarserver.test"
</ins><span class="cx"> config.EnableSSL = True
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -716,6 +717,7 @@
</span><span class="cx"> pemFile = os.path.join(sourceRoot, "twistedcaldav/test/data/server.pem")
</span><span class="cx"> config.SSLPrivateKey = pemFile
</span><span class="cx"> config.SSLCertificate = pemFile
</span><ins>+ config.SSLKeychainIdentity = "org.calendarserver.test"
</ins><span class="cx"> config.EnableSSL = True
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -768,6 +770,7 @@
</span><span class="cx"> pemFile = os.path.join(sourceRoot, "twistedcaldav/test/data/server.pem")
</span><span class="cx"> config.SSLPrivateKey = pemFile
</span><span class="cx"> config.SSLCertificate = pemFile
</span><ins>+ config.SSLKeychainIdentity = "org.calendarserver.test"
</ins><span class="cx"> config.EnableSSL = True
</span><span class="cx"> config.BindAddresses = [
</span><span class="cx"> "127.0.0.1",
</span><span class="lines">@@ -822,6 +825,7 @@
</span><span class="cx"> pemFile = os.path.join(sourceRoot, "twistedcaldav/test/data/server.pem")
</span><span class="cx"> config.SSLPrivateKey = pemFile
</span><span class="cx"> config.SSLCertificate = pemFile
</span><ins>+ config.SSLKeychainIdentity = "org.calendarserver.test"
</ins><span class="cx"> config.EnableSSL = True
</span><span class="cx"> config.BindAddresses = [
</span><span class="cx"> "127.0.0.1",
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertaptesttest_utilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/test/test_util.py (15221 => 15222)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/test/test_util.py 2015-10-23 20:38:33 UTC (rev 15221)
+++ CalendarServer/trunk/calendarserver/tap/test/test_util.py 2015-10-23 20:39:25 UTC (rev 15222)
</span><span class="lines">@@ -246,6 +246,7 @@
</span><span class="cx"> ConfigDict(
</span><span class="cx"> {
</span><span class="cx"> "SSLCertificate": "missing",
</span><ins>+ "SSLKeychainIdentity": "missing",
</ins><span class="cx"> }
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="lines">@@ -259,6 +260,7 @@
</span><span class="cx"> ConfigDict(
</span><span class="cx"> {
</span><span class="cx"> "SSLCertificate": certFilePath.path,
</span><ins>+ "SSLKeychainIdentity": "missing",
</ins><span class="cx"> }
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="lines">@@ -278,6 +280,7 @@
</span><span class="cx"> "SSLAuthorityChain": "",
</span><span class="cx"> "SSLMethod": "SSLv3_METHOD",
</span><span class="cx"> "SSLCiphers": "ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM",
</span><ins>+ "SSLKeychainIdentity": "missing",
</ins><span class="cx"> }
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/config.py (15221 => 15222)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/config.py 2015-10-23 20:38:33 UTC (rev 15221)
+++ CalendarServer/trunk/calendarserver/tools/config.py 2015-10-23 20:39:25 UTC (rev 15222)
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx"> "SSLCertificate",
</span><span class="cx"> "SSLPort",
</span><span class="cx"> "SSLPrivateKey",
</span><ins>+ "SSLKeychainIdentity",
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> READONLY_CONFIG_KEYS = [
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/config.py (15221 => 15222)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/config.py 2015-10-23 20:38:33 UTC (rev 15221)
+++ CalendarServer/trunk/calendarserver/webadmin/config.py 2015-10-23 20:39:25 UTC (rev 15222)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> "SSLCertificate",
</span><span class="cx"> "SSLPrivateKey",
</span><span class="cx"> "SSLAuthorityChain",
</span><ins>+ "SSLKeychainIdentity",
</ins><span class="cx"> "SSLMethod",
</span><span class="cx"> "SSLCiphers",
</span><span class="cx"> "EnableCalDAV",
</span></span></pre></div>
<a id="CalendarServertrunktxweb2testtest_httppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/test/test_http.py (15221 => 15222)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txweb2/test/test_http.py 2015-10-23 20:38:33 UTC (rev 15221)
+++ CalendarServer/trunk/txweb2/test/test_http.py 2015-10-23 20:39:25 UTC (rev 15222)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> from twisted.python import util, runtime
</span><span class="cx"> from txweb2.channel.http import SSLRedirectRequest, HTTPFactory, HTTPChannel
</span><span class="cx"> from twisted.internet.task import deferLater
</span><ins>+from twext.internet.ssl import ChainingOpenSSLContextFactory
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class RedirectResponseTestCase(unittest.TestCase):
</span><span class="lines">@@ -1362,7 +1363,10 @@
</span><span class="cx"> type = 'ssl'
</span><span class="cx"> def setUp(self):
</span><span class="cx"> HTTPChannel.allowPersistentConnections = True
</span><del>- sCTX = ssl.DefaultOpenSSLContextFactory(certPath, certPath)
</del><ins>+ sCTX = ChainingOpenSSLContextFactory(
+ certPath, certPath,
+ keychainIdentity="org.calendarserver.test",
+ )
</ins><span class="cx"> factory = SimpleFactory(requestFactory=SimpleRequest)
</span><span class="cx">
</span><span class="cx"> factory.testcase = self
</span></span></pre>
</div>
</div>
</body>
</html>