<!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>[15226] 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/15226">15226</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-10-24 09:02:50 -0700 (Sat, 24 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Check that Keychain identity private keys are accessible when pre-flighting the SSL and APNS certs.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.py</a></li>
<li><a href="#CalendarServertrunkrequirementstwistedosxtxt">CalendarServer/trunk/requirements-twisted-osx.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/util.py (15225 => 15226)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2015-10-24 16:00:50 UTC (rev 15225)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2015-10-24 16:02:50 UTC (rev 15226)
</span><span class="lines">@@ -1305,6 +1305,16 @@
</span><span class="cx"> if config.SSLKeychainIdentity:
</span><span class="cx"> # Fall through to see if we can load the identity from the keychain
</span><span class="cx"> certificate_title = "Keychain: {}".format(config.SSLKeychainIdentity)
</span><ins>+
+ error = OpenSSL.crypto.check_keychain_identity(config.SSLKeychainIdentity)
+ if error:
+ message = (
+ "The configured TLS Keychain Identity ({cert}) cannot be used: {reason}".format(
+ cert=certificate_title,
+ reason=error
+ )
+ )
+ return False, message
</ins><span class="cx"> else:
</span><span class="cx"> return True, "TLS disabled"
</span><span class="cx"> else:
</span><span class="lines">@@ -1388,6 +1398,17 @@
</span><span class="cx">
</span><span class="cx"> # Fall through to see if we can load the identity from the keychain
</span><span class="cx"> certificate_title = "Keychain: {}".format(protoConfig.KeychainIdentity)
</span><ins>+
+ error = OpenSSL.crypto.check_keychain_identity(protoConfig.KeychainIdentity)
+ if error:
+ message = (
+ "The {proto} APNS Keychain Identity ({cert}) cannot be used: {reason}".format(
+ proto=protocol,
+ cert=certificate_title,
+ reason=error
+ )
+ )
+ return False, message
</ins><span class="cx"> else:
</span><span class="cx"> message = (
</span><span class="cx"> "No {proto} APNS Keychain Identity was set".format(
</span></span></pre></div>
<a id="CalendarServertrunkrequirementstwistedosxtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-twisted-osx.txt (15225 => 15226)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-twisted-osx.txt 2015-10-24 16:00:50 UTC (rev 15225)
+++ CalendarServer/trunk/requirements-twisted-osx.txt 2015-10-24 16:02:50 UTC (rev 15226)
</span><span class="lines">@@ -6,9 +6,9 @@
</span><span class="cx"> #zope.interface
</span><span class="cx"> pycrypto==2.6.1
</span><span class="cx">
</span><del>- --editable svn+http://svn.calendarserver.org/repository/calendarserver/OSXFrameworks/trunk@15218#egg=osxframeworks
</del><ins>+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/OSXFrameworks/trunk@15224#egg=osxframeworks
</ins><span class="cx"> cffi==1.3.0
</span><span class="cx"> pycparser==2.13
</span><span class="cx">
</span><del>- --editable svn+http://svn.calendarserver.org/repository/calendarserver/PySecureTransport/trunk@15219#egg=pysecuretransport
</del><ins>+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/PySecureTransport/trunk@15225#egg=pysecuretransport
</ins><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>