From 43419ed6e9ec4dc3edbcc121055e4148260fdeb2 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 19 Mar 2014 09:49:31 +0100 Subject: [IMP] Allow openerp.tools.convert_file() to optionally take the full path name bzr revid: fme@openerp.com-20140319084931-1ipjqi2dd3ug7i2t --- openerp/tools/convert.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py index 43ee96660bd..eb7652f3737 100644 --- a/openerp/tools/convert.py +++ b/openerp/tools/convert.py @@ -952,8 +952,9 @@ form: module.record_id""" % (xml_id,) 'url': self._tag_url } -def convert_file(cr, module, filename, idref, mode='update', noupdate=False, kind=None, report=None): - pathname = os.path.join(module, filename) +def convert_file(cr, module, filename, idref, mode='update', noupdate=False, kind=None, report=None, pathname=None): + if pathname is None: + pathname = os.path.join(module, filename) fp = misc.file_open(pathname) ext = os.path.splitext(filename)[1].lower() try: -- cgit v1.2.3 From 40fdb08a7db13c52c49026f8425bc40dac5a7696 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 19 Mar 2014 09:53:43 +0100 Subject: [WIP] base_import_module bzr revid: fme@openerp.com-20140319085343-zkee3rmqc9dzpa7h --- addons/base_import_module/__init__.py | 2 + addons/base_import_module/__openerp__.py | 21 ++++++++++ addons/base_import_module/controllers/__init__.py | 1 + addons/base_import_module/controllers/main.py | 38 ++++++++++++++++++ addons/base_import_module/models/__init__.py | 2 + addons/base_import_module/models/ir_module.py | 49 +++++++++++++++++++++++ 6 files changed, 113 insertions(+) create mode 100644 addons/base_import_module/__init__.py create mode 100644 addons/base_import_module/__openerp__.py create mode 100644 addons/base_import_module/controllers/__init__.py create mode 100644 addons/base_import_module/controllers/main.py create mode 100644 addons/base_import_module/models/__init__.py create mode 100644 addons/base_import_module/models/ir_module.py diff --git a/addons/base_import_module/__init__.py b/addons/base_import_module/__init__.py new file mode 100644 index 00000000000..9f86759e32b --- /dev/null +++ b/addons/base_import_module/__init__.py @@ -0,0 +1,2 @@ +import controllers +import models diff --git a/addons/base_import_module/__openerp__.py b/addons/base_import_module/__openerp__.py new file mode 100644 index 00000000000..ba37462642c --- /dev/null +++ b/addons/base_import_module/__openerp__.py @@ -0,0 +1,21 @@ +{ + 'name': 'Base import module', + 'description': """ +Import a custom data module +=========================== + +This module allows authorized users to import a custom data module (.xml files and static assests) +for customization purpose. +""", + 'category': 'Uncategorized', + 'website': 'http://www.openerp.com', + 'author': 'OpenERP SA', + 'depends': ['web'], + 'installable': True, + 'auto_install': False, + 'data': [], + 'css': [], + 'js': [], + 'qweb': [], + 'test': [], +} diff --git a/addons/base_import_module/controllers/__init__.py b/addons/base_import_module/controllers/__init__.py new file mode 100644 index 00000000000..8ee9bae18d9 --- /dev/null +++ b/addons/base_import_module/controllers/__init__.py @@ -0,0 +1 @@ +import main diff --git a/addons/base_import_module/controllers/main.py b/addons/base_import_module/controllers/main.py new file mode 100644 index 00000000000..6ddd0158b4d --- /dev/null +++ b/addons/base_import_module/controllers/main.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +import os +import zipfile +from os.path import join as opj + +import openerp +from openerp.http import Controller, route, request + +MAX_FILE_SIZE = 100 * 1024 * 1024 # in megabytes + +class ImportModule(Controller): + + @route('/base_import_module/upload', type='http', auth='none') + def upload(self, mod_file=None, **kw): + assert request.db # TODO: custom ensure_db? + request.uid = openerp.SUPERUSER_ID # TODO: proper security + + imm = request.registry['ir.module.module'] + + if not mod_file: + raise Exception("No file sent.") + if not zipfile.is_zipfile(mod_file): + raise Exception("Not a zipfile.") + + with zipfile.ZipFile(mod_file, "r") as z: + for zf in z.filelist: + if zf.file_size > MAX_FILE_SIZE: + raise Exception("File %r exceed maximum allowed file size" % zf.filename) + + with openerp.tools.osutil.tempdir() as module_dir: + z.extractall(module_dir) + dirs = [d for d in os.listdir(module_dir) if os.path.isdir(opj(module_dir, d))] + for mod_name in dirs: + # assert mod_name.startswith('theme_') + path = opj(module_dir, mod_name) + imm.import_module(request.cr, request.uid, mod_name, path, context=request.context) + return 'ok' + diff --git a/addons/base_import_module/models/__init__.py b/addons/base_import_module/models/__init__.py new file mode 100644 index 00000000000..a28c82fe5ba --- /dev/null +++ b/addons/base_import_module/models/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +import ir_module diff --git a/addons/base_import_module/models/ir_module.py b/addons/base_import_module/models/ir_module.py new file mode 100644 index 00000000000..be03067972b --- /dev/null +++ b/addons/base_import_module/models/ir_module.py @@ -0,0 +1,49 @@ +import logging +from os.path import join as opj + +import openerp +from openerp.osv import osv, fields +from openerp.tools import convert_file + +_logger = logging.getLogger(__name__) + +class view(osv.osv): + _inherit = "ir.module.module" + _columns = { + 'is_theme': fields.boolean('Theme'), + } + _defaults = { + 'is_theme': False, + } + + def import_module(self, cr, uid, module, path, context=None): + known_mods = self.browse(cr, uid, self.search(cr, uid, [])) + known_mods_names = dict([(m.name, m) for m in known_mods]) + + mod = known_mods_names.get(module) + terp = openerp.modules.load_information_from_description_file(module, mod_path=path) + values = self.get_values_from_terp(terp) + + unmet_dependencies = set(terp['depends']).difference(known_mods_names.keys()) + if unmet_dependencies: + raise Exception("Unmet module dependencies: %s" % ', '.join(unmet_dependencies)) + + if mod: + self.write(cr, uid, mod.id, values) + mode = 'update' + else: + assert terp.get('installable', True), "Module not installable" + self.create(cr, uid, dict(name=module, state='uninstalled', **values)) + mode = 'init' + + for kind in ['data', 'init_xml', 'update_xml']: + for filename in terp[kind]: + _logger.info("module %s: loading %s", module, filename) + noupdate = False + if filename.endswith('.csv') and kind in ('init', 'init_xml'): + noupdate = True + pathname = opj(path, filename) + idref = {} + convert_file(cr, module, filename, idref, mode=mode, noupdate=noupdate, kind=kind, pathname=pathname) + + return True -- cgit v1.2.3 From 46cfd8940f7f3f0557335538892389751730ee6d Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 19 Mar 2014 09:54:54 +0100 Subject: [FIX] doc typo bzr revid: fme@openerp.com-20140319085454-1pnjm55b4vxfm1wc --- openerp/http.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/http.py b/openerp/http.py index 4f6a6cdd86a..0dc5e86171b 100644 --- a/openerp/http.py +++ b/openerp/http.py @@ -1027,7 +1027,7 @@ class Root(object): return self.dispatch(environ, start_response) def load_addons(self): - """ Load all addons from addons patch containg static files and + """ Load all addons from addons path containing static files and controllers and configure them. """ statics = {} -- cgit v1.2.3 From 14c3ffcb39e860e0f893d2727b4129eeea87244d Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 19 Mar 2014 09:57:08 +0100 Subject: [IMP] Allow openerp.modules.load_information_from_description_file() to take an optional mod_path argument bzr revid: fme@openerp.com-20140319085708-prrs0m4gjvuu4o86 --- openerp/modules/module.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/openerp/modules/module.py b/openerp/modules/module.py index 8958813baa2..b0b7e0aeb94 100644 --- a/openerp/modules/module.py +++ b/openerp/modules/module.py @@ -169,13 +169,15 @@ def get_module_icon(module): return ('/' + module + '/') + '/'.join(iconpath) return '/base/' + '/'.join(iconpath) -def load_information_from_description_file(module): +def load_information_from_description_file(module, mod_path=None): """ :param module: The name of the module (sale, purchase, ...) + :param mod_path: Physical path of module, if not providedThe name of the module (sale, purchase, ...) """ - terp_file = get_module_resource(module, '__openerp__.py') - mod_path = get_module_path(module) + if not mod_path: + mod_path = get_module_path(module) + terp_file = opj(mod_path, '__openerp__.py') if terp_file: info = {} if os.path.isfile(terp_file): -- cgit v1.2.3 From 5d107cfaa0946f81a7e584681467ac0d0f363272 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 20 Mar 2014 15:33:46 +0100 Subject: [IMP] static file injected in ir.attachment bzr revid: fme@openerp.com-20140320143346-nimxg7c61lm1253x --- addons/base_import_module/models/ir_module.py | 31 +++++++++++++++++++++------ 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/addons/base_import_module/models/ir_module.py b/addons/base_import_module/models/ir_module.py index be03067972b..318af923032 100644 --- a/addons/base_import_module/models/ir_module.py +++ b/addons/base_import_module/models/ir_module.py @@ -1,20 +1,16 @@ import logging +import os +import sys from os.path import join as opj import openerp -from openerp.osv import osv, fields +from openerp.osv import osv from openerp.tools import convert_file _logger = logging.getLogger(__name__) class view(osv.osv): _inherit = "ir.module.module" - _columns = { - 'is_theme': fields.boolean('Theme'), - } - _defaults = { - 'is_theme': False, - } def import_module(self, cr, uid, module, path, context=None): known_mods = self.browse(cr, uid, self.search(cr, uid, [])) @@ -46,4 +42,25 @@ class view(osv.osv): idref = {} convert_file(cr, module, filename, idref, mode=mode, noupdate=noupdate, kind=kind, pathname=pathname) + path_static = opj(path, 'static') + if os.path.isdir(path_static): + for root, _, files in os.walk(path_static): + for static_file in files: + full_path = opj(root, static_file) + with open(full_path, 'r') as fp: + data = fp.read().encode('base64') + url_path = full_path.split(path)[1].replace(os.path.sep, '/') + url_path = url_path.decode(sys.getfilesystemencoding()) + filename = os.path.split(url_path)[1] + values = dict( + name=filename, + datas_fname=filename, + url=url_path, + res_model='ir.ui.view', + type='binary', + datas=data, + ) + self.pool['ir.attachment'].create(cr, uid, values, context=context) + return True + -- cgit v1.2.3 From b8368d8182a582707bca3a77de8ae002e3217622 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 20 Mar 2014 16:03:48 +0100 Subject: [WIP] added virtual field. will probably change the name of this field bzr revid: fme@openerp.com-20140320150348-5tv7j2he26mhqpco --- openerp/addons/base/module/module.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index 6ad74857f39..84dbbd3b89d 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -292,6 +292,7 @@ class module(osv.osv): 'reports_by_module': fields.function(_get_views, string='Reports', type='text', multi="meta", store=True), 'views_by_module': fields.function(_get_views, string='Views', type='text', multi="meta", store=True), 'application': fields.boolean('Application', readonly=True), + 'virtual': fields.boolean('Virtual module', readonly=True), 'icon': fields.char('Icon URL', size=128), 'icon_image': fields.function(_get_icon_image, string='Icon', type="binary"), } @@ -301,6 +302,7 @@ class module(osv.osv): 'sequence': 100, 'demo': False, 'license': 'AGPL-3', + 'virtual': False, } _order = 'sequence,name' -- cgit v1.2.3 From 0f9905b9f1b0736297f55dfd222123a2ae4134f1 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 20 Mar 2014 16:36:51 +0100 Subject: [IMP] better syntax for routing_map cache invalidation bzr revid: fme@openerp.com-20140320153651-4lkoekzhawny0p85 --- openerp/addons/base/ir/ir_http.py | 5 +++++ openerp/modules/loading.py | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/ir/ir_http.py b/openerp/addons/base/ir/ir_http.py index 62ecd605223..ede0d7a2e02 100644 --- a/openerp/addons/base/ir/ir_http.py +++ b/openerp/addons/base/ir/ir_http.py @@ -145,6 +145,11 @@ class ir_http(osv.AbstractModel): return self._routing_map + def refresh_routing_map(self): + if hasattr(ir_http, '_routing_map'): + del(ir_http._routing_map) + return self.routing_map() + def convert_exception_to(to_type, with_message=False): """ Should only be called from an exception handler. Fetches the current exception data from sys.exc_info() and creates a new exception of type diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py index 681d8534c05..979917df1a2 100644 --- a/openerp/modules/loading.py +++ b/openerp/modules/loading.py @@ -186,11 +186,9 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules= if tools.config.options['test_enable']: # Yamel test report.record_result(load_test(module_name, idref, mode)) + # Force routing map to be rebuilt between each test suite on modules + registry['ir.http'].refresh_routing_map() # Python tests - ir_http = registry['ir.http'] - if hasattr(ir_http, '_routing_map'): - # Force routing map to be rebuilt between each module test suite - del(ir_http._routing_map) report.record_result(openerp.modules.module.run_unit_tests(module_name, cr.dbname)) processed_modules.append(package.name) -- cgit v1.2.3 From 9285813da9ea83853d6524395677ad4f40b76e10 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 24 Mar 2014 16:14:47 +0100 Subject: [IMP] website images: only checksum ir.attachment for empty urls bzr revid: fme@openerp.com-20140324151447-a3mkncjh0b7k16hg --- addons/website/models/website.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website/models/website.py b/addons/website/models/website.py index 1a541865987..ca39c9249eb 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -574,7 +574,7 @@ class ir_attachment(osv.osv): def _compute_checksum(self, attachment_dict): if attachment_dict.get('res_model') == 'ir.ui.view'\ - and not attachment_dict.get('res_id')\ + and not attachment_dict.get('res_id') and not attachment_dict.get('url')\ and attachment_dict.get('type', 'binary') == 'binary'\ and attachment_dict.get('datas'): return hashlib.new('sha1', attachment_dict['datas']).hexdigest() -- cgit v1.2.3 From 5e484ae892efc9a45ae66a01ac32d4fce193b4d7 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 24 Mar 2014 16:17:11 +0100 Subject: [IMP] Properly import files bzr revid: fme@openerp.com-20140324151711-89mfg14573dpnh0p --- addons/base_import_module/models/ir_module.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/base_import_module/models/ir_module.py b/addons/base_import_module/models/ir_module.py index 318af923032..18e60f858da 100644 --- a/addons/base_import_module/models/ir_module.py +++ b/addons/base_import_module/models/ir_module.py @@ -43,13 +43,14 @@ class view(osv.osv): convert_file(cr, module, filename, idref, mode=mode, noupdate=noupdate, kind=kind, pathname=pathname) path_static = opj(path, 'static') + ir_attach = self.pool['ir.attachment'] if os.path.isdir(path_static): for root, _, files in os.walk(path_static): for static_file in files: full_path = opj(root, static_file) with open(full_path, 'r') as fp: data = fp.read().encode('base64') - url_path = full_path.split(path)[1].replace(os.path.sep, '/') + url_path = '/%s%s' % (module, full_path.split(path)[1].replace(os.path.sep, '/')) url_path = url_path.decode(sys.getfilesystemencoding()) filename = os.path.split(url_path)[1] values = dict( @@ -60,7 +61,11 @@ class view(osv.osv): type='binary', datas=data, ) - self.pool['ir.attachment'].create(cr, uid, values, context=context) + att_id = ir_attach.search(cr, uid, [('url', '=', url_path), ('type', '=', 'binary'), ('res_model', '=', 'ir.ui.view')], context=context) + if att_id: + ir_attach.write(cr, uid, att_id, values, context=context) + else: + ir_attach.create(cr, uid, values, context=context) return True -- cgit v1.2.3 From bb8b7ea2d97bec32a1b78d1361ad51160f326344 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 24 Mar 2014 16:17:28 +0100 Subject: [ADD] website ir_http: serve binary ir.attchments with urls bzr revid: fme@openerp.com-20140324151728-hpegewvf3b38ndyi --- addons/website/models/ir_http.py | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py index 47c0853d6be..a7c066145c1 100644 --- a/addons/website/models/ir_http.py +++ b/addons/website/models/ir_http.py @@ -1,8 +1,10 @@ # -*- coding: utf-8 -*- +import datetime +import hashlib import logging +import mimetypes import re import traceback - import werkzeug import werkzeug.routing @@ -94,9 +96,40 @@ class ir_http(orm.AbstractModel): if path != request.httprequest.path: return werkzeug.utils.redirect(path) + def _serve_attachment(self): + domain = [('type', '=', 'binary'), ('url', '=', request.httprequest.path)] + attach = self.pool['ir.attachment'].search_read(request.cr, request.uid, domain, ['__last_update', 'datas', 'datas_fname'], context=request.context) + if attach: + wdate = attach[0]['__last_update'] + datas = attach[0]['datas'] + fname = attach[0]['datas_fname'] + response = werkzeug.wrappers.Response() + server_format = openerp.tools.misc.DEFAULT_SERVER_DATETIME_FORMAT + try: + response.last_modified = datetime.datetime.strptime(wdate, server_format + '.%f') + except ValueError: + # just in case we have a timestamp without microseconds + response.last_modified = datetime.datetime.strptime(wdate, server_format) + + response.set_etag(hashlib.sha1(datas).hexdigest()) + response.make_conditional(request.httprequest) + + if response.status_code == 304: + return response + + guessed_mimetype = mimetypes.guess_type(fname) + response.mimetype = guessed_mimetype[0] or 'application/octet-stream' + response.set_data(datas.decode('base64')) + return response + def _handle_exception(self, exception=None, code=500): if isinstance(exception, werkzeug.exceptions.HTTPException) and hasattr(exception, 'response') and exception.response: return exception.response + + attach = self._serve_attachment() + if attach: + return attach + if getattr(request, 'website_enabled', False) and request.website: values = dict( exception=exception, -- cgit v1.2.3 From 0fe55dddc1e051bedbe1a72482862622e49b4c9f Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 25 Mar 2014 17:04:13 +0100 Subject: [IMP] Added a mimetype field in ir.attachment bzr revid: fme@openerp.com-20140325160413-jvxjii6rbqcrjxor --- addons/website/models/ir_http.py | 7 ++----- addons/website/models/website.py | 13 ++++++++++++- addons/website/static/src/js/website.editor.js | 3 ++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py index a7c066145c1..f173b3bee38 100644 --- a/addons/website/models/ir_http.py +++ b/addons/website/models/ir_http.py @@ -2,7 +2,6 @@ import datetime import hashlib import logging -import mimetypes import re import traceback import werkzeug @@ -98,11 +97,10 @@ class ir_http(orm.AbstractModel): def _serve_attachment(self): domain = [('type', '=', 'binary'), ('url', '=', request.httprequest.path)] - attach = self.pool['ir.attachment'].search_read(request.cr, request.uid, domain, ['__last_update', 'datas', 'datas_fname'], context=request.context) + attach = self.pool['ir.attachment'].search_read(request.cr, request.uid, domain, ['__last_update', 'datas', 'mimetype'], context=request.context) if attach: wdate = attach[0]['__last_update'] datas = attach[0]['datas'] - fname = attach[0]['datas_fname'] response = werkzeug.wrappers.Response() server_format = openerp.tools.misc.DEFAULT_SERVER_DATETIME_FORMAT try: @@ -117,8 +115,7 @@ class ir_http(orm.AbstractModel): if response.status_code == 304: return response - guessed_mimetype = mimetypes.guess_type(fname) - response.mimetype = guessed_mimetype[0] or 'application/octet-stream' + response.mimetype = attach[0]['mimetype'] response.set_data(datas.decode('base64')) return response diff --git a/addons/website/models/website.py b/addons/website/models/website.py index ca39c9249eb..64a2d7b255c 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -4,6 +4,7 @@ import inspect import itertools import logging import math +import mimetypes import re import urlparse @@ -553,7 +554,7 @@ class ir_attachment(osv.osv): def _website_url_get(self, cr, uid, ids, name, arg, context=None): result = {} for attach in self.browse(cr, uid, ids, context=context): - if attach.type == 'url': + if attach.url: result[attach.id] = attach.url else: result[attach.id] = urlplus('/website/image', { @@ -600,17 +601,27 @@ class ir_attachment(osv.osv): 'website_url': fields.function(_website_url_get, string="Attachment URL", type='char'), 'datas_big': fields.function (_datas_big, type='binary', store=True, string="Resized file content"), + 'mimetype': fields.char('Mime Type', readonly=True), } + def _add_mimetype_if_needed(self, values): + if values.get('datas_fname'): + values['mimetype'] = mimetypes.guess_type(values.get('datas_fname'))[0] or 'application/octet-stream' + def create(self, cr, uid, values, context=None): chk = self._compute_checksum(values) if chk: match = self.search(cr, uid, [('datas_checksum', '=', chk)], context=context) if match: return match[0] + self._add_mimetype_if_needed(values) return super(ir_attachment, self).create( cr, uid, values, context=context) + def write(self, cr, uid, ids, values, context=None): + self._add_mimetype_if_needed(values) + return super(ir_attachment, self).write(cr, uid, ids, values, context=context) + def try_remove(self, cr, uid, ids, context=None): """ Removes a web-based image attachment if it is used by no view (template) diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index c89bf9ec2fb..24c97bce311 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -1500,7 +1500,8 @@ args: [], kwargs: { fields: ['name', 'website_url'], - domain: [['res_model', '=', 'ir.ui.view']], + domain: [['res_model', '=', 'ir.ui.view'], '|', + ['mimetype', '=', false], ['mimetype', '=like', 'image/%']], order: 'id desc', context: website.get_context(), } -- cgit v1.2.3 From 0dd65c6af887c737fd87d0255a19d97e75361b40 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 26 Mar 2014 14:33:19 +0100 Subject: [ADD] deploy script bzr revid: fme@openerp.com-20140326133319-sp8lcvujq7uy55zd --- addons/base_import_module/bin/oe_module_deploy.py | 65 +++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100755 addons/base_import_module/bin/oe_module_deploy.py diff --git a/addons/base_import_module/bin/oe_module_deploy.py b/addons/base_import_module/bin/oe_module_deploy.py new file mode 100755 index 00000000000..d57f589901a --- /dev/null +++ b/addons/base_import_module/bin/oe_module_deploy.py @@ -0,0 +1,65 @@ +#!/usr/bin/env python +import argparse +import os +import sys +import tempfile +import urllib +import urllib2 +import zipfile + +def deploy_module(module_path, url, login, password, db=None): + if url.endswith('/'): + url = url[:-1] + module_file = zip_module(module_path) + cookie = authenticate(url, login, password, db) + upload_module(url, module_file, cookie) + +def upload_module(server, module_file, cookie): + pass + +def authenticate(server, login, password, db): + if db: + args = dict(db=db, login=login, key=password) + url = server + '/login?' + urllib.urlencode(args) + req = urllib2.Request(url) + else: + url = server + '/web/login' + args = dict(login=login, password=password) + req = urllib2.Request(url, urllib.urlencode(args)) + response = urllib2.urlopen(req) + if response.code != 200: + raise Exception("Could not authenticate to OpenERP server %r" % server) + cookie = response.headers.get('Set-Cookie') + return cookie + +def zip_module(path): + path = os.path.abspath(path) + if not os.path.isdir(path): + raise Exception("Could not find module directory %r" % path) + container, module_name = os.path.split(path) + temp = tempfile.mktemp(suffix='.zip') + temp = '/tmp/1/test.zip' + with zipfile.ZipFile(temp, 'w') as zfile: + for root, dirs, files in os.walk(path): + for file in files: + file_path = os.path.join(root, file) + zfile.write(file_path, file_path.split(container).pop()) + return temp + +if __name__ == '__main__': + parser = argparse.ArgumentParser(description='Deploy a module on an OpenERP server.') + parser.add_argument('path', help="Path of the module to deploy") + parser.add_argument('--url', dest='url', help='Url of the server (default=http://localhost:8069)', default="http://localhost:8069") + parser.add_argument('--database', dest='database', help='Database to use if server does not use db-filter.') + parser.add_argument('--login', dest='login', default="admin", help='Login (default=admin)') + parser.add_argument('--password', dest='password', default="admin", help='Password (default=admin)') + if len(sys.argv) == 1: + parser.print_help() + sys.exit(1) + args = parser.parse_args() + deploy_module(args.path, args.url, args.login, args.password, args.database) + # try: + # deploy_module(args.path, args.url, args.login, args.password, args.database) + # except Exception, e: + # print(e) + # sys.exit(1) -- cgit v1.2.3 From 62a5632aec7c14a094164862f8bc2f47060a7943 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 26 Mar 2014 16:08:42 +0100 Subject: [IMP] Use requests for http requests. python does not provide multipart encoding bzr revid: fme@openerp.com-20140326150842-h33yuiwsnrm8gmbk --- addons/base_import_module/bin/oe_module_deploy.py | 82 +++++++++++++++-------- addons/base_import_module/controllers/main.py | 28 ++++++-- 2 files changed, 75 insertions(+), 35 deletions(-) diff --git a/addons/base_import_module/bin/oe_module_deploy.py b/addons/base_import_module/bin/oe_module_deploy.py index d57f589901a..863d7875b40 100755 --- a/addons/base_import_module/bin/oe_module_deploy.py +++ b/addons/base_import_module/bin/oe_module_deploy.py @@ -3,34 +3,58 @@ import argparse import os import sys import tempfile -import urllib -import urllib2 import zipfile + +try: + import requests +except ImportError: + # no multipart encoding in stdlib and this script is temporary + sys.exit("This script requires the 'requests' module. ( pip install requests )") + +session = requests.session() + def deploy_module(module_path, url, login, password, db=None): if url.endswith('/'): url = url[:-1] + authenticate(url, login, password, db) + check_import(url) module_file = zip_module(module_path) - cookie = authenticate(url, login, password, db) - upload_module(url, module_file, cookie) + try: + return upload_module(url, module_file) + finally: + os.remove(module_file) + +def check_import(server): + url = server +'/base_import_module/check' + res = session.get(url) + if res.status_code == 404: + raise Exception("The server %r does not have the 'base_import_module' installed." % server) + elif res.status_code != 200: + raise Exception("Server %r returned %s http error.", (server, res.status_code)) -def upload_module(server, module_file, cookie): - pass +def upload_module(server, module_file): + print("Uploading module file...") + url = server + '/base_import_module/upload' + files = dict(mod_file=open(module_file, 'rb')) + res = session.post(url, files=files) + if res.status_code != 200: + raise Exception("Could not authenticate on server %r" % server) + return res.text def authenticate(server, login, password, db): + print("Connecting to server %r" % server) + print("Waiting for server authentication...") if db: + url = server + '/login' args = dict(db=db, login=login, key=password) - url = server + '/login?' + urllib.urlencode(args) - req = urllib2.Request(url) + res = session.get(url, params=args) else: url = server + '/web/login' args = dict(login=login, password=password) - req = urllib2.Request(url, urllib.urlencode(args)) - response = urllib2.urlopen(req) - if response.code != 200: + res = session.post(url, args) + if res.status_code != 200: raise Exception("Could not authenticate to OpenERP server %r" % server) - cookie = response.headers.get('Set-Cookie') - return cookie def zip_module(path): path = os.path.abspath(path) @@ -38,13 +62,17 @@ def zip_module(path): raise Exception("Could not find module directory %r" % path) container, module_name = os.path.split(path) temp = tempfile.mktemp(suffix='.zip') - temp = '/tmp/1/test.zip' - with zipfile.ZipFile(temp, 'w') as zfile: - for root, dirs, files in os.walk(path): - for file in files: - file_path = os.path.join(root, file) - zfile.write(file_path, file_path.split(container).pop()) - return temp + try: + print("Zipping module directory...") + with zipfile.ZipFile(temp, 'w') as zfile: + for root, dirs, files in os.walk(path): + for file in files: + file_path = os.path.join(root, file) + zfile.write(file_path, file_path.split(container).pop()) + return temp + except Exception: + os.remove(temp) + raise if __name__ == '__main__': parser = argparse.ArgumentParser(description='Deploy a module on an OpenERP server.') @@ -54,12 +82,10 @@ if __name__ == '__main__': parser.add_argument('--login', dest='login', default="admin", help='Login (default=admin)') parser.add_argument('--password', dest='password', default="admin", help='Password (default=admin)') if len(sys.argv) == 1: - parser.print_help() - sys.exit(1) + sys.exit(parser.print_help()) args = parser.parse_args() - deploy_module(args.path, args.url, args.login, args.password, args.database) - # try: - # deploy_module(args.path, args.url, args.login, args.password, args.database) - # except Exception, e: - # print(e) - # sys.exit(1) + try: + result = deploy_module(args.path, args.url, args.login, args.password, args.database) + print(result) + except Exception, e: + sys.exit("ERROR: %s" % e) diff --git a/addons/base_import_module/controllers/main.py b/addons/base_import_module/controllers/main.py index 6ddd0158b4d..45ce1e57480 100644 --- a/addons/base_import_module/controllers/main.py +++ b/addons/base_import_module/controllers/main.py @@ -10,10 +10,16 @@ MAX_FILE_SIZE = 100 * 1024 * 1024 # in megabytes class ImportModule(Controller): - @route('/base_import_module/upload', type='http', auth='none') + @route('/base_import_module/check', type='http', auth='user', methods=['GET']) + def check(self): + assert request.db # TODO: custom ensure_db? + assert request.uid == openerp.SUPERUSER_ID # TODO: check admin group + return 'ok' + + @route('/base_import_module/upload', type='http', auth='user', methods=['POST']) def upload(self, mod_file=None, **kw): assert request.db # TODO: custom ensure_db? - request.uid = openerp.SUPERUSER_ID # TODO: proper security + assert request.uid == openerp.SUPERUSER_ID # TODO: check admin group imm = request.registry['ir.module.module'] @@ -22,6 +28,8 @@ class ImportModule(Controller): if not zipfile.is_zipfile(mod_file): raise Exception("Not a zipfile.") + success = [] + errors = dict() with zipfile.ZipFile(mod_file, "r") as z: for zf in z.filelist: if zf.file_size > MAX_FILE_SIZE: @@ -31,8 +39,14 @@ class ImportModule(Controller): z.extractall(module_dir) dirs = [d for d in os.listdir(module_dir) if os.path.isdir(opj(module_dir, d))] for mod_name in dirs: - # assert mod_name.startswith('theme_') - path = opj(module_dir, mod_name) - imm.import_module(request.cr, request.uid, mod_name, path, context=request.context) - return 'ok' - + try: + # assert mod_name.startswith('theme_') + path = opj(module_dir, mod_name) + imm.import_module(request.cr, request.uid, mod_name, path, context=request.context) + success.append(mod_name) + except Exception, e: + errors[mod_name] = str(e) + r = ["Successfully imported module %r" % mod for mod in success] + for mod, error in errors.items(): + r.append("Error while importing module %r: %r" % (mod, error)) + return '\n'.join(r) -- cgit v1.2.3 From 0195f0d8170e06ab2b83aca2209034bafda4702e Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 26 Mar 2014 16:14:11 +0100 Subject: [ADD] Test module Test suite is still todo bzr revid: fme@openerp.com-20140326151411-moo1yuozvpgro1mh --- .../tests/test_module/__openerp__.py | 37 +++++++++++++++++++++ .../tests/test_module/static/src/img/c64.png | Bin 0 -> 24385 bytes .../tests/test_module/static/src/js/test.js | 1 + .../base_import_module/tests/test_module/test.xml | 33 ++++++++++++++++++ 4 files changed, 71 insertions(+) create mode 100644 addons/base_import_module/tests/test_module/__openerp__.py create mode 100644 addons/base_import_module/tests/test_module/static/src/img/c64.png create mode 100644 addons/base_import_module/tests/test_module/static/src/js/test.js create mode 100644 addons/base_import_module/tests/test_module/test.xml diff --git a/addons/base_import_module/tests/test_module/__openerp__.py b/addons/base_import_module/tests/test_module/__openerp__.py new file mode 100644 index 00000000000..b0ecb362b3f --- /dev/null +++ b/addons/base_import_module/tests/test_module/__openerp__.py @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2013-Today OpenERP SA (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +{ + 'name': 'Test Module', + 'category': 'Website', + 'summary': 'Custom', + 'version': '1.0', + 'description': """ + Test + """, + 'author': 'OpenERP SA', + 'depends': ['website'], + 'data': [ + 'test.xml', + ], + 'installable': True, + 'application': True, +} diff --git a/addons/base_import_module/tests/test_module/static/src/img/c64.png b/addons/base_import_module/tests/test_module/static/src/img/c64.png new file mode 100644 index 00000000000..3e8183f934f Binary files /dev/null and b/addons/base_import_module/tests/test_module/static/src/img/c64.png differ diff --git a/addons/base_import_module/tests/test_module/static/src/js/test.js b/addons/base_import_module/tests/test_module/static/src/js/test.js new file mode 100644 index 00000000000..de803c83c34 --- /dev/null +++ b/addons/base_import_module/tests/test_module/static/src/js/test.js @@ -0,0 +1 @@ +console.log('test_module javascript'); diff --git a/addons/base_import_module/tests/test_module/test.xml b/addons/base_import_module/tests/test_module/test.xml new file mode 100644 index 00000000000..53c7d680fd0 --- /dev/null +++ b/addons/base_import_module/tests/test_module/test.xml @@ -0,0 +1,33 @@ + + + + + + Module Import Success + + + Hagrid + Your Company Tagline + + + + + + + + + -- cgit v1.2.3 From a0bbbf75c393339290676ede5d15d34c38cc7b29 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 26 Mar 2014 16:34:58 +0100 Subject: [IMP] Allow to disable ssl check bzr revid: fme@openerp.com-20140326153458-6yzhkipn9njcuxyc --- addons/base_import_module/bin/oe_module_deploy.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/base_import_module/bin/oe_module_deploy.py b/addons/base_import_module/bin/oe_module_deploy.py index 863d7875b40..833d455e360 100755 --- a/addons/base_import_module/bin/oe_module_deploy.py +++ b/addons/base_import_module/bin/oe_module_deploy.py @@ -81,9 +81,15 @@ if __name__ == '__main__': parser.add_argument('--database', dest='database', help='Database to use if server does not use db-filter.') parser.add_argument('--login', dest='login', default="admin", help='Login (default=admin)') parser.add_argument('--password', dest='password', default="admin", help='Password (default=admin)') + parser.add_argument('--no-ssl-check', dest='no_ssl_check', action='store_true', help='Do not check ssl cert') if len(sys.argv) == 1: sys.exit(parser.print_help()) + args = parser.parse_args() + + if args.no_ssl_check: + session.verify = False + try: result = deploy_module(args.path, args.url, args.login, args.password, args.database) print(result) -- cgit v1.2.3 From 4d850cdbc9e2f6a158c2cabaa257867fc776082c Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 26 Mar 2014 17:01:50 +0100 Subject: [REV] revert refresh_routing_map bzr revid: fme@openerp.com-20140326160150-daoc6fypcmckyynk --- openerp/addons/base/ir/ir_http.py | 5 ----- openerp/modules/loading.py | 6 ++++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/openerp/addons/base/ir/ir_http.py b/openerp/addons/base/ir/ir_http.py index ede0d7a2e02..62ecd605223 100644 --- a/openerp/addons/base/ir/ir_http.py +++ b/openerp/addons/base/ir/ir_http.py @@ -145,11 +145,6 @@ class ir_http(osv.AbstractModel): return self._routing_map - def refresh_routing_map(self): - if hasattr(ir_http, '_routing_map'): - del(ir_http._routing_map) - return self.routing_map() - def convert_exception_to(to_type, with_message=False): """ Should only be called from an exception handler. Fetches the current exception data from sys.exc_info() and creates a new exception of type diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py index 4f44f9bd38d..5635e42e780 100644 --- a/openerp/modules/loading.py +++ b/openerp/modules/loading.py @@ -187,9 +187,11 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules= if tools.config.options['test_enable']: # Yamel test report.record_result(load_test(module_name, idref, mode)) - # Force routing map to be rebuilt between each test suite on modules - registry['ir.http'].refresh_routing_map() # Python tests + ir_http = registry['ir.http'] + if hasattr(ir_http, '_routing_map'): + # Force routing map to be rebuilt between each module test suite + del(ir_http._routing_map) report.record_result(openerp.modules.module.run_unit_tests(module_name, cr.dbname)) processed_modules.append(package.name) -- cgit v1.2.3 From b7fbef1241ac257a24952b9b8eac725711a398f1 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 26 Mar 2014 19:40:22 +0100 Subject: [FIX] Serve ir.attachment with SUPERUSER_ID We are not supposed to have a user id here bzr revid: fme@openerp.com-20140326184022-1hulv7t5y6vuvr9y --- addons/website/models/ir_http.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py index 5459fe2ad8e..272e3480fb5 100644 --- a/addons/website/models/ir_http.py +++ b/addons/website/models/ir_http.py @@ -102,7 +102,7 @@ class ir_http(orm.AbstractModel): def _serve_attachment(self): domain = [('type', '=', 'binary'), ('url', '=', request.httprequest.path)] - attach = self.pool['ir.attachment'].search_read(request.cr, request.uid, domain, ['__last_update', 'datas', 'mimetype'], context=request.context) + attach = self.pool['ir.attachment'].search_read(request.cr, openerp.SUPERUSER_ID, domain, ['__last_update', 'datas', 'mimetype'], context=request.context) if attach: wdate = attach[0]['__last_update'] datas = attach[0]['datas'] -- cgit v1.2.3 From e49b8f5ae32b072c7a22763ad9472fcce9265f04 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 26 Mar 2014 22:57:09 +0100 Subject: [FIX] /login is not webservice friendly, base_import_module uses it's own Exceptions in /base_import_module/* will generate 500 pages with a short message bzr revid: fme@openerp.com-20140326215709-esc4zkpfp8uzuww1 --- addons/base_import_module/bin/oe_module_deploy.py | 47 +++++++++-------------- addons/base_import_module/controllers/main.py | 45 ++++++++++++++++------ 2 files changed, 51 insertions(+), 41 deletions(-) diff --git a/addons/base_import_module/bin/oe_module_deploy.py b/addons/base_import_module/bin/oe_module_deploy.py index 833d455e360..2412382cba5 100755 --- a/addons/base_import_module/bin/oe_module_deploy.py +++ b/addons/base_import_module/bin/oe_module_deploy.py @@ -14,52 +14,41 @@ except ImportError: session = requests.session() -def deploy_module(module_path, url, login, password, db=None): - if url.endswith('/'): - url = url[:-1] +def deploy_module(module_path, url, login, password, db=''): + url = url.rstrip('/') authenticate(url, login, password, db) - check_import(url) module_file = zip_module(module_path) try: return upload_module(url, module_file) finally: os.remove(module_file) -def check_import(server): - url = server +'/base_import_module/check' - res = session.get(url) - if res.status_code == 404: - raise Exception("The server %r does not have the 'base_import_module' installed." % server) - elif res.status_code != 200: - raise Exception("Server %r returned %s http error.", (server, res.status_code)) - def upload_module(server, module_file): print("Uploading module file...") url = server + '/base_import_module/upload' files = dict(mod_file=open(module_file, 'rb')) res = session.post(url, files=files) if res.status_code != 200: - raise Exception("Could not authenticate on server %r" % server) + raise Exception("Could not authenticate on server '%s'" % server) return res.text -def authenticate(server, login, password, db): - print("Connecting to server %r" % server) - print("Waiting for server authentication...") - if db: - url = server + '/login' - args = dict(db=db, login=login, key=password) - res = session.get(url, params=args) - else: - url = server + '/web/login' - args = dict(login=login, password=password) - res = session.post(url, args) - if res.status_code != 200: - raise Exception("Could not authenticate to OpenERP server %r" % server) +def authenticate(server, login, password, db=''): + print("Authenticating on server '%s' ..." % server) + + # Fixate session with a given db if any + session.get(server + '/web/login', params=dict(db=db)) + + args = dict(login=login, password=password, db=db) + res = session.post(server + '/base_import_module/login', args) + if res.status_code == 404: + raise Exception("The server '%s' does not have the 'base_import_module' installed." % server) + elif res.status_code != 200: + raise Exception(res.text) def zip_module(path): path = os.path.abspath(path) if not os.path.isdir(path): - raise Exception("Could not find module directory %r" % path) + raise Exception("Could not find module directory '%s'" % path) container, module_name = os.path.split(path) temp = tempfile.mktemp(suffix='.zip') try: @@ -78,7 +67,7 @@ if __name__ == '__main__': parser = argparse.ArgumentParser(description='Deploy a module on an OpenERP server.') parser.add_argument('path', help="Path of the module to deploy") parser.add_argument('--url', dest='url', help='Url of the server (default=http://localhost:8069)', default="http://localhost:8069") - parser.add_argument('--database', dest='database', help='Database to use if server does not use db-filter.') + parser.add_argument('--db', dest='db', help='Database to use if server does not use db-filter.') parser.add_argument('--login', dest='login', default="admin", help='Login (default=admin)') parser.add_argument('--password', dest='password', default="admin", help='Password (default=admin)') parser.add_argument('--no-ssl-check', dest='no_ssl_check', action='store_true', help='Do not check ssl cert') @@ -91,7 +80,7 @@ if __name__ == '__main__': session.verify = False try: - result = deploy_module(args.path, args.url, args.login, args.password, args.database) + result = deploy_module(args.path, args.url, args.login, args.password, args.db) print(result) except Exception, e: sys.exit("ERROR: %s" % e) diff --git a/addons/base_import_module/controllers/main.py b/addons/base_import_module/controllers/main.py index 45ce1e57480..cbfbd75894b 100644 --- a/addons/base_import_module/controllers/main.py +++ b/addons/base_import_module/controllers/main.py @@ -1,26 +1,47 @@ # -*- coding: utf-8 -*- +import functools import os import zipfile from os.path import join as opj import openerp -from openerp.http import Controller, route, request +from openerp.http import Controller, route, request, Response MAX_FILE_SIZE = 100 * 1024 * 1024 # in megabytes +def webservice(f): + @functools.wraps(f) + def wrap(*args, **kw): + try: + return f(*args, **kw) + except Exception, e: + return Response(response=str(e), status=500) + return wrap + class ImportModule(Controller): - @route('/base_import_module/check', type='http', auth='user', methods=['GET']) - def check(self): - assert request.db # TODO: custom ensure_db? - assert request.uid == openerp.SUPERUSER_ID # TODO: check admin group - return 'ok' + def check_user(self, uid=None): + if uid is None: + uid = request.uid + is_admin = request.registry['res.users'].has_group(request.cr, uid, 'base.group_erp_manager') + if not is_admin: + raise openerp.exceptions.AccessError("Only administrators can upload a module") + + @route('/base_import_module/login', type='http', auth='none', methods=['POST']) + @webservice + def login(self, login, password, db=None): + if db and db != request.db: + raise Exception("Could not select database '%s'" % db) + uid = request.session.authenticate(request.db, login, password) + if not uid: + return Response(response="Wrong login/password", status=401) + self.check_user(uid) + return "ok" @route('/base_import_module/upload', type='http', auth='user', methods=['POST']) + @webservice def upload(self, mod_file=None, **kw): - assert request.db # TODO: custom ensure_db? - assert request.uid == openerp.SUPERUSER_ID # TODO: check admin group - + self.check_user() imm = request.registry['ir.module.module'] if not mod_file: @@ -33,7 +54,7 @@ class ImportModule(Controller): with zipfile.ZipFile(mod_file, "r") as z: for zf in z.filelist: if zf.file_size > MAX_FILE_SIZE: - raise Exception("File %r exceed maximum allowed file size" % zf.filename) + raise Exception("File '%s' exceed maximum allowed file size" % zf.filename) with openerp.tools.osutil.tempdir() as module_dir: z.extractall(module_dir) @@ -46,7 +67,7 @@ class ImportModule(Controller): success.append(mod_name) except Exception, e: errors[mod_name] = str(e) - r = ["Successfully imported module %r" % mod for mod in success] + r = ["Successfully imported module '%s'" % mod for mod in success] for mod, error in errors.items(): - r.append("Error while importing module %r: %r" % (mod, error)) + r.append("Error while importing module '%s': %r" % (mod, error)) return '\n'.join(r) -- cgit v1.2.3 From e6aadeb58ce13b5c340b7dc21c098840bc83605a Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 27 Mar 2014 11:38:44 +0100 Subject: [FIX] Set correct record id for