January 2007 - calendarserver-dev - lists.macosforge.org

Re: [CalendarServer-changes] [1059] CalendarServer/trunk/twistedcaldav/static.py
by Wilfredo Sánchez Vega 19 Jan '07

19 Jan '07

Would raising HTTPError(responsecode.NOT_FOUND) be more appropriate here? I know I haven't defined provisionChild() very well yet, but my thinking it that it's not really supposed to be called unless we know the child should exist; the caller should expect it to always work. Raising should give us a better error result if not handled, where returning None might cause some other (more obscure) error down the line. I don't know what the error trace looked like, so I might be wrong. -wsv On Jan 18, 2007, at 11:26 AM, source_changes(a)macosforge.org wrote: > Revision > 1059 > Author > cdaboo(a)apple.com > Date > 2007-01-18 11:26:46 -0800 (Thu, 18 Jan 2007) > Log Message > > Fix 500 error when doing a request on a non-existent user's outbox. > Modified Paths > > CalendarServer/trunk/twistedcaldav/static.py > Diff > > Modified: CalendarServer/trunk/twistedcaldav/static.py (1058 => 1059) > > --- CalendarServer/trunk/twistedcaldav/static.py 2007-01-18 16:57:31 > UTC (rev 1058) > +++ CalendarServer/trunk/twistedcaldav/static.py 2007-01-18 19:26:46 > UTC (rev 1059) > @@ -436,7 +436,10 @@ > > def provisionChild(self, name): > record = > self.directory.recordWithShortName(self.recordType, name) > - assert record is not None, "No directory record %r of type > %r" % (name, self.recordType) > + if record is None: > + log.msg("No directory record %r of type %r" % (name, > self.recordType)) > + return None > + > child = CalendarHomeFile(self.fp.child(name).path, self, > record) > if not child.exists(): > # NOTE: provisionDefaultCalendars() returns a deferred, > which we are ignoring. > _______________________________________________ > calendarserver-changes mailing list > calendarserver-changes(a)lists.macosforge.org > http://lists.macosforge.org/mailman/listinfo/calendarserver-changes

2 2

Re: [CalendarServer-changes] [1064] CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.element. base.patch
by Wilfredo Sánchez Vega 19 Jan '07

19 Jan '07

What exactly is the issue with XML attributes? If they aren't in the allowed list, we should raise an error or something, no? Do we have to allow arbitrary unknown attributes to pass through? -wsv On Jan 18, 2007, at 1:30 PM, source_changes(a)macosforge.org wrote: > Revision > 1064 > Author > cdaboo(a)apple.com > Date > 2007-01-18 13:30:27 -0800 (Thu, 18 Jan 2007) > Log Message > > Fix for issue with XML attributes on properties being lost. > Modified Paths > > CalendarServer/trunk/lib-patches/Twisted/ > twisted.web2.dav.element.base.patch > Diff > > Modified: CalendarServer/trunk/lib-patches/Twisted/ > twisted.web2.dav.element.base.patch (1063 => 1064) > > --- CalendarServer/trunk/lib-patches/Twisted/ > twisted.web2.dav.element.base.patch 2007-01-18 21:15:52 UTC (rev 1063) > +++ CalendarServer/trunk/lib-patches/Twisted/ > twisted.web2.dav.element.base.patch 2007-01-18 21:30:27 UTC (rev 1064) > @@ -2,7 +2,36 @@ > =================================================================== > --- twisted/web2/dav/element/base.py (revision 18545) > +++ twisted/web2/dav/element/base.py (working copy) > -@@ -190,14 +190,93 @@ > +@@ -145,21 +145,20 @@ > + > + if self.allowed_attributes: > + for name in attributes: > +- if name in self.allowed_attributes: > +- my_attributes[name] = attributes[name] > +- else: > +- log.msg("Attribute %s is unexpected and > therefore ignored in %s element" > +- % (name, self.sname())) > ++ if name not in self.allowed_attributes: > ++ log.msg("Attribute %s is unexpected in %s > element" % (name, self.sname())) > ++ my_attributes[name] = attributes[name] > + > + for name, required in self.allowed_attributes.items(): > + if required and name not in my_attributes: > + raise ValueError("Attribute %s is required in > %s element" > + % (name, self.sname())) > + > +- elif not isinstance(self, WebDAVUnknownElement): > +- if attributes: > +- log.msg("Attributes %s are unexpected and > therefore ignored in %s element" > ++ else: > ++ if not isinstance(self, WebDAVUnknownElement) and > attributes: > ++ log.msg("Attributes %s are unexpected in %s element" > + % (attributes.keys(), self.sname())) > ++ my_attributes.update(attributes) > + > + self.attributes = my_attributes > + > +@@ -190,14 +189,93 @@ > return child in self.children > > def writeXML(self, output): > @@ -100,7 +129,7 @@ > > def element(self, document): > element = document.createElementNS(self.namespace, > self.name) > -@@ -324,6 +403,22 @@ > +@@ -324,6 +402,22 @@ > log.err("Invalid PCDATA: %r" % (self.data,)) > raise > > _______________________________________________ > calendarserver-changes mailing list > calendarserver-changes(a)lists.macosforge.org > http://lists.macosforge.org/mailman/listinfo/calendarserver-changes

2 1

Re: [CalendarServer-changes] [1055] CalendarServer/branches/users/cdaboo/od-schema-1044/twistedcaldav/ directory
by Wilfredo Sánchez Vega 19 Jan '07

19 Jan '07

This bit assumes that en0 is the interface being used by the server. You actually want to check each interface used by each of the IP addresses in config.BindAddresses. Anyone know how to lookup a MAC address in python? This looks potentially promising, but I can't grok it and it didn't work on my machine: http://rafb.net/p/LcL3wR37.html Seems like this should be doable without forking... -wsv On Jan 17, 2007, at 8:27 AM, source_changes(a)macosforge.org wrote: > + macaddr = os.popen('/sbin/ifconfig en0|grep > ether').read().replace('\n','').split()[1]

2 2