<!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>[15323] 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/15323">15323</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-11-16 12:14:08 -0800 (Mon, 16 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Post an alert when imap cert is untrusted</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertaptesttest_utilpy">CalendarServer/trunk/calendarserver/tap/test/test_util.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsutilpy">CalendarServer/trunk/calendarserver/tools/util.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimipinboundpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertaptesttest_utilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/test/test_util.py (15322 => 15323)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/test/test_util.py 2015-11-16 20:12:59 UTC (rev 15322)
+++ CalendarServer/trunk/calendarserver/tap/test/test_util.py 2015-11-16 20:14:08 UTC (rev 15323)
</span><span class="lines">@@ -14,7 +14,10 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from calendarserver.tap.util import MemoryLimitService, Stepper, verifyTLSCertificate, memoryForPID
</del><ins>+from calendarserver.tap.util import (
+ MemoryLimitService, Stepper, verifyTLSCertificate, memoryForPID,
+ secondsSinceLastPost, recordTimeStamp
+)
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks
</span><span class="cx"> from twisted.internet.task import Clock
</span><span class="lines">@@ -296,3 +299,40 @@
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> self.assertFalse(success)
</span><ins>+
+
+class AlertTestCase(TestCase):
+
+ def test_secondsSinceLastPost(self):
+
+ timestampsDir = self.mktemp()
+ os.mkdir(timestampsDir)
+
+ # Non existent timestamp file
+ self.assertEquals(
+ secondsSinceLastPost("TestAlert", timestampsDirectory=timestampsDir, now=10),
+ 10
+ )
+
+ # Existing valid, past timestamp file
+ recordTimeStamp("TestAlert", timestampsDirectory=timestampsDir, now=5)
+ self.assertEquals(
+ secondsSinceLastPost("TestAlert", timestampsDirectory=timestampsDir, now=12),
+ 7
+ )
+
+ # Existing valid, future timestamp file
+ recordTimeStamp("TestAlert", timestampsDirectory=timestampsDir, now=20)
+ self.assertEquals(
+ secondsSinceLastPost("TestAlert", timestampsDirectory=timestampsDir, now=12),
+ -8
+ )
+
+ # Existing invalid timestamp file
+ dirFP = FilePath(timestampsDir)
+ child = dirFP.child(".TestAlert.timestamp")
+ child.setContent("not a number")
+ self.assertEquals(
+ secondsSinceLastPost("TestAlert", timestampsDirectory=timestampsDir, now=12),
+ 12
+ )
</ins></span></pre></div>
<a id="CalendarServertrunkcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/util.py (15322 => 15323)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2015-11-16 20:12:59 UTC (rev 15322)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2015-11-16 20:14:08 UTC (rev 15323)
</span><span class="lines">@@ -111,6 +111,7 @@
</span><span class="cx"> import os
</span><span class="cx"> import psutil
</span><span class="cx"> import sys
</span><ins>+import time
</ins><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> from twistedcaldav.authkerb import NegotiateCredentialFactory
</span><span class="lines">@@ -1325,7 +1326,7 @@
</span><span class="cx"> cert=config.SSLCertificate
</span><span class="cx"> )
</span><span class="cx"> )
</span><del>- postAlert("MissingCertificateAlert", ["path", config.SSLCertificate])
</del><ins>+ postAlert("MissingCertificateAlert", 0, ["path", config.SSLCertificate])
</ins><span class="cx"> return False, message
</span><span class="cx">
</span><span class="cx"> length = os.stat(config.SSLCertificate).st_size
</span><span class="lines">@@ -1392,7 +1393,7 @@
</span><span class="cx"> topic = getAPNTopicFromIdentity(protoConfig.KeychainIdentity)
</span><span class="cx"> protoConfig.Topic = topic
</span><span class="cx"> if not protoConfig.Topic:
</span><del>- postAlert("PushNotificationKeychainIdentityAlert", [])
</del><ins>+ postAlert("PushNotificationKeychainIdentityAlert", 0, [])
</ins><span class="cx"> message = "Cannot extract APN topic"
</span><span class="cx"> return False, message
</span><span class="cx">
</span><span class="lines">@@ -1415,7 +1416,7 @@
</span><span class="cx"> proto=protocol,
</span><span class="cx"> )
</span><span class="cx"> )
</span><del>- postAlert("MissingKeychainIdentityAlert", [])
</del><ins>+ postAlert("MissingKeychainIdentityAlert", 0, [])
</ins><span class="cx"> return False, message
</span><span class="cx">
</span><span class="cx"> else:
</span><span class="lines">@@ -1426,7 +1427,7 @@
</span><span class="cx"> cert=protoConfig.CertificatePath
</span><span class="cx"> )
</span><span class="cx"> )
</span><del>- postAlert("PushNotificationCertificateAlert", [])
</del><ins>+ postAlert("PushNotificationCertificateAlert", 0, [])
</ins><span class="cx"> return False, message
</span><span class="cx">
</span><span class="cx"> # Verify we can extract the topic
</span><span class="lines">@@ -1434,7 +1435,7 @@
</span><span class="cx"> topic = getAPNTopicFromCertificate(protoConfig.CertificatePath)
</span><span class="cx"> protoConfig.Topic = topic
</span><span class="cx"> if not protoConfig.Topic:
</span><del>- postAlert("PushNotificationCertificateAlert", [])
</del><ins>+ postAlert("PushNotificationCertificateAlert", 0, [])
</ins><span class="cx"> message = "Cannot extract APN topic"
</span><span class="cx"> return False, message
</span><span class="cx">
</span><span class="lines">@@ -1448,7 +1449,7 @@
</span><span class="cx"> pass
</span><span class="cx"> except KeychainPasswordNotFound:
</span><span class="cx"> # The password doesn't exist in the keychain.
</span><del>- postAlert("PushNotificationCertificateAlert", [])
</del><ins>+ postAlert("PushNotificationCertificateAlert", 0, [])
</ins><span class="cx"> message = "Cannot retrieve APN passphrase from keychain"
</span><span class="cx"> return False, message
</span><span class="cx">
</span><span class="lines">@@ -1484,7 +1485,7 @@
</span><span class="cx"> reason=str(e)
</span><span class="cx"> )
</span><span class="cx"> )
</span><del>- postAlert("PushNotificationCertificateAlert", [])
</del><ins>+ postAlert("PushNotificationCertificateAlert", 0, [])
</ins><span class="cx"> return False, message
</span><span class="cx">
</span><span class="cx"> return True, "APNS enabled"
</span><span class="lines">@@ -1562,11 +1563,51 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def postAlert(alertType, args):
</del><ins>+def secondsSinceLastPost(alertType, timestampsDirectory=None, now=None):
+ if timestampsDirectory is None:
+ timestampsDirectory = config.DataRoot
+ if now is None:
+ now = int(time.time())
+
+ dirFP = FilePath(timestampsDirectory)
+ childFP = dirFP.child(".{}.timestamp".format(alertType))
+ if not childFP.exists():
+ timestamp = 0
+ else:
+ with childFP.open() as child:
+ try:
+ line = child.readline().strip()
+ timestamp = int(line)
+ except:
+ timestamp = 0
+ return now - timestamp
+
+
+
+def recordTimeStamp(alertType, timestampsDirectory=None, now=None):
+ if timestampsDirectory is None:
+ timestampsDirectory = config.DataRoot
+ if now is None:
+ now = int(time.time())
+
+ dirFP = FilePath(timestampsDirectory)
+ childFP = dirFP.child(".{}.timestamp".format(alertType))
+ childFP.setContent(str(now))
+
+
+
+def postAlert(alertType, ignoreWithinSeconds, args):
</ins><span class="cx"> if (
</span><span class="cx"> config.AlertPostingProgram and
</span><span class="cx"> os.path.exists(config.AlertPostingProgram)
</span><span class="cx"> ):
</span><ins>+ if ignoreWithinSeconds:
+ seconds = secondsSinceLastPost(alertType)
+ if seconds < ignoreWithinSeconds:
+ return
+
+ recordTimeStamp(alertType)
+
</ins><span class="cx"> try:
</span><span class="cx"> commandLine = [config.AlertPostingProgram, alertType]
</span><span class="cx"> commandLine.extend(args)
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/util.py (15322 => 15323)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/util.py 2015-11-16 20:12:59 UTC (rev 15322)
+++ CalendarServer/trunk/calendarserver/tools/util.py 2015-11-16 20:14:08 UTC (rev 15323)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> # until the volume is mounted
</span><span class="cx"> if not os.path.exists(dirpath) or (diagnose.detectPhantomVolume(dirpath) == diagnose.EXIT_CODE_PHANTOM_DATA_VOLUME):
</span><span class="cx"> from calendarserver.tap.util import postAlert
</span><del>- postAlert("MissingDataVolumeAlert", ["volumePath", dirpath])
</del><ins>+ postAlert("MissingDataVolumeAlert", 0, ["volumePath", dirpath])
</ins><span class="cx">
</span><span class="cx"> while not os.path.exists(dirpath) or (diagnose.detectPhantomVolume(dirpath) == diagnose.EXIT_CODE_PHANTOM_DATA_VOLUME):
</span><span class="cx"> if not os.path.exists(dirpath):
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimipinboundpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py (15322 => 15323)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py 2015-11-16 20:12:59 UTC (rev 15322)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py 2015-11-16 20:14:08 UTC (rev 15323)
</span><span class="lines">@@ -42,6 +42,8 @@
</span><span class="cx"> import dateutil.tz
</span><span class="cx"> import email.utils
</span><span class="cx">
</span><ins>+from OpenSSL.SSL import Error as TLSError
+from calendarserver.tap.util import postAlert
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="lines">@@ -635,6 +637,12 @@
</span><span class="cx"> class IMAP4DownloadProtocol(imap4.IMAP4Client):
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><ins>+
+ def connectionLost(self, reason):
+ if reason.type is TLSError:
+ postAlert("MailCertificateAlert", 7 * 24 * 60 * 60, [])
+
+
</ins><span class="cx"> def serverGreeting(self, capabilities):
</span><span class="cx"> self.log.debug("IMAP servergreeting")
</span><span class="cx"> return self.authenticate(
</span></span></pre>
</div>
</div>
</body>
</html>