feat: Remove XML-incompatible control characters

Author: RockyCYG

hmdriver2/_xpath.py

@@ -34,17 +34,26 @@ def __call__(self, xpath: str) -> '_XMLElement':
 
  return _XMLElement(None, self._d)
 
+ @staticmethod
+ def _sanitize_text(text: str) -> str:
+ """Remove XML-incompatible control characters."""
+ return re.sub(r'[\x00-\x1F\x7F]', '', text)
+
  @staticmethod
  def _json2xml(hierarchy: Dict) -> etree.Element:
+ """Convert JSON-like hierarchy to XML."""
  attributes = hierarchy.get("attributes", {})
- tag = attributes.get("type", "orgRoot") or "orgRoot"
- # Clean the "text" attribute to be compatible with XML format
- attributes["text"] = re.sub(u"[^\u0020-\uD7FF\u0009\u000A\u000D\uE000-\uFFFD\U00010000-\U0010FFFF]+", "", attributes.get("text", ""))
- xml = etree.Element(tag, attrib=attributes)
+
+ # 过滤所有属性的值，确保无非法字符
+ cleaned_attributes = {k: _XPath._sanitize_text(str(v)) for k, v in attributes.items()}
+
+ tag = cleaned_attributes.get("type", "orgRoot") or "orgRoot"
+ xml = etree.Element(tag, attrib=cleaned_attributes)
 
  children = hierarchy.get("children", [])
  for item in children:
  xml.append(_XPath._json2xml(item))
+
  return xml