1.1 --- a/WebStack/Adapters/BaseHTTPRequestHandler.py Thu Nov 17 19:21:34 2005 +0000
1.2 +++ b/WebStack/Adapters/BaseHTTPRequestHandler.py Sat Nov 19 23:59:54 2005 +0000
1.3 @@ -76,22 +76,24 @@
1.4 return
1.5
1.6 trans = WebStack.BaseHTTPRequestHandler.Transaction(self)
1.7 - if self.webstack_authenticator is None or self.webstack_authenticator.authenticate(trans):
1.8 - try:
1.9 - self.webstack_resource.respond(trans)
1.10 - except EndOfResponse:
1.11 - pass
1.12 - except:
1.13 - if self.handle_errors:
1.14 - trans.set_response_code(500) # Internal error
1.15 - else:
1.16 - raise
1.17 - else:
1.18 - trans.set_response_code(401) # Unauthorized
1.19 - trans.set_header_value("WWW-Authenticate", '%s realm="%s"' % (
1.20 - self.webstack_authenticator.get_auth_type(), self.webstack_authenticator.get_realm()))
1.21 + try:
1.22 + if self.webstack_authenticator is None or self.webstack_authenticator.authenticate(trans):
1.23 + try:
1.24 + self.webstack_resource.respond(trans)
1.25 + except EndOfResponse:
1.26 + pass
1.27 + except:
1.28 + if self.handle_errors:
1.29 + trans.set_response_code(500) # Internal error
1.30 + else:
1.31 + raise
1.32 + else:
1.33 + trans.set_response_code(401) # Unauthorized
1.34 + trans.set_header_value("WWW-Authenticate", '%s realm="%s"' % (
1.35 + self.webstack_authenticator.get_auth_type(), self.webstack_authenticator.get_realm()))
1.36
1.37 - trans.commit()
1.38 + finally:
1.39 + trans.commit()
1.40
1.41 default_address = ("", 8080)
1.42
2.1 --- a/WebStack/Adapters/JavaServlet.py Thu Nov 17 19:21:34 2005 +0000
2.2 +++ b/WebStack/Adapters/JavaServlet.py Sat Nov 19 23:59:54 2005 +0000
2.3 @@ -46,21 +46,23 @@
2.4 """
2.5
2.6 trans = WebStack.JavaServlet.Transaction(request, response)
2.7 - if self.webstack_authenticator is None or self.webstack_authenticator.authenticate(trans):
2.8 - try:
2.9 - self.webstack_resource.respond(trans)
2.10 - except EndOfResponse:
2.11 - pass
2.12 - except:
2.13 - if self.handle_errors:
2.14 - trans.set_response_code(500) # Internal error
2.15 - else:
2.16 - raise
2.17 - else:
2.18 - trans.set_response_code(401) # Unauthorized
2.19 - #trans.set_header_value("WWW-Authenticate", '%s realm="%s"' % (
2.20 - # self.webstack_authenticator.get_auth_type(), self.webstack_authenticator.get_realm()))
2.21 + try:
2.22 + if self.webstack_authenticator is None or self.webstack_authenticator.authenticate(trans):
2.23 + try:
2.24 + self.webstack_resource.respond(trans)
2.25 + except EndOfResponse:
2.26 + pass
2.27 + except:
2.28 + if self.handle_errors:
2.29 + trans.set_response_code(500) # Internal error
2.30 + else:
2.31 + raise
2.32 + else:
2.33 + trans.set_response_code(401) # Unauthorized
2.34 + #trans.set_header_value("WWW-Authenticate", '%s realm="%s"' % (
2.35 + # self.webstack_authenticator.get_auth_type(), self.webstack_authenticator.get_realm()))
2.36
2.37 - trans.commit()
2.38 + finally:
2.39 + trans.commit()
2.40
2.41 # vim: tabstop=4 expandtab shiftwidth=4
3.1 --- a/WebStack/Adapters/ModPython.py Thu Nov 17 19:21:34 2005 +0000
3.2 +++ b/WebStack/Adapters/ModPython.py Sat Nov 19 23:59:54 2005 +0000
3.3 @@ -38,20 +38,24 @@
3.4
3.5 try:
3.6 try:
3.7 - resource.respond(trans)
3.8 - except EndOfResponse:
3.9 - pass
3.10 - trans.commit()
3.11 - return trans.get_response_code()
3.12 - except:
3.13 + try:
3.14 + resource.respond(trans)
3.15 + except EndOfResponse:
3.16 + pass
3.17 + return trans.get_response_code()
3.18 +
3.19 + except:
3.20
3.21 - # NOTE: Error conditions should be investigated further, along with
3.22 - # NOTE: other response states.
3.23 + # NOTE: Error conditions should be investigated further, along with
3.24 + # NOTE: other response states.
3.25
3.26 - if handle_errors:
3.27 - return apache.HTTP_INTERNAL_SERVER_ERROR
3.28 - else:
3.29 - raise
3.30 + if handle_errors:
3.31 + return apache.HTTP_INTERNAL_SERVER_ERROR
3.32 + else:
3.33 + raise
3.34 +
3.35 + finally:
3.36 + trans.commit()
3.37
3.38 def authenticate(request, authenticator, handle_errors=1):
3.39
4.1 --- a/WebStack/Adapters/Twisted.py Thu Nov 17 19:21:34 2005 +0000
4.2 +++ b/WebStack/Adapters/Twisted.py Sat Nov 19 23:59:54 2005 +0000
4.3 @@ -53,22 +53,24 @@
4.4 "Dispatch the given 'request' to the root application-specific resource."
4.5
4.6 trans = WebStack.Twisted.Transaction(request)
4.7 - if self.webstack_authenticator is None or self.webstack_authenticator.authenticate(trans):
4.8 - try:
4.9 - self.webstack_resource.respond(trans)
4.10 - except EndOfResponse:
4.11 - pass
4.12 - except:
4.13 - if self.handle_errors:
4.14 - trans.set_response_code(500) # Internal error
4.15 - else:
4.16 - raise
4.17 - else:
4.18 - trans.set_response_code(401) # Unauthorized
4.19 - trans.set_header_value("WWW-Authenticate", '%s realm="%s"' % (
4.20 - self.webstack_authenticator.get_auth_type(), self.webstack_authenticator.get_realm()))
4.21 + try:
4.22 + if self.webstack_authenticator is None or self.webstack_authenticator.authenticate(trans):
4.23 + try:
4.24 + self.webstack_resource.respond(trans)
4.25 + except EndOfResponse:
4.26 + pass
4.27 + except:
4.28 + if self.handle_errors:
4.29 + trans.set_response_code(500) # Internal error
4.30 + else:
4.31 + raise
4.32 + else:
4.33 + trans.set_response_code(401) # Unauthorized
4.34 + trans.set_header_value("WWW-Authenticate", '%s realm="%s"' % (
4.35 + self.webstack_authenticator.get_auth_type(), self.webstack_authenticator.get_realm()))
4.36
4.37 - trans.commit()
4.38 + finally:
4.39 + trans.commit()
4.40 request.finish()
4.41 return twisted.web.server.NOT_DONE_YET
4.42
5.1 --- a/WebStack/Adapters/Webware.py Thu Nov 17 19:21:34 2005 +0000
5.2 +++ b/WebStack/Adapters/Webware.py Sat Nov 19 23:59:54 2005 +0000
5.3 @@ -158,21 +158,24 @@
5.4 """
5.5
5.6 new_trans = WebStack.Webware.Transaction(trans)
5.7 - if self.webstack_authenticator is None or self.webstack_authenticator.authenticate(new_trans):
5.8 - try:
5.9 - self.webstack_resource.respond(new_trans)
5.10 - except EndOfResponse:
5.11 - pass
5.12 - except:
5.13 - if self.handle_errors:
5.14 - new_trans.set_response_code(500) # Internal error
5.15 - else:
5.16 - raise
5.17 - else:
5.18 - new_trans.set_response_code(401) # Unauthorized
5.19 - new_trans.set_header_value("WWW-Authenticate", '%s realm="%s"' % (
5.20 - self.webstack_authenticator.get_auth_type(), self.webstack_authenticator.get_realm()))
5.21
5.22 - new_trans.commit()
5.23 + try:
5.24 + if self.webstack_authenticator is None or self.webstack_authenticator.authenticate(new_trans):
5.25 + try:
5.26 + self.webstack_resource.respond(new_trans)
5.27 + except EndOfResponse:
5.28 + pass
5.29 + except:
5.30 + if self.handle_errors:
5.31 + new_trans.set_response_code(500) # Internal error
5.32 + else:
5.33 + raise
5.34 + else:
5.35 + new_trans.set_response_code(401) # Unauthorized
5.36 + new_trans.set_header_value("WWW-Authenticate", '%s realm="%s"' % (
5.37 + self.webstack_authenticator.get_auth_type(), self.webstack_authenticator.get_realm()))
5.38 +
5.39 + finally:
5.40 + new_trans.commit()
5.41
5.42 # vim: tabstop=4 expandtab shiftwidth=4
6.1 --- a/WebStack/Adapters/Zope.py Thu Nov 17 19:21:34 2005 +0000
6.2 +++ b/WebStack/Adapters/Zope.py Sat Nov 19 23:59:54 2005 +0000
6.3 @@ -69,22 +69,24 @@
6.4 else:
6.5 raise "Internal Error"
6.6
6.7 - if self.webstack_authenticator is None or self.webstack_authenticator.authenticate(trans):
6.8 - try:
6.9 - self.webstack_resource.respond(trans)
6.10 - except EndOfResponse:
6.11 - pass
6.12 - except:
6.13 - if self.handle_errors:
6.14 - trans.set_response_code(500) # Internal error
6.15 - else:
6.16 - raise
6.17 - else:
6.18 - #trans.set_header_value("WWW-Authenticate", '%s realm="%s"' % (
6.19 - # self.webstack_authenticator.get_auth_type(), self.webstack_authenticator.get_realm()))
6.20 - raise "Unauthorized"
6.21 + try:
6.22 + if self.webstack_authenticator is None or self.webstack_authenticator.authenticate(trans):
6.23 + try:
6.24 + self.webstack_resource.respond(trans)
6.25 + except EndOfResponse:
6.26 + pass
6.27 + except:
6.28 + if self.handle_errors:
6.29 + trans.set_response_code(500) # Internal error
6.30 + else:
6.31 + raise
6.32 + else:
6.33 + #trans.set_header_value("WWW-Authenticate", '%s realm="%s"' % (
6.34 + # self.webstack_authenticator.get_auth_type(), self.webstack_authenticator.get_realm()))
6.35 + raise "Unauthorized"
6.36
6.37 - trans.commit()
6.38 + finally:
6.39 + trans.commit()
6.40 #raise status_reasons[trans.get_response_code()]
6.41
6.42 # vim: tabstop=4 expandtab shiftwidth=4