[CalendarServer-changes] [4210] CalendarServer/branches/exarkun/update-twisted-3816-3/twistedcaldav/ extensions.py
source_changes at macosforge.org
source_changes at macosforge.org
Fri May 8 07:41:41 PDT 2009
Revision: 4210
http://trac.macosforge.org/projects/calendarserver/changeset/4210
Author: exarkun at twistedmatrix.com
Date: 2009-05-08 07:41:39 -0700 (Fri, 08 May 2009)
Log Message:
-----------
Turn cred UnauthorizedLogin into an HTTPError with the right response info
Modified Paths:
--------------
CalendarServer/branches/exarkun/update-twisted-3816-3/twistedcaldav/extensions.py
Modified: CalendarServer/branches/exarkun/update-twisted-3816-3/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/branches/exarkun/update-twisted-3816-3/twistedcaldav/extensions.py 2009-05-08 00:52:43 UTC (rev 4209)
+++ CalendarServer/branches/exarkun/update-twisted-3816-3/twistedcaldav/extensions.py 2009-05-08 14:41:39 UTC (rev 4210)
@@ -35,6 +35,7 @@
from twisted.internet.defer import succeed, DeferredList, inlineCallbacks, returnValue
from twisted.internet.defer import maybeDeferred
+from twisted.cred.error import UnauthorizedLogin
from twisted.web2 import responsecode
from twisted.web2.auth.wrapper import UnauthorizedResponse
from twisted.web2.http import HTTPError, Response, RedirectResponse
@@ -148,7 +149,11 @@
pcreds = PrincipalCredentials(authnPrincipal, authzPrincipal, creds)
- result = (yield request.portal.login(pcreds, None, *request.loginInterfaces))
+ try:
+ result = (yield request.portal.login(pcreds, None, *request.loginInterfaces))
+ except UnauthorizedLogin:
+ raise HTTPError((yield UnauthorizedResponse.makeResponse(
+ request.credentialFactories, request.remoteAddr)))
request.authnUser = result[1]
request.authzUser = result[2]
returnValue((request.authnUser, request.authzUser,))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090508/73af9219/attachment.html>
More information about the calendarserver-changes
mailing list