import openerp.sql_db as sql_db
import openerp.tools as tools
import openerp.modules
+import openerp.exceptions
#.apidoc title: Exported Service methods
#.apidoc module-mods: member-order: bysource
procedures to be called. Each method has its own arguments footprint.
"""
+RPC_VERSION_1 = {'server_version': '6.1', 'protocol_version': 1}
+
# This should be moved to openerp.modules.db, along side initialize().
def _initialize_db(serv, id, db_name, demo, lang, user_password):
cr = None
self._pg_psw_env_var_is_set = False # on win32, pg_dump need the PGPASSWORD env var
- def dispatch(self, method, auth, params):
+ def dispatch(self, method, params):
if method in [ 'create', 'get_progress', 'drop', 'dump',
'restore', 'rename',
'change_admin_password', 'migrate_databases',
self.actions.pop(id)
return (1.0, users)
else:
- e = self.actions[id]['exception']
+ e = self.actions[id]['exception'] # TODO this seems wrong: actions[id]['traceback'] is set, but not 'exception'.
self.actions.pop(id)
raise Exception, e
def exp_drop(self, db_name):
+ openerp.modules.registry.RegistryManager.delete(db_name)
sql_db.close_db(db_name)
- openerp.modules.registry.RegistryManager.clear_caches(db_name)
- openerp.netsvc.Agent.cancel(db_name)
logger = netsvc.Logger()
db = sql_db.db_connect('template1')
return True
def exp_rename(self, old_name, new_name):
+ openerp.modules.registry.RegistryManager.delete(old_name)
sql_db.close_db(old_name)
- openerp.modules.registry.RegistryManager.clear_caches(old_name)
- openerp.netsvc.Agent.cancel(old_name)
logger = netsvc.Logger()
db = sql_db.db_connect('template1')
def exp_list(self, document=False):
if not tools.config['list_db'] and not document:
- raise Exception('AccessDenied')
+ raise openerp.exceptions.AccessDenied()
db = sql_db.db_connect('template1')
cr = db.cursor()
except except_orm, inst:
netsvc.abort_response(1, inst.name, 'warning', inst.value)
except except_osv, inst:
- netsvc.abort_response(1, inst.name, inst.exc_type, inst.value)
+ netsvc.abort_response(1, inst.name, 'warning', inst.value)
except Exception:
import traceback
tb_s = reduce(lambda x, y: x+y, traceback.format_exception( sys.exc_type, sys.exc_value, sys.exc_traceback))
return True
class common(netsvc.ExportService):
+ _logger = logging.getLogger('web-services')
+
def __init__(self,name="common"):
netsvc.ExportService.__init__(self,name)
- def dispatch(self, method, auth, params):
- logger = netsvc.Logger()
- if method == 'login':
- # At this old dispatcher, we do NOT update the auth proxy
- res = security.login(params[0], params[1], params[2])
- msg = res and 'successful login' or 'bad login or password'
- # TODO log the client ip address..
- logger.notifyChannel("web-service", netsvc.LOG_INFO, "%s from '%s' using database '%s'" % (msg, params[1], params[0].lower()))
- return res or False
- elif method == 'logout':
- if auth:
- auth.logout(params[1])
- logger.notifyChannel("web-service", netsvc.LOG_INFO,'Logout %s from database %s'%(login,db))
- return True
- elif method in ['about', 'timezone_get', 'get_server_environment',
- 'login_message','get_stats', 'check_connectivity',
- 'list_http_services']:
+ def dispatch(self, method, params):
+ if method in ['login', 'about', 'timezone_get', 'get_server_environment',
+ 'login_message','get_stats', 'check_connectivity',
+ 'list_http_services', 'version', 'authenticate']:
pass
elif method in ['get_available_updates', 'get_migration_scripts', 'set_loglevel', 'get_os_time', 'get_sqlcount']:
passwd = params[0]
fn = getattr(self, 'exp_'+method)
return fn(*params)
+ def exp_login(self, db, login, password):
+ # TODO: legacy indirection through 'security', should use directly
+ # the res.users model
+ res = security.login(db, login, password)
+ msg = res and 'successful login' or 'bad login or password'
+ self._logger.info("%s from '%s' using database '%s'", msg, login, db.lower())
+ return res or False
+
+ def exp_authenticate(self, db, login, password, user_agent_env):
+ res_users = pooler.get_pool(db).get('res.users')
+ return res_users.authenticate(db, login, password, user_agent_env)
+
+ def exp_version(self):
+ return RPC_VERSION_1
+
def exp_about(self, extended=False):
"""Return information about the OpenERP Server.
def __init__(self, name="object"):
netsvc.ExportService.__init__(self,name)
- def dispatch(self, method, auth, params):
+ def dispatch(self, method, params):
(db, uid, passwd ) = params[0:3]
params = params[3:]
if method == 'obj_list':
self.wiz_name = {}
self.wiz_uid = {}
- def dispatch(self, method, auth, params):
+ def dispatch(self, method, params):
(db, uid, passwd ) = params[0:3]
params = params[3:]
if method not in ['execute','create']:
if self.wiz_uid[wiz_id] == uid:
return self._execute(db, uid, wiz_id, datas, action, context)
else:
- raise Exception, 'AccessDenied'
+ raise openerp.exceptions.AccessDenied()
else:
- raise Exception, 'WizardNotFound'
+ raise openerp.exceptions.Warning('Wizard not found.')
#
# TODO: set a maximum report number per user to avoid DOS attacks
# False -> True
#
-class ExceptionWithTraceback(Exception):
- def __init__(self, msg, tb):
- self.message = msg
- self.traceback = tb
- self.args = (msg, tb)
-
class report_spool(netsvc.ExportService):
def __init__(self, name='report'):
netsvc.ExportService.__init__(self, name)
self.id = 0
self.id_protect = threading.Semaphore()
- def dispatch(self, method, auth, params):
+ def dispatch(self, method, params):
(db, uid, passwd ) = params[0:3]
params = params[3:]
if method not in ['report', 'report_get', 'render_report']:
(result, format) = obj.create(cr, uid, ids, datas, context)
if not result:
tb = sys.exc_info()
- self._reports[id]['exception'] = ExceptionWithTraceback('RML is not available at specified location or not enough data to print!', tb)
+ self._reports[id]['exception'] = openerp.exceptions.DeferredException('RML is not available at specified location or not enough data to print!', tb)
self._reports[id]['result'] = result
self._reports[id]['format'] = format
self._reports[id]['state'] = True
logger.notifyChannel('web-services', netsvc.LOG_ERROR,
'Exception: %s\n%s' % (str(exception), tb_s))
if hasattr(exception, 'name') and hasattr(exception, 'value'):
- self._reports[id]['exception'] = ExceptionWithTraceback(tools.ustr(exception.name), tools.ustr(exception.value))
+ self._reports[id]['exception'] = openerp.exceptions.DeferredException(tools.ustr(exception.name), tools.ustr(exception.value))
else:
- self._reports[id]['exception'] = ExceptionWithTraceback(tools.exception_to_unicode(exception), tb)
+ self._reports[id]['exception'] = openerp.exceptions.DeferredException(tools.exception_to_unicode(exception), tb)
self._reports[id]['state'] = True
cr.commit()
cr.close()
(result, format) = obj.create(cr, uid, ids, datas, context)
if not result:
tb = sys.exc_info()
- self._reports[id]['exception'] = ExceptionWithTraceback('RML is not available at specified location or not enough data to print!', tb)
+ self._reports[id]['exception'] = openerp.exceptions.DeferredException('RML is not available at specified location or not enough data to print!', tb)
self._reports[id]['result'] = result
self._reports[id]['format'] = format
self._reports[id]['state'] = True
logger.notifyChannel('web-services', netsvc.LOG_ERROR,
'Exception: %s\n%s' % (str(exception), tb_s))
if hasattr(exception, 'name') and hasattr(exception, 'value'):
- self._reports[id]['exception'] = ExceptionWithTraceback(tools.ustr(exception.name), tools.ustr(exception.value))
+ self._reports[id]['exception'] = openerp.exceptions.DeferredException(tools.ustr(exception.name), tools.ustr(exception.value))
else:
- self._reports[id]['exception'] = ExceptionWithTraceback(tools.exception_to_unicode(exception), tb)
+ self._reports[id]['exception'] = openerp.exceptions.DeferredException(tools.exception_to_unicode(exception), tb)
self._reports[id]['state'] = True
cr.commit()
cr.close()
projects / odoo / odoo.git / blobdiff