[CalendarServer-changes] [746] CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource. patch

[source_changes at macosforge.org]

Revision: 746
          http://trac.macosforge.org/projects/calendarserver/changeset/746
Author:   cdaboo at apple.com
Date:     2006-12-07 13:06:29 -0800 (Thu, 07 Dec 2006)

Log Message:
-----------
Make sure login failure errors are trapped so that proper 403 can be sent back.

Modified Paths:
--------------
    CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch

Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch	2006-12-07 20:06:52 UTC (rev 745)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch	2006-12-07 21:06:29 UTC (rev 746)
@@ -17,7 +17,7 @@
  from zope.interface import implements
  from twisted.python import log
 +from twisted.python.failure import Failure
-+from twisted.cred.error import UnauthorizedLogin
++from twisted.cred.error import LoginFailed, UnauthorizedLogin
  from twisted.internet.defer import Deferred, maybeDeferred, succeed
  from twisted.internet.defer import waitForDeferred, deferredGenerator
  from twisted.internet import reactor
@@ -227,7 +227,7 @@
          def onError(failure):
 -            log.err("Invalid authentication details: %s" % (request,))
 -            raise HTTPError(UnauthorizedResponse(
-+            failure.trap(UnauthorizedLogin)
++            failure.trap(UnauthorizedLogin, LoginFailed)
 +
 +            log.err("Authentication failed: %s" % (failure.value,))
 +            return Failure(HTTPError(UnauthorizedResponse(

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