Pull request #4688: Extractor Parser

Merge in SNORT/snort3 from ~OSHUMEIK/snort3:extr_parse_warning to master

Squashed commit of the following:

commit 1fff5b9cb510f73b7696a76261b618986622c8a9
Author: Oleksii Shumeiko <oshumeik@cisco.com>
Date:   Thu Apr 3 15:21:30 2025 +0300

    extractor: make parsing more strict

diff --git a/src/network_inspectors/extractor/extractor.cc b/src/network_inspectors/extractor/extractor.cc
index e943040de85908f52b7dea03b7ba07251062617e..7e59f31356576edf7895f59fb270a135e1be91f6 100644 (file)
--- a/src/network_inspectors/extractor/extractor.cc
+++ b/src/network_inspectors/extractor/extractor.cc
@@ -100,7 +100,7 @@ void ExtractorModule::commit_config()
     for (const auto& p : extractor_config.protocols)
     {
         if (p.tenant_id == service_config.tenant_id and p.service == service_config.service)
-            ParseWarning(WARN_CONF_STRICT, "%s service got multiple configurations", service_config.service.c_str());
+            ParseWarning(WARN_CONF, "%s service got multiple configurations", service_config.service.c_str());
     }
 
     extractor_config.protocols.push_back(service_config);

diff --git a/src/network_inspectors/extractor/extractor_service.cc b/src/network_inspectors/extractor/extractor_service.cc
index c4e9b2a4c0023c6137f2f0950e7b8875554b19d9..29e388986540d750c2c49a841d1546515786e031 100644 (file)
--- a/src/network_inspectors/extractor/extractor_service.cc
+++ b/src/network_inspectors/extractor/extractor_service.cc
@@ -186,7 +186,7 @@ void ExtractorService::validate_events(const ServiceBlueprint& sbp, const std::v
     for (const auto& val : vals)
     {
         if (!find_event(sbp, val))
-            ParseWarning(WARN_CONF_STRICT, "unsupported '%s' event in protocols.on_events", val.c_str());
+            ParseError("unsupported '%s' event in protocols.on_events", val.c_str());
     }
 }
 
@@ -195,7 +195,7 @@ void ExtractorService::validate_fields(const ServiceBlueprint& sbp, const std::v
     for (auto& val : vals)
     {
         if (!find_field(sbp, val))
-            ParseWarning(WARN_CONF_STRICT, "unsupported '%s' field in protocols.fields\n", val.c_str());
+            ParseError("unsupported '%s' field in protocols.fields\n", val.c_str());
     }
 }