January 2008 - calendarserver-changes

[2112] CalendarServer/trunk/conf/caldavd-test.plist
by source_changes＠macosforge.org 24 Jan '08

24 Jan '08

Revision: 2112 http://trac.macosforge.org/projects/calendarserver/changeset/2112 Author: wsanchez(a)apple.com Date: 2008-01-23 16:09:04 -0800 (Wed, 23 Jan 2008) Log Message: ----------- Bind to all interfaces so as to confuse fewer people. Modified Paths: -------------- CalendarServer/trunk/conf/caldavd-test.plist Modified: CalendarServer/trunk/conf/caldavd-test.plist =================================================================== --- CalendarServer/trunk/conf/caldavd-test.plist 2008-01-22 22:21:29 UTC (rev 2111) +++ CalendarServer/trunk/conf/caldavd-test.plist 2008-01-24 00:09:04 UTC (rev 2112) @@ -51,9 +51,7 @@  <key>BindAddresses</key> - <array> - <string>127.0.0.1</string> - </array> + <array></array>  <key>BindHTTPPorts</key>

1 0

[2111] CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav /cluster.py
by source_changes＠macosforge.org 22 Jan '08

22 Jan '08

Revision: 2111 http://trac.macosforge.org/projects/calendarserver/changeset/2111 Author: wsanchez(a)apple.com Date: 2008-01-22 14:21:29 -0800 (Tue, 22 Jan 2008) Log Message: ----------- Pulled up r2110 from trunk. Modified Paths: -------------- CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/cluster.py Modified: CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/cluster.py =================================================================== --- CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/cluster.py 2008-01-21 19:26:00 UTC (rev 2110) +++ CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/cluster.py 2008-01-22 22:21:29 UTC (rev 2111) @@ -26,7 +26,7 @@ from twisted.application import internet, service from twistedcaldav import logging -from twistedcaldav.config import config +from twistedcaldav.config import config, ConfigurationError from twistedcaldav.util import getNCPU @@ -69,10 +69,13 @@ self.interfaces = interfaces def getName(self): - return '%s-%s' % (self.prefix, self.ports[0]) + if self.ports is not None: + return '%s-%s' % (self.prefix, self.ports[0]) + elif self.sslPorts is not None: + return '%s-%s' % (self.prefix, self.sslPorts[0]) - def getSSLName(self): - return '%s-%s' % (self.prefix, self.sslPorts[0]) + raise ConfigurationError( + "Can't create TwistdSlaveProcess without a TCP Port") def getCommandLine(self): args = [ @@ -102,7 +105,7 @@ if self.sslPorts: args.extend([ - '-o', + '-o', 'BindSSLPorts=%s' % (','.join(map(str, self.sslPorts)),)]) @@ -110,18 +113,25 @@ return args - def getHostLine(self, ssl=None): + def getHostLine(self, ssl=True): name = self.getName() - port = self.ports + port = None - if ssl: - name = self.getSSLName() + if self.ports is not None: + port = self.ports + + if ssl and self.sslPorts is not None: port = self.sslPorts + if port is None: + raise ConfigurationError( + "Can not add a host without a port") + return hostTemplate % {'name': name, 'port': port[0], 'bindAddress': '127.0.0.1'} + def makeService_Combined(self, options): s = service.MultiService() monitor = procmon.ProcessMonitor()

1 0

[2110] CalendarServer/trunk/twistedcaldav/cluster.py
by source_changes＠macosforge.org 21 Jan '08

21 Jan '08

Revision: 2110 http://trac.macosforge.org/projects/calendarserver/changeset/2110 Author: dreid(a)apple.com Date: 2008-01-21 11:26:00 -0800 (Mon, 21 Jan 2008) Log Message: ----------- Make 0 actually disable HTTP instead of raise an error, also add some ConfigurationErrors that clearly indicate when things have gone really wrong and we just basically can't start up at all. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/cluster.py Modified: CalendarServer/trunk/twistedcaldav/cluster.py =================================================================== --- CalendarServer/trunk/twistedcaldav/cluster.py 2008-01-11 22:00:19 UTC (rev 2109) +++ CalendarServer/trunk/twistedcaldav/cluster.py 2008-01-21 19:26:00 UTC (rev 2110) @@ -24,7 +24,7 @@ from twisted.application import internet, service from twistedcaldav import logging -from twistedcaldav.config import config +from twistedcaldav.config import config, ConfigurationError from twistedcaldav.util import getNCPU @@ -67,10 +67,13 @@ self.interfaces = interfaces def getName(self): - return '%s-%s' % (self.prefix, self.ports[0]) + if self.ports is not None: + return '%s-%s' % (self.prefix, self.ports[0]) + elif self.sslPorts is not None: + return '%s-%s' % (self.prefix, self.sslPorts[0]) - def getSSLName(self): - return '%s-%s' % (self.prefix, self.sslPorts[0]) + raise ConfigurationError( + "Can't create TwistdSlaveProcess without a TCP Port") def getCommandLine(self): args = [ @@ -100,7 +103,7 @@ if self.sslPorts: args.extend([ - '-o', + '-o', 'BindSSLPorts=%s' % (','.join(map(str, self.sslPorts)),)]) @@ -108,18 +111,25 @@ return args - def getHostLine(self, ssl=None): + def getHostLine(self, ssl=True): name = self.getName() - port = self.ports + port = None - if ssl: - name = self.getSSLName() + if self.ports is not None: + port = self.ports + + if ssl and self.sslPorts is not None: port = self.sslPorts + if port is None: + raise ConfigurationError( + "Can not add a host without a port") + return hostTemplate % {'name': name, 'port': port[0], 'bindAddress': '127.0.0.1'} + def makeService_Combined(self, options): s = service.MultiService() monitor = procmon.ProcessMonitor()

1 0

[2109] CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/ Twisted/twisted.web2.dav.xattrprops.patch
by source_changes＠macosforge.org 11 Jan '08

11 Jan '08

Revision: 2109 http://trac.macosforge.org/projects/calendarserver/changeset/2109 Author: wsanchez(a)apple.com Date: 2008-01-11 14:00:19 -0800 (Fri, 11 Jan 2008) Log Message: ----------- Pull up r2101, import log Modified Paths: -------------- CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch Modified: CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch =================================================================== --- CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch 2008-01-11 21:59:04 UTC (rev 2108) +++ CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch 2008-01-11 22:00:19 UTC (rev 2109) @@ -2,7 +2,7 @@ =================================================================== --- twisted/web2/dav/xattrprops.py (revision 19773) +++ twisted/web2/dav/xattrprops.py (working copy) -@@ -33,6 +33,11 @@ +@@ -33,12 +33,18 @@ import urllib import sys @@ -14,7 +14,14 @@ import xattr -@@ -66,16 +71,8 @@ + if getattr(xattr, 'xattr', None) is None: + raise ImportError("wrong xattr package imported") + ++from twisted.python import log + from twisted.web2 import responsecode + from twisted.web2.http import HTTPError, StatusResponse + from twisted.web2.dav import davxml +@@ -66,16 +72,8 @@ deadPropertyXattrPrefix = "user." def _encode(clazz, name): @@ -33,7 +40,7 @@ return r def _decode(clazz, name): -@@ -97,19 +94,41 @@ +@@ -97,19 +95,41 @@ def get(self, qname): try:

1 0

[2108] CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/ Twisted/twisted.web2.dav.element.parser.patch
by source_changes＠macosforge.org 11 Jan '08

11 Jan '08

Revision: 2108 http://trac.macosforge.org/projects/calendarserver/changeset/2108 Author: wsanchez(a)apple.com Date: 2008-01-11 13:59:04 -0800 (Fri, 11 Jan 2008) Log Message: ----------- Pull up r2066, coalesce PCDATA sections. Modified Paths: -------------- CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/Twisted/twisted.web2.dav.element.parser.patch Modified: CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/Twisted/twisted.web2.dav.element.parser.patch =================================================================== --- CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/Twisted/twisted.web2.dav.element.parser.patch 2008-01-11 21:39:36 UTC (rev 2107) +++ CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/Twisted/twisted.web2.dav.element.parser.patch 2008-01-11 21:59:04 UTC (rev 2108) @@ -68,7 +68,21 @@ self.stack.append({ "name" : name, -@@ -194,6 +219,8 @@ +@@ -158,7 +183,12 @@ + self.stack[-1]["children"].append(element) + + def characters(self, content): +- self.stack[-1]["children"].append(PCDATAElement(content)) ++ # Coalesce adjacent PCDATAElements ++ pcdata = PCDATAElement(content) ++ if len(self.stack[-1]["children"]) and isinstance(self.stack[-1]["children"][-1], PCDATAElement): ++ self.stack[-1]["children"][-1] = self.stack[-1]["children"][-1] + pcdata ++ else: ++ self.stack[-1]["children"].append(pcdata) + + def ignorableWhitespace(self, whitespace): + self.characters(self, whitespace) +@@ -194,6 +224,8 @@ except xml.sax.SAXParseException, e: raise ValueError(e)

1 0

[2107] CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav /directory
by source_changes＠macosforge.org 11 Jan '08

11 Jan '08

Revision: 2107 http://trac.macosforge.org/projects/calendarserver/changeset/2107 Author: wsanchez(a)apple.com Date: 2008-01-11 13:39:36 -0800 (Fri, 11 Jan 2008) Log Message: ----------- Pull up r2046, sudo users shouldn't be enabled for calendaring Modified Paths: -------------- CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/directory/sudo.py CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/directory/test/test_sudo.py Modified: CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/directory/sudo.py =================================================================== --- CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/directory/sudo.py 2008-01-11 21:19:38 UTC (rev 2106) +++ CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/directory/sudo.py 2008-01-11 21:39:36 UTC (rev 2107) @@ -27,13 +27,13 @@ from twisted.python.filepath import FilePath -from twisted.cred.credentials import (IUsernamePassword, +from twisted.cred.credentials import (IUsernamePassword, IUsernameHashedPassword) from twisted.cred.error import UnauthorizedLogin from twistedcaldav.py.plistlib import readPlist -from twistedcaldav.directory.directory import (DirectoryService, +from twistedcaldav.directory.directory import (DirectoryService, DirectoryRecord, UnknownRecordTypeError) @@ -58,7 +58,7 @@ if isinstance(plistFile, (unicode, str)): plistFile = FilePath(plistFile) - + self.plistFile = plistFile self._fileInfo = None self._accounts() @@ -104,12 +104,12 @@ # implementation because you shouldn't have a principal object for a # disabled directory principal. sudouser = self.recordWithShortName( - SudoDirectoryService.recordType_sudoers, + SudoDirectoryService.recordType_sudoers, credentials.credentials.username) if sudouser is None: raise UnauthorizedLogin("No such user: %s" % (sudouser,)) - + if sudouser.verifyCredentials(credentials.credentials): return ( credentials.authnPrincipal.principalURL(), @@ -117,7 +117,7 @@ ) else: raise UnauthorizedLogin( - "Incorrect credentials for %s" % (sudouser,)) + "Incorrect credentials for %s" % (sudouser,)) class SudoDirectoryRecord(DirectoryRecord): @@ -133,7 +133,8 @@ shortName=shortName, fullName=shortName, calendarUserAddresses=set(), - autoSchedule=False) + autoSchedule=False, + enabledForCalendaring=False) self.password = entry['password'] @@ -142,5 +143,5 @@ return credentials.checkPassword(self.password) elif IUsernameHashedPassword.providedBy(credentials): return credentials.checkPassword(self.password) - + return super(SudoDirectoryRecord, self).verifyCredentials(credentials) Modified: CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/directory/test/test_sudo.py =================================================================== --- CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/directory/test/test_sudo.py 2008-01-11 21:19:38 UTC (rev 2106) +++ CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/directory/test/test_sudo.py 2008-01-11 21:39:36 UTC (rev 2107) @@ -84,3 +84,11 @@ record = service.recordWithShortName(self.recordType, 'bob') self.assertEquals(record.password, 'bob') + + def test_calendaringDisabled(self): + service = self.service() + + record = service.recordWithShortName(self.recordType, 'alice') + + self.failIf(record.enabledForCalendaring, + "sudoers should have enabledForCalendaring=False")

1 0

[2106] CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav /directory
by source_changes＠macosforge.org 11 Jan '08

11 Jan '08

Revision: 2106 http://trac.macosforge.org/projects/calendarserver/changeset/2106 Author: wsanchez(a)apple.com Date: 2008-01-11 13:19:38 -0800 (Fri, 11 Jan 2008) Log Message: ----------- Pull up auth caching: r2079 r2102 r2105 Modified Paths: -------------- CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/directory/appleopendirectory.py CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/directory/test/util.py Modified: CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/directory/appleopendirectory.py =================================================================== --- CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/directory/appleopendirectory.py 2008-01-11 21:17:40 UTC (rev 2105) +++ CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/directory/appleopendirectory.py 2008-01-11 21:19:38 UTC (rev 2106) @@ -764,12 +764,25 @@ def verifyCredentials(self, credentials): if isinstance(credentials, UsernamePassword): + # Check cached password try: - return opendirectory.authenticateUserBasic(self.service.directory, self._nodename, self.shortName, credentials.password) + if credentials.password == self.password: + return True + except AttributeError: + pass + + # Check with directory services + try: + if opendirectory.authenticateUserBasic(self.service.directory, self._nodename, self.shortName, credentials.password): + # Cache the password to avoid future DS queries + self.password = credentials.password + return True except opendirectory.ODError, e: logging.err("Open Directory (node=%s) error while performing basic authentication for user %s: %s" - % (self.service.realmName, self.shortName, e), system="OpenDirectoryService") - return False + % (self.service.realmName, self.shortName, e), system="OpenDirectoryService") + + return False + elif isinstance(credentials, DigestedCredentials): try: # We need a special format for the "challenge" and "response" strings passed into open directory, as it is @@ -788,14 +801,28 @@ % (self.service.realmName, self.shortName, e, credentials.fields), system="OpenDirectoryService") return False - return opendirectory.authenticateUserDigest( + if self.digestcache[credentials.fields["uri"]] == response: + return True + except (AttributeError, KeyError): + pass + + try: + if opendirectory.authenticateUserDigest( self.service.directory, self._nodename, self.shortName, challenge, response, credentials.method - ) + ): + try: + cache = self.digestcache + except AttributeError: + cache = self.digestcache = {} + + cache[credentials.fields["uri"]] = response + + return True except opendirectory.ODError, e: logging.err("Open Directory (node=%s) error while performing digest authentication for user %s: %s" % (self.service.realmName, self.shortName, e), system="OpenDirectoryService") Modified: CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/directory/test/util.py =================================================================== --- CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/directory/test/util.py 2008-01-11 21:17:40 UTC (rev 2105) +++ CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/directory/test/util.py 2008-01-11 21:19:38 UTC (rev 2106) @@ -297,39 +297,48 @@ service = self.service() for user in self.users: - userRecord = service.recordWithShortName(DirectoryService.recordType_users, user) + for good in (True, True, False, False, True): + userRecord = service.recordWithShortName(DirectoryService.recordType_users, user) - # I'm glad this is so simple... - response = calcResponse( - calcHA1( + # I'm glad this is so simple... + response = calcResponse( + calcHA1( + "md5", + user, + service.realmName, + self.users[user]["password"], + "booger", + "phlegm", + ), "md5", - user, - service.realmName, - self.users[user]["password"], "booger", + None, "phlegm", - ), - "md5", - "booger", - None, - "phlegm", - "auth", - "GET", - "/", - None, - ) + "auth", + "GET", + "/", + None, + ) - credentials = DigestedCredentials( - user, - "GET", - service.realmName, - { - "response": response, - "uri": "/", - "nonce": "booger", - "cnonce": "phlegm", - "nc": None, - }, - ) + if good: + noise = "" + else: + noise = "blah" - self.failUnless(userRecord.verifyCredentials(credentials)) + credentials = DigestedCredentials( + user, + "GET", + service.realmName, + { + "response": response, + "uri": "/", + "nonce": "booger" + noise, + "cnonce": "phlegm", + "nc": None, + }, + ) + + if good: + self.failUnless(userRecord.verifyCredentials(credentials)) + else: + self.failIf(userRecord.verifyCredentials(credentials))

1 0

[2105] CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
by source_changes＠macosforge.org 11 Jan '08

11 Jan '08

Revision: 2105 http://trac.macosforge.org/projects/calendarserver/changeset/2105 Author: wsanchez(a)apple.com Date: 2008-01-11 13:17:40 -0800 (Fri, 11 Jan 2008) Log Message: ----------- uri is a string key, not a variable Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2008-01-11 20:27:40 UTC (rev 2104) +++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2008-01-11 21:17:40 UTC (rev 2105) @@ -800,7 +800,7 @@ return False try: - if self.digestcache[credentials.fields[uri]] == response: + if self.digestcache[credentials.fields["uri"]] == response: return True except (AttributeError, KeyError): pass @@ -819,7 +819,7 @@ except AttributeError: cache = self.digestcache = {} - cache[credentials.fields[uri]] = response + cache[credentials.fields["uri"]] = response return True except opendirectory.ODError, e:

1 0

[2104] CalendarServer/branches/release/CalendarServer-1.2-dev/
by source_changes＠macosforge.org 11 Jan '08

11 Jan '08

Revision: 2104 http://trac.macosforge.org/projects/calendarserver/changeset/2104 Author: wsanchez(a)apple.com Date: 2008-01-11 12:27:40 -0800 (Fri, 11 Jan 2008) Log Message: ----------- Start 1.2 branch Added Paths: ----------- CalendarServer/branches/release/CalendarServer-1.2-dev/ Copied: CalendarServer/branches/release/CalendarServer-1.2-dev (from rev 2103, CalendarServer/tags/release/CalendarServer-1.1)

1 0

[2103] CalendarServer/branches/release/CalendarServer-1.1-dev/
by source_changes＠macosforge.org 11 Jan '08

11 Jan '08

Revision: 2103 http://trac.macosforge.org/projects/calendarserver/changeset/2103 Author: wsanchez(a)apple.com Date: 2008-01-11 12:26:58 -0800 (Fri, 11 Jan 2008) Log Message: ----------- Released. Removed Paths: ------------- CalendarServer/branches/release/CalendarServer-1.1-dev/

1 0