support stdout_xml

* use defusedxml for security reasons

Signed-off-by: Aleksei Stepanov <penguinolog@gmail.com>

Author: penguinolog

README.rst

@@ -203,6 +203,8 @@ Execution result object has a set of useful properties:
 
 * `stdout_yaml` - STDOUT decoded as YAML.
 
+* `stdout_xml` - STDOUT decoded as XML to `ElementTree` using `defusedxml` library.
+
 * `timestamp` -> `typing.Optional(datetime.datetime)`. Timestamp for received exit code.
 
 SSHClient specific

doc/source/ExecResult.rst

@@ -147,6 +147,13 @@ API: ExecResult
         :rtype: ``typing.Any``
         :raises DeserializeValueError: STDOUT can not be deserialized as YAML
 
+    .. py:attribute:: stdout_xml
+
+        XML from stdout
+
+        :rtype: xml.etree.ElementTree.Element
+        :raises DeserializeValueError: STDOUT can not be deserialized as XML
+
     .. py:method:: read_stdout(src=None, log=None, verbose=False)
 
         Read stdout file-like object to stdout.

exec_helpers/exec_result.py

@@ -25,16 +25,21 @@
 import json
 import logging
 import threading
-import typing  # noqa  # pylint: disable=unused-import
+import typing
+
 
 # External Dependencies
+import defusedxml.ElementTree  # type: ignore
 import six
 import yaml
 
 # Exec-Helpers Implementation
 from exec_helpers import exceptions
 from exec_helpers import proc_enums
 
+if typing.TYPE_CHECKING:
+    import xml.etree.ElementTree  # nosec  # noqa  # pylint: disable=unused-import
+
 __all__ = ("ExecResult",)
 
 logger = logging.getLogger(__name__)
@@ -489,6 +494,8 @@ def __deserialize(self, fmt):  # type: (typing.Text) -> typing.Any
                 if yaml.__with_libyaml__:
                     return yaml.load(self.stdout_str, Loader=yaml.CSafeLoader)  # nosec  # Safe
                 return yaml.safe_load(self.stdout_str)
+            if fmt == "xml":
+                return defusedxml.ElementTree.fromstring(bytes(self.stdout_bin))
         except Exception:
             tmpl = " stdout is not valid {fmt}:\n" "{{stdout!r}}\n".format(fmt=fmt)
             logger.exception(self.cmd + tmpl.format(stdout=self.stdout_str))
@@ -502,6 +509,7 @@ def stdout_json(self):  # type: () -> typing.Any
         """JSON from stdout.
 
         :rtype: typing.Any
+        :raises DeserializeValueError: STDOUT can not be deserialized as JSON
         """
         with self.stdout_lock:
             return self.__deserialize(fmt="json")
@@ -511,10 +519,21 @@ def stdout_yaml(self):  # type: () -> typing.Any
         """YAML from stdout.
 
         :rtype: typing.Any
+        :raises DeserializeValueError: STDOUT can not be deserialized as YAML
         """
         with self.stdout_lock:
             return self.__deserialize(fmt="yaml")
 
+    @property
+    def stdout_xml(self):  # type: () -> xml.etree.ElementTree.Element
+        """YAML from stdout.
+
+        :rtype: xml.etree.ElementTree.Element
+        :raises DeserializeValueError: STDOUT can not be deserialized as XML
+        """
+        with self.stdout_lock:
+            return self.__deserialize(fmt="xml")  # type: ignore
+
     def __dir__(self):  # type: () -> typing.List[typing.Text]
         """Override dir for IDE and as source for getitem checks."""
         return [
@@ -532,6 +551,7 @@ def __dir__(self):  # type: () -> typing.List[typing.Text]
             "stderr_lines",
             "stdout_json",
             "stdout_yaml",
+            "stdout_xml",
             "lock",
         ]
 

requirements.txt

@@ -8,3 +8,4 @@ typing >= 3.6; python_version < "3.7"  # PSF
 futures>=3.1; python_version == "2.7"
 enum34>=1.1; python_version == "2.7"
 psutil >= 5.0
+defusedxml

test/test_exec_result.py

@@ -22,6 +22,7 @@
 
 import datetime
 import unittest
+import xml.etree.ElementTree
 
 import mock
 
@@ -301,3 +302,16 @@ def test_indexed_lines_access(self):
             _ = result.stdout_lines["aaa"]  # noqa
         with self.assertRaises(TypeError):
             _ = result.stdout_lines[1, "aaa"]  # noqa
+
+    def test_stdout_xml(self):
+        result = exec_helpers.ExecResult(
+            "test",
+            stdout=[
+                b"<?xml version='1.0'?>\n",
+                b'<data>123</data>\n',
+            ]
+        )
+        expect = xml.etree.ElementTree.fromstring(b"<?xml version='1.0'?>\n<data>123</data>\n")
+        self.assertEqual(
+            xml.etree.ElementTree.tostring(expect), xml.etree.ElementTree.tostring(result.stdout_xml)
+        )