December 2006 - calendarserver-changes

[901] CalendarServer/trunk/doc
by source_changes＠macosforge.org 23 Dec '06

23 Dec '06

Revision: 901 http://trac.macosforge.org/projects/calendarserver/changeset/901 Author: dreid(a)apple.com Date: 2006-12-22 16:47:35 -0800 (Fri, 22 Dec 2006) Log Message: ----------- update the caldavd man page and add a man page for caladmin Modified Paths: -------------- CalendarServer/trunk/doc/caldavd.8 Added Paths: ----------- CalendarServer/trunk/doc/caladmin.8 Added: CalendarServer/trunk/doc/caladmin.8 =================================================================== --- CalendarServer/trunk/doc/caladmin.8 (rev 0) +++ CalendarServer/trunk/doc/caladmin.8 2006-12-23 00:47:35 UTC (rev 901) @@ -0,0 +1,73 @@ +.\" +.\" Copyright (c) 2006 Apple Computer, 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. +.\" +.\" DRI: David Reid, dreid(a)apple.com +.\" +.\" The following requests are required for all man pages. +.Dd December 22, 2006 +.Dt CALADMIN 8 +.Os +.Sh NAME +.Nm caladmin +.Nd Calendar Server Administrative Interface +.Sh SYNOPSIS +.Nm +.Op Fl -c Ar caldavd.plist +.Op Fl -f Ar format +.Op Fl Ar -help +.Op Fl -o Ar options +.Ao Ar command Ac +.Sh DESCRIPTION +.Nm +is an administrative tool for the Darwin Calendar Server. It provides +several types of statistics for the Calendar Server and some common +administrative operations. +.Pp +.Sh OPTIONS +.Bl -tag -width flag +.It Fl -help +Display usage information. +.It Fl c, Fl -config= +Path to the configuration file for the server you wish to inspect or +manipulate. +.It Fl f, Fl -format= +The format you would like the output in. Common formats are 'plain' +and 'plist'. +.It Fl o, Fl -option= +Options for the formatter. +.El +.Sh COMMANDS +.Bl -tag -width flag +.It group +.It user +.It resource +Each of these commands prints statistics for each user, group, or +resource. Statistics may include but are not limited to, quota and +disk usage statistics. +.It purge +This can be used to keep your store from becoming unnecessarily large +by deleting old events. +.It stats +Generate some overall usage statistics for the server. +.It logs +Analyze the log file to gather even more. +.El +.Sh HISTORY +.Nm +was first introduced as part of Darwin 9 and Mac OS 10.5. +.Sh BUGS +This version of +.Nm +is still in development and testing. Modified: CalendarServer/trunk/doc/caldavd.8 =================================================================== --- CalendarServer/trunk/doc/caldavd.8 2006-12-22 23:16:05 UTC (rev 900) +++ CalendarServer/trunk/doc/caldavd.8 2006-12-23 00:47:35 UTC (rev 901) @@ -16,16 +16,19 @@ .\" DRI: Wilfredo Sanchez, wsanchez(a)apple.com .\" .\" The following requests are required for all man pages. -.Dd June 16, 2006 -.Dt CALDAVD 1 +.Dd December 22, 2006 +.Dt CALDAVD 8 .Os .Sh NAME .Nm caldavd .Nd Calendar Server Control Interface .Sh SYNOPSIS .Nm -.Op Fl v -.Ar command +.Op Fl hX +.Op Fl u Ar username +.Op Fl g Ar groupname +.Op Fl T Ar twistd +.Op Fl f Ar caldavd.plist .Sh DESCRIPTION .Nm is a front end to the Darwin Calendar Server. The Darwin Calendar @@ -33,19 +36,21 @@ and CalDAV protocols. .Pp .Nm -is a simple tool for starting, stopping, and restarting the server. It -takes a single argument, ( -.Ar command ) -which describes the desired action. -.Sh COMMANDS -The allows commands are: +is a simple tool for starting the server. +.Sh OPTIONS .Bl -tag -width flag -.It Ar start -Starts the server. -.It Ar stop -Stops the server. -.It Ar restart -Restarts the server. If the server is not running, simply starts the server. +.It Fl h +Displays usage information +.It Fl X +Starts the server but does not daemonize it. +.It Fl u Ar username +Drops privileges to the given username. +.It Fl g Ar groupname +Drops privileges to the given groupname. +.It Fl f Ar caldavd.plist +Specifies the path of the configuration file to read. +.It Fl T Ar twistd +Specifies the path to the twistd binary. .El .Sh FILES .Bl -tag -width flag

1 0

[900] CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/ test/sudoers.plist
by source_changes＠macosforge.org 22 Dec '06

22 Dec '06

Revision: 900 http://trac.macosforge.org/projects/calendarserver/changeset/900 Author: dreid(a)apple.com Date: 2006-12-22 15:16:05 -0800 (Fri, 22 Dec 2006) Log Message: ----------- fix the test/sudoers.plist Modified Paths: -------------- CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/test/sudoers.plist Modified: CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/test/sudoers.plist =================================================================== --- CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/test/sudoers.plist 2006-12-22 23:02:29 UTC (rev 899) +++ CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/test/sudoers.plist 2006-12-22 23:16:05 UTC (rev 900) @@ -2,27 +2,27 @@ <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>users</key> + <key>users</key> + <array> + <dict> + <key>authorize-as</key> + <dict> + <key>allow</key> + <true/> + <key>principals</key> <array> - <dict> - <key>authorize-as</key> - <dict> - <key>allow</key> - <true/> - <key>principals</key> - <array> - <string>all</string> - </array> - </dict> - <key>authorize-from</key> - <array> - <string>127.0.0.1</string> - </array> - <key>password</key> - <string></string> - <key>username</key> - <string></string> - </dict> + <string>all</string> </array> + </dict> + <key>authorize-from</key> + <array> + <string>127.0.0.1</string> + </array> + <key>password</key> + <string>alice</string> + <key>username</key> + <string>alice</string> + </dict> + </array> </dict> </plist>

1 0

[899] CalendarServer/branches/users/dreid/sudoers
by source_changes＠macosforge.org 22 Dec '06

22 Dec '06

Revision: 899 http://trac.macosforge.org/projects/calendarserver/changeset/899 Author: dreid(a)apple.com Date: 2006-12-22 15:02:29 -0800 (Fri, 22 Dec 2006) Log Message: ----------- HOORAY SUDO SUPPORT Modified Paths: -------------- CalendarServer/branches/users/dreid/sudoers/conf/accounts.xml CalendarServer/branches/users/dreid/sudoers/conf/sudoers.plist CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/directory.py CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/sudo.py CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/xmlaccountsparser.py CalendarServer/branches/users/dreid/sudoers/twistedcaldav/extensions.py CalendarServer/branches/users/dreid/sudoers/twistedcaldav/resource.py CalendarServer/branches/users/dreid/sudoers/twistedcaldav/tap.py Modified: CalendarServer/branches/users/dreid/sudoers/conf/accounts.xml =================================================================== --- CalendarServer/branches/users/dreid/sudoers/conf/accounts.xml 2006-12-22 19:26:19 UTC (rev 898) +++ CalendarServer/branches/users/dreid/sudoers/conf/accounts.xml 2006-12-22 23:02:29 UTC (rev 899) @@ -25,12 +25,6 @@ <name>Super User</name> </user> <user> - <uid>proxy</uid> - <password>proxy</password> - <name>User who can authorize as someone else</name> - <canproxy/>  - </user> - <user> <uid>test</uid> <password>test</password> <name>Test User</name> Modified: CalendarServer/branches/users/dreid/sudoers/conf/sudoers.plist =================================================================== --- CalendarServer/branches/users/dreid/sudoers/conf/sudoers.plist 2006-12-22 19:26:19 UTC (rev 898) +++ CalendarServer/branches/users/dreid/sudoers/conf/sudoers.plist 2006-12-22 23:02:29 UTC (rev 899) @@ -29,6 +29,12 @@ <string></string> </dict> --> + <dict> + <key>username</key> + <string>bob</string> + <key>password</key> + <string>bob</string> + </dict> </array> </dict> </plist> Modified: CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/directory.py =================================================================== --- CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/directory.py 2006-12-22 19:26:19 UTC (rev 898) +++ CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/directory.py 2006-12-22 23:02:29 UTC (rev 899) @@ -76,6 +76,8 @@ credentialInterfaces = (IPrincipalCredentials,) def requestAvatarId(self, credentials): + import pdb + pdb.set_trace() credentials = IPrincipalCredentials(credentials) # FIXME: ? Modified: CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/sudo.py =================================================================== --- CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/sudo.py 2006-12-22 19:26:19 UTC (rev 898) +++ CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/sudo.py 2006-12-22 23:02:29 UTC (rev 899) @@ -94,7 +94,25 @@ if entry['username'] == shortName: return self._recordForEntry(entry) + def requestAvatarId(self, credentials): + # FIXME: ? + # We were checking if principal is enabled; seems unnecessary in current + # implementation because you shouldn't have a principal object for a + # disabled directory principal. + user = self.recordWithShortName("sudoer", + credentials.credentials.username) + if user is None: + raise UnauthorizedLogin("No such user: %s" % (user,)) + + if user.verifyCredentials(credentials.credentials): + return ( + credentials.authnPrincipal.principalURL(), + credentials.authzPrincipal.principalURL(), + ) + else: + raise UnauthorizedLogin("Incorrect credentials for %s" % (user,)) + class SudoDirectoryRecord(DirectoryRecord): """ L{DirectoryRecord} implementation for Sudo users. Modified: CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/xmlaccountsparser.py =================================================================== --- CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/xmlaccountsparser.py 2006-12-22 19:26:19 UTC (rev 898) +++ CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/xmlaccountsparser.py 2006-12-22 23:02:29 UTC (rev 899) @@ -42,7 +42,7 @@ ELEMENT_MEMBERS = "members" ELEMENT_MEMBER = "member" ELEMENT_CUADDR = "cuaddr" -ELEMENT_CANPROXY = "canproxy" +# ELEMENT_CANPROXY = "canproxy" ATTRIBUTE_REALM = "realm" ATTRIBUTE_REPEAT = "repeat" @@ -129,7 +129,7 @@ self.members = set() self.groups = set() self.calendarUserAddresses = set() - self.canproxy = False +# self.canproxy = False def repeat(self, ctr): """ @@ -162,7 +162,7 @@ result.name = name result.members = self.members result.calendarUserAddresses = calendarUserAddresses - result.canproxy = self.canproxy +# result.canproxy = self.canproxy return result def parseXML(self, node): @@ -181,9 +181,9 @@ elif child._get_localName() == ELEMENT_CUADDR: if child.firstChild is not None: self.calendarUserAddresses.add(child.firstChild.data.encode("utf-8")) - elif child._get_localName() == ELEMENT_CANPROXY: - CalDAVResource.proxyUsers.add(self.shortName) - self.canproxy = True +# elif child._get_localName() == ELEMENT_CANPROXY: +# CalDAVResource.proxyUsers.add(self.shortName) +# self.canproxy = True def _parseMembers(self, node): for child in node._get_childNodes(): Modified: CalendarServer/branches/users/dreid/sudoers/twistedcaldav/extensions.py =================================================================== --- CalendarServer/branches/users/dreid/sudoers/twistedcaldav/extensions.py 2006-12-22 19:26:19 UTC (rev 898) +++ CalendarServer/branches/users/dreid/sudoers/twistedcaldav/extensions.py 2006-12-22 23:02:29 UTC (rev 899) @@ -46,6 +46,24 @@ Extended L{twisted.web2.dav.resource.DAVResource} implementation. """ + def findPrincipalForAuthID(self, authid): + """ + Return an authentication and authorization principal identifiers for + the authentication identifier passed in. Check for sudo users before + regular users. + """ + + record = self.directory.recordWithShortName('sudoer', authid) + + if record: + for collection in self.principalCollections(): + principal = collection.principalForRecord(record) + if principal is not None: + return principal + + return super(DAVResource, self).findPrincipalForAuthID(authid) + + class DAVFile (SuperDAVFile): """ Extended L{twisted.web2.dav.static.DAVFile} implementation. @@ -213,6 +231,14 @@ response.headers.setHeader("content-type", MimeType("text", "html")) return response + def findPrincipalForAuthID(self, authid): + """ + returns the principals by asking it's parent, because it doesn't have + a reference to the directory + """ + return self.parent.findPrincipalForAuthID(authid) + + class ReadOnlyResourceMixIn (object): """ Read only resource. Modified: CalendarServer/branches/users/dreid/sudoers/twistedcaldav/resource.py =================================================================== --- CalendarServer/branches/users/dreid/sudoers/twistedcaldav/resource.py 2006-12-22 19:26:19 UTC (rev 898) +++ CalendarServer/branches/users/dreid/sudoers/twistedcaldav/resource.py 2006-12-22 23:02:29 UTC (rev 899) @@ -74,10 +74,6 @@ # resources to that size, or C{None} for no limit. sizeLimit = None - # Set containing user ids of all the users who have been given - # the right to authorize as someone else. - proxyUsers = set() - ## # HTTP ## @@ -259,9 +255,14 @@ authz = authz[0] # See if authenticated uid is a proxy user - if authid in CalDAVResource.proxyUsers: + sudoRecord = self.directory.recordWithShortName( + 'sudoer', + authid) + + if sudoRecord: if authz: - if authz in CalDAVResource.proxyUsers: + record = self.directory.recordWithShortName('sudoer', authz) + if record: log.msg("Cannot proxy as another proxy: user '%s' as user '%s'" % (authid, authz)) raise HTTPError(responsecode.UNAUTHORIZED) else: Modified: CalendarServer/branches/users/dreid/sudoers/twistedcaldav/tap.py =================================================================== --- CalendarServer/branches/users/dreid/sudoers/twistedcaldav/tap.py 2006-12-22 19:26:19 UTC (rev 898) +++ CalendarServer/branches/users/dreid/sudoers/twistedcaldav/tap.py 2006-12-22 23:02:29 UTC (rev 899) @@ -45,6 +45,7 @@ from twistedcaldav.config import config, parseConfig, defaultConfig from twistedcaldav.logging import RotatingFileAccessLoggingObserver from twistedcaldav.root import RootResource +from twistedcaldav.resource import CalDAVResource from twistedcaldav.directory.principal import DirectoryPrincipalProvisioningResource from twistedcaldav.directory.aggregate import AggregateDirectoryService from twistedcaldav.directory.sudo import SudoDirectoryService @@ -132,9 +133,13 @@ directoryClass = namedClass(config.DirectoryService['type']) baseDirectory = directoryClass(**config.DirectoryService['params']) + sudoDirectory = None + if config.SudoersFile: sudoDirectory = SudoDirectoryService(config.SudoersFile) sudoDirectory.realmName = baseDirectory.realmName + + CalDAVResource.sudoDirectory = sudoDirectory directory = AggregateDirectoryService((baseDirectory, sudoDirectory)) @@ -196,6 +201,12 @@ portal.registerChecker(directory) + # FIXME: This is a hack, why doesn't aggregate directory service + # do the right thing. + + if sudoDirectory: + portal.registerChecker(sudoDirectory) + realm = directory.realmName or "" for scheme, schemeConfig in config.Authentication.iteritems():

1 0

[898] CalendarServer/branches/users/dreid/sudoers
by source_changes＠macosforge.org 22 Dec '06

22 Dec '06

Revision: 898 http://trac.macosforge.org/projects/calendarserver/changeset/898 Author: dreid(a)apple.com Date: 2006-12-22 11:26:19 -0800 (Fri, 22 Dec 2006) Log Message: ----------- set up the aggregate directory service and the sudoDirectory Modified Paths: -------------- CalendarServer/branches/users/dreid/sudoers/conf/caldavd-test.plist CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/sudo.py CalendarServer/branches/users/dreid/sudoers/twistedcaldav/tap.py Modified: CalendarServer/branches/users/dreid/sudoers/conf/caldavd-test.plist =================================================================== --- CalendarServer/branches/users/dreid/sudoers/conf/caldavd-test.plist 2006-12-22 19:06:59 UTC (rev 897) +++ CalendarServer/branches/users/dreid/sudoers/conf/caldavd-test.plist 2006-12-22 19:26:19 UTC (rev 898) @@ -184,7 +184,6 @@ <string>/principals/user/admin</string> </array> - <key>SudoersFile</key> <string>conf/sudoers.plist</string> </dict> Modified: CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/sudo.py =================================================================== --- CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/sudo.py 2006-12-22 19:06:59 UTC (rev 897) +++ CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/sudo.py 2006-12-22 19:26:19 UTC (rev 898) @@ -59,9 +59,9 @@ self.plistFile = plistFile self._fileInfo = None - self._readPlist() + self._accounts() - def _readPlist(self): + def _accounts(self): fileInfo = (self.plistFile.getmtime(), self.plistFile.getsize()) if fileInfo != self._fileInfo: self._plist = readPlist(self.plistFile.path) @@ -83,14 +83,14 @@ if recordType != self.recordType: raise UnknownRecordTypeError(recordType) - for entry in self._plist['users']: + for entry in self._accounts()['users']: yield self._recordForEntry(entry) def recordWithShortName(self, recordType, shortName): if recordType != self.recordType: raise UnknownRecordTypeError(recordType) - for entry in self._plist['users']: + for entry in self._accounts()['users']: if entry['username'] == shortName: return self._recordForEntry(entry) Modified: CalendarServer/branches/users/dreid/sudoers/twistedcaldav/tap.py =================================================================== --- CalendarServer/branches/users/dreid/sudoers/twistedcaldav/tap.py 2006-12-22 19:06:59 UTC (rev 897) +++ CalendarServer/branches/users/dreid/sudoers/twistedcaldav/tap.py 2006-12-22 19:26:19 UTC (rev 898) @@ -46,6 +46,9 @@ from twistedcaldav.logging import RotatingFileAccessLoggingObserver from twistedcaldav.root import RootResource from twistedcaldav.directory.principal import DirectoryPrincipalProvisioningResource +from twistedcaldav.directory.aggregate import AggregateDirectoryService +from twistedcaldav.directory.sudo import SudoDirectoryService + from twistedcaldav.static import CalendarHomeProvisioningFile from twistedcaldav.authkerb import NegotiateCredentialFactory @@ -127,8 +130,15 @@ # Setup the Directory # directoryClass = namedClass(config.DirectoryService['type']) - directory = directoryClass(**config.DirectoryService['params']) + baseDirectory = directoryClass(**config.DirectoryService['params']) + if config.SudoersFile: + sudoDirectory = SudoDirectoryService(config.SudoersFile) + sudoDirectory.realmName = baseDirectory.realmName + + directory = AggregateDirectoryService((baseDirectory, + sudoDirectory)) + # # Setup Resource hierarchy #

1 0

[897] CalendarServer/branches/users/dreid/sudoers
by source_changes＠macosforge.org 22 Dec '06

22 Dec '06

Revision: 897 http://trac.macosforge.org/projects/calendarserver/changeset/897 Author: dreid(a)apple.com Date: 2006-12-22 11:06:59 -0800 (Fri, 22 Dec 2006) Log Message: ----------- first pass at a sudo user directory service Modified Paths: -------------- CalendarServer/branches/users/dreid/sudoers/conf/caldavd-test.plist CalendarServer/branches/users/dreid/sudoers/conf/caldavd.plist CalendarServer/branches/users/dreid/sudoers/twistedcaldav/config.py Added Paths: ----------- CalendarServer/branches/users/dreid/sudoers/conf/sudoers.plist CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/sudo.py CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/test/sudoers.plist CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/test/test_sudo.py Modified: CalendarServer/branches/users/dreid/sudoers/conf/caldavd-test.plist =================================================================== --- CalendarServer/branches/users/dreid/sudoers/conf/caldavd-test.plist 2006-12-22 17:45:36 UTC (rev 896) +++ CalendarServer/branches/users/dreid/sudoers/conf/caldavd-test.plist 2006-12-22 19:06:59 UTC (rev 897) @@ -183,5 +183,9 @@ <array> <string>/principals/user/admin</string> </array> + + + <key>SudoersFile</key> + <string>conf/sudoers.plist</string> </dict> </plist> Modified: CalendarServer/branches/users/dreid/sudoers/conf/caldavd.plist =================================================================== --- CalendarServer/branches/users/dreid/sudoers/conf/caldavd.plist 2006-12-22 17:45:36 UTC (rev 896) +++ CalendarServer/branches/users/dreid/sudoers/conf/caldavd.plist 2006-12-22 19:06:59 UTC (rev 897) @@ -129,5 +129,8 @@ <array> <string>/principals/user/admin</string> </array> + + <key>SudoersFile</key> + <string>/etc/caldavd/sudoers.plist</string> </dict> </plist> Added: CalendarServer/branches/users/dreid/sudoers/conf/sudoers.plist =================================================================== --- CalendarServer/branches/users/dreid/sudoers/conf/sudoers.plist (rev 0) +++ CalendarServer/branches/users/dreid/sudoers/conf/sudoers.plist 2006-12-22 19:06:59 UTC (rev 897) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> +<key>users</key> +<array> + + +</array> +</dict> +</plist> Modified: CalendarServer/branches/users/dreid/sudoers/twistedcaldav/config.py =================================================================== --- CalendarServer/branches/users/dreid/sudoers/twistedcaldav/config.py 2006-12-22 17:45:36 UTC (rev 896) +++ CalendarServer/branches/users/dreid/sudoers/twistedcaldav/config.py 2006-12-22 19:06:59 UTC (rev 897) @@ -60,7 +60,8 @@ 'ServicePrincipal': '', }, }, - 'AdminPrincipals': ['/principals/user/admin'] + 'AdminPrincipals': ['/principals/user/admin'], + 'SudoersFile': '/etc/caldavd/sudoers.plist', } Added: CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/sudo.py =================================================================== --- CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/sudo.py (rev 0) +++ CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/sudo.py 2006-12-22 19:06:59 UTC (rev 897) @@ -0,0 +1,120 @@ +## +# Copyright (c) 2006 Apple Computer, 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. +# +# DRI: David reid, dreid(a)apple.com +## + +""" +Directory service implementation for users who are allowed to authorize +as other principals. +""" + +__all__ = [ + "SudoDirectoryService", +] + +from twisted.python.filepath import FilePath + +from twisted.cred.credentials import (IUsernamePassword, + IUsernameHashedPassword) + +from twistedcaldav.py.plistlib import readPlist +from twistedcaldav.directory.directory import (DirectoryService, + DirectoryRecord, + UnknownRecordTypeError) + +class SudoDirectoryService(DirectoryService): + """ + L{IDirectoryService} implementation for Sudo users. + """ + baseGUID = "1EE00E46-1885-4DBC-A001-590AFA76A8E3" + + realmName = None + + plistFile = None + + recordType = "sudoer" + + def __repr__(self): + return "<%s %r: %r>" % (self.__class__.__name__, self.realmName, + self.plistFile) + + def __init__(self, plistFile): + super(SudoDirectoryService, self).__init__() + + if isinstance(plistFile, (unicode, str)): + plistFile = FilePath(plistFile) + + self.plistFile = plistFile + self._fileInfo = None + self._readPlist() + + def _readPlist(self): + fileInfo = (self.plistFile.getmtime(), self.plistFile.getsize()) + if fileInfo != self._fileInfo: + self._plist = readPlist(self.plistFile.path) + + return self._plist + + def recordTypes(self): + return (self.recordType,) + + def _recordForEntry(self, entry): + return SudoDirectoryRecord( + service=self, + recordType=self.recordType, + shortName=entry['username'], + entry=entry) + + + def listRecords(self, recordType): + if recordType != self.recordType: + raise UnknownRecordTypeError(recordType) + + for entry in self._plist['users']: + yield self._recordForEntry(entry) + + def recordWithShortName(self, recordType, shortName): + if recordType != self.recordType: + raise UnknownRecordTypeError(recordType) + + for entry in self._plist['users']: + if entry['username'] == shortName: + return self._recordForEntry(entry) + + +class SudoDirectoryRecord(DirectoryRecord): + """ + L{DirectoryRecord} implementation for Sudo users. + """ + + def __init__(self, service, recordType, shortName, entry): + super(SudoDirectoryRecord, self).__init__( + service=service, + recordType=recordType, + guid=None, + shortName=shortName, + fullName=shortName, + calendarUserAddresses=set()) + + self.password = entry['password'] + + def verifyCredentials(self, credentials): + if IUsernamePassword.providedBy(credentials): + return credentials.checkPassword(self.password) + elif IUsernameHashedPassword.providedBy(credentials): + return credentials.checkPassword(self.password) + + return super(SudoDirectoryRecord, self).verifyCredentials(credentials) Added: CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/test/sudoers.plist =================================================================== --- CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/test/sudoers.plist (rev 0) +++ CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/test/sudoers.plist 2006-12-22 19:06:59 UTC (rev 897) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>users</key> + <array> + <dict> + <key>authorize-as</key> + <dict> + <key>allow</key> + <true/> + <key>principals</key> + <array> + <string>all</string> + </array> + </dict> + <key>authorize-from</key> + <array> + <string>127.0.0.1</string> + </array> + <key>password</key> + <string></string> + <key>username</key> + <string></string> + </dict> + </array> +</dict> +</plist> Added: CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/test/test_sudo.py =================================================================== --- CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/test/test_sudo.py (rev 0) +++ CalendarServer/branches/users/dreid/sudoers/twistedcaldav/directory/test/test_sudo.py 2006-12-22 19:06:59 UTC (rev 897) @@ -0,0 +1,66 @@ +## +# Copyright (c) 2005-2006 Apple Computer, 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. +# +# DRI: David Reid, dreid(a)apple.com +## +import os + +from twisted.python.filepath import FilePath + +import twistedcaldav.directory.test.util +from twistedcaldav.directory.sudo import SudoDirectoryService +from twistedcaldav.py.plistlib import writePlist + +plistFile = FilePath(os.path.join(os.path.dirname(__file__), "sudoers.plist")) + +class SudoTestCase( + twistedcaldav.directory.test.util.BasicTestCase, + twistedcaldav.directory.test.util.DigestTestCase +): + """ + Test the Sudo Directory Service + """ + + recordTypes = set(('sudoer',)) + recordType = 'sudoer' + + sudoers = {'alice': {'password': 'alice',}, + } + + def plistFile(self): + if not hasattr(self, "_plistFile"): + self._plistFile = FilePath(self.mktemp()) + plistFile.copyTo(self._plistFile) + return self._plistFile + + def service(self): + service = SudoDirectoryService(self.plistFile()) + service.realmName = "test realm" + return service + + def test_listRecords(self): + for record in self.service().listRecords(self.recordType): + self.failUnless(record.shortName in self.sudoers) + self.assertEqual(self.sudoers[record.shortName]['password'], + record.password) + + def test_recordWithShortName(self): + service = self.service() + + record = service.recordWithShortName('sudoer', 'alice') + self.assertEquals(record.password, 'alice') + + record = service.recordWithShortName('sudoer', 'bob') + self.failIf(record)

1 0

[896] CalendarServer/branches/users/dreid/sudoers/
by source_changes＠macosforge.org 22 Dec '06

22 Dec '06

Revision: 896 http://trac.macosforge.org/projects/calendarserver/changeset/896 Author: dreid(a)apple.com Date: 2006-12-22 09:45:36 -0800 (Fri, 22 Dec 2006) Log Message: ----------- Branching to 'users/dreid/sudoers' Added Paths: ----------- CalendarServer/branches/users/dreid/sudoers/ Copied: CalendarServer/branches/users/dreid/sudoers (from rev 895, CalendarServer/trunk)

1 0

[895] CalendarServer/branches
by source_changes＠macosforge.org 22 Dec '06

22 Dec '06

Revision: 895 http://trac.macosforge.org/projects/calendarserver/changeset/895 Author: dreid(a)apple.com Date: 2006-12-22 09:45:20 -0800 (Fri, 22 Dec 2006) Log Message: ----------- Merged Removed Paths: ------------- CalendarServer/branches/SACLs/ CalendarServer/branches/backup/ CalendarServer/branches/caladmin-tool/ CalendarServer/branches/caladmin-tool-2/ CalendarServer/branches/caldavd-twistd-plugin/ CalendarServer/branches/caldavd-twistd-plugin-2/ CalendarServer/branches/sudoers/

1 0

[894] CalendarServer/branches/sudoers/
by source_changes＠macosforge.org 22 Dec '06

22 Dec '06

Revision: 894 http://trac.macosforge.org/projects/calendarserver/changeset/894 Author: dreid(a)apple.com Date: 2006-12-22 09:44:00 -0800 (Fri, 22 Dec 2006) Log Message: ----------- Branching to 'sudoers' Added Paths: ----------- CalendarServer/branches/sudoers/ Copied: CalendarServer/branches/sudoers (from rev 893, CalendarServer/trunk)

1 0

[893] PyOpenDirectory/branches/users/cdaboo/new-schema-892/
by source_changes＠macosforge.org 22 Dec '06

22 Dec '06

Revision: 893 http://trac.macosforge.org/projects/calendarserver/changeset/893 Author: cdaboo(a)apple.com Date: 2006-12-22 08:45:19 -0800 (Fri, 22 Dec 2006) Log Message: ----------- Branching for changes to support new schema. Added Paths: ----------- PyOpenDirectory/branches/users/cdaboo/new-schema-892/ Copied: PyOpenDirectory/branches/users/cdaboo/new-schema-892 (from rev 892, PyOpenDirectory/trunk)

1 0

[892] PyOpenDirectory/branches/users/cdaboo/
by source_changes＠macosforge.org 22 Dec '06

22 Dec '06

Revision: 892 http://trac.macosforge.org/projects/calendarserver/changeset/892 Author: cdaboo(a)apple.com Date: 2006-12-22 08:42:32 -0800 (Fri, 22 Dec 2006) Log Message: ----------- Added Paths: ----------- PyOpenDirectory/branches/users/cdaboo/

1 0