[CalendarServer-changes] [5104] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 5104
          http://trac.macosforge.org/projects/calendarserver/changeset/5104
Author:   sagen at apple.com
Date:     2010-02-12 14:27:11 -0800 (Fri, 12 Feb 2010)
Log Message:
-----------
Use Basic auth for internal /inbox POSTing

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py
    CalendarServer/trunk/twistedcaldav/mail.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2010-02-12 22:22:16 UTC (rev 5103)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2010-02-12 22:27:11 UTC (rev 5104)
@@ -647,14 +647,9 @@
                 credentialFactories.append(credFactory)
 
 
-        # Set up a digest credential factory for use on the /inbox iMIP
+        # Set up a basic credential factory for use on the /inbox iMIP
         # injection resource
-        schemeConfig = config.Authentication.Digest
-        digestCredentialFactory = QopDigestCredentialFactory(
-            schemeConfig["Algorithm"],
-            schemeConfig["Qop"],
-            realm,
-        )
+        inboxCredentialFactory = BasicCredentialFactory(realm)
 
         #
         # Setup Resource hierarchy
@@ -728,7 +723,7 @@
                           % (self.imipResourceClass,))
 
             # The authenticationWrapper below will be configured to always
-            # allow digest auth on /inbox
+            # allow basic auth on /inbox
             root.putChild("inbox", self.imipResourceClass(root))
 
         #
@@ -772,7 +767,7 @@
             credentialFactories,
             (auth.IPrincipal,),
             overrides = {
-                "/inbox" : (digestCredentialFactory,),
+                "/inbox" : (inboxCredentialFactory,),
             }
         )
 

Modified: CalendarServer/trunk/twistedcaldav/mail.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/mail.py	2010-02-12 22:22:16 UTC (rev 5103)
+++ CalendarServer/trunk/twistedcaldav/mail.py	2010-02-12 22:27:11 UTC (rev 5104)
@@ -47,6 +47,7 @@
 from twisted.python.usage import Options, UsageError
 from twisted.web import client
 from twisted.web2 import server, responsecode
+from twisted.web2.auth.basic import BasicCredentialFactory
 from twisted.web2.channel.http import HTTPFactory
 from twisted.web2.dav import auth
 from twisted.web2.dav import davxml
@@ -59,7 +60,6 @@
 from twistedcaldav import ical, caldavxml
 from twistedcaldav import memcachepool
 from twistedcaldav.config import config
-from twistedcaldav.directory.digest import QopDigestCredentialFactory
 from twistedcaldav.directory.principal import DirectoryPrincipalProvisioningResource
 from twistedcaldav.directory.util import NotFilePath
 from twistedcaldav.ical import Property
@@ -605,17 +605,11 @@
         portal = Portal(auth.DavRealm())
         portal.registerChecker(directory)
         realm = directory.realmName or ""
-        schemeConfig = config.Authentication.Digest
-        digestCredentialFactory = QopDigestCredentialFactory(
-            schemeConfig["Algorithm"],
-            schemeConfig["Qop"],
-            realm,
-        )
         root.putChild('inbox',
             auth.AuthenticationWrapper(
                 IMIPInvitationInboxResource(root, mailer),
                 portal,
-                (digestCredentialFactory,),
+                (BasicCredentialFactory(realm),),
                 (auth.IPrincipal,),
             )
         )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100212/9192ce57/attachment.html>