From af4c04be5970388da7bdf272e728f5d7306cfef6 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Tue, 23 Nov 2021 10:57:21 -0500 Subject: [PATCH] Fix #6325 - Prevent XML header from outputting to ossec.conf --- salt/common/tools/sbin/so-allow | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/salt/common/tools/sbin/so-allow b/salt/common/tools/sbin/so-allow index 6a66876e7..6aa20df1e 100755 --- a/salt/common/tools/sbin/so-allow +++ b/salt/common/tools/sbin/so-allow @@ -23,7 +23,6 @@ import sys import argparse import re from lxml import etree as ET -from xml.dom import minidom from datetime import datetime as dt from datetime import timezone as tz @@ -87,12 +86,7 @@ def wazuh_enabled() -> bool: def root_to_str(root: ET.ElementTree) -> str: - xml_str = ET.tostring(root, encoding='unicode', method='xml').replace('\n', '') - xml_str = re.sub(r'(?:(?<=>) *)', '', xml_str) - xml_str = re.sub(r' -', '', xml_str) - xml_str = re.sub(r' -->', ' -->', xml_str) - dom = minidom.parseString(xml_str) - return dom.toprettyxml(indent=" ") + return ET.tostring(root, encoding='unicode', method='xml', xml_declaration=False, pretty_print=True) def add_wl(ip):