March 2007 - calendarserver-changes

[1439] CalendarServer/branches/users/cdaboo/fast-multiget-1425/ twistedcaldav/method/report_calquery.py
by source_changes＠macosforge.org 30 Mar '07

30 Mar '07

Revision: 1439 http://trac.macosforge.org/projects/calendarserver/changeset/1439 Author: cdaboo(a)apple.com Date: 2007-03-30 13:38:32 -0700 (Fri, 30 Mar 2007) Log Message: ----------- Various optimizations to improve performance: fast acls, by pass full calendar search if we can, don't read the calendar data if its not needed. 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:37:28 UTC (rev 1438) +++ CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_calquery.py 2007-03-30 20:38:32 UTC (rev 1439) @@ -71,15 +71,17 @@ if query.qname() == ("DAV:", "allprop"): propertiesForResource = report_common.allPropertiesForResource + generate_calendar_data = False elif query.qname() == ("DAV:", "propname"): propertiesForResource = report_common.propertyNamesForResource + generate_calendar_data = False elif query.qname() == ("DAV:", "prop"): propertiesForResource = report_common.propertyListForResource # Verify that any calendar-data element matches what we can handle - result, message = report_common.validPropertyListCalendarDataTypeVersion(query) + result, message, generate_calendar_data = report_common.validPropertyListCalendarDataTypeVersion(query) if not result: log.err(message) raise HTTPError(ErrorResponse(responsecode.FORBIDDEN, (caldav_namespace, "supported-calendar-data"))) @@ -101,7 +103,7 @@ @param uri: the uri for the calendar collecton resource. """ - def queryCalendarObjectResource(resource, uri, name, calendar): + def queryCalendarObjectResource(resource, uri, name, calendar, query_ok = False): """ Run a query on the specified calendar. @param resource: the L{CalDAVFile} for the calendar. @@ -110,7 +112,7 @@ @param calendar: the L{Component} calendar read from the resource. """ - if filter.match(calendar): + if query_ok or filter.match(calendar): # Check size of results is within limit matchcount[0] += 1 if matchcount[0] > max_number_of_matches: @@ -146,23 +148,37 @@ # Check for disabled access if filteredaces is not None: - for name, uid, type in calresource.index().search(filter): #@UnusedVariable - # Check privileges - must have at least DAV:read - child = waitForDeferred(request.locateChildResource(calresource, name)) - yield child - child = child.getResult() - - try: - d = waitForDeferred(child.checkPrivileges(request, (davxml.Read(),), inherited_aces=filteredaces)) - yield d - d.getResult() - except: - continue - - calendar = calresource.iCalendar(name) - assert calendar is not None, "Calendar %s is missing from calendar collection %r" % (name, self) + # See whether the filter is valid for an index only query + index_query_ok = calresource.index().searchValid(filter) + + # Get list of children that match the search and have read access + names = [name for name, ignore_uid, ignore_type in calresource.index().search(filter)] + + # Now determine which valid resources are readable and which are not + ok_resources = [] + d = self.findChildrenFaster( + "1", + request, + lambda x, y: ok_resources.append((x, y)), + None, + names, + (davxml.Read(),), + inherited_aces=filteredaces + ) + x = waitForDeferred(d) + yield x + x.getResult() + + for child, child_uri in ok_resources: + child_name = child_uri[child_uri.rfind("/") + 1:] - d = waitForDeferred(queryCalendarObjectResource(child, uri, name, calendar)) + if generate_calendar_data or not index_query_ok: + calendar = calresource.iCalendar(child_name) + assert calendar is not None, "Calendar %s is missing from calendar collection %r" % (child_name, self) + else: + calendar = None + + d = waitForDeferred(queryCalendarObjectResource(child, child_uri, child_name, calendar, query_ok = index_query_ok)) yield d d.getResult() else:

1 0

[1438] CalendarServer/branches/users/cdaboo/fast-multiget-1425/ twistedcaldav/method
by source_changes＠macosforge.org 30 Mar '07

30 Mar '07

Revision: 1438 http://trac.macosforge.org/projects/calendarserver/changeset/1438 Author: cdaboo(a)apple.com Date: 2007-03-30 13:37:28 -0700 (Fri, 30 Mar 2007) Log Message: ----------- Provide another return parameter so that the caller knows whether any calendar-data element was requested. Modified Paths: -------------- CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_common.py CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_multiget.py Modified: CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_common.py =================================================================== --- CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_common.py 2007-03-30 20:36:28 UTC (rev 1437) +++ CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_common.py 2007-03-30 20:37:28 UTC (rev 1438) @@ -193,14 +193,16 @@ result = True message = "" + generate_calendar_data = False for property in prop.children: if isinstance(property, caldavxml.CalendarData): if not property.verifyTypeVersion([("text/calendar", "2.0")]): result = False message = "Calendar-data element type/version not supported: content-type: %s, version: %s" % (property.content_type,property.version) + generate_calendar_data = True break - return result, message + return result, message, generate_calendar_data def _namedPropertiesForResource(request, props, resource, calendar=None): """ Modified: CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_multiget.py =================================================================== --- CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_multiget.py 2007-03-30 20:36:28 UTC (rev 1437) +++ CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_multiget.py 2007-03-30 20:37:28 UTC (rev 1438) @@ -64,15 +64,17 @@ if propertyreq.qname() == ("DAV:", "allprop"): propertiesForResource = report_common.allPropertiesForResource + generate_calendar_data = False elif propertyreq.qname() == ("DAV:", "propname"): propertiesForResource = report_common.propertyNamesForResource + generate_calendar_data = False elif propertyreq.qname() == ("DAV:", "prop"): propertiesForResource = report_common.propertyListForResource # Verify that any calendar-data element matches what we can handle - result, message = report_common.validPropertyListCalendarDataTypeVersion(propertyreq) + result, message, generate_calendar_data = report_common.validPropertyListCalendarDataTypeVersion(propertyreq) if not result: log.err(message) raise HTTPError(ErrorResponse(responsecode.FORBIDDEN, (caldav_namespace, "supported-calendar-data")))

1 0

[1437] CalendarServer/branches/users/cdaboo/fast-multiget-1425/ twistedcaldav/index.py
by source_changes＠macosforge.org 30 Mar '07

30 Mar '07

Revision: 1437 http://trac.macosforge.org/projects/calendarserver/changeset/1437 Author: cdaboo(a)apple.com Date: 2007-03-30 13:36:28 -0700 (Fri, 30 Mar 2007) Log Message: ----------- Add method to allow someone to determine whether a particular calendar query filter will be fully satisfied by an SQL. This allows the caller to avoid doing a full calendar search if the index search does it. 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-03-30 20:35:13 UTC (rev 1436) +++ CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/index.py 2007-03-30 20:36:28 UTC (rev 1437) @@ -233,6 +233,14 @@ results = self._db_values_for_sql(statement, *names) return results + def searchValid(self, filter): + if isinstance(filter, caldavxml.Filter): + qualifiers = calendarquery.sqlcalendarquery(filter) + else: + qualifiers = None + + return qualifiers is not None + def search(self, filter): """ Finds resources matching the given qualifiers.

1 0

[1436] CalendarServer/branches/users/cdaboo/fast-multiget-1425/ twistedcaldav/extensions.py
by source_changes＠macosforge.org 30 Mar '07

30 Mar '07

Revision: 1436 http://trac.macosforge.org/projects/calendarserver/changeset/1436 Author: cdaboo(a)apple.com Date: 2007-03-30 13:35:13 -0700 (Fri, 30 Mar 2007) Log Message: ----------- Add comments. Allow callbacks to be None. Modified Paths: -------------- CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/extensions.py Modified: CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/extensions.py =================================================================== --- CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/extensions.py 2007-03-30 17:14:48 UTC (rev 1435) +++ CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/extensions.py 2007-03-30 20:35:13 UTC (rev 1436) @@ -81,6 +81,17 @@ This implementation works for C{depth} values of C{"0"}, C{"1"}, and C{"infinity"}. As long as C{self.listChildren} is implemented + + @param depth: a C{str} for the depth: "0", "1" and "infinity" only allowed. + @param request: the L{Request} for the current request in progress + @param okcallback: a callback function used on all resources that pass the privilege check, + or C{None} + @param badcallback: a callback function used on all resources that fail the privilege check, + or C{None} + @param names: a C{list} of C{str}'s containing the names of the child resources to lookup. If + empty or C{None} all children will be examined, otherwise only the ones in the list. + @param privileges: a list of privileges to check. + @param inherited_aces: the list of parent ACEs that are inherited by all children. """ assert depth in ("0", "1", "infinity"), "Invalid depth: %s" % (depth,) @@ -131,12 +142,14 @@ checked = checked.getResult() if checked: for resource, url in items[2]: - okcallback(resource, url) + if okcallback: + okcallback(resource, url) if resource.isCollection(): allowed_collections.append((resource, url)) else: - for resource, url in items[2]: - badcallback(resource, url) + if badcallback: + for resource, url in items[2]: + badcallback(resource, url) # TODO: Depth: inifinity support if depth == "infinity":

1 0

[1435] CalendarServer/trunk/twistedcaldav/static.py
by source_changes＠macosforge.org 30 Mar '07

30 Mar '07

Revision: 1435 http://trac.macosforge.org/projects/calendarserver/changeset/1435 Author: wsanchez(a)apple.com Date: 2007-03-30 10:14:48 -0700 (Fri, 30 Mar 2007) Log Message: ----------- If we're not a collection but makedirs() fails, it could be because someone else came along and did it for us. Deal with the race condition by checking again if makedirs() raises, and re-raise only if we're still not a collection. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/static.py Modified: CalendarServer/trunk/twistedcaldav/static.py =================================================================== --- CalendarServer/trunk/twistedcaldav/static.py 2007-03-29 18:52:31 UTC (rev 1434) +++ CalendarServer/trunk/twistedcaldav/static.py 2007-03-30 17:14:48 UTC (rev 1435) @@ -404,7 +404,13 @@ assert parent.isCollection() if self.isCollection(): - fp.makedirs() + try: + fp.makedirs() + except OSError: + # It's possible someone else created the directory in the meantime... + # Check our status again, and re-raise if we're not a collection. + if not self.isCollection(): + raise fp.restat(False) else: fp.open("w").close()

1 0

[1434] CalendarServer/trunk/twistedcaldav/method/report_multiget.py
by source_changes＠macosforge.org 29 Mar '07

29 Mar '07

Revision: 1434 http://trac.macosforge.org/projects/calendarserver/changeset/1434 Author: cdaboo(a)apple.com Date: 2007-03-29 11:52:31 -0700 (Thu, 29 Mar 2007) Log Message: ----------- Proper fix for encoded characters in the URI. We need to only decode the last segment for getChild() since that expects a decoded name. The remainder of thwe URI remains encoded as we need to do comparisons against the request.uri with that, and request.uri is not encoded. What we really need here is a proper URI class that can maintain its encoded/decoded state, so comparisons etc are done transparently, and so we can avoid double-encode/decode issues too. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/method/report_multiget.py Modified: CalendarServer/trunk/twistedcaldav/method/report_multiget.py =================================================================== --- CalendarServer/trunk/twistedcaldav/method/report_multiget.py 2007-03-29 18:45:23 UTC (rev 1433) +++ CalendarServer/trunk/twistedcaldav/method/report_multiget.py 2007-03-29 18:52:31 UTC (rev 1434) @@ -123,12 +123,12 @@ if not disabled: for href in resources: - resource_uri = unquote(str(href)) + resource_uri = str(href) # Do href checks if requestURIis == "calendar": # Verify that href is an immediate child of the request URI and that resource exists. - name = resource_uri[resource_uri.rfind("/") + 1:] + name = unquote(resource_uri[resource_uri.rfind("/") + 1:]) if not self._isChildURI(request, resource_uri) or self.getChild(name) is None: responses.append(davxml.StatusResponse(href, davxml.Status.fromResponseCode(responsecode.NOT_FOUND))) continue @@ -143,7 +143,7 @@ child = child.getResult() elif requestURIis == "collection": - name = resource_uri[resource_uri.rfind("/") + 1:] + name = unquote(resource_uri[resource_uri.rfind("/") + 1:]) if not self._isChildURI(request, resource_uri, False): responses.append(davxml.StatusResponse(href, davxml.Status.fromResponseCode(responsecode.NOT_FOUND))) continue @@ -184,7 +184,7 @@ filteredaces = filteredaces.getResult() else: - name = resource_uri[resource_uri.rfind("/") + 1:] + name = unquote(resource_uri[resource_uri.rfind("/") + 1:]) if (resource_uri != request.uri) or not self.exists(): responses.append(davxml.StatusResponse(href, davxml.Status.fromResponseCode(responsecode.NOT_FOUND))) continue

1 0

[1433] CalDAVTester/trunk
by source_changes＠macosforge.org 29 Mar '07

29 Mar '07

Revision: 1433 http://trac.macosforge.org/projects/calendarserver/changeset/1433 Author: cdaboo(a)apple.com Date: 2007-03-29 11:45:23 -0700 (Thu, 29 Mar 2007) Log Message: ----------- Tests to check for encoded characters not only in the last segment of the URI but in previous segments too. Modified Paths: -------------- CalDAVTester/trunk/scripts/tests/encodedURIs.xml Added Paths: ----------- CalDAVTester/trunk/Resource/reports/multiget/encoded2.xml Added: CalDAVTester/trunk/Resource/reports/multiget/encoded2.xml =================================================================== --- CalDAVTester/trunk/Resource/reports/multiget/encoded2.xml (rev 0) +++ CalDAVTester/trunk/Resource/reports/multiget/encoded2.xml 2007-03-29 18:45:23 UTC (rev 1433) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" ?> +<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"> +<D:prop> +<D:getetag/> +<C:calendar-data> +<C:comp name="VCALENDAR"> +<C:allprop/> +<C:allcomp/> +</C:comp> +</C:calendar-data> +</D:prop> +<D:href>$pathprefix:/calendar%203/2_3%20a.ics</D:href> +</C:calendar-multiget> Modified: CalDAVTester/trunk/scripts/tests/encodedURIs.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/encodedURIs.xml 2007-03-28 20:57:33 UTC (rev 1432) +++ CalDAVTester/trunk/scripts/tests/encodedURIs.xml 2007-03-29 18:45:23 UTC (rev 1433) @@ -316,6 +316,69 @@ </verify> </request> </test> + <test name='6'> + <description>multiget REPORT on encoded calendar collection path</description> + <request print-response='no'> + <method>REPORT</method> + <ruri>$pathprefix:/calendar%203/</ruri> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/reports/multiget/encoded2.xml</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + <verify> + <callback>multistatusItems</callback> + <arg> + <name>okhrefs</name> + <value>2_3%20a.ics</value> + </arg> + </verify> + </request> + </test> + <test name='7'> + <description>multiget REPORT on encoded calendar resource path</description> + <request print-response='no'> + <method>REPORT</method> + <ruri>$pathprefix:/calendar%203/2_3%20a.ics</ruri> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/reports/multiget/encoded2.xml</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + <verify> + <callback>multistatusItems</callback> + <arg> + <name>okhrefs</name> + <value></value> + </arg> + </verify> + </request> + </test> + <test name='8'> + <description>multiget REPORT on encoded collection path</description> + <request print-response='no'> + <method>REPORT</method> + <ruri>$pathprefix:/</ruri> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/reports/multiget/encoded2.xml</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + <verify> + <callback>multistatusItems</callback> + <arg> + <name>okhrefs</name> + <value>calendar%203/2_3%20a.ics</value> + </arg> + </verify> + </request> + </test> </test-suite> <end/>

1 0

[1432] CalendarServer/branches/users/cdaboo/fast-multiget-1425/ twistedcaldav/method/report_multiget.py
by source_changes＠macosforge.org 28 Mar '07

28 Mar '07

Revision: 1432 http://trac.macosforge.org/projects/calendarserver/changeset/1432 Author: cdaboo(a)apple.com Date: 2007-03-28 13:57:33 -0700 (Wed, 28 Mar 2007) Log Message: ----------- Fix some test case bugs. Modified Paths: -------------- CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_multiget.py Modified: CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_multiget.py =================================================================== --- CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_multiget.py 2007-03-28 20:24:08 UTC (rev 1431) +++ CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_multiget.py 2007-03-28 20:57:33 UTC (rev 1432) @@ -133,13 +133,16 @@ responses.append(davxml.StatusResponse(href, davxml.Status.fromResponseCode(responsecode.NOT_FOUND))) else: valid_names.append(name) - + if not valid_names: + yield None + return + # Verify that valid requested resources are calendar objects - exists_names = self.index().resourcesExist(valid_names) + exists_names = tuple(self.index().resourcesExist(valid_names)) checked_names = [] for name in valid_names: - href = joinURL(request.uri, name) if name not in exists_names: + href = davxml.HRef.fromString(joinURL(request.uri, name)) responses.append(davxml.StatusResponse(href, davxml.Status.fromResponseCode(responsecode.NOT_ALLOWED))) else: checked_names.append(name) @@ -162,13 +165,13 @@ # Get properties for all valid readable resources for resource, href in ok_resources: - d = waitForDeferred(report_common.responseForHref(request, responses, href, resource, None, propertiesForResource, propertyreq)) + d = waitForDeferred(report_common.responseForHref(request, responses, davxml.HRef.fromString(href), resource, None, propertiesForResource, propertyreq)) yield d d.getResult() # Indicate error for all valid non-readable resources for ignore_resource, href in bad_resources: - responses.append(davxml.StatusResponse(href, davxml.Status.fromResponseCode(responsecode.NOT_ALLOWED))) + responses.append(davxml.StatusResponse(davxml.HRef.fromString(href), davxml.Status.fromResponseCode(responsecode.NOT_ALLOWED))) doCalendarResponse = deferredGenerator(doCalendarResponse)

1 0

[1431] CalendarServer/trunk/run
by source_changes＠macosforge.org 28 Mar '07

28 Mar '07

Revision: 1431 http://trac.macosforge.org/projects/calendarserver/changeset/1431 Author: wsanchez(a)apple.com Date: 2007-03-28 13:24:08 -0700 (Wed, 28 Mar 2007) Log Message: ----------- Add -r flag Modified Paths: -------------- CalendarServer/trunk/run Modified: CalendarServer/trunk/run =================================================================== --- CalendarServer/trunk/run 2007-03-28 18:21:51 UTC (rev 1430) +++ CalendarServer/trunk/run 2007-03-28 20:24:08 UTC (rev 1431) @@ -35,6 +35,7 @@ install=""; daemonize="-X"; kill="false"; + restart="false"; plugin_name="caldav"; service_type="Slave"; read_key=""; @@ -45,17 +46,18 @@ if [ "${1--}" != "-" ]; then echo "$@"; echo; fi; - echo "Usage: ${program} [-hvsfp] [-K key] [-iI dst] [-t type]"; + echo "Usage: ${program} [-hvsfpndkr] [-K key] [-iI dst] [-t type]"; echo "Options:"; echo " -h Print this help and exit"; echo " -v Be verbose"; echo " -s Run setup only; don't run server"; echo " -f Force setup to run"; echo " -p Print PYTHONPATH value for server and exit"; - echo " -K Print value of configuration key and exit"; echo " -n Do not run setup"; echo " -d Run caldavd as a daemon"; echo " -k Stop caldavd"; + echo " -r Restart caldavd"; + echo " -K Print value of configuration key and exit"; echo " -i Perform a system install into dst; implies -s"; echo " -I Perform a home install into dst; implies -s"; echo " -t Select the server process type (Master, Slave or Combined)"; @@ -64,7 +66,7 @@ exit 64; } -while getopts 'hvsfnpkdP:i:I:t:K:' option; do +while getopts 'hvsfnpkrdP:i:I:t:K:' option; do case "$option" in '?') usage; ;; 'h') usage -; exit 0; ;; @@ -74,6 +76,7 @@ 'n') disable_setup="true"; ;; 'p') print_path="true"; ;; 'k') kill="true"; ;; + 'r') restart="true"; ;; 'd') daemonize=""; ;; 'P') plugin_name="${OPTARG}"; ;; 'i') setup_only="true"; install="${OPTARG}"; install_flag="--root="; ;; @@ -162,7 +165,7 @@ exit $?; fi; -if "${kill}"; then +if "${kill}" || "${restart}"; then pidfile="$(conf_read_key "PIDFile")"; if [ ! -r "${pidfile}" ]; then echo "Unreadable PID file: ${pidfile}"; @@ -175,7 +178,9 @@ fi; echo "Killing process ${pid}"; kill -TERM "${pid}"; - exit 0; + if ! "${restart}"; then + exit 0; + fi; fi; if [ -z "${PYTHONPATH:-}" ]; then

1 0

[1430] CalendarServer/trunk/run
by source_changes＠macosforge.org 28 Mar '07

28 Mar '07

Revision: 1430 http://trac.macosforge.org/projects/calendarserver/changeset/1430 Author: wsanchez(a)apple.com Date: 2007-03-28 11:21:51 -0700 (Wed, 28 Mar 2007) Log Message: ----------- Add some awesomeness: - Add -K option to read a config option - Add -k option to kill running server Modified Paths: -------------- CalendarServer/trunk/run Modified: CalendarServer/trunk/run =================================================================== --- CalendarServer/trunk/run 2007-03-28 18:09:56 UTC (rev 1429) +++ CalendarServer/trunk/run 2007-03-28 18:21:51 UTC (rev 1430) @@ -34,8 +34,10 @@ print_path="false"; install=""; daemonize="-X"; + kill="false"; plugin_name="caldav"; service_type="Slave"; + read_key=""; usage () { @@ -43,15 +45,17 @@ if [ "${1--}" != "-" ]; then echo "$@"; echo; fi; - echo "Usage: ${program} [-hvsf] [-iI dst]"; + echo "Usage: ${program} [-hvsfp] [-K key] [-iI dst] [-t type]"; echo "Options:"; echo " -h Print this help and exit"; echo " -v Be verbose"; echo " -s Run setup only; don't run server"; + echo " -f Force setup to run"; echo " -p Print PYTHONPATH value for server and exit"; - echo " -f Force setup to run"; + echo " -K Print value of configuration key and exit"; echo " -n Do not run setup"; echo " -d Run caldavd as a daemon"; + echo " -k Stop caldavd"; echo " -i Perform a system install into dst; implies -s"; echo " -I Perform a home install into dst; implies -s"; echo " -t Select the server process type (Master, Slave or Combined)"; @@ -60,7 +64,7 @@ exit 64; } -while getopts 'hvsfnpdP:i:I:t:' option; do +while getopts 'hvsfnpkdP:i:I:t:K:' option; do case "$option" in '?') usage; ;; 'h') usage -; exit 0; ;; @@ -69,11 +73,13 @@ 'f') force_setup="true"; ;; 'n') disable_setup="true"; ;; 'p') print_path="true"; ;; + 'k') kill="true"; ;; 'd') daemonize=""; ;; 'P') plugin_name="${OPTARG}"; ;; 'i') setup_only="true"; install="${OPTARG}"; install_flag="--root="; ;; 'I') setup_only="true"; install="${wd}/build/dst"; install_flag="--root="; install_home="${OPTARG}"; ;; 't') service_type="${OPTARG}"; ;; + 'K') read_key="${OPTARG}"; ;; esac; done; shift $((${OPTIND} - 1)); @@ -141,6 +147,37 @@ config="${wd}/conf/caldavd-dev.plist"; fi; +conf_read_key () +{ + local key="$1"; shift; + + # FIXME: This only works for simple values (no arrays, dicts) + tr '\n' ' ' < "${config}" \ + | xpath "/plist/dict/*[preceding-sibling::key[1]='${key}'" 2>/dev/null \ + | sed -n 's|^<[^<][^<]*>$[^<]*$</[^<][^<]*>.*$|\1|p'; +} + +if [ -n "${read_key}" ]; then + conf_read_key "${read_key}"; + exit $?; +fi; + +if "${kill}"; then + pidfile="$(conf_read_key "PIDFile")"; + if [ ! -r "${pidfile}" ]; then + echo "Unreadable PID file: ${pidfile}"; + exit 1; + fi; + pid="$(cat "${pidfile}" | head -1)"; + if [ -z "${pid}" ]; then + echo "No PID in PID file: ${pidfile}"; + exit 1; + fi; + echo "Killing process ${pid}"; + kill -TERM "${pid}"; + exit 0; +fi; + if [ -z "${PYTHONPATH:-}" ]; then user_python_path=""; else

1 0