[CalendarServer-changes] [15160] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 15160
          http://trac.calendarserver.org//changeset/15160
Author:   cdaboo at apple.com
Date:     2015-09-30 01:44:06 -0700 (Wed, 30 Sep 2015)
Log Message:
-----------
Update to latest server-info draft.

Modified Paths:
--------------
    CalendarServer/trunk/requirements-dev.txt
    CalendarServer/trunk/twistedcaldav/extensions.py
    CalendarServer/trunk/twistedcaldav/resource.py
    CalendarServer/trunk/twistedcaldav/serverinfoxml.py

Modified: CalendarServer/trunk/requirements-dev.txt
===================================================================
--- CalendarServer/trunk/requirements-dev.txt	2015-09-30 08:41:09 UTC (rev 15159)
+++ CalendarServer/trunk/requirements-dev.txt	2015-09-30 08:44:06 UTC (rev 15160)
@@ -8,4 +8,4 @@
 q
 tl.eggdeps
 --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@14856#egg=CalDAVClientLibrary
---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@15157#egg=CalDAVTester
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@15159#egg=CalDAVTester

Modified: CalendarServer/trunk/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/extensions.py	2015-09-30 08:41:09 UTC (rev 15159)
+++ CalendarServer/trunk/twistedcaldav/extensions.py	2015-09-30 08:44:06 UTC (rev 15160)
@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ##
+
 from __future__ import print_function
 
 """
@@ -79,15 +80,16 @@
 class WebDAVServerInfoMixIn(object):
 
     def renderHTTP(self, request):
-        def _addServerInfoToken(request, response):
+        def _addServerInfoURL(request, response):
             # server-info-token processing
             if config.EnableServerInfo and (
-                request.headers.hasHeader("server-info-token") or
-                request.method == "OPTIONS"
+                request.headers.hasHeader("server-info-token") and request.headers.getRawHeaders("server-info-token")[0] != config.ServerInfoToken or
+                not request.headers.hasHeader("server-info-token") and request.method == "OPTIONS"
             ):
-                response.headers.setRawHeaders("server-info-token", (config.ServerInfoToken,))
+                uri = request.unparseURL(path="/server-info")
+                response.headers.setRawHeaders("server-info-url", (uri,))
             return response
-        request.addResponseFilter(_addServerInfoToken, onlyOnce=True)
+        request.addResponseFilter(_addServerInfoURL, onlyOnce=True)
         return super(WebDAVServerInfoMixIn, self).renderHTTP(request)
 
 

Modified: CalendarServer/trunk/twistedcaldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/resource.py	2015-09-30 08:41:09 UTC (rev 15159)
+++ CalendarServer/trunk/twistedcaldav/resource.py	2015-09-30 08:44:06 UTC (rev 15160)
@@ -39,7 +39,6 @@
 
 from twistedcaldav import caldavxml, customxml
 from twistedcaldav import carddavxml
-from twistedcaldav import serverinfoxml
 from twistedcaldav import ical
 from twistedcaldav.cache import PropfindCacheMixin
 from twistedcaldav.caldavxml import caldav_namespace
@@ -60,7 +59,7 @@
 from txdav.common.icommondatastore import InternalDataStoreError, \
     SyncTokenValidException
 from txdav.xml import element
-from txdav.xml.element import dav_namespace, HRef
+from txdav.xml.element import dav_namespace
 
 from txweb2 import responsecode, http, http_headers
 from txweb2.auth.wrapper import UnauthorizedResponse
@@ -555,10 +554,7 @@
                     customxml.AllowedSharingModes.qname(),
                 )
 
-        if config.EnableServerInfo:
-            baseProperties += (serverinfoxml.ServerInfoHref.qname(),)
 
-
         return super(CalDAVResource, self).liveProperties() + baseProperties
 
 
@@ -710,10 +706,6 @@
                 returnValue(None)
 
 
-        elif qname == serverinfoxml.ServerInfoHref.qname():
-            if config.EnableServerInfo:
-                returnValue(serverinfoxml.ServerInfoHref(HRef.fromString("/server-info")))
-
         result = (yield super(CalDAVResource, self).readProperty(property, request))
         returnValue(result)
 

Modified: CalendarServer/trunk/twistedcaldav/serverinfoxml.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/serverinfoxml.py	2015-09-30 08:41:09 UTC (rev 15159)
+++ CalendarServer/trunk/twistedcaldav/serverinfoxml.py	2015-09-30 08:44:06 UTC (rev 15160)
@@ -19,18 +19,6 @@
     SyncCollection, AddMember
 
 @registerElement
-class ServerInfoHref (WebDAVElement):
-    namespace = dav_namespace
-    name = "server-info-href"
-    hidden = True
-    protected = True
-    allowed_children = {
-        (dav_namespace, "href"): (0, 1),
-    }
-
-
-
- at registerElement
 class ServerInfo (WebDAVElement):
     namespace = dav_namespace
     name = "server-info"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150930/552fa564/attachment-0001.html>