<!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>[14734] 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/14734">14734</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-05-01 15:32:00 -0700 (Fri, 01 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use new APNS cert alert; return ServerRoot key from calendarserver_config (but it's read only)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsconfigpy">CalendarServer/trunk/calendarserver/tools/config.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstesttest_configpy">CalendarServer/trunk/calendarserver/tools/test/test_config.py</a></li>
<li><a href="#CalendarServertrunkconfcaldavdappleplist">CalendarServer/trunk/conf/caldavd-apple.plist</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 (14733 => 14734)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py        2015-05-01 20:01:24 UTC (rev 14733)
+++ CalendarServer/trunk/calendarserver/tap/util.py        2015-05-01 22:32:00 UTC (rev 14734)
</span><span class="lines">@@ -1328,6 +1328,7 @@
</span><span class="cx"> cert=protoConfig.CertificatePath
</span><span class="cx"> )
</span><span class="cx"> )
</span><ins>+ postAlert("PushNotificationCertificateAlert", [])
</ins><span class="cx"> return False, message
</span><span class="cx">
</span><span class="cx"> try:
</span><span class="lines">@@ -1351,6 +1352,7 @@
</span><span class="cx"> reason=str(e)
</span><span class="cx"> )
</span><span class="cx"> )
</span><ins>+ postAlert("PushNotificationCertificateAlert", [])
</ins><span class="cx"> return False, message
</span><span class="cx">
</span><span class="cx"> return True, "APNS enabled"
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/config.py (14733 => 14734)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/config.py        2015-05-01 20:01:24 UTC (rev 14733)
+++ CalendarServer/trunk/calendarserver/tools/config.py        2015-05-01 22:32:00 UTC (rev 14734)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> from getopt import getopt, GetoptError
</span><ins>+from itertools import chain
</ins><span class="cx"> import os
</span><span class="cx"> import plistlib
</span><span class="cx"> import signal
</span><span class="lines">@@ -84,6 +85,9 @@
</span><span class="cx"> "SSLPrivateKey",
</span><span class="cx"> ]
</span><span class="cx">
</span><ins>+READONLY_CONFIG_KEYS = [
+ "ServerRoot",
+]
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -351,7 +355,7 @@
</span><span class="cx"> @type command: C{dict}
</span><span class="cx"> """
</span><span class="cx"> result = {}
</span><del>- for keyPath in WRITABLE_CONFIG_KEYS:
</del><ins>+ for keyPath in chain(WRITABLE_CONFIG_KEYS, READONLY_CONFIG_KEYS):
</ins><span class="cx"> value = getKeyPath(config, keyPath)
</span><span class="cx"> if value is not None:
</span><span class="cx"> # Note: config contains utf-8 encoded strings, but plistlib
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_configpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_config.py (14733 => 14734)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_config.py        2015-05-01 20:01:24 UTC (rev 14733)
+++ CalendarServer/trunk/calendarserver/tools/test/test_config.py        2015-05-01 22:32:00 UTC (rev 14734)
</span><span class="lines">@@ -133,8 +133,8 @@
</span><span class="cx"> self.assertEquals(results["result"]["Notifications"]["Services"]["APNS"]["Enabled"], False)
</span><span class="cx"> self.assertEquals(results["result"]["Notifications"]["Services"]["APNS"]["CalDAV"]["CertificatePath"], "/example/calendar.cer")
</span><span class="cx">
</span><del>- # Verify not all keys are present, such as ServerRoot which is not writable
- self.assertFalse("ServerRoot" in results["result"])
</del><ins>+ # Verify not all keys are present, such as umask which is not accessible
+ self.assertFalse("umask" in results["result"])
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -154,6 +154,9 @@
</span><span class="cx"> hostName = "hostname_%s_%s" % (unichr(208), u"\ud83d\udca3")
</span><span class="cx"> self.assertTrue(results["result"]["ServerHostName"].endswith(hostName))
</span><span class="cx">
</span><ins>+ # We tried to modify ServerRoot, but make sure our change did not take
+ self.assertNotEquals(results["result"]["ServerRoot"], "/You/Shall/Not/Pass")
+
</ins><span class="cx"> # The static plist should still have EnableCalDAV = True
</span><span class="cx"> staticPlist = plistlib.readPlist(self.configFileName)
</span><span class="cx"> self.assertTrue(staticPlist["EnableCalDAV"])
</span><span class="lines">@@ -241,6 +244,8 @@
</span><span class="cx"> <true/>
</span><span class="cx"> <key>Notifications.Services.APNS.CalDAV.CertificatePath</key>
</span><span class="cx"> <string>/example/changed.cer</string>
</span><ins>+ <key>ServerRoot</key>
+ <string>/You/Shall/Not/Pass</string>
</ins><span class="cx"> <key>ServerHostName</key>
</span><span class="cx"> <string>hostname_%s_%s</string>
</span><span class="cx"> </dict>
</span></span></pre></div>
<a id="CalendarServertrunkconfcaldavdappleplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd-apple.plist (14733 => 14734)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-apple.plist        2015-05-01 20:01:24 UTC (rev 14733)
+++ CalendarServer/trunk/conf/caldavd-apple.plist        2015-05-01 22:32:00 UTC (rev 14734)
</span><span class="lines">@@ -558,7 +558,7 @@
</span><span class="cx"> <!-- Alert-posting program
</span><span class="cx"> -->
</span><span class="cx"> <key>AlertPostingProgram</key>
</span><del>- <string>/Applications/Server.app/Contents/ServerRoot/Library/CalendarServer/bin/calendarserver_alert</string>
</del><ins>+ <string>/Applications/Server.app/Contents/ServerRoot/Library/CalendarServer/Setup/CalendarServerAlert</string>
</ins><span class="cx">
</span><span class="cx"> <!-- Includes of other plists
</span><span class="cx"> -->
</span></span></pre>
</div>
</div>
</body>
</html>