April 2007 - calendarserver-changes

[1445] CalendarServer/trunk/twistedcaldav/cluster.py
by source_changes＠macosforge.org 03 Apr '07

03 Apr '07

Revision: 1445 http://trac.macosforge.org/projects/calendarserver/changeset/1445 Author: cdaboo(a)apple.com Date: 2007-04-03 12:49:36 -0700 (Tue, 03 Apr 2007) Log Message: ----------- Use default port values when "bind" ports are not specified. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/cluster.py Modified: CalendarServer/trunk/twistedcaldav/cluster.py =================================================================== --- CalendarServer/trunk/twistedcaldav/cluster.py 2007-04-03 18:09:03 UTC (rev 1444) +++ CalendarServer/trunk/twistedcaldav/cluster.py 2007-04-03 19:49:36 UTC (rev 1445) @@ -163,14 +163,22 @@ httpListeners = [] sslListeners = [] - for ports, listeners in ((config.BindHTTPPorts, httpListeners), - (config.BindSSLPorts, sslListeners)): + httpPorts = config.BindHTTPPorts + if not httpPorts: + httpPorts = (config.HTTPPort,) + + sslPorts = config.BindSSLPorts + if not sslPorts: + sslPorts = (config.SSLPort,) + + for ports, listeners in ((httpPorts, httpListeners), + (sslPorts, sslListeners)): for port in ports: listeners.append(listenTemplate % { 'bindAddress': bindAddress, 'port': port}) - if config.BindHTTPPorts: + if httpPorts: services.append(serviceTemplate % { 'name': 'http', 'listeningInterfaces': '\n'.join(httpListeners), @@ -179,7 +187,7 @@ 'hosts': '\n'.join(hosts) }) - if config.BindSSLPorts: + if sslPorts: services.append(serviceTemplate % { 'name': 'https', 'listeningInterfaces': '\n'.join(sslListeners),

1 0

[1444] CalendarServer/trunk/bin/xattr
by source_changes＠macosforge.org 03 Apr '07

03 Apr '07

Revision: 1444 http://trac.macosforge.org/projects/calendarserver/changeset/1444 Author: wsanchez(a)apple.com Date: 2007-04-03 11:09:03 -0700 (Tue, 03 Apr 2007) Log Message: ----------- Added Paths: ----------- CalendarServer/trunk/bin/xattr Added: CalendarServer/trunk/bin/xattr =================================================================== --- CalendarServer/trunk/bin/xattr (rev 0) +++ CalendarServer/trunk/bin/xattr 2007-04-03 18:09:03 UTC (rev 1444) @@ -0,0 +1,157 @@ +#!/usr/bin/env python + +## +# Copyright (c) 2005-2007 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. +# +# DRI: Wilfredo Sanchez, wsanchez(a)apple.com +## + +import sys +import os +import getopt +import xattr + +def usage(e=None): + if e: + print e + print "" + + name = os.path.basename(sys.argv[0]) + print "usage: %s [-l] file [file ...]" % (name,) + print " %s -p [-l] attr_name file [file ...]" % (name,) + print " %s -w attr_name attr_value file [file ...]" % (name,) + print " %s -d attr_name file [file ...]" % (name,) + print "" + print "The first form lists the names of all xattrs on the given file(s)." + print "The second form prints the value of the xattr attr_name on the given file(s)." + print "The third form sets the value of the xattr attr_name to attr_value on the given file(s)." + print "The fourth form deletes the xattr attr_value on the given file(s)." + print "" + print "options:" + print " -h: print this help" + print " -l: print long format (attr_name: attr_value)" + + if e: + sys.exit(64) + else: + sys.exit(0) + +def main(): + try: + (optargs, args) = getopt.getopt(sys.argv[1:], "hlpwd", ["help"]) + except getopt.GetoptError, e: + usage(e) + + attr_name = None + long_format = False + read = False + write = False + delete = False + status = 0 + + for opt, arg in optargs: + if opt in ("-h", "--help"): + usage() + elif opt == "-l": + long_format = True + elif opt == "-p": + read = True + elif opt == "-w": + write = True + elif opt == "-d": + delete = True + + if write or delete: + if long_format: + usage("-l not allowed with -w or -p") + + if read or write or delete: + if not args: + usage("No attr_name") + attr_name = args.pop(0) + + if write: + if not args: + usage("No attr_value") + attr_value = args.pop(0) + + if len(args) > 1: + multiple_files = True + else: + multiple_files = False + + for filename in args: + def onError(e): + if not os.path.exists(filename): + sys.stderr.write("No such file: %s\n" % (filename,)) + else: + sys.stderr.write(str(e) + "\n") + status = 1 + + try: + attrs = xattr.xattr(filename) + except (IOError, OSError), e: + onError(e) + continue + + if write: + try: + attrs[attr_name] = attr_value + except (IOError, OSError), e: + onError(e) + continue + + elif delete: + try: + del attrs[attr_name] + except (IOError, OSError), e: + onError(e) + continue + except KeyError: + onError("No such xattr: %s" % (attr_name,)) + continue + + else: + try: + if read: + attr_names = (attr_name,) + else: + attr_names = attrs.keys() + except (IOError, OSError), e: + onError(e) + continue + + if multiple_files: + file_prefix = "%s: " % (filename,) + else: + file_prefix = "" + + for attr_name in attr_names: + try: + if long_format: + print "".join((file_prefix, "%s: " % (attr_name,), attrs[attr_name])) + else: + if read: + print "".join((file_prefix, attrs[attr_name])) + else: + print "".join((file_prefix, attr_name)) + except KeyError: + onError("%sNo such xattr: %s" % (file_prefix, attr_name)) + continue + + sys.exit(status) + +if __name__ == "__main__": + main() Property changes on: CalendarServer/trunk/bin/xattr ___________________________________________________________________ Name: svn:executable + *

1 0

[1443] CalendarServer/trunk/twistedcaldav/tap.py
by source_changes＠macosforge.org 03 Apr '07

03 Apr '07

Revision: 1443 http://trac.macosforge.org/projects/calendarserver/changeset/1443 Author: cdaboo(a)apple.com Date: 2007-04-03 10:28:07 -0700 (Tue, 03 Apr 2007) Log Message: ----------- Fix KeyError when invalid GroupName is used. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/tap.py Modified: CalendarServer/trunk/twistedcaldav/tap.py =================================================================== --- CalendarServer/trunk/twistedcaldav/tap.py 2007-04-03 17:13:16 UTC (rev 1442) +++ CalendarServer/trunk/twistedcaldav/tap.py 2007-04-03 17:28:07 UTC (rev 1443) @@ -144,7 +144,7 @@ if gid: if gid != os.getgid() and os.getgid() != 0: import grp - groupname = grp.getgrgid(os.getuid())[0] + groupname = grp.getgrgid(os.getgid())[0] raise UsageError("Only root can drop privileges, you are: %s" % (groupname,))

1 0

[1442] CalendarServer/trunk/twistedcaldav/root.py
by source_changes＠macosforge.org 03 Apr '07

03 Apr '07

Revision: 1442 http://trac.macosforge.org/projects/calendarserver/changeset/1442 Author: cdaboo(a)apple.com Date: 2007-04-03 10:13:16 -0700 (Tue, 03 Apr 2007) Log Message: ----------- Make sure we trak the LoginError exception too. Add some logging for failed SACL checks. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/root.py Modified: CalendarServer/trunk/twistedcaldav/root.py =================================================================== --- CalendarServer/trunk/twistedcaldav/root.py 2007-04-02 03:34:41 UTC (rev 1441) +++ CalendarServer/trunk/twistedcaldav/root.py 2007-04-03 17:13:16 UTC (rev 1442) @@ -20,6 +20,7 @@ from twisted.internet import defer from twisted.python.failure import Failure +from twisted.cred.error import LoginFailed from twisted.cred.error import UnauthorizedLogin from twisted.web2.http import HTTPError @@ -55,10 +56,11 @@ """ def _authCb((authnUser, authzUser)): - # Insure that the user is not unauthenticated. + # Ensure that the user is not unauthenticated. # SACLs are authorization for the use of the service, # so unauthenticated access doesn't make any sense. if authzUser == davxml.Principal(davxml.Unauthenticated()): + log.msg("Unauthenticated users not enabled with the '%s' SACL" % (self.saclService,)) return Failure(HTTPError(UnauthorizedResponse( request.credentialFactories, request.remoteAddr))) @@ -67,7 +69,7 @@ def _authEb(failure): # Make sure we propogate UnauthorizedLogin errors. - failure.trap(UnauthorizedLogin) + failure.trap(UnauthorizedLogin, LoginFailed) return Failure(HTTPError(UnauthorizedResponse( request.credentialFactories, @@ -79,6 +81,7 @@ username = username.rstrip('/').split('/')[-1] if RootResource.CheckSACL(username, self.saclService) != 0: + log.msg("User '%s' is not enabled with the '%s' SACL" % (username, self.saclService,)) return Failure(HTTPError(403)) return True

1 0

[1441] CalendarServer/branches/users/cdaboo/fast-multiget-1425/ twistedcaldav/index.py
by source_changes＠macosforge.org 02 Apr '07

02 Apr '07

Revision: 1441 http://trac.macosforge.org/projects/calendarserver/changeset/1441 Author: cdaboo(a)apple.com Date: 2007-04-01 20:34:41 -0700 (Sun, 01 Apr 2007) Log Message: ----------- We need the dates stored in the index to all be relative to utc - even the floating ones, as we always run a query comparing against a utc formatted datetime. Modified Paths: -------------- CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/index.py Modified: CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/index.py =================================================================== --- CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/index.py 2007-04-02 03:32:30 UTC (rev 1440) +++ CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/index.py 2007-04-02 03:34:41 UTC (rev 1441) @@ -44,6 +44,8 @@ from twistedcaldav.query import calendarquery from twistedcaldav import caldavxml +from vobject.icalendar import utc + db_basename = ".db.sqlite" schema_version = "4" collection_types = {"Calendar": "Regular Calendar Collection", "iTIP": "iTIP Calendar Collection"} @@ -548,12 +550,14 @@ instances = calendar.expandTimeRanges(expand_max) for key in instances: instance = instances[key] + start = instance.start.replace(tzinfo=utc) + end = instance.end.replace(tzinfo=utc) float = ('N', 'Y')[instance.start.tzinfo is None] self._db_execute( """ insert into TIMESPAN (NAME, FLOAT, START, END) values (:1, :2, :3, :4) - """, name, float, normalizeForIndex(instance.start), normalizeForIndex(instance.end) + """, name, float, start, end ) self._db_execute(

1 0

[1440] CalendarServer/branches/users/cdaboo/fast-multiget-1425/ twistedcaldav/method/report_calquery.py
by source_changes＠macosforge.org 02 Apr '07

02 Apr '07

Revision: 1440 http://trac.macosforge.org/projects/calendarserver/changeset/1440 Author: cdaboo(a)apple.com Date: 2007-04-01 20:32:30 -0700 (Sun, 01 Apr 2007) Log Message: ----------- Fix some bugs. Modified Paths: -------------- CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_calquery.py Modified: CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_calquery.py =================================================================== --- CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_calquery.py 2007-03-30 20:38:32 UTC (rev 1439) +++ CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_calquery.py 2007-04-02 03:32:30 UTC (rev 1440) @@ -156,7 +156,7 @@ # Now determine which valid resources are readable and which are not ok_resources = [] - d = self.findChildrenFaster( + d = calresource.findChildrenFaster( "1", request, lambda x, y: ok_resources.append((x, y)), @@ -178,7 +178,7 @@ else: calendar = None - d = waitForDeferred(queryCalendarObjectResource(child, child_uri, child_name, calendar, query_ok = index_query_ok)) + d = waitForDeferred(queryCalendarObjectResource(child, uri, child_name, calendar, query_ok = index_query_ok)) yield d d.getResult() else:

1 0