[CalendarServer-changes] [4169] CalendarServer/branches/release/CalendarServer-2.2-dev
source_changes at macosforge.org
source_changes at macosforge.org
Mon May 4 18:12:45 PDT 2009
Revision: 4169
http://trac.macosforge.org/projects/calendarserver/changeset/4169
Author: wsanchez at apple.com
Date: 2009-05-04 18:12:44 -0700 (Mon, 04 May 2009)
Log Message:
-----------
Pulled up r4157 r4158 from trunk.
Modified Paths:
--------------
CalendarServer/branches/release/CalendarServer-2.2-dev/calendarserver/tap/caldav.py
CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/mail.py
Property Changed:
----------------
CalendarServer/branches/release/CalendarServer-2.2-dev/
CalendarServer/branches/release/CalendarServer-2.2-dev/doc/Extensions/caldav-privatecomments.txt
CalendarServer/branches/release/CalendarServer-2.2-dev/doc/Extensions/caldav-privatecomments.xml
CalendarServer/branches/release/CalendarServer-2.2-dev/doc/Extensions/caldav-schedulingchanges.txt
CalendarServer/branches/release/CalendarServer-2.2-dev/doc/Extensions/caldav-schedulingchanges.xml
Property changes on: CalendarServer/branches/release/CalendarServer-2.2-dev
___________________________________________________________________
Modified: svn:mergeinfo
- /CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/trunk:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4142,4156,4163-4165
+ /CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/trunk:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4142,4156-4158,4163-4165
Modified: CalendarServer/branches/release/CalendarServer-2.2-dev/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-2.2-dev/calendarserver/tap/caldav.py 2009-05-05 01:09:13 UTC (rev 4168)
+++ CalendarServer/branches/release/CalendarServer-2.2-dev/calendarserver/tap/caldav.py 2009-05-05 01:12:44 UTC (rev 4169)
@@ -486,6 +486,76 @@
)
#
+ # Configure the Site and Wrappers
+ #
+ credentialFactories = []
+
+ portal = Portal(auth.DavRealm())
+
+ portal.registerChecker(directory)
+
+ realm = directory.realmName or ""
+
+ self.log_info("Configuring authentication for realm: %s" % (realm,))
+
+ for scheme, schemeConfig in config.Authentication.iteritems():
+ scheme = scheme.lower()
+
+ credFactory = None
+
+ if schemeConfig["Enabled"]:
+ self.log_info("Setting up scheme: %s" % (scheme,))
+
+ if scheme == "kerberos":
+ if not NegotiateCredentialFactory:
+ self.log_info("Kerberos support not available")
+ continue
+
+ try:
+ principal = schemeConfig["ServicePrincipal"]
+ if not principal:
+ credFactory = NegotiateCredentialFactory(
+ type="http",
+ hostname=config.ServerHostName,
+ )
+ else:
+ credFactory = NegotiateCredentialFactory(
+ principal=principal,
+ )
+ except ValueError:
+ self.log_info("Could not start Kerberos")
+ continue
+
+ elif scheme == "digest":
+ credFactory = QopDigestCredentialFactory(
+ schemeConfig["Algorithm"],
+ schemeConfig["Qop"],
+ realm,
+ )
+
+ elif scheme == "basic":
+ credFactory = BasicCredentialFactory(realm)
+
+ elif scheme == "wiki":
+ pass
+
+ else:
+ self.log_error("Unknown scheme: %s" % (scheme,))
+
+ if credFactory:
+ credentialFactories.append(credFactory)
+
+
+ # Set up a digest credential factory for use on the /inbox iMIP
+ # injection resource
+ schemeConfig = config.Authentication.Digest
+ digestCredentialFactory = QopDigestCredentialFactory(
+ schemeConfig["Algorithm"],
+ schemeConfig["Qop"],
+ realm,
+ )
+
+ #
# Setup Resource hierarchy
#
self.log_info("Setting up document root at: %s"
@@ -554,8 +624,16 @@
self.log_info("Setting up iMIP inbox resource: %r"
% (self.imipResourceClass,))
- imipInbox = self.imipResourceClass(root)
- root.putChild("inbox", imipInbox)
+ # This resource uses the digestCredentialFactory no matter
+ # what the overall server authentication settings are.
+ root.putChild("inbox",
+ auth.AuthenticationWrapper(
+ self.imipResourceClass(root),
+ portal,
+ (digestCredentialFactory,),
+ (auth.IPrincipal,),
+ )
+ )
#
# WebCal
@@ -575,63 +653,8 @@
self.log_info("Setting up Timezone Cache")
TimezoneCache.create()
- #
- # Configure the Site and Wrappers
- #
- credentialFactories = []
- portal = Portal(auth.DavRealm())
- portal.registerChecker(directory)
-
- realm = directory.realmName or ""
-
- self.log_info("Configuring authentication for realm: %s" % (realm,))
-
- for scheme, schemeConfig in config.Authentication.iteritems():
- scheme = scheme.lower()
-
- credFactory = None
-
- if schemeConfig["Enabled"]:
- self.log_info("Setting up scheme: %s" % (scheme,))
-
- if scheme == "kerberos":
- if not NegotiateCredentialFactory:
- self.log_info("Kerberos support not available")
- continue
-
- try:
- principal = schemeConfig["ServicePrincipal"]
- if not principal:
- credFactory = NegotiateCredentialFactory(
- type="http",
- hostname=config.ServerHostName,
- )
- else:
- credFactory = NegotiateCredentialFactory(
- principal=principal,
- )
- except ValueError:
- self.log_info("Could not start Kerberos")
- continue
-
- elif scheme == "digest":
- credFactory = QopDigestCredentialFactory(
- schemeConfig["Algorithm"],
- schemeConfig["Qop"],
- realm,
- )
-
- elif scheme == "basic":
- credFactory = BasicCredentialFactory(realm)
-
- else:
- self.log_error("Unknown scheme: %s" % (scheme,))
-
- if credFactory:
- credentialFactories.append(credFactory)
-
self.log_info("Configuring authentication wrapper")
authWrapper = auth.AuthenticationWrapper(
Property changes on: CalendarServer/branches/release/CalendarServer-2.2-dev/doc/Extensions/caldav-privatecomments.txt
___________________________________________________________________
Modified: svn:mergeinfo
- /CalendarServer/branches/users/cdaboo/attendee-comments-2886/doc/Extensions/caldav-privatecomments-00.txt:2887-2910
/CalendarServer/branches/users/cdaboo/byebye-serviceslocator-2937/doc/Extensions/caldav-privatecomments-00.txt:2938-3097
/CalendarServer/branches/users/cdaboo/implicit-if-match-3306/doc/Extensions/caldav-privatecomments.txt:3307-3349
/CalendarServer/branches/users/cdaboo/implicitauto-2947/doc/Extensions/caldav-privatecomments-00.txt:2948-2989
/CalendarServer/branches/users/cdaboo/location-partial-accept-3573/doc/Extensions/caldav-privatecomments.txt:3574-3581
/CalendarServer/branches/users/sagen/resource-delegates-4038/doc/Extensions/caldav-privatecomments.txt:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066/doc/Extensions/caldav-privatecomments.txt:4068-4075
/CalendarServer/trunk/doc/Extensions/caldav-privatecomments.txt:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4142,4156,4163-4165
+ /CalendarServer/branches/users/cdaboo/attendee-comments-2886/doc/Extensions/caldav-privatecomments-00.txt:2887-2910
/CalendarServer/branches/users/cdaboo/byebye-serviceslocator-2937/doc/Extensions/caldav-privatecomments-00.txt:2938-3097
/CalendarServer/branches/users/cdaboo/implicit-if-match-3306/doc/Extensions/caldav-privatecomments.txt:3307-3349
/CalendarServer/branches/users/cdaboo/implicitauto-2947/doc/Extensions/caldav-privatecomments-00.txt:2948-2989
/CalendarServer/branches/users/cdaboo/location-partial-accept-3573/doc/Extensions/caldav-privatecomments.txt:3574-3581
/CalendarServer/branches/users/sagen/resource-delegates-4038/doc/Extensions/caldav-privatecomments.txt:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066/doc/Extensions/caldav-privatecomments.txt:4068-4075
/CalendarServer/trunk/doc/Extensions/caldav-privatecomments.txt:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4142,4156-4158,4163-4165
Property changes on: CalendarServer/branches/release/CalendarServer-2.2-dev/doc/Extensions/caldav-privatecomments.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalendarServer/branches/users/cdaboo/attendee-comments-2886/doc/Extensions/caldav-privatecomments-00.xml:2887-2910
/CalendarServer/branches/users/cdaboo/byebye-serviceslocator-2937/doc/Extensions/caldav-privatecomments-00.xml:2938-3097
/CalendarServer/branches/users/cdaboo/implicit-if-match-3306/doc/Extensions/caldav-privatecomments.xml:3307-3349
/CalendarServer/branches/users/cdaboo/implicitauto-2947/doc/Extensions/caldav-privatecomments-00.xml:2948-2989
/CalendarServer/branches/users/cdaboo/location-partial-accept-3573/doc/Extensions/caldav-privatecomments.xml:3574-3581
/CalendarServer/branches/users/sagen/resource-delegates-4038/doc/Extensions/caldav-privatecomments.xml:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066/doc/Extensions/caldav-privatecomments.xml:4068-4075
/CalendarServer/trunk/doc/Extensions/caldav-privatecomments.xml:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4142,4156,4163-4165
+ /CalendarServer/branches/users/cdaboo/attendee-comments-2886/doc/Extensions/caldav-privatecomments-00.xml:2887-2910
/CalendarServer/branches/users/cdaboo/byebye-serviceslocator-2937/doc/Extensions/caldav-privatecomments-00.xml:2938-3097
/CalendarServer/branches/users/cdaboo/implicit-if-match-3306/doc/Extensions/caldav-privatecomments.xml:3307-3349
/CalendarServer/branches/users/cdaboo/implicitauto-2947/doc/Extensions/caldav-privatecomments-00.xml:2948-2989
/CalendarServer/branches/users/cdaboo/location-partial-accept-3573/doc/Extensions/caldav-privatecomments.xml:3574-3581
/CalendarServer/branches/users/sagen/resource-delegates-4038/doc/Extensions/caldav-privatecomments.xml:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066/doc/Extensions/caldav-privatecomments.xml:4068-4075
/CalendarServer/trunk/doc/Extensions/caldav-privatecomments.xml:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4142,4156-4158,4163-4165
Property changes on: CalendarServer/branches/release/CalendarServer-2.2-dev/doc/Extensions/caldav-schedulingchanges.txt
___________________________________________________________________
Modified: svn:mergeinfo
- /CalendarServer/branches/users/cdaboo/attendee-comments-2886/doc/Extensions/caldav-schedulingchanges-01.txt:2887-2910
/CalendarServer/branches/users/cdaboo/byebye-serviceslocator-2937/doc/Extensions/caldav-schedulingchanges-01.txt:2938-3097
/CalendarServer/branches/users/cdaboo/implicit-if-match-3306/doc/Extensions/caldav-schedulingchanges.txt:3307-3349
/CalendarServer/branches/users/cdaboo/implicitauto-2947/doc/Extensions/caldav-schedulingchanges-01.txt:2948-2989
/CalendarServer/branches/users/cdaboo/location-partial-accept-3573/doc/Extensions/caldav-schedulingchanges.txt:3574-3581
/CalendarServer/branches/users/sagen/resource-delegates-4038/doc/Extensions/caldav-schedulingchanges.txt:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066/doc/Extensions/caldav-schedulingchanges.txt:4068-4075
/CalendarServer/trunk/doc/Extensions/caldav-schedulingchanges.txt:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4142,4156,4163-4165
+ /CalendarServer/branches/users/cdaboo/attendee-comments-2886/doc/Extensions/caldav-schedulingchanges-01.txt:2887-2910
/CalendarServer/branches/users/cdaboo/byebye-serviceslocator-2937/doc/Extensions/caldav-schedulingchanges-01.txt:2938-3097
/CalendarServer/branches/users/cdaboo/implicit-if-match-3306/doc/Extensions/caldav-schedulingchanges.txt:3307-3349
/CalendarServer/branches/users/cdaboo/implicitauto-2947/doc/Extensions/caldav-schedulingchanges-01.txt:2948-2989
/CalendarServer/branches/users/cdaboo/location-partial-accept-3573/doc/Extensions/caldav-schedulingchanges.txt:3574-3581
/CalendarServer/branches/users/sagen/resource-delegates-4038/doc/Extensions/caldav-schedulingchanges.txt:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066/doc/Extensions/caldav-schedulingchanges.txt:4068-4075
/CalendarServer/trunk/doc/Extensions/caldav-schedulingchanges.txt:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4142,4156-4158,4163-4165
Property changes on: CalendarServer/branches/release/CalendarServer-2.2-dev/doc/Extensions/caldav-schedulingchanges.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalendarServer/branches/users/cdaboo/attendee-comments-2886/doc/Extensions/caldav-schedulingchanges-01.xml:2887-2910
/CalendarServer/branches/users/cdaboo/byebye-serviceslocator-2937/doc/Extensions/caldav-schedulingchanges-01.xml:2938-3097
/CalendarServer/branches/users/cdaboo/implicit-if-match-3306/doc/Extensions/caldav-schedulingchanges.xml:3307-3349
/CalendarServer/branches/users/cdaboo/implicitauto-2947/doc/Extensions/caldav-schedulingchanges-01.xml:2948-2989
/CalendarServer/branches/users/cdaboo/location-partial-accept-3573/doc/Extensions/caldav-schedulingchanges.xml:3574-3581
/CalendarServer/branches/users/sagen/resource-delegates-4038/doc/Extensions/caldav-schedulingchanges.xml:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066/doc/Extensions/caldav-schedulingchanges.xml:4068-4075
/CalendarServer/trunk/doc/Extensions/caldav-schedulingchanges.xml:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4142,4156,4163-4165
+ /CalendarServer/branches/users/cdaboo/attendee-comments-2886/doc/Extensions/caldav-schedulingchanges-01.xml:2887-2910
/CalendarServer/branches/users/cdaboo/byebye-serviceslocator-2937/doc/Extensions/caldav-schedulingchanges-01.xml:2938-3097
/CalendarServer/branches/users/cdaboo/implicit-if-match-3306/doc/Extensions/caldav-schedulingchanges.xml:3307-3349
/CalendarServer/branches/users/cdaboo/implicitauto-2947/doc/Extensions/caldav-schedulingchanges-01.xml:2948-2989
/CalendarServer/branches/users/cdaboo/location-partial-accept-3573/doc/Extensions/caldav-schedulingchanges.xml:3574-3581
/CalendarServer/branches/users/sagen/resource-delegates-4038/doc/Extensions/caldav-schedulingchanges.xml:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066/doc/Extensions/caldav-schedulingchanges.xml:4068-4075
/CalendarServer/trunk/doc/Extensions/caldav-schedulingchanges.xml:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4142,4156-4158,4163-4165
Modified: CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/mail.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/mail.py 2009-05-05 01:09:13 UTC (rev 4168)
+++ CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/mail.py 2009-05-05 01:12:44 UTC (rev 4169)
@@ -39,6 +39,7 @@
from twisted.web2.http import Response, HTTPError
from twisted.web2.http_headers import MimeType
+from twistedcaldav.directory.digest import QopDigestCredentialFactory
from twistedcaldav import ical, caldavxml
from twistedcaldav.config import config, defaultConfig, defaultConfigFile
from twistedcaldav.ical import Property
@@ -184,6 +185,7 @@
self.parent = parent
+
def accessControlList(self, request, inheritance=True,
expanding=False, inherited_aces=None):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090504/5b10f25e/attachment-0001.html>
More information about the calendarserver-changes
mailing list