From f82c6503b7a194010f0a0bf3d29790bef04b898e Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Fri, 30 Sep 2011 10:50:12 +0200
Subject: [PATCH 1/7] [FIX] xmlrpc: handle old/new exceptions with old/new
 clients.

bzr revid: vmt@openerp.com-20110930085012-pqzzb3qwvdwu9hxy
---
 openerp/exceptions.py |  3 +--
 openerp/netsvc.py     |  5 +---
 openerp/osv/osv.py    | 12 +++++----
 openerp/wsgi.py       | 63 +++++++++++++++++++++++++++++++++++++------
 4 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/openerp/exceptions.py b/openerp/exceptions.py
index d12910c3448..fbf52c7f3a9 100644
--- a/openerp/exceptions.py
+++ b/openerp/exceptions.py
@@ -33,7 +33,7 @@ class Warning(Exception):
 class AccessDenied(Exception):
     """ Login/password error. No message, no traceback. """
     def __init__(self):
-        super(AccessDenied, self).__init__('AccessDenied.')
+        super(AccessDenied, self).__init__('Access denied.')
         self.traceback = ('', '', '')
 
 class AccessError(Exception):
@@ -52,6 +52,5 @@ class DeferredException(Exception):
     def __init__(self, msg, tb):
         self.message = msg
         self.traceback = tb
-        self.args = (msg, tb)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index 1d0b2a25726..1d4bf0c2b58 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -63,10 +63,7 @@ def close_socket(sock):
 
 def abort_response(dummy_1, description, dummy_2, details):
     # TODO Replace except_{osv,orm} with these directly.
-    if description == 'AccessError':
-        raise openerp.exceptions.AccessError(details)
-    else:
-        raise openerp.exceptions.Warning(details)
+    raise openerp.osv.osv.except_osv(description, detail)
 
 class Service(object):
     """ Base class for *Local* services
diff --git a/openerp/osv/osv.py b/openerp/osv/osv.py
index 821c52a55ef..b3f2a045589 100644
--- a/openerp/osv/osv.py
+++ b/openerp/osv/osv.py
@@ -34,8 +34,12 @@ from openerp.tools.translate import translate
 from openerp.osv.orm import MetaModel, Model, TransientModel, AbstractModel
 import openerp.exceptions
 
-# For backward compatibility
-except_osv = openerp.exceptions.Warning
+# Deprecated.
+class except_osv(Exception):
+    def __init__(self, name, value):
+        self.name = name
+        self.value = value
+        self.args = (name, value)
 
 service = None
 
@@ -115,9 +119,7 @@ class object_proxy():
                     raise except_osv('Database not ready', 'Currently, this database is not fully loaded and can not be used.')
                 return f(self, dbname, *args, **kwargs)
             except orm.except_orm, inst:
-                if inst.name == 'AccessError':
-                    self.logger.debug("AccessError", exc_info=True)
-                netsvc.abort_response(1, inst.name, 'warning', inst.value)
+                raise except_osv(inst.name, inst.value)
             except except_osv:
                 raise
             except IntegrityError, inst:
diff --git a/openerp/wsgi.py b/openerp/wsgi.py
index e5aa378bf04..b334c72b3ef 100644
--- a/openerp/wsgi.py
+++ b/openerp/wsgi.py
@@ -48,12 +48,15 @@ import service.websrv_lib as websrv_lib
 # User code must use the exceptions defined in ``openerp.exceptions`` (not
 # create directly ``xmlrpclib.Fault`` objects).
 XML_RPC_FAULT_CODE_APPLICATION_ERROR = 1
+# Unused, deferred errors are indistinguishable from normal application
+# errors. We keep them so we can use the word 'indistinguishable' twice
+# in the same comment.
 XML_RPC_FAULT_CODE_DEFERRED_APPLICATION_ERROR = 2
 XML_RPC_FAULT_CODE_ACCESS_DENIED = 3
 XML_RPC_FAULT_CODE_ACCESS_ERROR = 4
 XML_RPC_FAULT_CODE_WARNING = 5
 
-def xmlrpc_return(start_response, service, method, params):
+def xmlrpc_return(start_response, service, method, params, legacy_exceptions=False):
     """
     Helper to call a service's method with some params, using a wsgi-supplied
     ``start_response`` callback.
@@ -70,6 +73,20 @@ def xmlrpc_return(start_response, service, method, params):
     try:
         result = openerp.netsvc.dispatch_rpc(service, method, params)
         response = xmlrpclib.dumps((result,), methodresponse=1, allow_none=False, encoding=None)
+    except Exception, e:
+        if legacy_exceptions:
+            response = xmlrpc_handle_exception_legacy(e)
+        else:
+            response = xmlrpc_handle_exception(e)
+    start_response("200 OK", [('Content-Type','text/xml'), ('Content-Length', str(len(response)))])
+    return [response]
+
+def xmlrpc_handle_exception(e):
+    try:
+        raise e
+    except openerp.osv.osv.except_osv, e: # legacy
+        fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_WARNING, openerp.tools.ustr(e.value))
+        response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
     except openerp.exceptions.Warning, e:
         fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_WARNING, str(e))
         response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
@@ -84,17 +101,47 @@ def xmlrpc_return(start_response, service, method, params):
         # Which one is the best ?
         formatted_info = "".join(traceback.format_exception(*info))
         #formatted_info = openerp.tools.exception_to_unicode(e) + '\n' + info
-        fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_DEFERRED_APPLICATION_ERROR, formatted_info)
+        fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_APPLICATION_ERROR, formatted_info)
+        response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
+    except Exception, e:
+        if hasattr(e, 'message') and e.message == 'AccessDenied': # legacy
+            fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_ACCESS_DENIED, str(e))
+            response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
+        else:
+            info = sys.exc_info()
+            # Which one is the best ?
+            formatted_info = "".join(traceback.format_exception(*info))
+            #formatted_info = openerp.tools.exception_to_unicode(e) + '\n' + info
+            fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_APPLICATION_ERROR, formatted_info)
+            response = xmlrpclib.dumps(fault, allow_none=None, encoding=None)
+    return response
+
+def xmlrpc_handle_exception_legacy(e):
+    try:
+        raise e
+    except openerp.osv.osv.except_osv, e:
+        fault = xmlrpclib.Fault('warning -- ' + e.name + '\n\n' + e.value, '')
+        response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
+    except openerp.exceptions.Warning, e:
+        fault = xmlrpclib.Fault('warning -- Warning\n\n' + str(e), '')
+        response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
+    except openerp.exceptions.AccessError, e:
+        fault = xmlrpclib.Fault('warning -- AccessError\n\n' + str(e), '')
+        response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
+    except openerp.exceptions.AccessDenied, e:
+        fault = xmlrpclib.Fault('AccessDenied', str(e))
+        response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
+    except openerp.exceptions.DeferredException, e:
+        info = e.traceback
+        formatted_info = "".join(traceback.format_exception(*info))
+        fault = xmlrpclib.Fault(openerp.tools.ustr(e.message), formatted_info)
         response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
     except Exception, e:
         info = sys.exc_info()
-        # Which one is the best ?
         formatted_info = "".join(traceback.format_exception(*info))
-        #formatted_info = openerp.tools.exception_to_unicode(e) + '\n' + info
-        fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_APPLICATION_ERROR, formatted_info)
+        fault = xmlrpclib.Fault(openerp.tools.exception_to_unicode(e), formatted_info)
         response = xmlrpclib.dumps(fault, allow_none=None, encoding=None)
-    start_response("200 OK", [('Content-Type','text/xml'), ('Content-Length', str(len(response)))])
-    return [response]
+    return response
 
 def wsgi_xmlrpc(environ, start_response):
     """ The main OpenERP WSGI handler."""
@@ -138,7 +185,7 @@ def legacy_wsgi_xmlrpc(environ, start_response):
         path = environ['PATH_INFO'][len('/xmlrpc/'):] # expected to be one of db, object, ...
 
         params, method = xmlrpclib.loads(data)
-        return xmlrpc_return(start_response, path, method, params)
+        return xmlrpc_return(start_response, path, method, params, True)
 
 def wsgi_jsonrpc(environ, start_response):
     pass

From d273e72f35fe560981639a999e5c55521b7399e7 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Fri, 30 Sep 2011 11:37:55 +0200
Subject: [PATCH 2/7] [IMP] xmlrpc/exceptions: added a model and a view to
 exercise exception handling.

bzr revid: vmt@openerp.com-20110930093755-ee6569l3bhgrervp
---
 tests/addons/test_exceptions/__init__.py    |  3 +
 tests/addons/test_exceptions/__openerp__.py | 15 +++++
 tests/addons/test_exceptions/models.py      | 33 ++++++++++
 tests/addons/test_exceptions/view.xml       | 68 +++++++++++++++++++++
 4 files changed, 119 insertions(+)
 create mode 100644 tests/addons/test_exceptions/__init__.py
 create mode 100644 tests/addons/test_exceptions/__openerp__.py
 create mode 100644 tests/addons/test_exceptions/models.py
 create mode 100644 tests/addons/test_exceptions/view.xml

diff --git a/tests/addons/test_exceptions/__init__.py b/tests/addons/test_exceptions/__init__.py
new file mode 100644
index 00000000000..fe4487156b1
--- /dev/null
+++ b/tests/addons/test_exceptions/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+import models
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/tests/addons/test_exceptions/__openerp__.py b/tests/addons/test_exceptions/__openerp__.py
new file mode 100644
index 00000000000..bac853e301a
--- /dev/null
+++ b/tests/addons/test_exceptions/__openerp__.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+{
+    'name': 'test-exceptions',
+    'version': '0.1',
+    'category': 'Tests',
+    'description': """A module to generate exceptions.""",
+    'author': 'OpenERP SA',
+    'maintainer': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['base'],
+    'data': ['view.xml'],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/tests/addons/test_exceptions/models.py b/tests/addons/test_exceptions/models.py
new file mode 100644
index 00000000000..45f0e6dbd47
--- /dev/null
+++ b/tests/addons/test_exceptions/models.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+import openerp
+
+class m(openerp.osv.osv.Model):
+    """ This model exposes a few methods that will raise the different
+        exceptions that must be handled by the server (and its RPC layer)
+        and the clients.
+    """
+    _name = 'test.exceptions.model'
+
+    def generate_except_osv(self, cr, uid, ids, context=None):
+        # title is ignored in the new (6.1) exceptions
+        raise openerp.osv.osv.except_osv('title', 'description')
+
+    def generate_except_orm(self, cr, uid, ids, context=None):
+        # title is ignored in the new (6.1) exceptions
+        raise openerp.osv.orm.except_orm('title', 'description')
+
+    def generate_warning(self, cr, uid, ids, context=None):
+        raise openerp.exceptions.Warning('description')
+
+    def generate_access_denied(self, cr, uid, ids, context=None):
+        raise openerp.exceptions.AccessDenied()
+
+    def generate_access_error(self, cr, uid, ids, context=None):
+        raise openerp.exceptions.AccessError('description')
+
+    def generate_exc_access_denied(self, cr, uid, ids, context=None):
+        raise Exception('AccessDenied')
+
+    def generate_undefined(self, cr, uid, ids, context=None):
+        self.surely_undefined_sumbol
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/tests/addons/test_exceptions/view.xml b/tests/addons/test_exceptions/view.xml
new file mode 100644
index 00000000000..296f862aec4
--- /dev/null
+++ b/tests/addons/test_exceptions/view.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_test_exceptions_model" model="ir.ui.view">
+            <field name="name">Test exceptions</field>
+            <field name="model">test.exceptions.model</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Test exceptions">
+                      <label string="Each button generates a specific exception on the server. The text on the right is the expected representation of the exception when displayed on the client."/>
+                      <group colspan="8" col="8">
+                          <separator string="" colspan="8"/>
+                          <button name="generate_except_osv" string="except_osv" type="object" icon="gtk-ok" colspan="1"/>
+                          <label string="Warning-description"/>
+                      </group>
+                      <group colspan="8" col="8">
+                          <button name="generate_except_orm" string="except_orm" type="object" icon="gtk-ok" colspan="1"/>
+                          <label string="Warning-description"/>
+                      </group>
+                      <group colspan="8" col="8">
+                          <button name="generate_warning" string="Warning" type="object" icon="gtk-ok" colspan="1"/>
+                          <label string="Warning-description"/>
+                      </group>
+                      <group colspan="8" col="8">
+                          <button name="generate_access_denied" string="AccessDenied" type="object" icon="gtk-ok" colspan="1"/>
+                          <label string="Access denied-traceback"/>
+                      </group>
+                      <group colspan="8" col="8">
+                          <button name="generate_access_error" string="AccessError" type="object" icon="gtk-ok" colspan="1"/>
+                          <label string="Access rights error-description"/>
+                      </group>
+                      <group colspan="8" col="8">
+                          <button name="generate_exc_access_denied" string="Exc AccessDenied" type="object" icon="gtk-ok" colspan="1"/>
+                          <label string="Access denied-traceback"/>
+                      </group>
+                      <group colspan="8" col="8">
+                          <button name="generate_undefined" string="Undefined" type="object" icon="gtk-ok" colspan="1"/>
+                          <label string="Server error-traceback"/>
+                      </group>
+                      <group colspan="8" col="8">
+                          <separator string="" colspan="8"/>
+                          <label colspan="6" width="220"/>
+                          <button special="cancel" string="Cancel" icon="gtk-cancel" colspan="1"/>
+                      </group>
+                </form>
+           </field>
+        </record>
+
+        <record id="action_test_exceptions" model="ir.actions.act_window">
+            <field name="name">Test exceptions</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">test.exceptions.model</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tests" name="Tests"/>
+
+        <menuitem id="menu_test_exceptions" parent="base.menu_tests" name="Test exceptions"/>
+
+        <menuitem id="menu_test_exceptions_leaf"
+            name="Test exceptions"
+            action="action_test_exceptions"
+            parent="menu_test_exceptions"/>
+    </data>
+</openerp>

From 8fa79ba27ddbd67dad797a3d551f27243e88cdd1 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Fri, 30 Sep 2011 14:55:38 +0200
Subject: [PATCH 3/7] [IMP] xmlrpc: handle exceptions with isinstance instead
 of re-raising them, use the openerp xml-rpc protocol version 1 path, return
 an xmlrpclib Fault when the request is wrong.

bzr revid: vmt@openerp.com-20110930125538-8mo5tqdmjbb88fa8
---
 openerp/wsgi.py | 53 +++++++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/openerp/wsgi.py b/openerp/wsgi.py
index b334c72b3ef..36d9f252f32 100644
--- a/openerp/wsgi.py
+++ b/openerp/wsgi.py
@@ -47,6 +47,7 @@ import service.websrv_lib as websrv_lib
 # constants are also defined client-side and must remain in sync.
 # User code must use the exceptions defined in ``openerp.exceptions`` (not
 # create directly ``xmlrpclib.Fault`` objects).
+XML_RPC_FAULT_CODE_CLIENT_ERROR = 1 # again, indistinguishable from app. error.
 XML_RPC_FAULT_CODE_APPLICATION_ERROR = 1
 # Unused, deferred errors are indistinguishable from normal application
 # errors. We keep them so we can use the word 'indistinguishable' twice
@@ -56,6 +57,12 @@ XML_RPC_FAULT_CODE_ACCESS_DENIED = 3
 XML_RPC_FAULT_CODE_ACCESS_ERROR = 4
 XML_RPC_FAULT_CODE_WARNING = 5
 
+# The new (6.1) versioned RPC paths.
+XML_RPC_PATH = '/openerp/xmlrpc'
+XML_RPC_PATH_1 = '/openerp/xmlrpc/1'
+JSON_RPC_PATH = '/openerp/jsonrpc'
+JSON_RPC_PATH_1 = '/openerp/jsonrpc/1'
+
 def xmlrpc_return(start_response, service, method, params, legacy_exceptions=False):
     """
     Helper to call a service's method with some params, using a wsgi-supplied
@@ -82,28 +89,26 @@ def xmlrpc_return(start_response, service, method, params, legacy_exceptions=Fal
     return [response]
 
 def xmlrpc_handle_exception(e):
-    try:
-        raise e
-    except openerp.osv.osv.except_osv, e: # legacy
+    if isinstance(e, openerp.osv.osv.except_osv): # legacy
         fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_WARNING, openerp.tools.ustr(e.value))
         response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
-    except openerp.exceptions.Warning, e:
+    elif isinstance(e, openerp.exceptions.Warning):
         fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_WARNING, str(e))
         response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
-    except openerp.exceptions.AccessError, e:
+    elif isinstance (e, openerp.exceptions.AccessError):
         fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_ACCESS_ERROR, str(e))
         response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
-    except openerp.exceptions.AccessDenied, e:
+    elif isinstance(e, openerp.exceptions.AccessDenied):
         fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_ACCESS_DENIED, str(e))
         response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
-    except openerp.exceptions.DeferredException, e:
+    elif isinstance(e, openerp.exceptions.DeferredException):
         info = e.traceback
         # Which one is the best ?
         formatted_info = "".join(traceback.format_exception(*info))
         #formatted_info = openerp.tools.exception_to_unicode(e) + '\n' + info
         fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_APPLICATION_ERROR, formatted_info)
         response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
-    except Exception, e:
+    else:
         if hasattr(e, 'message') and e.message == 'AccessDenied': # legacy
             fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_ACCESS_DENIED, str(e))
             response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
@@ -117,26 +122,24 @@ def xmlrpc_handle_exception(e):
     return response
 
 def xmlrpc_handle_exception_legacy(e):
-    try:
-        raise e
-    except openerp.osv.osv.except_osv, e:
+    if isinstance(e, openerp.osv.osv.except_osv):
         fault = xmlrpclib.Fault('warning -- ' + e.name + '\n\n' + e.value, '')
         response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
-    except openerp.exceptions.Warning, e:
+    elif isinstance(e, openerp.exceptions.Warning):
         fault = xmlrpclib.Fault('warning -- Warning\n\n' + str(e), '')
         response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
-    except openerp.exceptions.AccessError, e:
+    elif isinstance(e, openerp.exceptions.AccessError):
         fault = xmlrpclib.Fault('warning -- AccessError\n\n' + str(e), '')
         response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
-    except openerp.exceptions.AccessDenied, e:
+    elif isinstance(e, openerp.exceptions.AccessDenied):
         fault = xmlrpclib.Fault('AccessDenied', str(e))
         response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
-    except openerp.exceptions.DeferredException, e:
+    elif isinstance(e, openerp.exceptions.DeferredException):
         info = e.traceback
         formatted_info = "".join(traceback.format_exception(*info))
         fault = xmlrpclib.Fault(openerp.tools.ustr(e.message), formatted_info)
         response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
-    except Exception, e:
+    else:
         info = sys.exc_info()
         formatted_info = "".join(traceback.format_exception(*info))
         fault = xmlrpclib.Fault(openerp.tools.exception_to_unicode(e), formatted_info)
@@ -145,13 +148,13 @@ def xmlrpc_handle_exception_legacy(e):
 
 def wsgi_xmlrpc(environ, start_response):
     """ The main OpenERP WSGI handler."""
-    if environ['REQUEST_METHOD'] == 'POST' and environ['PATH_INFO'].startswith('/openerp/6.1/xmlrpc'):
+    if environ['REQUEST_METHOD'] == 'POST' and environ['PATH_INFO'].startswith(XML_RPC_PATH_1):
         length = int(environ['CONTENT_LENGTH'])
         data = environ['wsgi.input'].read(length)
 
         params, method = xmlrpclib.loads(data)
 
-        path = environ['PATH_INFO'][len('/openerp/6.1/xmlrpc'):]
+        path = environ['PATH_INFO'][len(XML_RPC_PATH_1):]
         if path.startswith('/'): path = path[1:]
         if path.endswith('/'): p = path[:-1]
         path = path.split('/')
@@ -172,11 +175,19 @@ def wsgi_xmlrpc(environ, start_response):
             service, db_name = path
             params = (db_name,) + params
 
-            if service == 'model':
-                service = 'object'
             return xmlrpc_return(start_response, service, method, params)
 
-        # TODO the body has been read, need to raise an exception (not return None).
+        # A db segment and a model segment must be given.
+        elif len(path) == 3 and path[0] == 'model':
+            service, db_name, model_name = path
+            params = (db_name,) + params[:2] + (model_name,) + params[2:]
+            service = 'object'
+            return xmlrpc_return(start_response, service, method, params)
+
+        # The body has been read, need to raise an exception (not return None).
+        fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_CLIENT_ERROR, '')
+        response = xmlrpclib.dumps(fault, allow_none=None, encoding=None)
+        return response
 
 def legacy_wsgi_xmlrpc(environ, start_response):
     if environ['REQUEST_METHOD'] == 'POST' and environ['PATH_INFO'].startswith('/xmlrpc/'):

From 048d2038b6a05be4d083f6a60c439e21fbfcc0fe Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Fri, 30 Sep 2011 15:38:21 +0200
Subject: [PATCH 4/7] [IMP] xmlrpc: support proxy(/openerp/xmlrpc).version().

bzr revid: vmt@openerp.com-20110930133821-rujj8rxajez3p7xz
---
 openerp/wsgi.py | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/openerp/wsgi.py b/openerp/wsgi.py
index 36d9f252f32..d8ed642cb82 100644
--- a/openerp/wsgi.py
+++ b/openerp/wsgi.py
@@ -63,6 +63,8 @@ XML_RPC_PATH_1 = '/openerp/xmlrpc/1'
 JSON_RPC_PATH = '/openerp/jsonrpc'
 JSON_RPC_PATH_1 = '/openerp/jsonrpc/1'
 
+XML_RPC_VERSION_1 = {'server_version': '6.1', 'protocol_version': 1}
+
 def xmlrpc_return(start_response, service, method, params, legacy_exceptions=False):
     """
     Helper to call a service's method with some params, using a wsgi-supplied
@@ -146,7 +148,7 @@ def xmlrpc_handle_exception_legacy(e):
         response = xmlrpclib.dumps(fault, allow_none=None, encoding=None)
     return response
 
-def wsgi_xmlrpc(environ, start_response):
+def wsgi_xmlrpc_1(environ, start_response):
     """ The main OpenERP WSGI handler."""
     if environ['REQUEST_METHOD'] == 'POST' and environ['PATH_INFO'].startswith(XML_RPC_PATH_1):
         length = int(environ['CONTENT_LENGTH'])
@@ -187,7 +189,34 @@ def wsgi_xmlrpc(environ, start_response):
         # The body has been read, need to raise an exception (not return None).
         fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_CLIENT_ERROR, '')
         response = xmlrpclib.dumps(fault, allow_none=None, encoding=None)
-        return response
+        start_response("200 OK", [('Content-Type','text/xml'), ('Content-Length', str(len(response)))])
+        return [response]
+
+def wsgi_xmlrpc(environ, start_response):
+    """ WSGI handler to return the versions."""
+    if environ['REQUEST_METHOD'] == 'POST' and environ['PATH_INFO'].startswith(XML_RPC_PATH):
+        length = int(environ['CONTENT_LENGTH'])
+        data = environ['wsgi.input'].read(length)
+
+        params, method = xmlrpclib.loads(data)
+
+        path = environ['PATH_INFO'][len(XML_RPC_PATH):]
+        if path.startswith('/'): path = path[1:]
+        if path.endswith('/'): p = path[:-1]
+        path = path.split('/')
+
+        # All routes are hard-coded.
+
+        if len(path) == 1 and path[0] == '' and method in ('version',):
+            response = xmlrpclib.dumps((XML_RPC_VERSION_1,), methodresponse=1, allow_none=False, encoding=None)
+            start_response("200 OK", [('Content-Type','text/xml'), ('Content-Length', str(len(response)))])
+            return [response]
+
+        # The body has been read, need to raise an exception (not return None).
+        fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_CLIENT_ERROR, '')
+        response = xmlrpclib.dumps(fault, allow_none=None, encoding=None)
+        start_response("200 OK", [('Content-Type','text/xml'), ('Content-Length', str(len(response)))])
+        return [response]
 
 def legacy_wsgi_xmlrpc(environ, start_response):
     if environ['REQUEST_METHOD'] == 'POST' and environ['PATH_INFO'].startswith('/xmlrpc/'):
@@ -366,6 +395,7 @@ def application(environ, start_response):
 
     # Try all handlers until one returns some result (i.e. not None).
     wsgi_handlers = [
+        wsgi_xmlrpc_1,
         wsgi_xmlrpc,
         wsgi_jsonrpc,
         legacy_wsgi_xmlrpc,

From b88209b49923b5080e0e819443e89bdf0f2f6e5d Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Fri, 30 Sep 2011 15:59:42 +0200
Subject: [PATCH 5/7] [IMP] xmlrpc: version() moved to common, still available
 on /openerp/xmlrpc.

bzr revid: vmt@openerp.com-20110930135942-ytlxz7vlwl84myg0
---
 openerp/service/web_services.py | 7 ++++++-
 openerp/wsgi.py                 | 6 +-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 41951cc9fc3..5f0a1dccff9 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -49,6 +49,8 @@ import openerp.exceptions
     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
@@ -377,7 +379,7 @@ class common(netsvc.ExportService):
             return res or False
         elif method in ['about', 'timezone_get', 'get_server_environment',
                         'login_message','get_stats', 'check_connectivity',
-                        'list_http_services']:
+                        'list_http_services', 'version']:
             pass
         elif method in ['get_available_updates', 'get_migration_scripts', 'set_loglevel', 'get_os_time', 'get_sqlcount']:
             passwd = params[0]
@@ -389,6 +391,9 @@ class common(netsvc.ExportService):
         fn = getattr(self, 'exp_'+method)
         return fn(*params)
 
+    def exp_version(self):
+        return RPC_VERSION_1
+
     def exp_about(self, extended=False):
         """Return information about the OpenERP Server.
 
diff --git a/openerp/wsgi.py b/openerp/wsgi.py
index d8ed642cb82..b7a948f0620 100644
--- a/openerp/wsgi.py
+++ b/openerp/wsgi.py
@@ -63,8 +63,6 @@ XML_RPC_PATH_1 = '/openerp/xmlrpc/1'
 JSON_RPC_PATH = '/openerp/jsonrpc'
 JSON_RPC_PATH_1 = '/openerp/jsonrpc/1'
 
-XML_RPC_VERSION_1 = {'server_version': '6.1', 'protocol_version': 1}
-
 def xmlrpc_return(start_response, service, method, params, legacy_exceptions=False):
     """
     Helper to call a service's method with some params, using a wsgi-supplied
@@ -208,9 +206,7 @@ def wsgi_xmlrpc(environ, start_response):
         # All routes are hard-coded.
 
         if len(path) == 1 and path[0] == '' and method in ('version',):
-            response = xmlrpclib.dumps((XML_RPC_VERSION_1,), methodresponse=1, allow_none=False, encoding=None)
-            start_response("200 OK", [('Content-Type','text/xml'), ('Content-Length', str(len(response)))])
-            return [response]
+            return xmlrpc_return(start_response, 'common', method, ())
 
         # The body has been read, need to raise an exception (not return None).
         fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_CLIENT_ERROR, '')

From 2a51c9a0cace9309e15c5b9f84b71dbfcf55aeb1 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 1 Oct 2011 03:28:01 +0200
Subject: [PATCH 6/7] [IMP] misc renames

bzr revid: al@openerp.com-20111001012801-kkk39qlm4o8hk025
---
 openerp/wsgi.py | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/openerp/wsgi.py b/openerp/wsgi.py
index a2598a11097..be7d2bfbdc1 100644
--- a/openerp/wsgi.py
+++ b/openerp/wsgi.py
@@ -47,15 +47,11 @@ import service.websrv_lib as websrv_lib
 # constants are also defined client-side and must remain in sync.
 # User code must use the exceptions defined in ``openerp.exceptions`` (not
 # create directly ``xmlrpclib.Fault`` objects).
-XML_RPC_FAULT_CODE_CLIENT_ERROR = 1 # again, indistinguishable from app. error.
-XML_RPC_FAULT_CODE_APPLICATION_ERROR = 1
-# Unused, deferred errors are indistinguishable from normal application
-# errors. We keep them so we can use the word 'indistinguishable' twice
-# in the same comment.
-XML_RPC_FAULT_CODE_DEFERRED_APPLICATION_ERROR = 2
-XML_RPC_FAULT_CODE_ACCESS_DENIED = 3
-XML_RPC_FAULT_CODE_ACCESS_ERROR = 4
-XML_RPC_FAULT_CODE_WARNING = 5
+RPC_FAULT_CODE_CLIENT_ERROR = 1 # indistinguishable from app. error.
+RPC_FAULT_CODE_APPLICATION_ERROR = 1
+RPC_FAULT_CODE_WARNING = 2
+RPC_FAULT_CODE_ACCESS_DENIED = 3
+RPC_FAULT_CODE_ACCESS_ERROR = 4
 
 # The new (6.1) versioned RPC paths.
 XML_RPC_PATH = '/openerp/xmlrpc'
@@ -74,7 +70,7 @@ def xmlrpc_return(start_response, service, method, params, legacy_exceptions=Fal
     # Map OpenERP core exceptions to XML-RPC fault codes. Specific exceptions
     # defined in ``openerp.exceptions`` are mapped to specific fault codes;
     # all the other exceptions are mapped to the generic
-    # XML_RPC_FAULT_CODE_APPLICATION_ERROR value.
+    # RPC_FAULT_CODE_APPLICATION_ERROR value.
     # This also mimics SimpleXMLRPCDispatcher._marshaled_dispatch() for
     # exception handling.
     try:
@@ -90,34 +86,34 @@ def xmlrpc_return(start_response, service, method, params, legacy_exceptions=Fal
 
 def xmlrpc_handle_exception(e):
     if isinstance(e, openerp.osv.osv.except_osv): # legacy
-        fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_WARNING, openerp.tools.ustr(e.value))
+        fault = xmlrpclib.Fault(RPC_FAULT_CODE_WARNING, openerp.tools.ustr(e.value))
         response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
     elif isinstance(e, openerp.exceptions.Warning):
-        fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_WARNING, str(e))
+        fault = xmlrpclib.Fault(RPC_FAULT_CODE_WARNING, str(e))
         response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
     elif isinstance (e, openerp.exceptions.AccessError):
-        fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_ACCESS_ERROR, str(e))
+        fault = xmlrpclib.Fault(RPC_FAULT_CODE_ACCESS_ERROR, str(e))
         response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
     elif isinstance(e, openerp.exceptions.AccessDenied):
-        fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_ACCESS_DENIED, str(e))
+        fault = xmlrpclib.Fault(RPC_FAULT_CODE_ACCESS_DENIED, str(e))
         response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
     elif isinstance(e, openerp.exceptions.DeferredException):
         info = e.traceback
         # Which one is the best ?
         formatted_info = "".join(traceback.format_exception(*info))
         #formatted_info = openerp.tools.exception_to_unicode(e) + '\n' + info
-        fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_APPLICATION_ERROR, formatted_info)
+        fault = xmlrpclib.Fault(RPC_FAULT_CODE_APPLICATION_ERROR, formatted_info)
         response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
     else:
         if hasattr(e, 'message') and e.message == 'AccessDenied': # legacy
-            fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_ACCESS_DENIED, str(e))
+            fault = xmlrpclib.Fault(RPC_FAULT_CODE_ACCESS_DENIED, str(e))
             response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
         else:
             info = sys.exc_info()
             # Which one is the best ?
             formatted_info = "".join(traceback.format_exception(*info))
             #formatted_info = openerp.tools.exception_to_unicode(e) + '\n' + info
-            fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_APPLICATION_ERROR, formatted_info)
+            fault = xmlrpclib.Fault(RPC_FAULT_CODE_APPLICATION_ERROR, formatted_info)
             response = xmlrpclib.dumps(fault, allow_none=None, encoding=None)
     return response
 
@@ -185,7 +181,7 @@ def wsgi_xmlrpc_1(environ, start_response):
             return xmlrpc_return(start_response, service, method, params)
 
         # The body has been read, need to raise an exception (not return None).
-        fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_CLIENT_ERROR, '')
+        fault = xmlrpclib.Fault(RPC_FAULT_CODE_CLIENT_ERROR, '')
         response = xmlrpclib.dumps(fault, allow_none=None, encoding=None)
         start_response("200 OK", [('Content-Type','text/xml'), ('Content-Length', str(len(response)))])
         return [response]
@@ -209,12 +205,12 @@ def wsgi_xmlrpc(environ, start_response):
             return xmlrpc_return(start_response, 'common', method, ())
 
         # The body has been read, need to raise an exception (not return None).
-        fault = xmlrpclib.Fault(XML_RPC_FAULT_CODE_CLIENT_ERROR, '')
+        fault = xmlrpclib.Fault(RPC_FAULT_CODE_CLIENT_ERROR, '')
         response = xmlrpclib.dumps(fault, allow_none=None, encoding=None)
         start_response("200 OK", [('Content-Type','text/xml'), ('Content-Length', str(len(response)))])
         return [response]
 
-def legacy_wsgi_xmlrpc(environ, start_response):
+def wsgi_xmlrpc_legacy(environ, start_response):
     if environ['REQUEST_METHOD'] == 'POST' and environ['PATH_INFO'].startswith('/xmlrpc/'):
         length = int(environ['CONTENT_LENGTH'])
         data = environ['wsgi.input'].read(length)
@@ -395,7 +391,7 @@ def application(environ, start_response):
         wsgi_xmlrpc_1,
         wsgi_xmlrpc,
         wsgi_jsonrpc,
-        legacy_wsgi_xmlrpc,
+        wsgi_xmlrpc_legacy,
         wsgi_webdav
         ] + module_handlers
     for handler in wsgi_handlers:

From 0b95d29ca9e645a54d2ff81debfa9f35f923bc90 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 1 Oct 2011 03:32:54 +0200
Subject: [PATCH 7/7] [FIX] abort_response typo

bzr revid: al@openerp.com-20111001013254-obq2j3cqxwn20iq0
---
 openerp/netsvc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index 1d4bf0c2b58..c1120763ad4 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -63,7 +63,7 @@ def close_socket(sock):
 
 def abort_response(dummy_1, description, dummy_2, details):
     # TODO Replace except_{osv,orm} with these directly.
-    raise openerp.osv.osv.except_osv(description, detail)
+    raise openerp.osv.osv.except_osv(description, details)
 
 class Service(object):
     """ Base class for *Local* services