import re
import sys
-import werkzeug
+import werkzeug.exceptions
+import werkzeug.routing
+import werkzeug.urls
+import werkzeug.utils
import openerp
+import openerp.exceptions
+import openerp.models
from openerp import http
from openerp.http import request
from openerp.osv import osv, orm
def _auth_method_user(self):
request.uid = request.session.uid
if not request.uid:
- if not request.params.get('noredirect'):
- query = werkzeug.url_encode({
- 'redirect': request.httprequest.url,
- })
- response = werkzeug.utils.redirect('/web/login?%s' % query)
- werkzeug.exceptions.abort(response)
raise http.SessionExpiredException("Session expired")
def _auth_method_none(self):
except (openerp.exceptions.AccessDenied, openerp.http.SessionExpiredException):
# All other exceptions mean undetermined status (e.g. connection pool full),
# let them bubble up
- request.session.logout()
+ request.session.logout(keep_db=True)
getattr(self, "_auth_method_%s" % auth_method)()
except (openerp.exceptions.AccessDenied, openerp.http.SessionExpiredException):
raise
def _handle_exception(self, exception):
# If handle_exception returns something different than None, it will be used as a response
- return request._handle_exception(exception)
+
+ # Don't handle exception but use werkeug debugger if server in --dev mode
+ if openerp.tools.config['dev_mode']:
+ raise
+ try:
+ return request._handle_exception(exception)
+ except openerp.exceptions.AccessDenied:
+ return werkzeug.exceptions.Forbidden()
def _dispatch(self):
# locate the controller method
# check authentication level
try:
auth_method = self._authenticate(func.routing["auth"])
- except Exception:
- # force a Forbidden exception with the original traceback
- return self._handle_exception(
- convert_exception_to(
- werkzeug.exceptions.Forbidden))
+ except Exception as e:
+ return self._handle_exception(e)
processing = self._postprocess_args(arguments, rule)
if processing:
return processing
-
# set and execute handler
try:
request.set_handler(func, arguments, auth_method)
def _postprocess_args(self, arguments, rule):
""" post process arg to set uid on browse records """
- for arg in arguments.itervalues():
+ for name, arg in arguments.items():
if isinstance(arg, orm.browse_record) and arg._uid is UID_PLACEHOLDER:
- arg._uid = request.uid
+ arguments[name] = arg.sudo(request.uid)
try:
- arg[arg._rec_name]
- except KeyError:
+ arg.exists()
+ except openerp.models.MissingError:
return self._handle_exception(werkzeug.exceptions.NotFound())
def routing_map(self):