Merge lp:~jr.allen/unifield-web/us-2080 into lp:unifield-web

[Jeff Allen]

[lp:~jr.allen/unifield-web/us-2080]

4840. By Jeff Allen on 2017-02-16

merge

4841. By Jeff Allen on 2017-02-16

pyflakes fixes. To avoid a race, move the signal where it should have been all along. Update revprox to handle LetsEncrypt automatically.

=== modified file 'doc/openerp-web-oc.cfg'
--- doc/openerp-web-oc.cfg	2016-06-08 10:23:06 +0000
+++ doc/openerp-web-oc.cfg	2017-02-16 14:13:31 +0000
@@ -8,3 +8,9 @@
 #server.environment = "red"
 #server.environment = "blue"
 
+# HTTPS server
+# To enable the HTTPS wrapper server (revprox.exe) set this to the
+# fully qualified domain name of the server, and arrange for this to
+# resolve in local DNS to the Unifield server machine's IP address.
+
+# server.https_name = "THIS-INSTANCE.prod.unifield.org"
 
=== modified file 'openerp-web.py'
--- openerp-web.py	2010-09-15 17:46:36 +0000
+++ openerp-web.py	2017-02-16 14:13:31 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 """Start script for the openerp-web project.
 
 This script is only needed during development for running from the project
 
=== modified file 'openobject/commands.py'
--- openobject/commands.py	2016-01-18 08:45:32 +0000
+++ openobject/commands.py	2017-02-16 14:13:31 +0000
@@ -1,9 +1,10 @@
 import os
 import sys
+import time
+import subprocess
+import threading
 from optparse import OptionParser
 
-import babel.localedata
-
 import cherrypy
 try:
     from cherrypy.lib.reprconf import as_dict
@@ -81,6 +82,15 @@
     if options.static:
         openobject.enable_static_paths()
 
+    # Try to start revprox now so that we know what default to set for
+    # port number (revprox ok? port = 18061)
+    if options.port is None:
+        options.port = cherrypy.config.get('server.socket_port', 8061)
+    if revprox(options.port):
+        options.port = 18061
+        options.address = '127.0.0.1'
+        cherrypy.config['tools.proxy.on'] = True
+
     if options.address:
         cherrypy.config['server.socket_host'] = options.address
     if options.port:
@@ -89,6 +99,7 @@
         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") %
@@ -122,3 +133,82 @@
 
 def stop():
     cherrypy.engine.exit()
+
+# Try to start the reverse proxy. If anything goes wrong, return
+# False. Launch a thread which monitors it's output, copying it to
+# cherrypy.log, and kills the server if revproxy dies.
+def revprox(redir_port):
+    ctx = "REVPROX"
+
+    https_name = cherrypy.config.get('server.https_name')
+    if not https_name:
+        cherrypy.log("server.https_name is not set, not running the reverse proxy", ctx)
+        return False
+
+    rbin = 'revprox'
+    if sys.platform == 'win32':
+        rbin += '.exe'
+    rbin = os.path.abspath(openobject.paths.root('revprox', rbin))
+    if not os.path.exists(rbin):
+        cherrypy.log("%s does not exist, not running the reverse proxy." % rbin, ctx)
+        return False
+
+    cmd = [ rbin, '-server', https_name, '-redir', str(redir_port) ]
+    if cherrypy.config.get('server.use_letsencrypt', False):
+        cmd.append('-usele')
+    proc = subprocess.Popen(cmd,
+                            stderr=subprocess.STDOUT,  # Merge stdout and stderr
+                            stdout=subprocess.PIPE)
+    ok = False
+    while not ok:
+        line = proc.stdout.readline()
+        if line != '':
+            line = line.strip().split(" ", 2)
+            cherrypy.log(line[-1], ctx)
+            if line[-1] == 'Startup OK.':
+                ok = True
+        else:
+            # Process exited
+            break
+
+    if not ok:
+        cherrypy.log("reverse proxy exited without starting up", ctx)
+        return False
+
+    # It started correctly. So arrange that it's logs are copied
+    # and that it is killed on shutdown.
+
+    def logRead(proc):
+        while True:
+            line = proc.stdout.readline()
+            if line != '':
+                line = line.split(" ", 2)
+                cherrypy.log(line[-1].strip(), ctx)
+            else:
+                break
+        rc = proc.wait()
+        cherrypy.log("reverse proxy exited (rc=%d)." % rc, ctx)
+        if rc != 0:
+            # revprox exited with an error, so tell cherrypy to exit too.
+            # We will be restarted by the system (see setup.nsi: "sc failure...")
+            cherrypy.engine.stop()
+            # However, if it gets stuck on "Bus STOPPED", use exit to be sure
+            time.sleep(5)
+            os._exit(1)
+        return
+
+    thread = threading.Thread(target=logRead, args=[proc])
+    thread.start()
+
+    # A callback to register on stop, for killing revprox.
+    def _cb(p):
+        cherrypy.log("stopping", ctx)
+        try:
+            p.terminate()
+        except OSError:
+            # Probably "no such process", which is ok.
+            pass
+
+    cherrypy.engine.subscribe('stop', lambda p=proc: _cb(p))
+    return True
+
 
=== modified file 'openobject/i18n/_gettext.py'
--- openobject/i18n/_gettext.py	2011-05-10 13:22:29 +0000
+++ openobject/i18n/_gettext.py	2017-02-16 14:13:31 +0000
@@ -62,9 +62,9 @@
             with open(popath, 'rb') as pofile:
                 with open(mopath, 'wb') as mofile:
                     babel.messages.mofile.write_mo(
-                            mofile,
-                            babel.messages.pofile.read_po(
-                                    pofile, locale, domain))
+                        mofile,
+                        babel.messages.pofile.read_po(
+                            pofile, locale, domain))
         except Exception:
             # If the parsing of the PO file broke, don't leave an empty MO
             # file hanging around
@@ -75,7 +75,7 @@
             raise
 
     return babel.support.Translations.load(
-            locale_path, [locale], domain)
+        locale_path, [locale], domain)
 
 def _load_translations(path, locales, domain):
     if not locales:
@@ -94,11 +94,11 @@
         except SyntaxError:
             # http://babel.edgewall.org/ticket/213
             cherrypy.log.error(
-                    'Could not load translation domain "%s" for'
-                    ' locale "%s" in addon %s' % (
-                        domain, locale, basename(path)),
-                    context="i18n",
-                    severity=logging.WARNING)
+                'Could not load translation domain "%s" for'
+                ' locale "%s" in addon %s' % (
+                    domain, locale, basename(path)),
+                context="i18n",
+                severity=logging.WARNING)
             cherrypy.log.error(context='i18n', severity=logging.DEBUG,
                                traceback=True)
         if isinstance(translation, babel.support.Translations):
@@ -184,7 +184,7 @@
 _lazy_gettext = lazify(_gettext)
 
 def gettext(key, locale=None, domain=None):
-    if cherrypy.request.loading_addons:
+    if hasattr(cherrypy.request, "loading_addons") and cherrypy.request.loading_addons:
         return _lazy_gettext(key, locale, domain)
     return _gettext(key, locale, domain)
 
 
=== added directory 'revprox'
=== added file 'revprox/revprox.exe'
 Binary files revprox/revprox.exe	1970-01-01 00:00:00 +0000 and revprox/revprox.exe	2017-02-16 14:13:31 +0000 differ
=== modified file 'setup.nsi'
--- setup.nsi	2016-10-27 09:40:52 +0000
+++ setup.nsi	2017-02-16 14:13:31 +0000
@@ -170,6 +170,7 @@
 Section -RestartService
     nsExec::Exec '"$INSTDIR\service\OpenERPWebService.exe" -auto -install'
     sleep 2
+    nsExec::Exec 'sc failure openerp-web-6.0 reset= 0 actions= restart/0/restart/0/restart/0'
     nsExec::Exec "sc config openerp-web-6.0 depend= openerp-server-6.0"
     nsExec::Exec "net start openerp-web-6.0"
     sleep 2
 
=== modified file 'setup.py'
--- setup.py	2013-02-04 09:09:45 +0000
+++ setup.py	2017-02-16 14:13:31 +0000
@@ -24,12 +24,12 @@
         'win32serviceutil',
     ])
     opts['options']['py2exe'].update(
-            skip_archive=1,
-            compressed=0,
-            bundle_files=3,
-            optimize=0,
-            collected_libs_dir='libs',
-            collected_libs_data_relocate='babel,pytz',
+        skip_archive=1,
+        compressed=0,
+        bundle_files=3,
+        optimize=0,
+        collected_libs_dir='libs',
+        collected_libs_data_relocate='babel,pytz',
     )
     opts.setdefault('data_files', []).extend(fixup_data_pytz_zoneinfo())
     opts.update(cmdclass={'py2exe': custom_py2exe},)
@@ -99,16 +99,17 @@
         'Programming Language :: Python',
         'Environment :: Web Environment',
         'Topic :: Office/Business :: Financial',
-        ],
+    ],
     scripts=['scripts/openerp-web'],
     data_files=(find_data_files('addons/openerp')
-              + find_data_files('addons/view_calendar')
-              + find_data_files('addons/view_diagram')
-              + find_data_files('addons/view_graph')
-              + find_data_files('addons/widget_ckeditor')
-              + find_data_files('doc', patterns='')
-              + find_data_files('openobject', patterns=r'.+\.(cfg|css|js|mako|gif|png|jpg|ico)')
-              + opts.pop('data_files', [])
-    ),
+                + find_data_files('addons/view_calendar')
+                + find_data_files('addons/view_diagram')
+                + find_data_files('addons/view_graph')
+                + find_data_files('addons/widget_ckeditor')
+                + find_data_files('doc', patterns='')
+                + find_data_files('openobject', patterns=r'.+\.(cfg|css|js|mako|gif|png|jpg|ico)')
+                + find_data_files('revprox', patterns='')
+                + opts.pop('data_files', [])
+                ),
     **opts
 )
 
=== modified file 'win32/OpenERPWebService.py'
--- win32/OpenERPWebService.py	2013-02-04 09:06:57 +0000
+++ win32/OpenERPWebService.py	2017-02-16 14:13:31 +0000
@@ -20,7 +20,6 @@
 ##############################################################################
 
 # Win32 python extensions modules
-import win32con
 import win32serviceutil
 import win32service
 import win32event
@@ -54,11 +53,13 @@
     def SvcStop(self):
         # Before we do anything, tell the SCM we are starting the stop process.
         self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING)
-        # stop the running OpenERP Web: say it's a normal exit
-        win32api.TerminateProcess(int(self.openerp_process._handle), 0)
-        servicemanager.LogInfoMsg("OpenERP Web stopped correctly")
         # And set my event.
         win32event.SetEvent(self.hWaitStop)
+        # stop the running OpenERP Web and any children (i.e. revprox.exe)
+        pid = str(self.openerp_process.pid)
+        subprocess.call(['taskkill', '/F', '/T', '/PID', pid])
+        self.openerp_process = None
+        servicemanager.LogInfoMsg("OpenERP Web stopped correctly")
         self.ReportServiceStatus(win32service.SERVICE_STOPPED)
 
     def StartOpenERP(self):
@@ -69,7 +70,7 @@
         service_dir = os.path.dirname(sys.argv[0])
         server_dir = os.path.split(service_dir)[0]
         server_path = os.path.join(server_dir, 'openerp-web.exe')
-        result = win32api.SetConsoleCtrlHandler(self.handle, 1)
+        win32api.SetConsoleCtrlHandler(self.handle, 1)
 
         self.openerp_process = subprocess.Popen([server_path], cwd=server_dir, creationflags=win32process.CREATE_NO_WINDOW)
 
@@ -92,7 +93,8 @@
         # verification if the server is really running, else quit with an error
         self.openerp_process.wait()
         if not self.stopping:
-            sys.exit("OpenERP Web check: server not running, check the logfile for more info")
+            servicemanager.LogInfoMsg("openerp-web child process died unexpectedly, exiting now")
+            os._exit(1)
 
 if __name__=='__main__':
     # Do with the service whatever option is passed in the command line