<!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>[13967] CalendarServer/trunk/calendarserver/tap</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/13967">13967</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-09-16 12:33:31 -0700 (Tue, 16 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pre-flight the APNS certificates, and the EnableCalDAV/EnableCardDAV values.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertapcaldavpy">CalendarServer/trunk/calendarserver/tap/caldav.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.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 (13966 => 13967)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py 2014-09-16 02:00:47 UTC (rev 13966)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2014-09-16 19:33:31 UTC (rev 13967)
</span><span class="lines">@@ -428,15 +428,6 @@
</span><span class="cx">
</span><span class="cx"> def checkConfiguration(self):
</span><span class="cx">
</span><del>- # Having CalDAV *and* CardDAV both disabled is an illegal configuration
- # for a running server (but is fine for command-line utilities)
- if config.ProcessType not in ["Agent", "Utility"]:
- if not config.EnableCalDAV and not config.EnableCardDAV:
- print(
- "Neither EnableCalDAV nor EnableCardDAV are set to True."
- )
- sys.exit(1)
-
</del><span class="cx"> uid, gid = None, None
</span><span class="cx">
</span><span class="cx"> if self.parent["uid"] or self.parent["gid"]:
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/util.py (13966 => 13967)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2014-09-16 02:00:47 UTC (rev 13966)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2014-09-16 19:33:31 UTC (rev 13967)
</span><span class="lines">@@ -1147,8 +1147,14 @@
</span><span class="cx"> Otherwise exits.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- success, reason = verifyTLSCertificate(config)
</del><ins>+ success, reason = verifyConfig(config)
</ins><span class="cx">
</span><ins>+ if success:
+ success, reason = verifyTLSCertificate(config)
+
+ if success:
+ success, reason = verifyAPNSCertificate(config)
+
</ins><span class="cx"> if not success:
</span><span class="cx"> if config.ServiceDisablingProgram:
</span><span class="cx"> # If pre-flight checks fail, we don't want launchd to
</span><span class="lines">@@ -1170,6 +1176,17 @@
</span><span class="cx"> return True
</span><span class="cx">
</span><span class="cx">
</span><ins>+def verifyConfig(config):
+ """
+ At least one of EnableCalDAV or EnableCardDAV must be True
+ """
+
+ if config.EnableCalDAV or config.EnableCardDAV:
+ return True, "A protocol is enabled"
+
+ return False, "Neither CalDAV nor CardDAV are enabled"
+
+
</ins><span class="cx"> def verifyTLSCertificate(config):
</span><span class="cx"> """
</span><span class="cx"> If a TLS certificate is configured, make sure it exists, is non empty,
</span><span class="lines">@@ -1217,6 +1234,54 @@
</span><span class="cx"> return True, "TLS enabled"
</span><span class="cx">
</span><span class="cx">
</span><ins>+def verifyAPNSCertificate(config):
+ """
+ If APNS certificates are configured, make sure they're valid.
+ """
+
+ if config.Notifications.Services.APNS.Enabled:
+
+ for protocol in ("CalDAV", "CardDAV"):
+ protoConfig = config.Notifications.Services.APNS[protocol]
+
+ if not os.path.exists(protoConfig.CertificatePath):
+ message = (
+ "The {proto} APNS certificate ({cert}) is missing".format(
+ proto=protocol,
+ cert=protoConfig.CertificatePath
+ )
+ )
+ return False, message
+
+ try:
+ if protoConfig.Passphrase:
+ passwdCallback = lambda *ignored: protoConfig.Passphrase
+ else:
+ passwdCallback = None
+
+ ChainingOpenSSLContextFactory(
+ protoConfig.PrivateKeyPath,
+ protoConfig.CertificatePath,
+ certificateChainFile=protoConfig.AuthorityChainPath,
+ passwdCallback=passwdCallback,
+ sslmethod=getattr(OpenSSL.SSL, "TLSv1_METHOD"),
+ )
+ except Exception as e:
+ message = (
+ "The {proto} APNS certificate ({cert}) cannot be used: {reason}".format(
+ proto=protocol,
+ cert=protoConfig.CertificatePath,
+ reason=str(e)
+ )
+ )
+ return False, message
+
+ return True, "APNS enabled"
+
+ else:
+ return True, "APNS disabled"
+
+
</ins><span class="cx"> def getSSLPassphrase(*ignored):
</span><span class="cx">
</span><span class="cx"> if not config.SSLPrivateKey:
</span></span></pre>
</div>
</div>
</body>
</html>