Merge lp:~jfb-tempo-consulting/unifield-web/us-812 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/controllers/actions.py'
--- addons/openerp/controllers/actions.py	2015-12-18 16:10:29 +0000
+++ addons/openerp/controllers/actions.py	2016-01-19 10:40:01 +0000
@@ -27,7 +27,7 @@
 import zlib
 
 import cherrypy
-from openerp.utils import rpc, common, expr_eval, TinyDict
+from openerp.utils import rpc, common, expr_eval, TinyDict, is_server_local, serve_file
 
 from form import Form
 from openobject import tools
@@ -36,6 +36,7 @@
 from wizard import Wizard
 import urllib
 import re
+import os
 
 def execute_window(view_ids, model, res_id=False, domain=None, view_type='form', context=None,
                    mode='form,tree', name=None, target=None, limit=None, search_view=None,
@@ -127,17 +128,29 @@
 }
 
 def _print_data(data):
-
-    if 'result' not in data:
+    if 'result' not in data and 'path' not in data:
         raise common.message(_('Error no report'))
 
+    cherrypy.response.headers['Content-Type'] = PRINT_FORMATS[data['format']]
     if data.get('code','normal')=='zlib':
         import zlib
         content = zlib.decompress(base64.decodestring(data['result']))
     else:
+        if not data.get('result') and data.get('path'):
+            try:
+                return serve_file.serve_file(data['path'], "application/x-download", 'attachment', delete=data.get('delete', False))
+            except Exception, e:
+                cherrypy.response.headers['Content-Type'] = 'text/html'
+                if 'Content-Disposition' in cherrypy.response.headers:
+                    del(cherrypy.response.headers['Content-Disposition'])
+                raise common.warning(e)
+            finally:
+                if data.get('delete', False) and os.path.exists(data['path']):
+                    os.remove(data['path'])
+#            return cherrypy.lib.static.serve_file(data['path'], "application/x-download", 'attachment')
+
         content = base64.decodestring(data['result'])
 
-    cherrypy.response.headers['Content-Type'] = PRINT_FORMATS[data['format']]
     return content
 
 def execute_report(name, **data):
@@ -162,6 +175,8 @@
     try:
         ctx = dict(rpc.session.context)
         ctx.update(datas.get('context', {}))
+        if is_server_local():
+            ctx['report_fromfile'] = 1
         report_id = rpc.session.execute('report', 'report', name, ids, datas, ctx)
         state = False
         attempt = 0
@@ -189,8 +204,7 @@
         if datas.get('force_attach'):
             attachment = 'attachment;'
         if background_id:
-            bg_report = rpc.session.execute('object', 'execute', 'memory.background.report', 'write', [background_id], {'report_id': report_id, 'report_name': report_name})
-
+            bg_report = rpc.session.execute('object', 'execute', 'memory.background.report', 'write', [background_id], {'report_id': background_id, 'report_name': report_name})
 
         while not state:
             val = rpc.session.execute('report', 'report_get', report_id)
 
=== modified file 'addons/openerp/controllers/database.py'
--- addons/openerp/controllers/database.py	2015-05-28 10:07:02 +0000
+++ addons/openerp/controllers/database.py	2016-01-19 10:40:01 +0000
@@ -21,6 +21,7 @@
 import base64
 import re
 import time
+import os
 
 import cherrypy
 import formencode
@@ -31,7 +32,9 @@
 import openobject.errors
 
 from openerp import validators
-from openerp.utils import rpc, get_server_version
+from openerp.utils import rpc, get_server_version, is_server_local, serve_file
+from tempfile import NamedTemporaryFile
+import shutil
 
 def get_lang_list():
     langs = [('en_US', 'English (US)')]
@@ -94,14 +97,19 @@
     fields = [openobject.widgets.SelectField(name='dbname', options=get_db_list, label=_('Database:'), validator=validators.String(not_empty=True)),
               openobject.widgets.PasswordField(name='password', label=_('Backup password:'), validator=formencode.validators.NotEmpty())]
 
+class FileField(openobject.widgets.FileField):
+    def adjust_value(self, value, **params):
+        return False
+
 class FormRestore(DBForm):
     name = "restore"
     string = _('Restore database')
     action = '/openerp/database/do_restore'
     submit_text = _('Restore')
-    fields = [openobject.widgets.FileField(name="filename", label=_('File:')),
+    fields = [FileField(name="filename", label=_('File:')),
               openobject.widgets.PasswordField(name='password', label=_('Restore password:'), validator=formencode.validators.NotEmpty()),
               openobject.widgets.TextField(name='dbname', label=_('New database name:'), validator=formencode.validators.NotEmpty(), readonly=1, attrs={'readonly': ''})]
+    hidden_fields = [openobject.widgets.HiddenField(name='fpath', label=_('Path:'))]
 
 class FormPassword(DBForm):
     name = "password"
@@ -245,15 +253,24 @@
     def do_backup(self, dbname, password, **kw):
         self.msg = {}
         try:
-            res = rpc.session.execute_db('dump', password, dbname)
             filename = [dbname, time.strftime('%Y%m%d-%H%M%S')]
             version = get_server_version()
             if version:
                 filename.append(version)
-            if res:
-                cherrypy.response.headers['Content-Type'] = "application/data"
-                cherrypy.response.headers['Content-Disposition'] = 'filename="%s.dump"' % '-'.join(filename)
-                return base64.decodestring(res)
+
+            if is_server_local():
+                res = rpc.session.execute_db('dump_file', password, dbname)
+                try:
+                    return serve_file.serve_file(res, "application/x-download", 'attachment', '%s.dump' % '-'.join(filename), delete=True)
+                finally:
+                    if os.path.exists(res):
+                        os.remove(res)
+            else:
+                res = rpc.session.execute_db('dump', password, dbname)
+                if res:
+                    cherrypy.response.headers['Content-Type'] = "application/data"
+                    cherrypy.response.headers['Content-Disposition'] = 'filename="%s.dump"' % '-'.join(filename)
+                    return base64.decodestring(res)
         except openobject.errors.AccessDenied, e:
             self.msg = {'message': _('Wrong password'),
                         'title' : e.title}
@@ -293,14 +310,30 @@
                             'title': _('Error')}
                 return self.restore()
         try:
-            data = base64.encodestring(filename.file.read())
-            rpc.session.execute_db('restore', password, dbname, data)
+            if is_server_local():
+                if not filename.filename and kw.get('fpath'):
+                    filename = kw.get('fpath')
+                else:
+                    newfile = NamedTemporaryFile(delete=False)
+                    shutil.copyfileobj(filename.file, newfile)
+                    filename = newfile.name
+                    newfile.close()
+                rpc.session.execute_db('restore_file', password, dbname, filename)
+            else:
+                data = base64.encodestring(filename.file.read())
+                rpc.session.execute_db('restore', password, dbname, data)
         except openobject.errors.AccessDenied, e:
             self.msg = {'message': _('Wrong password'),
                         'title' : e.title}
+            if hasattr(cherrypy.request, 'input_values') and filename:
+                cherrypy.request.input_values['fpath'] = filename
             return self.restore()
-        except Exception:
-            self.msg = {'message': _("Could not restore database")}
+        except Exception, e:
+            msg = _("Could not restore database")
+            if isinstance(e, openobject.errors.TinyException):
+                if 'Database already exists' in e.message:
+                    msg = _("Could not restore: database already exists")
+            self.msg = {'message': msg}
             return self.restore()
         raise redirect('/openerp/login', db=dbname)
 
 
=== added file 'addons/openerp/utils/serve_file.py'
--- addons/openerp/utils/serve_file.py	1970-01-01 00:00:00 +0000
+++ addons/openerp/utils/serve_file.py	2016-01-19 10:40:01 +0000
@@ -0,0 +1,142 @@
+import mimetypes
+mimetypes.init()
+mimetypes.types_map['.dwg']='image/x-dwg'
+mimetypes.types_map['.ico']='image/x-icon'
+
+import os
+import re
+import stat
+import time
+import urllib
+import tempfile
+import cherrypy
+from cherrypy.lib import cptools, http, file_generator_limited
+
+def serve_file(path, content_type=None, disposition=None, name=None, delete=False):
+    """Set status, headers, and body in order to serve the given file.
+    
+    The Content-Type header will be set to the content_type arg, if provided.
+    If not provided, the Content-Type will be guessed by the file extension
+    of the 'path' argument.
+    
+    If disposition is not None, the Content-Disposition header will be set
+    to "<disposition>; filename=<name>". If name is None, it will be set
+    to the basename of path. If disposition is None, no Content-Disposition
+    header will be written.
+    """
+    
+    response = cherrypy.response
+    
+    # If path is relative, users should fix it by making path absolute.
+    # That is, CherryPy should not guess where the application root is.
+    # It certainly should *not* use cwd (since CP may be invoked from a
+    # variety of paths). If using tools.static, you can make your relative
+    # paths become absolute by supplying a value for "tools.static.root".
+    if not os.path.isabs(path):
+        raise ValueError("'%s' is not an absolute path." % path)
+    
+    try:
+        st = os.stat(path)
+    except OSError:
+        raise cherrypy.NotFound()
+    
+    # Check if path is a directory.
+    if stat.S_ISDIR(st.st_mode):
+        # Let the caller deal with it as they like.
+        raise cherrypy.NotFound()
+    
+    # Set the Last-Modified response header, so that
+    # modified-since validation code can work.
+    response.headers['Last-Modified'] = http.HTTPDate(st.st_mtime)
+    cptools.validate_since()
+    
+    if content_type is None:
+        # Set content-type based on filename extension
+        ext = ""
+        i = path.rfind('.')
+        if i != -1:
+            ext = path[i:].lower()
+        content_type = mimetypes.types_map.get(ext, "text/plain")
+    response.headers['Content-Type'] = content_type
+    
+    if disposition is not None:
+        if name is None:
+            name = os.path.basename(path)
+        cd = '%s; filename="%s"' % (disposition, name)
+        response.headers["Content-Disposition"] = cd
+    
+    # Set Content-Length and use an iterable (file object)
+    #   this way CP won't load the whole file in memory
+    c_len = st.st_size
+    if delete:
+        flag = os.O_RDWR | os.O_EXCL
+        if hasattr(os, 'O_BINARY'):
+            flag |= os.O_BINARY
+        if os.name == 'nt':
+            flag |= os.O_TEMPORARY
+        fd = os.open(path, flag)
+        file = os.fdopen(fd, 'rb')
+        bodyfile = file
+    else:
+        bodyfile = open(path, 'rb')
+    
+    # HTTP/1.0 didn't have Range/Accept-Ranges headers, or the 206 code
+    if cherrypy.request.protocol >= (1, 1):
+        response.headers["Accept-Ranges"] = "bytes"
+        r = http.get_ranges(cherrypy.request.headers.get('Range'), c_len)
+        if r == []:
+            response.headers['Content-Range'] = "bytes */%s" % c_len
+            message = "Invalid Range (first-byte-pos greater than Content-Length)"
+            raise cherrypy.HTTPError(416, message)
+        if r:
+            if len(r) == 1:
+                # Return a single-part response.
+                start, stop = r[0]
+                if stop > c_len:
+                    stop = c_len
+                r_len = stop - start
+                response.status = "206 Partial Content"
+                response.headers['Content-Range'] = ("bytes %s-%s/%s" %
+                                                       (start, stop - 1, c_len))
+                response.headers['Content-Length'] = r_len
+                bodyfile.seek(start)
+                response.body = file_generator_limited(bodyfile, r_len)
+            else:
+                # Return a multipart/byteranges response.
+                response.status = "206 Partial Content"
+                import mimetools
+                boundary = mimetools.choose_boundary()
+                ct = "multipart/byteranges; boundary=%s" % boundary
+                response.headers['Content-Type'] = ct
+                if response.headers.has_key("Content-Length"):
+                    # Delete Content-Length header so finalize() recalcs it.
+                    del response.headers["Content-Length"]
+                
+                def file_ranges():
+                    # Apache compatibility:
+                    yield "\r\n"
+                    
+                    for start, stop in r:
+                        yield "--" + boundary
+                        yield "\r\nContent-type: %s" % content_type
+                        yield ("\r\nContent-range: bytes %s-%s/%s\r\n\r\n"
+                               % (start, stop - 1, c_len))
+                        bodyfile.seek(start)
+                        for chunk in file_generator_limited(bodyfile, stop-start):
+                            yield chunk
+                        yield "\r\n"
+                    # Final boundary
+                    yield "--" + boundary + "--"
+                    
+                    # Apache compatibility:
+                    yield "\r\n"
+                response.body = file_ranges()
+        else:
+            response.headers['Content-Length'] = c_len
+            response.body = bodyfile
+    else:
+        response.headers['Content-Length'] = c_len
+        response.body = bodyfile
+    response.stream = True
+    return response.body
+
 
=== modified file 'addons/openerp/utils/tools.py'
--- addons/openerp/utils/tools.py	2011-06-30 13:58:31 +0000
+++ addons/openerp/utils/tools.py	2016-01-19 10:40:01 +0000
@@ -253,5 +253,6 @@
     def __deepcopy__(self, visit):
         return self
 
-
+def is_server_local():
+    return cherrypy.config.get('openerp.server.host') in ['127.0.0.1', 'localhost']
 # vim: ts=4 sts=4 sw=4 si et
 
=== added file 'doc/openerp-web-oc.cfg'
--- doc/openerp-web-oc.cfg	1970-01-01 00:00:00 +0000
+++ doc/openerp-web-oc.cfg	2016-01-19 10:40:01 +0000
@@ -0,0 +1,5 @@
+[global]
+
+# Web tcp/port, default port is 8061
+#server.socket_port = 8061
+
 
=== added file 'doc/openerp-web-win.cfg'
--- doc/openerp-web-win.cfg	1970-01-01 00:00:00 +0000
+++ doc/openerp-web-win.cfg	2016-01-19 10:40:01 +0000
@@ -0,0 +1,93 @@
+[global]
+server.environment = "development"
+
+# Some server parameters that you may want to tweak
+server.socket_host = "0.0.0.0"
+server.socket_port = 8061
+
+# Sets the number of threads the server uses
+server.thread_pool = 40
+
+tools.sessions.on = True
+tools.sessions.persistent = False
+
+# Simple code profiling
+server.profile_on = False
+server.profile_dir = "profile"
+# Max size: 10GB
+server.max_request_body_size = 10737418240
+# disable monitor which raises an error at the end of the request
+engine.timeout_monitor.on = False
+
+# if this is part of a larger site, you can set the path
+# to the TurboGears instance here
+#server.webpath = ""
+
+# Set to True if you are deploying your App behind a proxy
+# e.g. Apache using mod_proxy
+#tools.proxy.on = True
+
+# If your proxy does not add the X-Forwarded-Host header, set
+# the following to the *public* host url.
+#tools.proxy.base = 'http://mydomain.com'
+
+# logging
+#log.screen = False
+#log.access_file = "/var/log/openerp-web/access.log"
+#log.error_file = "/var/log/openerp-web/error.log"
+log.error_file = "../ServerLog/openerp-web.log"
+log.access_level = "INFO"
+log.error_level = "INFO"
+# Replaces the cherrypy-created FileHandler by a TimedRotatingFileHandler,
+# requires that access_file and error_file be uncommented and set correctly
+# (they will be used to configure the rotating file handlers).
+# Value should be a dictionary providing TimedRotatingFileHandler's optional
+# arguments (any argument can be provided but `filename`).
+# See the documentation at http://docs.python.org/library/logging.handlers.html#logging.handlers.TimedRotatingFileHandler
+# for more informations on TimedRotatingFileHandler
+log.rotate = {'when' : 'D'}
+
+# Set to false to disable CSRF checks
+tools.csrf.on = True
+
+# replace builtin traceback tools by cgitb
+tools.log_tracebacks.on: False
+tools.cgitb.on: True
+# a default install can probably avoid logging those via cgitb as they're
+# available in the server log
+tools.cgitb.ignore=(
+    openobject.errors.Concurrency,
+    openobject.errors.TinyException)
+
+# if enable this force cookie to be sent over a secure channel 'ssl'
+# (make sure you site is reachable on https before activating this)
+#tools.secure_cookies.on = True
+
+# if enable for browse who understand this, the cookie will not be
+# readable by scripts, see: http://www.owasp.org/index.php/HttpOnly
+tools.httponly_cookies.on = True
+
+# fix support of cherrpy 3.1.2 tools.sessions.persistant = False
+tools.fix_312_session_persistent.on = True
+
+# OpenERP Server
+openerp.server.host = 'localhost'
+openerp.server.port = '8070'
+openerp.server.protocol = 'socket'
+openerp.server.timeout = 1800
+
+# Web client settings
+[openerp-web]
+# filter dblists based on url pattern?
+# NONE: No Filter
+# EXACT: Exact Hostname
+# UNDERSCORE: Hostname_
+# BOTH: Exact Hostname or Hostname_
+
+dblist.filter = 'NONE'
+
+# whether to show Databases button on Login screen or not
+dbbutton.visible = True
+
+# will be applied on company logo
+company.url = ''
 
=== modified file 'doc/openerp-web.cfg'
--- doc/openerp-web.cfg	2015-10-01 08:55:14 +0000
+++ doc/openerp-web.cfg	2016-01-19 10:40:01 +0000
@@ -14,7 +14,8 @@
 # Simple code profiling
 server.profile_on = False
 server.profile_dir = "profile"
-server.max_request_body_size = 209715200
+# Max size: 10GB
+server.max_request_body_size = 10737418240
 # disable monitor which raises an error at the end of the request
 engine.timeout_monitor.on = False
 
 
=== modified file 'openobject/__init__.py'
--- openobject/__init__.py	2011-06-22 09:35:20 +0000
+++ openobject/__init__.py	2016-01-19 10:40:01 +0000
@@ -128,8 +128,11 @@
         error_handler = handlers.TimedRotatingFileHandler(error_file, **rotate)
         error_handler.setLevel(error_level)
         log.error_log.addHandler(error_handler)
+        log.error_file = ''
 
         # Make a new RotatingFileHandler for the access log.
-        access_handler = handlers.TimedRotatingFileHandler(access_file, **rotate)
-        access_handler.setLevel(access_level)
-        log.access_log.addHandler(access_handler)
+        if access_file:
+            access_handler = handlers.TimedRotatingFileHandler(access_file, **rotate)
+            access_handler.setLevel(access_level)
+            log.access_log.addHandler(access_handler)
+            log.access_file = ''
 
=== modified file 'openobject/commands.py'
--- openobject/commands.py	2013-02-04 11:48:01 +0000
+++ openobject/commands.py	2016-01-19 10:40:01 +0000
@@ -19,6 +19,15 @@
 
 DISTRIBUTION_CONFIG = os.path.join('doc', 'openerp-web.cfg')
 FROZEN_DISTRIBUTION_CONFIG = os.path.join('conf', 'openerp-web.cfg')
+OVERRIDE_CONFIG = os.path.join('conf', 'openerp-web-oc.cfg')
+def get_config_override_file():
+    if hasattr(sys, 'frozen'):
+        configfile = os.path.join(openobject.paths.root(), OVERRIDE_CONFIG)
+        if os.path.exists(configfile):
+            return configfile
+
+    return False
+
 def get_config_file():
     if hasattr(sys, 'frozen'):
         configfile = os.path.join(openobject.paths.root(), FROZEN_DISTRIBUTION_CONFIG)
@@ -37,6 +46,8 @@
     parser = OptionParser(version="%s" % (openobject.release.version))
     parser.add_option("-c", "--config", metavar="FILE", dest="config",
                       help="configuration file", default=get_config_file())
+    parser.add_option("--config-override", metavar="FILE", dest="config_override",
+                      help="override configuration file", default=get_config_override_file())
     parser.add_option("-a", "--address", help="host address, overrides server.socket_host")
     parser.add_option("-p", "--port", help="port number, overrides server.socket_port")
     parser.add_option("--openerp-host", dest="openerp_host", help="overrides openerp.server.host")
@@ -50,13 +61,26 @@
     if not os.path.exists(options.config):
         raise ConfigurationError(_("Could not find configuration file: %s") %
                                  options.config)
-                                 
+
+    error_config = False
     app_config = as_dict(options.config)
-    
+    if options.config_override:
+        try:
+            over_config = as_dict(options.config_override)
+            for section, value in over_config.iteritems():
+                app_config.setdefault(section, {}).update(value)
+        except Exception, error_config:
+            pass
     openobject.configure(app_config)
+
+    if error_config:
+        cherrypy.log('Unable to parse %s\nError: %s' % (options.config_override, error_config), "ERROR")
+        raise ConfigurationError(_("Unable to parse: %s") %
+                                 options.config_override)
+
     if options.static:
         openobject.enable_static_paths()
-    
+
     if options.address:
         cherrypy.config['server.socket_host'] = options.address
     if options.port:
@@ -64,6 +88,11 @@
             cherrypy.config['server.socket_port'] = int(options.port)
         except:
             pass
+    port = cherrypy.config.get('server.socket_port')
+    if not isinstance(port, (int, long)) or port < 1 or port > 65535:
+        cherrypy.log('Wrong configuration socket_port: %s' % (port,), "ERROR")
+        raise ConfigurationError(_("Wrong configuration socket_port: %s") %
+                                 port)
     if options.openerp_host:
         cherrypy.config['openerp.server.host'] = options.openerp_host
     if options.openerp_port:
 
=== modified file 'openobject/tools/_expose.py'
--- openobject/tools/_expose.py	2011-01-20 18:50:26 +0000
+++ openobject/tools/_expose.py	2016-01-19 10:40:01 +0000
@@ -29,7 +29,8 @@
 from openobject import i18n
 import _utils as utils
 import resources
-
+import types
+import tempfile
 
 __all__ = ['load_template', 'render_template', 'expose', 'register_template_vars']
 
@@ -220,7 +221,8 @@
                                 jset.add(script)
 
                     return render_template(_template, res).encode("utf-8")
-
+            if isinstance(res, types.GeneratorType) and hasattr(res, '__name__') and res.__name__ == 'file_generator':
+                return res
             if not isinstance(res, basestring):
                 return unicode(res).encode("utf-8")
 
 
=== modified file 'setup.nsi'
--- setup.nsi	2010-12-29 19:48:48 +0000
+++ setup.nsi	2016-01-19 10:40:01 +0000
@@ -151,7 +151,8 @@
     File "win32\stop.bat"
 
     SetOutPath "$INSTDIR\conf"
-    File "/oname=openerp-web.cfg" ".\doc\openerp-web.cfg"
+    File "/oname=openerp-web.cfg" ".\doc\openerp-web-win.cfg"
+    File "/oname=openerp-web-oc.cfg" ".\doc\openerp-web-oc.cfg"
 
     !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
         ;Create shortcuts
@@ -159,7 +160,7 @@
         
         CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Start OpenERP Web.lnk" "$INSTDIR\service\start.bat"
         CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Stop OpenERP Web.lnk" "$INSTDIR\service\stop.bat"
-        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Edit Web Config.lnk" "notepad.exe" "$INSTDIR\conf\openerp-web.cfg"
+        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Edit Web Config.lnk" "notepad.exe" "$INSTDIR\conf\openerp-web-oc.cfg"
         CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\uninstall.exe"
         !insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\Forum" "http://www.openerp.com/forum"
         !insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\Translation" "https://translations.launchpad.net/openobject"