[CalendarServer-changes] [8636] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 8636
          http://trac.macosforge.org/projects/calendarserver/changeset/8636
Author:   sagen at apple.com
Date:     2012-02-08 16:42:41 -0800 (Wed, 08 Feb 2012)
Log Message:
-----------
Make /apns auth mechanism configurable via plist

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/util.py
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/calendarserver/tap/util.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/util.py	2012-02-08 19:15:46 UTC (rev 8635)
+++ CalendarServer/trunk/calendarserver/tap/util.py	2012-02-09 00:42:41 UTC (rev 8636)
@@ -643,14 +643,13 @@
     #
     apnConfig = config.Notifications.Services["ApplePushNotifier"]
     if apnConfig.Enabled:
-        log.info("Setting up APNS resource at /%s" %
-            (apnConfig["SubscriptionURL"],))
-        # Only advertise digest auth on /apns
+        log.info("Setting up APNS resource at /%s with auth: %s" %
+            (apnConfig["SubscriptionURL"], apnConfig["AuthMechanism"]))
         resources.append((
             apnConfig["SubscriptionURL"],
             apnSubscriptionResourceClass,
             [],
-            "digest"
+            apnConfig["AuthMechanism"]
         ))
 
     #

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2012-02-08 19:15:46 UTC (rev 8635)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2012-02-09 00:42:41 UTC (rev 8636)
@@ -669,6 +669,7 @@
                 "Service" : "calendarserver.push.applepush.ApplePushNotifierService",
                 "Enabled" : False,
                 "SubscriptionURL" : "apns",
+                "AuthMechanism" : "digest",
                 "DataHost" : "",
                 "ProviderHost" : "gateway.push.apple.com",
                 "ProviderPort" : 2195,
@@ -1254,6 +1255,10 @@
             if service["DataHost"] == "":
                 service["DataHost"] = configDict.ServerHostName
 
+            if service["AuthMechanism"] not in ("basic", "digest"):
+                raise ConfigurationError("Unknown ApplePushNotifier AuthMechanism value: '%s'. Must be either 'basic' or 'digest'." %
+                    (service["AuthMechanism"],))
+
             # Retrieve APN topics from certificates if not explicitly set
             for protocol, accountName in (
                 ("CalDAV", "apns:com.apple.calendar"),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120208/04dd2b3e/attachment-0001.html>