Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Req test XML format error handling #565

Closed
wants to merge 2 commits into from
Closed

fix: Req test XML format error handling #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c000038
fix: Req test XML format error handling
nandinivij Feb 24, 2022
c5bee64
pre commit checks
nandinivij Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
192 changes: 94 additions & 98 deletions pytest_splunk_addon/standard_lib/event_ingestors/requirement_event_ingester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,108 +109,104 @@ def get_events(self):
for file1 in os.listdir(req_file_path):
filename = os.path.join(req_file_path, file1)
if filename.endswith(".log"):
if self.check_xml_format(filename):
root = self.get_root(filename)
for event_tag in root.iter("event"):
model_list = self.get_models(event_tag)
if len(model_list) != 0:
transport_type = self.extract_transport_tag(event_tag)
if transport_type == "syslog":
transport_type = "syslog_tcp"
LOGGER.info(
"sending data using sc4s {}".format(filename)
)
elif transport_type in (
"modinput",
"Modinput",
"Mod input",
"Modular Input",
"Modular input",
"modular input",
"modular_input",
"Mod Input",
"hec_event",
):
transport_type = "modinput"
host, source, sourcetype = self.extract_params(
event_tag
)
LOGGER.info(
f"sending data transport_type:modinput filename:{filename} host:{host}, source:{source} sourcetype:{sourcetype}"
)
elif transport_type == "dbx":
transport_type = "modinput"
host, source, sourcetype = self.extract_params(
event_tag
)
LOGGER.info(
f"sending data transport_type:dbx filename:{filename} host:{host}, source:{source} sourcetype:{sourcetype}"
)
elif transport_type == "windows_input":
host, source, sourcetype = self.extract_params(
event_tag
)
LOGGER.info(
f"sending data transport_type:windows_input filename:{filename} host:{host}, source:{source} sourcetype:{sourcetype}"
)
elif transport_type == "forwarder":
transport_type = "uf_file_monitor"
host, source, sourcetype = self.extract_params(
event_tag
)
host_type = "plugin"
LOGGER.info(
f"sending data transport_type:forwarder/uf_file_monitor filename:{filename} "
)
elif transport_type in (
"scripted_input",
"scripted input",
"hec_raw",
):
transport_type = "scripted_input"
host, source, sourcetype = self.extract_params(
event_tag
)
LOGGER.info(
f"sending data transport_type:scripted_input or hec_raw filename:{filename} "
)
elif transport_type == "file_monitor":
host, source, sourcetype = self.extract_params(
event_tag
)
LOGGER.info(
f"sending data transport_type:file_monitor filename:{filename} "
)
else:
transport_type = "default"
unescaped_event = self.extract_raw_events(event_tag)
escaped_ingest = self.escape_before_ingest(
unescaped_event
try:
self.check_xml_format(filename)
except ET.ParseError as e:
LOGGER.error(f"Invalid XML- {filename} Exception- {e}")
continue
root = self.get_root(filename)
for event_tag in root.iter("event"):
model_list = self.get_models(event_tag)
if len(model_list) != 0:
transport_type = self.extract_transport_tag(event_tag)
if transport_type == "syslog":
transport_type = "syslog_tcp"
LOGGER.info(
"sending data using sc4s {}".format(filename)
)
metadata = {
"input_type": transport_type,
"index": "main",
"source": source,
"host": host,
"sourcetype": sourcetype,
"timestamp_type": "event",
"host_type": host_type,
}
events.append(
SampleEvent(
escaped_ingest, metadata, "requirement_test"
)
elif transport_type in (
"modinput",
"Modinput",
"Mod input",
"Modular Input",
"Modular input",
"modular input",
"modular_input",
"Mod Input",
"hec_event",
):
transport_type = "modinput"
host, source, sourcetype = self.extract_params(
event_tag
)
LOGGER.info(
f"sending data transport_type:modinput filename:{filename} host:{host}, source:{source} sourcetype:{sourcetype}"
)
elif transport_type == "dbx":
transport_type = "modinput"
host, source, sourcetype = self.extract_params(
event_tag
)
LOGGER.info(
f"sending data transport_type:dbx filename:{filename} host:{host}, source:{source} sourcetype:{sourcetype}"
)
elif transport_type == "windows_input":
host, source, sourcetype = self.extract_params(
event_tag
)
LOGGER.info(
f"sending data transport_type:windows_input filename:{filename} host:{host}, source:{source} sourcetype:{sourcetype}"
)
elif transport_type == "forwarder":
transport_type = "uf_file_monitor"
host, source, sourcetype = self.extract_params(
event_tag
)
host_type = "plugin"
LOGGER.info(
f"sending data transport_type:forwarder/uf_file_monitor filename:{filename} "
)
elif transport_type in (
"scripted_input",
"scripted input",
"hec_raw",
):
transport_type = "scripted_input"
host, source, sourcetype = self.extract_params(
event_tag
)
LOGGER.info(
f"sending data transport_type:scripted_input or hec_raw filename:{filename} "
)
elif transport_type == "file_monitor":
host, source, sourcetype = self.extract_params(
event_tag
)
LOGGER.info(
f"sending data transport_type:file_monitor filename:{filename} "
)

else:
# if there is no model in event do not ingest that event
continue
else:
LOGGER.error(
"Requirement event ingestion failure: Invalid XML {}".format(
filename
transport_type = "default"
unescaped_event = self.extract_raw_events(event_tag)
escaped_ingest = self.escape_before_ingest(unescaped_event)
metadata = {
"input_type": transport_type,
"index": "main",
"source": source,
"host": host,
"sourcetype": sourcetype,
"timestamp_type": "event",
"host_type": host_type,
}
events.append(
SampleEvent(
escaped_ingest, metadata, "requirement_test"
)
)
)

else:
# if there is no model in event do not ingest that event
continue
else:
LOGGER.error(
"Requirement event ingestion failure: Invalid file format not .log {}".format(
Expand Down
4 changes: 2 additions & 2 deletions pytest_splunk_addon/standard_lib/requirement_tests/test_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ def generate_cim_req_params(self):
if filename.endswith(".log"):
try:
self.check_xml_format(filename)
except Exception:
LOGGER.error("Invalid XML")
except ET.ParseError as e:
LOGGER.error(f"Invalid XML- {filename} Exception- {e}")
continue
root = self.get_root(filename)
event_no = 0
Expand Down
Loading