[CalendarServer-changes] [70] CalendarServer/branches/users/cdaboo/acl-merge/bin/caldavd

[source_changes at macosforge.org]

Revision: 70
Author:   cdaboo at apple.com
Date:     2006-08-28 07:04:34 -0700 (Mon, 28 Aug 2006)

Log Message:
-----------
Modified for new twisted.creds based authentication.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/acl-merge/bin/caldavd

Modified: CalendarServer/branches/users/cdaboo/acl-merge/bin/caldavd
===================================================================
--- CalendarServer/branches/users/cdaboo/acl-merge/bin/caldavd	2006-08-28 14:03:45 UTC (rev 69)
+++ CalendarServer/branches/users/cdaboo/acl-merge/bin/caldavd	2006-08-28 14:04:34 UTC (rev 70)
@@ -352,10 +352,13 @@
     else:
         raise IOError("SSL Certificate file does not exist: %%s" %% (certfile,))
 
-from twisted.application.service import Application, IServiceCollection
+from twisted.application.service  import Application, IServiceCollection
 from twisted.application.internet import TCPServer
-from twisted.web2.server import Site
-from twisted.web2.channel.http import HTTPFactory
+from twisted.cred.portal 		  import Portal
+from twisted.web2.auth			  import basic
+from twisted.web2.dav             import davxml, auth
+from twisted.web2.server          import Site
+from twisted.web2.channel.http    import HTTPFactory
 
 if dossl:
     from twisted.application.internet import SSLServer
@@ -365,10 +368,23 @@
 
 builder = RepositoryBuilder(docroot, doAccounts=doacct, resetACLs=doacl)
 builder.buildFromFile(repo)
+rootresource = builder.docRoot.collection.resource
 
 application = Application("CalDAVServer")
 parent      = IServiceCollection(application)
-site        = Site(builder.docRoot.collection.resource)
+
+portal = Portal(auth.DavRealm())
+portal.registerChecker(auth.TwistedPropertyChecker())
+
+credentialFactories = (basic.BasicCredentialFactory(""),)
+
+loginInterfaces = (auth.IPrincipal,)
+
+site = Site(auth.AuthenticationWrapper(rootresource, 
+                                            portal,
+                                            credentialFactories,
+                                            loginInterfaces))
+
 factory     = HTTPFactory(site)
 
 if not onlyssl:

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060828/dea9ca99/attachment.html