[CalendarServer-changes] [6878] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Feb 3 20:24:21 PST 2011
Revision: 6878
http://trac.macosforge.org/projects/calendarserver/changeset/6878
Author: sagen at apple.com
Date: 2011-02-03 20:24:17 -0800 (Thu, 03 Feb 2011)
Log Message:
-----------
Adds calendarserver_monitor_notifications, a script to ensure push notifications are working.
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/tools/purge.py
CalendarServer/trunk/setup.py
CalendarServer/trunk/support/Makefile.Apple
CalendarServer/trunk/twistedcaldav/util.py
Added Paths:
-----------
CalendarServer/trunk/calendarserver/tools/notifications.py
CalendarServer/trunk/doc/calendarserver_monitor_notifications.8
Added: CalendarServer/trunk/calendarserver/tools/notifications.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/notifications.py (rev 0)
+++ CalendarServer/trunk/calendarserver/tools/notifications.py 2011-02-04 04:24:17 UTC (rev 6878)
@@ -0,0 +1,554 @@
+##
+# Copyright (c) 2011 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from calendarserver.tools.util import loadConfig
+from datetime import datetime
+from getopt import getopt, GetoptError
+from getpass import getpass
+from twisted.application.service import Service
+from twisted.internet import reactor, ssl
+from twisted.internet.defer import inlineCallbacks, returnValue
+from twisted.web import client
+from twisted.words.protocols.jabber import xmlstream
+from twisted.words.protocols.jabber.client import XMPPAuthenticator, IQAuthInitializer
+from twisted.words.protocols.jabber.jid import JID
+from twisted.words.protocols.jabber.xmlstream import IQ
+from twisted.words.xish import domish
+from twistedcaldav.config import config, ConfigurationError
+from twistedcaldav.util import AuthorizedHTTPGetter
+from xml.etree import ElementTree
+import os
+import signal
+import sys
+import uuid
+
+
+def usage(e=None):
+ name = os.path.basename(sys.argv[0])
+ print "usage: %s [options] username" % (name,)
+ print ""
+ print " Monitor push notification events from calendar server"
+ print ""
+ print "options:"
+ print " -f --config <path>: Specify caldavd.plist configuration path"
+ print " -h --help: print this help and exit"
+ print " -H --host <hostname>: calendar server host name"
+ print " -p --port <port number>: calendar server port number"
+ print " -s --ssl: use https (default is http)"
+ print " -v --verbose: print additional information including XMPP traffic"
+ print ""
+
+ if e:
+ sys.stderr.write("%s\n" % (e,))
+ sys.exit(64)
+ else:
+ sys.exit(0)
+
+
+def main():
+ try:
+ (optargs, args) = getopt(
+ sys.argv[1:], "f:hH:p:sv", [
+ "config=",
+ "help",
+ "host=",
+ "port=",
+ "ssl",
+ "verbose",
+ ],
+ )
+ except GetoptError, e:
+ usage(e)
+
+ configFileName = None
+ host = None
+ port = None
+ useSSL = False
+ verbose = False
+
+ for opt, arg in optargs:
+ if opt in ("-h", "--help"):
+ usage()
+ elif opt in ("-f", "--config"):
+ configFileName = arg
+ elif opt in ("-H", "--host"):
+ host = arg
+ elif opt in ("-p", "--port"):
+ port = int(arg)
+ elif opt in ("-s", "--ssl"):
+ useSSL = True
+ elif opt in ("-v", "--verbose"):
+ verbose = True
+ else:
+ raise NotImplementedError(opt)
+
+ if len(args) != 1:
+ usage("Username not specified")
+
+ username = args[0]
+
+ if host is None:
+ # No host specified, so try loading config to look up settings
+ try:
+ loadConfig(configFileName)
+ except ConfigurationError, e:
+ print "Error in confiuration: %s" % (e,)
+ sys.exit(1)
+
+ useSSL = config.EnableSSL
+ host = config.ServerHostName
+ port = config.SSLPort if useSSL else config.HTTPPort
+
+ if port is None:
+ usage("Must specify a port number")
+
+ password = getpass("Password for %s: " % (username,))
+
+ monitorService = PushMonitorService(useSSL, host, port, username, password,
+ verbose)
+ reactor.addSystemEventTrigger("during", "startup",
+ monitorService.startService)
+ reactor.addSystemEventTrigger("before", "shutdown",
+ monitorService.stopService)
+
+ reactor.run()
+
+
+
+class PubSubClientFactory(xmlstream.XmlStreamFactory):
+ """
+ An XMPP pubsub client that subscribes to nodes and prints a message
+ whenever a notification arrives.
+ """
+
+ pubsubNS = 'http://jabber.org/protocol/pubsub'
+
+ def __init__(self, jid, password, service, nodes, verbose):
+ resource = "pushmonitor.%s" % (uuid.uuid4().hex,)
+ self.jid = "%s/%s" % (jid, resource)
+ self.service = service
+ self.nodes = nodes
+ self.verbose = verbose
+
+ if self.verbose:
+ print "JID:", self.jid, "Pubsub service:", self.service
+
+ self.presenceSeconds = 60
+ self.presenceCall = None
+ self.xmlStream = None
+ self.doKeepAlive = True
+
+ xmlstream.XmlStreamFactory.__init__(self,
+ XMPPAuthenticator(JID(self.jid), password))
+
+ self.addBootstrap(xmlstream.STREAM_CONNECTED_EVENT, self.connected)
+ self.addBootstrap(xmlstream.STREAM_END_EVENT, self.disconnected)
+ self.addBootstrap(xmlstream.INIT_FAILED_EVENT, self.initFailed)
+
+ self.addBootstrap(xmlstream.STREAM_AUTHD_EVENT, self.authenticated)
+ self.addBootstrap(IQAuthInitializer.INVALID_USER_EVENT,
+ self.authFailed)
+ self.addBootstrap(IQAuthInitializer.AUTH_FAILED_EVENT,
+ self.authFailed)
+
+ signal.signal(signal.SIGINT, self.sigint_handler)
+
+ @inlineCallbacks
+ def sigint_handler(self, num, frame):
+ print " Shutting down..."
+ if self.xmlStream is not None:
+ for node, (url, name, kind) in self.nodes.iteritems():
+ yield self.unsubscribe(node, name, kind)
+ reactor.stop()
+
+ def connected(self, xmlStream):
+ self.xmlStream = xmlStream
+ if self.verbose:
+ print "XMPP connection successful"
+ xmlStream.rawDataInFn = self.rawDataIn
+ xmlStream.rawDataOutFn = self.rawDataOut
+ xmlStream.addObserver("/message/event/items",
+ self.handleMessageEventItems)
+
+ def disconnected(self, xmlStream):
+ self.xmlStream = None
+ if self.presenceCall is not None:
+ self.presenceCall.cancel()
+ self.presenceCall = None
+ if self.verbose:
+ print "XMPP disconnected"
+
+ def initFailed(self, failure):
+ self.xmlStream = None
+ print "XMPP connection failure: %s" % (failure,)
+ reactor.stop()
+
+ @inlineCallbacks
+ def authenticated(self, xmlStream):
+ if self.verbose:
+ print "XMPP authentication successful"
+ self.sendPresence()
+ for node, (url, name, kind) in self.nodes.iteritems():
+ yield self.subscribe(node, name, kind)
+
+ print "Awaiting notifications (hit Control-C to end)"
+
+ def authFailed(self, e):
+ print "XMPP authentication failed"
+ reactor.stop()
+
+ def sendPresence(self):
+ if self.doKeepAlive and self.xmlStream is not None:
+ presence = domish.Element(('jabber:client', 'presence'))
+ self.xmlStream.send(presence)
+ self.presenceCall = reactor.callLater(self.presenceSeconds,
+ self.sendPresence)
+
+ def handleMessageEventItems(self, iq):
+ item = iq.firstChildElement().firstChildElement()
+ if item:
+ node = item.getAttribute("node")
+ if node:
+ node = str(node)
+ url, name, kind = self.nodes.get(node, ("Not subscribed", "Unknown", "Unknown"))
+ timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+ print '%s | Notification for "%s" (%s)' % (timestamp, name, kind)
+ if self.verbose:
+ print " node = %s" % (node,)
+ print " url = %s" % (url,)
+
+
+ @inlineCallbacks
+ def subscribe(self, node, name, kind):
+ iq = IQ(self.xmlStream)
+ pubsubElement = iq.addElement("pubsub", defaultUri=self.pubsubNS)
+ subElement = pubsubElement.addElement("subscribe")
+ subElement["node"] = node
+ subElement["jid"] = self.jid
+ print 'Subscribing to "%s" (%s)' % (name, kind)
+ if self.verbose:
+ print node
+ try:
+ yield iq.send(to=self.service)
+ print "OK"
+ except Exception, e:
+ print "Subscription failure: %s %s" % (node, e)
+
+ @inlineCallbacks
+ def unsubscribe(self, node, name, kind):
+ iq = IQ(self.xmlStream)
+ pubsubElement = iq.addElement("pubsub", defaultUri=self.pubsubNS)
+ subElement = pubsubElement.addElement("unsubscribe")
+ subElement["node"] = node
+ subElement["jid"] = self.jid
+ print 'Unsubscribing from "%s" (%s)' % (name, kind)
+ if self.verbose:
+ print node
+ try:
+ yield iq.send(to=self.service)
+ print "OK"
+ except Exception, e:
+ print "Unsubscription failure: %s %s" % (node, e)
+
+
+ @inlineCallbacks
+ def retrieveSubscriptions(self):
+ # This isn't supported by Apple's pubsub service
+ iq = IQ(self.xmlStream)
+ pubsubElement = iq.addElement("pubsub", defaultUri=self.pubsubNS)
+ pubsubElement.addElement("subscriptions")
+ print "Requesting list of subscriptions"
+ try:
+ yield iq.send(to=self.service)
+ except Exception, e:
+ print "Subscription list failure: %s" % (e,)
+
+
+ def rawDataIn(self, buf):
+ print "RECV: %s" % unicode(buf, 'utf-8').encode('ascii', 'replace')
+
+ def rawDataOut(self, buf):
+ print "SEND: %s" % unicode(buf, 'utf-8').encode('ascii', 'replace')
+
+
+class PropfindRequestor(AuthorizedHTTPGetter):
+ handleStatus_207 = lambda self: self.handleStatus_200
+
+
+class PushMonitorService(Service):
+ """
+ A service which uses CalDAV to determine which pubsub node(s) correspond
+ to any calendar the user has access to (including any belonging to users
+ who have delegated access to the user). Those nodes are subscribed to
+ using XMPP and monitored for updates.
+ """
+
+ def __init__(self, useSSL, host, port, username, password, verbose):
+ self.useSSL = useSSL
+ self.host = host
+ self.port = port
+ self.username = username
+ self.password = password
+ self.verbose = verbose
+
+ @inlineCallbacks
+ def startService(self):
+ try:
+ principals = (yield self.getProxyFor())
+ principals.add("/principals/users/%s/" % (self.username,))
+ paths = set()
+ for principal in principals:
+ name, homes = (yield self.getPrincipalDetails(principal))
+ if self.verbose:
+ print name, homes
+ for home in homes:
+ paths.add(home)
+ subscribeNodes = { }
+ for path in paths:
+ host, port, nodes = (yield self.getPushInfo(path))
+ subscribeNodes.update(nodes)
+ if subscribeNodes:
+ self.startMonitoring(host, port, subscribeNodes)
+ else:
+ print "No nodes to monitor"
+ reactor.stop()
+
+ except Exception, e:
+ print "Error:", e
+ reactor.stop()
+
+ @inlineCallbacks
+ def getPrincipalDetails(self, path):
+ """
+ Given a principal path, retrieve and return the corresponding
+ displayname and set of calendar homes.
+ """
+
+ name = ""
+ homes = []
+
+ headers = {
+ "Depth" : "0",
+ }
+ body = """<?xml version="1.0" encoding="UTF-8"?>
+ <A:propfind xmlns:A="DAV:"
+ xmlns:C="urn:ietf:params:xml:ns:caldav">
+ <A:prop>
+ <C:calendar-home-set/>
+ <A:displayname/>
+ </A:prop>
+ </A:propfind>
+ """
+
+ try:
+ responseBody = (yield self.makeRequest(path, "PROPFIND", headers,
+ body))
+ try:
+ doc = ElementTree.fromstring(responseBody)
+ for response in doc.findall("{DAV:}response"):
+ href = response.find("{DAV:}href")
+ for propstat in response.findall("{DAV:}propstat"):
+ status = propstat.find("{DAV:}status")
+ if "200 OK" in status.text:
+ for prop in propstat.findall("{DAV:}prop"):
+ calendarHomeSet = prop.find("{urn:ietf:params:xml:ns:caldav}calendar-home-set")
+ if calendarHomeSet is not None:
+ for href in calendarHomeSet.findall("{DAV:}href"):
+ href = href.text
+ if href:
+ homes.append(href)
+ displayName = prop.find("{DAV:}displayname")
+ if displayName is not None:
+ displayName = displayName.text
+ if displayName:
+ name = displayName
+
+ except Exception, e:
+ print "Unable to parse principal details", e
+ print responseBody
+ raise
+
+ except Exception, e:
+ print "Unable to look up principal details", e
+ raise
+
+ returnValue( (name, homes) )
+
+ @inlineCallbacks
+ def getProxyFor(self):
+ """
+ Retrieve and return the principal paths for any user that has delegated
+ calendar access to this user.
+ """
+
+ proxies = set()
+
+ headers = {
+ "Depth" : "0",
+ }
+ body = """<?xml version="1.0" encoding="UTF-8"?>
+ <A:propfind xmlns:A="DAV:">
+ <A:prop>
+ <C:calendar-proxy-read-for xmlns:C="http://calendarserver.org/ns/"/>
+ <C:calendar-proxy-write-for xmlns:C="http://calendarserver.org/ns/"/>
+ </A:prop>
+ </A:propfind>
+ """
+ path = "principals/users/%s" % (self.username,)
+
+ try:
+ responseBody = (yield self.makeRequest(path, "PROPFIND", headers,
+ body))
+ try:
+ doc = ElementTree.fromstring(responseBody)
+ for response in doc.findall("{DAV:}response"):
+ href = response.find("{DAV:}href")
+ for propstat in response.findall("{DAV:}propstat"):
+ status = propstat.find("{DAV:}status")
+ if "200 OK" in status.text:
+ for prop in propstat.findall("{DAV:}prop"):
+ for element in (
+ "{http://calendarserver.org/ns/}calendar-proxy-read-for",
+ "{http://calendarserver.org/ns/}calendar-proxy-write-for",
+ ):
+ proxyFor = prop.find(element)
+ if proxyFor is not None:
+ for href in proxyFor.findall("{DAV:}href"):
+ href = href.text
+ if href:
+ proxies.add(href)
+
+ except Exception, e:
+ print "Unable to parse proxy information", e
+ print responseBody
+ raise
+
+ except Exception, e:
+ print "Unable to look up who %s is a proxy for" % (self.username,)
+ raise
+
+ returnValue(proxies)
+
+
+ @inlineCallbacks
+ def getPushInfo(self, path):
+ """
+ Given a calendar home path, retrieve push notification info including
+ xmpp hostname and port, the pushkey for the home and for each shared
+ collection bound into the home.
+ """
+
+ headers = {
+ "Depth" : "1",
+ }
+ body = """<?xml version="1.0" encoding="UTF-8"?>
+ <A:propfind xmlns:A="DAV:">
+ <A:prop>
+ <A:displayname/>
+ <A:resourcetype/>
+ <C:xmpp-server xmlns:C="http://calendarserver.org/ns/"/>
+ <C:pushkey xmlns:C="http://calendarserver.org/ns/"/>
+ </A:prop>
+ </A:propfind>
+ """
+
+ try:
+ responseBody = (yield self.makeRequest(path, "PROPFIND", headers,
+ body))
+ host = None
+ port = None
+ nodes = {}
+ try:
+ doc = ElementTree.fromstring(responseBody)
+ for response in doc.findall("{DAV:}response"):
+ href = response.find("{DAV:}href")
+ key = None
+ name = None
+ kind = "home"
+ for propstat in response.findall("{DAV:}propstat"):
+ status = propstat.find("{DAV:}status")
+ if "200 OK" in status.text:
+ for prop in propstat.findall("{DAV:}prop"):
+ displayName = prop.find("{DAV:}displayname")
+ if displayName is not None:
+ displayName = displayName.text
+ if displayName:
+ name = displayName
+ resourceType = prop.find("{DAV:}resourcetype")
+ if resourceType is not None:
+ shared = resourceType.find("{http://calendarserver.org/ns/}shared")
+ if shared is not None:
+ kind = "shared collection"
+ pushKey = prop.find("{http://calendarserver.org/ns/}pushkey")
+ if pushKey is not None:
+ pushKey = pushKey.text
+ if pushKey:
+ key = pushKey
+
+ xmppServer = prop.find("{http://calendarserver.org/ns/}xmpp-server")
+ if xmppServer is not None:
+ xmppServer = xmppServer.text
+ if xmppServer:
+ if ":" in xmppServer:
+ host, port = xmppServer.split(":")
+ port = int(port)
+ else:
+ host = xmppServer
+ port = 5222
+
+ if key and not nodes.has_key(key):
+ nodes[key] = (href.text, name, kind)
+
+ except Exception, e:
+ print "Unable to parse proxy information", e
+ print responseBody
+ raise
+
+ except Exception, e:
+ print "Unable to look up who %s is a proxy for" % (self.username,)
+ raise
+
+ returnValue( (host, port, nodes) )
+
+
+ def startMonitoring(self, host, port, nodes):
+ service = "pubsub.%s" % (host,)
+ jid = "%s@%s" % (self.username, host)
+
+ pubsubFactory = PubSubClientFactory(jid, self.password, service, nodes,
+ self.verbose)
+ reactor.connectTCP(host, port, pubsubFactory)
+
+ def makeRequest(self, path, method, headers, body):
+ scheme = "https:" if self.useSSL else "http:"
+ url = "%s//%s:%d/%s/" % (scheme, self.host, self.port, path)
+ caldavFactory = client.HTTPClientFactory(url, method=method,
+ headers=headers, postdata=body, agent="Push Monitor")
+ caldavFactory.username = self.username
+ caldavFactory.password = self.password
+ caldavFactory.noisy = False
+ caldavFactory.protocol = PropfindRequestor
+ if self.useSSL:
+ reactor.connectSSL(self.host, self.port, caldavFactory,
+ ssl.ClientContextFactory())
+ else:
+ reactor.connectTCP(self.host, self.port, caldavFactory)
+
+ return caldavFactory.deferred
+
+
+if __name__ == "__main__":
+ main()
Modified: CalendarServer/trunk/calendarserver/tools/purge.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/purge.py 2011-02-04 00:42:52 UTC (rev 6877)
+++ CalendarServer/trunk/calendarserver/tools/purge.py 2011-02-04 04:24:17 UTC (rev 6878)
@@ -463,7 +463,7 @@
elif orphanCount == 1:
print "1 orphaned attachment"
else:
- print "%d orphaned attachments" % (eventCount,)
+ print "%d orphaned attachments" % (orphanCount,)
returnValue(orphanCount)
if verbose:
Added: CalendarServer/trunk/doc/calendarserver_monitor_notifications.8
===================================================================
--- CalendarServer/trunk/doc/calendarserver_monitor_notifications.8 (rev 0)
+++ CalendarServer/trunk/doc/calendarserver_monitor_notifications.8 2011-02-04 04:24:17 UTC (rev 6878)
@@ -0,0 +1,56 @@
+.\"
+.\" Copyright (c) 2011 Apple Inc. All rights reserved.
+.\"
+.\" Licensed under the Apache License, Version 2.0 (the "License");
+.\" you may not use this file except in compliance with the License.
+.\" You may obtain a copy of the License at
+.\"
+.\" http://www.apache.org/licenses/LICENSE-2.0
+.\"
+.\" Unless required by applicable law or agreed to in writing, software
+.\" distributed under the License is distributed on an "AS IS" BASIS,
+.\" WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.\" See the License for the specific language governing permissions and
+.\" limitations under the License.
+.\"
+.\" The following requests are required for all man pages.
+.Dd Feb 3, 2011
+.Dt CALENDARSERVER_MONITOR_NOTIFICATIONS 8
+.Os
+.Sh NAME
+.Nm calendarserver_monitor_notifications
+.Nd Darwin Calendar Server push notification monitor
+.Sh SYNOPSIS
+.Nm
+.Op Fl -config Ar file
+.Op Fl -host AH hostname
+.Op Fl -port Ap port number
+.Op Fl -ssl
+.Op Fl -verbose
+.Op Fl -help
+.Sh DESCRIPTION
+.Nm
+is a tool for making sure XMPP push notifications are working properly. Given a username and password it will connect to the calendar server and determine which pubsub node(s) correspond to that user's calendar home, as well as those of any user which has delegated calendar access. Next it will subscribe to those nodes and await notifications, printing them to stdout. Exit by hitting Control-C.
+.Pp
+.Sh OPTIONS
+.Bl -tag -width flag
+.It Fl h, -help
+Display usage information
+.It Fl f, -config Ar FILE
+Use the Calendar Server configuration specified in the given file. Defaults to /etc/caldavd/caldavd.plist.
+.It Fl H, -host Ar HOSTNAME
+Connect to the specified calendar server. If not passed on the command line, the host name is looked up in the configuration file.
+.It Fl p, -port Ar NUMBER
+Connect to the specified port number. If not passed on the command line, the port number is looked up in the configuration file.
+.It Fl s, -ssl
+Use https to connect to calendar server (default is http).
+.It Fl v, -verbose
+Print debugging information.
+.El
+.Sh FILES
+.Bl -tag -width flag
+.It /etc/caldavd/caldavd.plist
+The Calendar Server configuration file.
+.El
+.Sh SEE ALSO
+.Xr caldavd 8
Modified: CalendarServer/trunk/setup.py
===================================================================
--- CalendarServer/trunk/setup.py 2011-02-04 00:42:52 UTC (rev 6877)
+++ CalendarServer/trunk/setup.py 2011-02-04 04:24:17 UTC (rev 6878)
@@ -124,6 +124,7 @@
"bin/calendarserver_purge_attachments",
"bin/calendarserver_purge_principals",
"bin/calendarserver_migrate_resources",
+ "bin/calendarserver_monitor_notifications",
],
data_files = [ ("caldavd", ["conf/caldavd.plist"]), ],
ext_modules = extensions,
Modified: CalendarServer/trunk/support/Makefile.Apple
===================================================================
--- CalendarServer/trunk/support/Makefile.Apple 2011-02-04 00:42:52 UTC (rev 6877)
+++ CalendarServer/trunk/support/Makefile.Apple 2011-02-04 04:24:17 UTC (rev 6878)
@@ -88,6 +88,7 @@
$(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_migrate_resources.8" "$(DSTROOT)$(MANDIR)/man8"
$(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_command_gateway.8" "$(DSTROOT)$(MANDIR)/man8"
$(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_purge_events.8" "$(DSTROOT)$(MANDIR)/man8"
+ $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_monitor_notifications.8" "$(DSTROOT)$(MANDIR)/man8"
$(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_purge_attachments.8" "$(DSTROOT)$(MANDIR)/man8"
$(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_purge_principals.8" "$(DSTROOT)$(MANDIR)/man8"
$(_v) gzip -9 -f "$(DSTROOT)$(MANDIR)/man8/"*.[0-9]
Modified: CalendarServer/trunk/twistedcaldav/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/util.py 2011-02-04 00:42:52 UTC (rev 6877)
+++ CalendarServer/trunk/twistedcaldav/util.py 2011-02-04 04:24:17 UTC (rev 6878)
@@ -314,11 +314,11 @@
self.transport.loseConnection()
if not hasattr(self.factory, "username"):
- self.factory.deferred.errback(failure.Failure(Unauthorized("Mail gateway not able to process reply; authentication required for calendar server")))
+ self.factory.deferred.errback(failure.Failure(Unauthorized("Authentication required")))
return self.factory.deferred
if hasattr(self.factory, "retried"):
- self.factory.deferred.errback(failure.Failure(Unauthorized("Mail gateway not able to process reply; could not authenticate user %s with calendar server" % (self.factory.username,))))
+ self.factory.deferred.errback(failure.Failure(Unauthorized("Could not authenticate user %s with calendar server" % (self.factory.username,))))
return self.factory.deferred
self.factory.retried = True
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110203/3f7fa1e1/attachment-0001.html>
More information about the calendarserver-changes
mailing list