May 2007 - calendarserver-changes - lists.macosforge.org

[1571] CalendarServer/trunk/twistedcaldav/test/test_tap.py
by source_changes＠macosforge.org 25 May '07

25 May '07

Revision: 1571 http://trac.macosforge.org/projects/calendarserver/changeset/1571 Author: cdaboo(a)apple.com Date: 2007-05-24 19:40:24 -0700 (Thu, 24 May 2007) Log Message: ----------- Fix up test for change to Kerberos failure behavior. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/test/test_tap.py Modified: CalendarServer/trunk/twistedcaldav/test/test_tap.py =================================================================== --- CalendarServer/trunk/twistedcaldav/test/test_tap.py 2007-05-25 02:22:17 UTC (rev 1570) +++ CalendarServer/trunk/twistedcaldav/test/test_tap.py 2007-05-25 02:40:24 UTC (rev 1571) @@ -440,10 +440,12 @@ self.config['Authentication']['Kerberos']['ServicePrincipal'] = '' self.config['Authentication']['Kerberos']['Enabled'] = True self.writeConfig() - self.assertRaises( - ValueError, - self.getSite) + site = self.getSite() + authWrapper = site.resource.resource + + self.assertFalse(authWrapper.credentialFactories.has_key('negotiate')) + def test_servicePrincipal(self): """ Test that the kerberos realm is the realm portion of a principal

1 0

[1570] CalendarServer/trunk/twistedcaldav/tap.py
by source_changes＠macosforge.org 25 May '07

25 May '07

Revision: 1570 http://trac.macosforge.org/projects/calendarserver/changeset/1570 Author: cdaboo(a)apple.com Date: 2007-05-24 19:22:17 -0700 (Thu, 24 May 2007) Log Message: ----------- Allow server to start even if Kerberos initialization fails. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/tap.py Modified: CalendarServer/trunk/twistedcaldav/tap.py =================================================================== --- CalendarServer/trunk/twistedcaldav/tap.py 2007-05-24 23:27:46 UTC (rev 1569) +++ CalendarServer/trunk/twistedcaldav/tap.py 2007-05-25 02:22:17 UTC (rev 1570) @@ -446,11 +446,15 @@ log.msg("Kerberos support not available") continue - principal = schemeConfig['ServicePrincipal'] - if not principal: - credFactory = NegotiateCredentialFactory(type="http", hostname=config.ServerHostName) - else: - credFactory = NegotiateCredentialFactory(principal=principal) + try: + principal = schemeConfig['ServicePrincipal'] + if not principal: + credFactory = NegotiateCredentialFactory(type="http", hostname=config.ServerHostName) + else: + credFactory = NegotiateCredentialFactory(principal=principal) + except ValueError: + log.msg("Could not start Kerberos") + continue elif scheme == 'digest': credFactory = QopDigestCredentialFactory(

1 0

[1569] CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
by source_changes＠macosforge.org 24 May '07

24 May '07

Revision: 1569 http://trac.macosforge.org/projects/calendarserver/changeset/1569 Author: wsanchez(a)apple.com Date: 2007-05-24 16:27:46 -0700 (Thu, 24 May 2007) Log Message: ----------- Remove %s in format string with empty args Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2007-05-24 20:55:06 UTC (rev 1568) +++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2007-05-24 23:27:46 UTC (rev 1569) @@ -419,7 +419,7 @@ break if not enabled: - log.err("Record %s is not enabled" % ()) + log.err("Record is not enabled") continue # Now get useful record info.

1 0

[1568] CalendarServer/trunk/twistedcaldav/admin
by source_changes＠macosforge.org 24 May '07

24 May '07

Revision: 1568 http://trac.macosforge.org/projects/calendarserver/changeset/1568 Author: cdaboo(a)apple.com Date: 2007-05-24 13:55:06 -0700 (Thu, 24 May 2007) Log Message: ----------- Add time-of-day analysis for requests. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/admin/formatters.py CalendarServer/trunk/twistedcaldav/admin/logs.py Modified: CalendarServer/trunk/twistedcaldav/admin/formatters.py =================================================================== --- CalendarServer/trunk/twistedcaldav/admin/formatters.py 2007-05-24 16:55:04 UTC (rev 1567) +++ CalendarServer/trunk/twistedcaldav/admin/formatters.py 2007-05-24 20:55:06 UTC (rev 1568) @@ -119,6 +119,28 @@ values += tuple(value[f] for f in fields[1:]) self.writeLine(values) + def writeFrequencies(self, frequencies): + + width = len(frequencies) + plot = [[" "] * width for ignore in range(20)] + plot.append(["|---"] * 24) + plot.append(["%02d " % d for d in range(24)]) + + max_count = 0 + for freq in frequencies: + max_count = max(freq, max_count) + + for column, freq in enumerate(frequencies): + if freq == 0: + continue + scaled = (20 * freq) / max_count + for row in range(20): + if row <= scaled: + plot[19 - row][column] = "*" + + self.write("\n".join(["".join(p) for p in plot])) + self.write("\n") + def writeReport(self, report, name, fields, headings): if self.options.has_key('fields'): fields = self.options.get('fields', '').split(',') @@ -169,9 +191,11 @@ self.writeReport(report, 'Statistics', fields, headings) def report_logs(self, report): - self.write('Log Statistics:\n') + self.write('Log Statistics:\n\n') - self.write(' Bytes Out: %s\n' % (report['data']['bytesOut'],)) + self.write(' Start Date: %s\n End Date :%s\n\n' % report['data']['dateRange']) + + self.write(' Bytes Out: %s\n\n' % (report['data']['bytesOut'],)) self.write(' # Requests:\n') fields = ( @@ -203,7 +227,12 @@ 'maxtime': 'Max. time', } self.writeMap(report['data']['requestStats'], fields, headings) + self.write('\n') + self.write(' # Requests by time of day:\n') + self.writeFrequencies(report['data']['timeOfDayStats']) + self.write('\n') + self.write(' User Agents:\n') for ua, count in report['data']['userAgents'].iteritems(): Modified: CalendarServer/trunk/twistedcaldav/admin/logs.py =================================================================== --- CalendarServer/trunk/twistedcaldav/admin/logs.py 2007-05-24 16:55:04 UTC (rev 1567) +++ CalendarServer/trunk/twistedcaldav/admin/logs.py 2007-05-24 20:55:06 UTC (rev 1568) @@ -28,10 +28,16 @@ from twistedcaldav.admin import util +PLIST_VERSION = 1 + statsTemplate = plistlib.Dict( - bytesOut=0, + version=PLIST_VERSION, + bytesOut="0", + startDate="", + endDate="", requestStats=plistlib.Dict( - ), + ), + timeOfDayStats=[0] * 96, invitations=plistlib.Dict( day=0, week=0, @@ -43,18 +49,30 @@ class Stats(object): def __init__(self, fp): self.fp = fp + self._data = None if self.fp.exists(): self._data = plistlib.readPlist(self.fp.path) - else: + if self._data.version != PLIST_VERSION: + self._data = None + + if self._data is None: self._data = statsTemplate self.save() + def addDate(self, date): + if not self._data.startDate: + self._data.startDate = date + self._data.endDate = date + + def getDateRange(self): + return (self._data.startDate, self._data.endDate) + def getBytes(self): - return self._data.bytesOut + return long(self._data.bytesOut) def addBytes(self, bytes): - self._data.bytesOut += bytes + self._data.bytesOut = str(long(self._data.bytesOut) + bytes) def addRequestStats(self, request, status, bytes, time): if request in self._data.requestStats: @@ -103,6 +121,14 @@ def getRequestStats(self): return self._data.requestStats + def addTimeOfDayStats(self, request, time): + hour, minute = time.split(":") + bucket = int(hour) * 4 + divmod(int(minute), 15)[0] + self._data.timeOfDayStats[bucket] = self._data.timeOfDayStats[bucket] + 1 + + def getTimeOfDayStats(self): + return self._data.timeOfDayStats + def addUserAgent(self, useragent): if useragent in self._data.userAgents: self._data.userAgents[useragent] += 1 @@ -171,28 +197,45 @@ def run(self): if not self.readOnly: - for line in self.logfile.open(): + total_count = -1 + for total_count, line in enumerate(self.logfile.open()): + pass + total_count += 1 + print "Reading file: %s (%d lines)" % (self.logfile.basename(), total_count,) + print "|" + "--" * 48 + "|" + last_count = 0 + for line_count, line in enumerate(self.logfile.open()): if (line.startswith('Log opened') or line.startswith('Log closed')): continue else: pline = parseCLFLine(line) + self.stats.addDate(pline[3]) self.stats.addBytes(int(pline[6])) self.stats.addRequestStats(pline[4].split(' ')[0], int(pline[5]), int(pline[6]), float(pline[9][:-3])) + self.stats.addTimeOfDayStats(pline[4].split(' ')[0], pline[3][pline[3].find(":") + 1:][:5]) if len(pline) > 7: self.stats.addUserAgent(pline[8]) + + if (50 * line_count) / total_count > last_count: + print ".", + last_count = (50 * line_count) / total_count + print "\n\n" + self.stats.save() if not self.noOutput: report = { 'type': 'logs', 'data': { + 'dateRange': self.stats.getDateRange(), 'bytesOut': util.prepareByteValue(self.config, self.stats.getBytes()), 'requestStats': self.stats.getRequestStats(), + 'timeOfDayStats': self.stats.getTimeOfDayStats(), 'userAgents': self.stats.getUserAgents(), } }

1 0

[1567] CalendarServer/trunk/twistedcaldav/admin
by source_changes＠macosforge.org 24 May '07

24 May '07

Revision: 1567 http://trac.macosforge.org/projects/calendarserver/changeset/1567 Author: cdaboo(a)apple.com Date: 2007-05-24 09:55:04 -0700 (Thu, 24 May 2007) Log Message: ----------- Also track the status response by logging Ok, bad, failed (internal server error), and other statistics for each request method. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/admin/formatters.py CalendarServer/trunk/twistedcaldav/admin/logs.py Modified: CalendarServer/trunk/twistedcaldav/admin/formatters.py =================================================================== --- CalendarServer/trunk/twistedcaldav/admin/formatters.py 2007-05-24 16:39:24 UTC (rev 1566) +++ CalendarServer/trunk/twistedcaldav/admin/formatters.py 2007-05-24 16:55:04 UTC (rev 1567) @@ -177,6 +177,10 @@ fields = ( 'method', 'num', + 'numOK', + 'numBAD', + 'numISE', + 'numOther', 'minbytes', 'avbytes', 'maxbytes', @@ -185,8 +189,12 @@ 'maxtime', ) headings = { - 'method': 'Method ', - 'num': '# Requests ', + 'method': 'Method', + 'num': '# Requests', + 'numOK': ' # OK', + 'numBAD': ' # BAD', + 'numISE': ' # Failed', + 'numOther': ' # Other', 'minbytes': 'Min. bytes', 'avbytes': ' Av. bytes', 'maxbytes': 'Max. bytes', Modified: CalendarServer/trunk/twistedcaldav/admin/logs.py =================================================================== --- CalendarServer/trunk/twistedcaldav/admin/logs.py 2007-05-24 16:39:24 UTC (rev 1566) +++ CalendarServer/trunk/twistedcaldav/admin/logs.py 2007-05-24 16:55:04 UTC (rev 1567) @@ -56,10 +56,18 @@ def addBytes(self, bytes): self._data.bytesOut += bytes - def addRequestStats(self, request, bytes, time): + def addRequestStats(self, request, status, bytes, time): if request in self._data.requestStats: old_num = self._data.requestStats[request]['num'] self._data.requestStats[request]['num'] = old_num + 1 + if status >= 200 and status < 300: + self._data.requestStats[request]['numOK'] = self._data.requestStats[request]['numOK'] + 1 + elif status == 500: + self._data.requestStats[request]['numISE'] = self._data.requestStats[request]['numISE'] + 1 + elif status >= 400 and status < 600: + self._data.requestStats[request]['numBAD'] = self._data.requestStats[request]['numBAD'] + 1 + else: + self._data.requestStats[request]['numOther'] = self._data.requestStats[request]['numOther'] + 1 if bytes < self._data.requestStats[request]['minbytes']: self._data.requestStats[request]['minbytes'] = bytes if bytes > self._data.requestStats[request]['maxbytes']: @@ -73,6 +81,18 @@ else: self._data.requestStats[request] = {} self._data.requestStats[request]['num'] = 1 + self._data.requestStats[request]['numOK'] = 0 + self._data.requestStats[request]['numBAD'] = 0 + self._data.requestStats[request]['numISE'] = 0 + self._data.requestStats[request]['numOther'] = 0 + if status >= 200 and status < 300: + self._data.requestStats[request]['numOK'] = 1 + elif status == 500: + self._data.requestStats[request]['numISE'] = 1 + elif status >= 400 and status < 600: + self._data.requestStats[request]['numBAD'] = 1 + else: + self._data.requestStats[request]['numOther'] = 1 self._data.requestStats[request]['minbytes'] = bytes self._data.requestStats[request]['maxbytes'] = bytes self._data.requestStats[request]['avbytes'] = bytes @@ -159,7 +179,7 @@ pline = parseCLFLine(line) self.stats.addBytes(int(pline[6])) - self.stats.addRequestStats(pline[4].split(' ')[0], int(pline[6]), float(pline[9][:-3])) + self.stats.addRequestStats(pline[4].split(' ')[0], int(pline[5]), int(pline[6]), float(pline[9][:-3])) if len(pline) > 7: self.stats.addUserAgent(pline[8])

1 0

[1566] CalendarServer/trunk/twistedcaldav/admin
by source_changes＠macosforge.org 24 May '07

24 May '07

Revision: 1566 http://trac.macosforge.org/projects/calendarserver/changeset/1566 Author: cdaboo(a)apple.com Date: 2007-05-24 09:39:24 -0700 (Thu, 24 May 2007) Log Message: ----------- Generate a more detailed break down of request statistics on a per method basis. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/admin/formatters.py CalendarServer/trunk/twistedcaldav/admin/logs.py Modified: CalendarServer/trunk/twistedcaldav/admin/formatters.py =================================================================== --- CalendarServer/trunk/twistedcaldav/admin/formatters.py 2007-05-23 21:55:30 UTC (rev 1565) +++ CalendarServer/trunk/twistedcaldav/admin/formatters.py 2007-05-24 16:39:24 UTC (rev 1566) @@ -91,8 +91,14 @@ spacing = self.options.get('spacing', 16) for f in fields: - self.write(str(f)) - self.write(' '*(int(spacing) - len(str(f)))) + if isinstance(f, float): + p = "% 9.2f" % (f,) + elif isinstance(f, int): + p = "% 9d" % (f,) + else: + p = str(f) + self.write(p) + self.write(' '*(int(spacing) - len(p))) self.write('\n') @@ -105,6 +111,14 @@ for record in report['records']: self.writeLine((record[f] for f in fields)) + def writeMap(self, reportmap, fields, headings): + self.writeLine((headings[f] for f in fields)) + + for key, value in reportmap.iteritems(): + values = (key,) + values += tuple(value[f] for f in fields[1:]) + self.writeLine(values) + def writeReport(self, report, name, fields, headings): if self.options.has_key('fields'): fields = self.options.get('fields', '').split(',') @@ -160,8 +174,27 @@ self.write(' Bytes Out: %s\n' % (report['data']['bytesOut'],)) self.write(' # Requests:\n') - for req, count in report['data']['requestCounts'].iteritems(): - self.write(' %s: %s\n' % (req, count)) + fields = ( + 'method', + 'num', + 'minbytes', + 'avbytes', + 'maxbytes', + 'mintime', + 'avtime', + 'maxtime', + ) + headings = { + 'method': 'Method ', + 'num': '# Requests ', + 'minbytes': 'Min. bytes', + 'avbytes': ' Av. bytes', + 'maxbytes': 'Max. bytes', + 'mintime': 'Min. time', + 'avtime': ' Av. time', + 'maxtime': 'Max. time', + } + self.writeMap(report['data']['requestStats'], fields, headings) self.write(' User Agents:\n') Modified: CalendarServer/trunk/twistedcaldav/admin/logs.py =================================================================== --- CalendarServer/trunk/twistedcaldav/admin/logs.py 2007-05-23 21:55:30 UTC (rev 1565) +++ CalendarServer/trunk/twistedcaldav/admin/logs.py 2007-05-24 16:39:24 UTC (rev 1566) @@ -30,7 +30,7 @@ statsTemplate = plistlib.Dict( bytesOut=0, - requestCounts=plistlib.Dict( + requestStats=plistlib.Dict( ), invitations=plistlib.Dict( day=0, @@ -56,14 +56,32 @@ def addBytes(self, bytes): self._data.bytesOut += bytes - def addRequest(self, request): - if request in self._data.requestCounts: - self._data.requestCounts[request] += 1 + def addRequestStats(self, request, bytes, time): + if request in self._data.requestStats: + old_num = self._data.requestStats[request]['num'] + self._data.requestStats[request]['num'] = old_num + 1 + if bytes < self._data.requestStats[request]['minbytes']: + self._data.requestStats[request]['minbytes'] = bytes + if bytes > self._data.requestStats[request]['maxbytes']: + self._data.requestStats[request]['maxbytes'] = bytes + self._data.requestStats[request]['avbytes'] = (self._data.requestStats[request]['avbytes'] * old_num + bytes) / (old_num + 1) + if time < self._data.requestStats[request]['mintime']: + self._data.requestStats[request]['mintime'] = time + if time > self._data.requestStats[request]['maxtime']: + self._data.requestStats[request]['maxtime'] = time + self._data.requestStats[request]['avtime'] = (self._data.requestStats[request]['avtime'] * old_num + time) / (old_num + 1) else: - self._data.requestCounts[request] = 1 + self._data.requestStats[request] = {} + self._data.requestStats[request]['num'] = 1 + self._data.requestStats[request]['minbytes'] = bytes + self._data.requestStats[request]['maxbytes'] = bytes + self._data.requestStats[request]['avbytes'] = bytes + self._data.requestStats[request]['mintime'] = time + self._data.requestStats[request]['maxtime'] = time + self._data.requestStats[request]['avtime'] = time - def getRequests(self): - return self._data.requestCounts + def getRequestStats(self): + return self._data.requestStats def addUserAgent(self, useragent): if useragent in self._data.userAgents: @@ -141,7 +159,7 @@ pline = parseCLFLine(line) self.stats.addBytes(int(pline[6])) - self.stats.addRequest(pline[4].split(' ')[0]) + self.stats.addRequestStats(pline[4].split(' ')[0], int(pline[6]), float(pline[9][:-3])) if len(pline) > 7: self.stats.addUserAgent(pline[8]) @@ -154,7 +172,7 @@ 'data': { 'bytesOut': util.prepareByteValue(self.config, self.stats.getBytes()), - 'requestCounts': self.stats.getRequests(), + 'requestStats': self.stats.getRequestStats(), 'userAgents': self.stats.getUserAgents(), } }

1 0

[1565] CalendarServer/trunk/twistedcaldav
by source_changes＠macosforge.org 23 May '07

23 May '07

Revision: 1565 http://trac.macosforge.org/projects/calendarserver/changeset/1565 Author: wsanchez(a)apple.com Date: 2007-05-23 14:55:30 -0700 (Wed, 23 May 2007) Log Message: ----------- Get rid of some class variables that are copies of data from the config object. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/config.py CalendarServer/trunk/twistedcaldav/directory/calendar.py CalendarServer/trunk/twistedcaldav/method/put_common.py CalendarServer/trunk/twistedcaldav/resource.py Modified: CalendarServer/trunk/twistedcaldav/config.py =================================================================== --- CalendarServer/trunk/twistedcaldav/config.py 2007-05-23 20:40:39 UTC (rev 1564) +++ CalendarServer/trunk/twistedcaldav/config.py 2007-05-23 21:55:30 UTC (rev 1565) @@ -222,17 +222,10 @@ EnableDropBox EnableNotifications """ - from twistedcaldav.resource import CalendarPrincipalResource CalendarPrincipalResource.enableDropBox(self.EnableDropBox) CalendarPrincipalResource.enableNotifications(self.EnableNotifications) - # Handle global quota value - from twistedcaldav.directory.calendar import DirectoryCalendarHomeResource - from twistedcaldav.resource import CalDAVResource - DirectoryCalendarHomeResource.quotaLimit = self.UserQuota - CalDAVResource.sizeLimit = self.MaximumAttachmentSize - def updateDefaults(self, items): _mergeData(self._defaults, items) self.update(items) Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/calendar.py 2007-05-23 20:40:39 UTC (rev 1564) +++ CalendarServer/trunk/twistedcaldav/directory/calendar.py 2007-05-23 21:55:30 UTC (rev 1565) @@ -174,10 +174,6 @@ """ Calendar home collection resource. """ - # A global quota limit for all calendar homes. Either a C{int} (size in bytes) to limit - # quota to that size, or C{None} for no limit. - quotaLimit = None - def __init__(self, parent, record): """ @param path: the path to the file which will back the resource. @@ -309,7 +305,7 @@ """ @return: a C{True} if this resource has quota root, C{False} otherwise. """ - return self.hasDeadProperty(TwistedQuotaRootProperty) or DirectoryCalendarHomeResource.quotaLimit is not None + return self.hasDeadProperty(TwistedQuotaRootProperty) or config.UserQuota def quotaRoot(self, request): """ @@ -319,7 +315,7 @@ if self.hasDeadProperty(TwistedQuotaRootProperty): return int(str(self.readDeadProperty(TwistedQuotaRootProperty))) else: - return DirectoryCalendarHomeResource.quotaLimit + return config.UserQuota ## # Utilities Modified: CalendarServer/trunk/twistedcaldav/method/put_common.py =================================================================== --- CalendarServer/trunk/twistedcaldav/method/put_common.py 2007-05-23 20:40:39 UTC (rev 1564) +++ CalendarServer/trunk/twistedcaldav/method/put_common.py 2007-05-23 21:55:30 UTC (rev 1565) @@ -41,6 +41,7 @@ from twisted.web2.stream import MemoryStream from twistedcaldav import logging +from twistedcaldav.config import config from twistedcaldav.caldavxml import NoUIDConflict from twistedcaldav.caldavxml import NumberOfRecurrencesWithinLimits from twistedcaldav.caldavxml import caldav_namespace @@ -236,11 +237,11 @@ """ result = True message = "" - if CalDAVResource.sizeLimit is not None: + if config.MaximumAttachmentSize: calsize = len(str(calendar)) - if calsize > CalDAVResource.sizeLimit: + if calsize > config.MaximumAttachmentSize: result = False - message = "Data size %d bytes is larger than allowed limit %d bytes" % (calsize, CalDAVResource.sizeLimit) + message = "Data size %d bytes is larger than allowed limit %d bytes" % (calsize, config.MaximumAttachmentSize) return result, message Modified: CalendarServer/trunk/twistedcaldav/resource.py =================================================================== --- CalendarServer/trunk/twistedcaldav/resource.py 2007-05-23 20:40:39 UTC (rev 1564) +++ CalendarServer/trunk/twistedcaldav/resource.py 2007-05-23 21:55:30 UTC (rev 1565) @@ -74,10 +74,6 @@ """ implements(ICalDAVResource) - # A global limit for the size of calendar object resources. Either a C{int} (size in bytes) to limit - # resources to that size, or C{None} for no limit. - sizeLimit = None - ## # HTTP ## @@ -169,9 +165,9 @@ )) elif name == "max-resource-size": # CalDAV-access-15, section 5.2.5 - if CalDAVResource.sizeLimit is not None: + if config.MaximumAttachmentSize: return succeed(caldavxml.MaxResourceSize.fromString( - str(CalDAVResource.sizeLimit) + str(config.MaximumAttachmentSize) )) return super(CalDAVResource, self).readProperty(property, request)

1 0

[1564] CalendarServer/trunk/twistedcaldav
by source_changes＠macosforge.org 23 May '07

23 May '07

Revision: 1564 http://trac.macosforge.org/projects/calendarserver/changeset/1564 Author: wsanchez(a)apple.com Date: 2007-05-23 13:40:39 -0700 (Wed, 23 May 2007) Log Message: ----------- Define updateCTag() so we don't have several copies of the same code everywhere. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/method/delete.py CalendarServer/trunk/twistedcaldav/method/put_common.py CalendarServer/trunk/twistedcaldav/static.py Modified: CalendarServer/trunk/twistedcaldav/method/delete.py =================================================================== --- CalendarServer/trunk/twistedcaldav/method/delete.py 2007-05-23 20:17:48 UTC (rev 1563) +++ CalendarServer/trunk/twistedcaldav/method/delete.py 2007-05-23 20:40:39 UTC (rev 1564) @@ -22,12 +22,9 @@ __all__ = ["http_DELETE"] -import datetime - from twisted.web2 import responsecode from twisted.web2.dav.util import parentForURL -from twistedcaldav import customxml from twistedcaldav.resource import isPseudoCalendarCollectionResource def http_DELETE(self, request): @@ -43,7 +40,7 @@ index.deleteResource(self.fp.basename()) # Change CTag on the parent calendar collection - parent.writeDeadProperty(customxml.GETCTag(str(datetime.datetime.now()))) + parent.updateCTag() return response Modified: CalendarServer/trunk/twistedcaldav/method/put_common.py =================================================================== --- CalendarServer/trunk/twistedcaldav/method/put_common.py 2007-05-23 20:17:48 UTC (rev 1563) +++ CalendarServer/trunk/twistedcaldav/method/put_common.py 2007-05-23 20:40:39 UTC (rev 1564) @@ -22,8 +22,6 @@ __all__ = ["storeCalendarObjectResource"] -import datetime - from twisted.internet.defer import deferredGenerator from twisted.internet.defer import maybeDeferred from twisted.internet.defer import waitForDeferred @@ -46,7 +44,6 @@ from twistedcaldav.caldavxml import NoUIDConflict from twistedcaldav.caldavxml import NumberOfRecurrencesWithinLimits from twistedcaldav.caldavxml import caldav_namespace -from twistedcaldav import customxml from twistedcaldav.ical import Component from twistedcaldav.instance import TooManyInstancesError from twistedcaldav.resource import CalDAVResource @@ -534,7 +531,7 @@ if sourcecal: # Change CTag on the parent calendar collection - sourceparent.writeDeadProperty(customxml.GETCTag(str(datetime.datetime.now()))) + sourceparent.updateCTag() if destinationcal: result = doDestinationIndex(calendar) @@ -560,7 +557,7 @@ if destinationcal: # Change CTag on the parent calendar collection - destinationparent.writeDeadProperty(customxml.GETCTag(str(datetime.datetime.now()))) + destinationparent.updateCTag() # Can now commit changes and forget the rollback details rollback.Commit() @@ -582,4 +579,4 @@ rollback.Rollback() raise -storeCalendarObjectResource = deferredGenerator(storeCalendarObjectResource) \ No newline at end of file +storeCalendarObjectResource = deferredGenerator(storeCalendarObjectResource) Modified: CalendarServer/trunk/twistedcaldav/static.py =================================================================== --- CalendarServer/trunk/twistedcaldav/static.py 2007-05-23 20:17:48 UTC (rev 1563) +++ CalendarServer/trunk/twistedcaldav/static.py 2007-05-23 20:40:39 UTC (rev 1564) @@ -132,7 +132,7 @@ raise HTTPError(status) # Initialize CTag on the calendar collection - self.writeDeadProperty(customxml.GETCTag(str(datetime.datetime.now()))) + self.updateCTag() # Create the index so its ready when the first PUTs come in self.index().create() @@ -281,6 +281,10 @@ if child != db_basename ] + def updateCTag(self): + assert self.isCollection() + self.writeDeadProperty(customxml.GETCTag(str(datetime.datetime.now()))) + ## # Quota ## @@ -579,7 +583,7 @@ self.writeDeadProperty(customxml.TwistedScheduleAutoRespond()) # Initialize CTag on the calendar collection - self.writeDeadProperty(customxml.GETCTag(str(datetime.datetime.now()))) + self.updateCTag() return super(ScheduleInboxFile, self).provision() @@ -597,7 +601,7 @@ def provision(self): if self.provisionFile(): # Initialize CTag on the calendar collection - self.writeDeadProperty(customxml.GETCTag(str(datetime.datetime.now()))) + self.updateCTag() return super(ScheduleOutboxFile, self).provision()

1 0

[1563] CalendarServer/trunk/README
by source_changes＠macosforge.org 23 May '07

23 May '07

Revision: 1563 http://trac.macosforge.org/projects/calendarserver/changeset/1563 Author: wsanchez(a)apple.com Date: 2007-05-23 13:17:48 -0700 (Wed, 23 May 2007) Log Message: ----------- Update URLs Modified Paths: -------------- CalendarServer/trunk/README Modified: CalendarServer/trunk/README =================================================================== --- CalendarServer/trunk/README 2007-05-23 19:34:32 UTC (rev 1562) +++ CalendarServer/trunk/README 2007-05-23 20:17:48 UTC (rev 1563) @@ -2,7 +2,7 @@ For general information about the server, see: - http://calendarserver.macosforge.org/ + http://www.calendarserver.org/ COPYRIGHT AND LICENSE @@ -140,7 +140,7 @@ Linux and FreeBSD users have has some success running our calendar server. Check our bug tracker for status: - http://trac.macosforge.org/projects/calendarserver/report/1 + http://trac.calendarserver.org/projects/calendarserver/report/1 PYTHON 2.4 ---------- @@ -163,12 +163,12 @@ If you are interested in getting involved with development, be sure to visit our home page for more information: - http://calendarserver.macosforge.org/ + http://www.calendarserver.org/ Bug reports are welcome, and contributions such as code patches and documentation are appreciated. Visit our bug tracker: - http://trac.macosforge.org/projects/calendarserver/report/ + http://trac.calendarserver.org/projects/calendarserver/report/ You can chat with other users and developers on IRC on channel #calendarserver on the irc.freenode.net server network.

1 0

[1562] CalendarServer/trunk/twistedcaldav
by source_changes＠macosforge.org 23 May '07

23 May '07

Revision: 1562 http://trac.macosforge.org/projects/calendarserver/changeset/1562 Author: cdaboo(a)apple.com Date: 2007-05-23 12:34:32 -0700 (Wed, 23 May 2007) Log Message: ----------- Mask out ORGANIZER-less events if the requester is the same as the responder. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/method/report_common.py CalendarServer/trunk/twistedcaldav/schedule.py Modified: CalendarServer/trunk/twistedcaldav/method/report_common.py =================================================================== --- CalendarServer/trunk/twistedcaldav/method/report_common.py 2007-05-23 19:29:00 UTC (rev 1561) +++ CalendarServer/trunk/twistedcaldav/method/report_common.py 2007-05-23 19:34:32 UTC (rev 1562) @@ -263,7 +263,8 @@ _namedPropertiesForResource = deferredGenerator(_namedPropertiesForResource) -def generateFreeBusyInfo(request, calresource, fbinfo, timerange, matchtotal, excludeuid=None, organizer=None): +def generateFreeBusyInfo(request, calresource, fbinfo, timerange, matchtotal, + excludeuid=None, organizer=None, same_calendar_user=False): """ Run a free busy report on the specified calendar collection accumulating the free busy info for later processing. @@ -276,6 +277,8 @@ UID from contributing to free-busy. @param organizer: a C{str} containing the value of the ORGANIZER proeprty in the VFREEBUSY request. This is used in conjunction with the UID value to process exclusions. + @param same_calendar_user: a C{bool} indicating whether the calendar user requesting tyhe free-busy information + is the same as the calendar user being targeted. """ # First check the privilege on this collection @@ -342,9 +345,14 @@ # Ignore ones of this UID if excludeuid: - # Check that ORGANIZER's match (security requirement) and UIDs match - if (excludeuid == uid) and ((organizer is None) or (organizer == calendar.getOrganizer())): - continue + # See if we have a UID match + if (excludeuid == uid): + # Check that ORGANIZER's match (security requirement) + if (organizer is None) or (organizer == calendar.getOrganizer()): + continue + # Check for no ORGANIZER and check by same calendar user + elif (calendar.getOrganizer() is None) and same_calendar_user: + continue if filter.match(calendar): # Check size of results is within limit Modified: CalendarServer/trunk/twistedcaldav/schedule.py =================================================================== --- CalendarServer/trunk/twistedcaldav/schedule.py 2007-05-23 19:29:00 UTC (rev 1561) +++ CalendarServer/trunk/twistedcaldav/schedule.py 2007-05-23 19:34:32 UTC (rev 1562) @@ -402,6 +402,10 @@ availability = availability.calendar() report_common.processAvailabilityFreeBusy(availability, fbinfo, timerange) + # Check to see if the recipient is the same calendar user as the organizer. + # Needed for masked UID stuff. + same_calendar_user = oprincipal.principalURL() == principal.principalURL() + # Now process free-busy set calendars matchtotal = 0 for calURL in fbset: @@ -420,7 +424,8 @@ timerange, matchtotal, excludeuid=excludeuid, - organizer=organizer)) + organizer=organizer, + same_calendar_user=same_calendar_user)) yield matchtotal matchtotal = matchtotal.getResult()

1 0