[CalendarServer-changes] [8759] CalendarServer/branches/release/CalendarServer-3.3-dev/ calendarserver/push/applepush.py

source_changes at macosforge.org source_changes at macosforge.org
Wed Feb 22 15:27:20 PST 2012


Revision: 8759
          http://trac.macosforge.org/projects/calendarserver/changeset/8759
Author:   sagen at apple.com
Date:     2012-02-22 15:27:20 -0800 (Wed, 22 Feb 2012)
Log Message:
-----------
Clean up a failed merge

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-3.3-dev/calendarserver/push/applepush.py

Modified: CalendarServer/branches/release/CalendarServer-3.3-dev/calendarserver/push/applepush.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-3.3-dev/calendarserver/push/applepush.py	2012-02-22 16:40:08 UTC (rev 8758)
+++ CalendarServer/branches/release/CalendarServer-3.3-dev/calendarserver/push/applepush.py	2012-02-22 23:27:20 UTC (rev 8759)
@@ -547,22 +547,17 @@
         @type request: L{twext.web2.server.Request}
         """
 
-        token = request.args.get("token", None)
-        key = request.args.get("key", None)
-        if key and token:
-            key = key[0]
-            token = token[0].replace(" ", "").lower()
-            principal = self.principalFromRequest(request)
-            guid = principal.record.guid
-            yield self.addSubscription(token, key, guid)
-            code = responsecode.OK
-            msg = None
-        else:
+        token = request.args.get("token", ("",))[0].replace(" ", "").lower()
+        key = request.args.get("key", ("",))[0]
+
+        if not (key and token):
             code = responsecode.BAD_REQUEST
             msg = "Invalid request: both 'token' and 'key' must be provided"
 
-<<<<<<< .working
-=======
+        elif not validToken(token):
+            code = responsecode.BAD_REQUEST
+            msg = "Invalid request: bad 'token' %s" % (token,)
+
         else:
             principal = self.principalFromRequest(request)
             uid = principal.record.uid
@@ -574,7 +569,6 @@
                 code = responsecode.BAD_REQUEST
                 msg = "Invalid subscription values"
 
->>>>>>> .merge-right.r8549
         returnValue((code, msg))
 
     @inlineCallbacks
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120222/55abbbff/attachment-0001.html>


More information about the calendarserver-changes mailing list