Use the new process_xml helper function

Author: Wout Feys

aikido_firewall/context/__init__.py

@@ -54,7 +54,7 @@ def __init__(self, context_obj=None, req=None, raw_body=None, source=None):
         self.user = None
         self.remote_address = get_ip_from_request(req["REMOTE_ADDR"], self.headers)
         self.parsed_userinput = {}
-        self.xml = []
+        self.xml = {}
 
     def __reduce__(self):
         return (

aikido_firewall/sources/xml.py

@@ -5,25 +5,9 @@
 import copy
 import importhook
 from aikido_firewall.helpers.logging import logger
-from aikido_firewall.context import get_current_context
+from aikido_firewall.helpers.process_xml import process_xml
 
 
-def process_xml(user_input, root_element):
-    """Extracts all attributes from the xml and adds them to context"""
-    context = get_current_context()
-    if not isinstance(context.body, str) or user_input != context.body:
-        return
-
-    extracted_xml_attrs = dict()
-    for el in root_element:
-        for k, v in el.items():
-            if not extracted_xml_attrs.get(k):
-                extracted_xml_attrs[k] = set()
-            extracted_xml_attrs[k].add(v)
-        extracted_xml_attrs.update(set(el.items()))
-    context.xml.append(extracted_xml_attrs)
-    context.set_as_current_context()
-
 
 @importhook.on_import("xml.etree.ElementTree")
 def on_xml_import(eltree):