changeset 893e2657e9d8 in trytond:4.4
details: https://hg.tryton.org/trytond?cmd=changeset;node=893e2657e9d8
description:
        Return XML-RPC answer only to XML-RPC request

        This prevents to answer an XML-RPC fault to a request which only set 
xml as
        accepted mimetype.

        issue7913
        review66481002
        (grafted from af815f679066116848d097d29b2d8ccc9d19dc87)
diffstat:

 trytond/protocols/xmlrpc.py |  23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diffs (38 lines):

diff -r f4fd7ea1d67a -r 893e2657e9d8 trytond/protocols/xmlrpc.py
--- a/trytond/protocols/xmlrpc.py       Sun Dec 30 00:14:27 2018 +0100
+++ b/trytond/protocols/xmlrpc.py       Sun Dec 30 00:21:39 2018 +0100
@@ -9,7 +9,7 @@
 
 from werkzeug.wrappers import Response
 from werkzeug.utils import cached_property
-from werkzeug.exceptions import BadRequest
+from werkzeug.exceptions import BadRequest, InternalServerError
 
 from trytond.protocols.wrappers import Request
 from trytond.exceptions import TrytonException
@@ -167,12 +167,17 @@
 
     @classmethod
     def response(cls, data, request):
-        if isinstance(data, TrytonException):
-            data = client.Fault(data.code, str(data))
-        elif isinstance(data, Exception):
-            data = client.Fault(255, str(data))
+        if isinstance(request, XMLRequest):
+            if isinstance(data, TrytonException):
+                data = client.Fault(data.code, str(data))
+            elif isinstance(data, Exception):
+                data = client.Fault(255, str(data))
+            else:
+                data = (data,)
+            return Response(client.dumps(
+                    data, methodresponse=True, allow_none=True),
+                content_type='text/xml')
         else:
-            data = (data,)
-        return Response(client.dumps(
-                data, methodresponse=True, allow_none=True),
-            content_type='text/xml')
+            if isinstance(data, Exception):
+                return InternalServerError(data)
+            return Response(data)

Reply via email to