From bf707de08f34d14440302f04e2d957ae1a42eb26 Mon Sep 17 00:00:00 2001 From: Ervin Hegedus Date: Mon, 28 Apr 2025 21:58:18 +0200 Subject: [PATCH] Change directive format to strict camel case --- src/actions/ctl/parse_xml_into_args.cc | 2 +- src/parser/seclang-scanner.ll | 4 ++-- src/request_body_processor/xml.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/actions/ctl/parse_xml_into_args.cc b/src/actions/ctl/parse_xml_into_args.cc index 3aeb39cb..55f8d5fb 100644 --- a/src/actions/ctl/parse_xml_into_args.cc +++ b/src/actions/ctl/parse_xml_into_args.cc @@ -47,7 +47,7 @@ bool ParseXmlIntoArgs::init(std::string *error) { bool ParseXmlIntoArgs::evaluate(RuleWithActions *rule, Transaction *transaction) { std::stringstream a; - a << "Setting SecParseXMLIntoArgs to "; + a << "Setting SecParseXmlIntoArgs to "; a << modsecurity::RulesSetProperties::configXMLParseXmlIntoArgsString(m_secXMLParseXmlIntoArgs); a << " as requested by a ctl:parseXmlIntoArgs action"; diff --git a/src/parser/seclang-scanner.ll b/src/parser/seclang-scanner.ll index 1bae1a0c..b2d47a88 100755 --- a/src/parser/seclang-scanner.ll +++ b/src/parser/seclang-scanner.ll @@ -90,7 +90,7 @@ ACTION_CTL_BDY_JSON (?i:ctl:requestBodyProcessor=JSO ACTION_CTL_BDY_XML (?i:ctl:requestBodyProcessor=XML) ACTION_CTL_BDY_URLENCODED (?i:ctl:requestBodyProcessor=URLENCODED) ACTION_CTL_FORCE_REQ_BODY_VAR (?i:ctl:forceRequestBodyVariable) -ACTION_CTL_PARSE_XML_INTO_ARGS (?i:ctl:parseXMLintoArgs) +ACTION_CTL_PARSE_XML_INTO_ARGS (?i:ctl:parseXmlIntoArgs) ACTION_CTL_REQUEST_BODY_ACCESS (?i:ctl:requestBodyAccess) ACTION_CTL_RULE_ENGINE (?i:ctl:ruleEngine) ACTION_CTL_RULE_REMOVE_BY_TAG (?i:ctl:ruleRemoveByTag) @@ -412,7 +412,7 @@ CONFIG_VALUE_RELEVANT_ONLY (?i:RelevantOnly) CONFIG_VALUE_SERIAL (?i:Serial) CONFIG_VALUE_WARN (?i:Warn) CONFIG_XML_EXTERNAL_ENTITY (?i:SecXmlExternalEntity) -CONFIG_XML_PARSE_XML_INTO_ARGS (?i:SecParseXMLIntoArgs) +CONFIG_XML_PARSE_XML_INTO_ARGS (?i:SecParseXmlIntoArgs) CONGIG_DIR_RESPONSE_BODY_MP (?i:SecResponseBodyMimeType) CONGIG_DIR_RESPONSE_BODY_MP_CLEAR (?i:SecResponseBodyMimeTypesClear) CONGIG_DIR_SEC_ARG_SEP (?i:SecArgumentSeparator) diff --git a/src/request_body_processor/xml.cc b/src/request_body_processor/xml.cc index 71f9c0f8..0f48750c 100644 --- a/src/request_body_processor/xml.cc +++ b/src/request_body_processor/xml.cc @@ -170,7 +170,7 @@ bool XML::init() { m_transaction->m_secXMLParseXmlIntoArgs == RulesSetProperties::OnlyArgsConfigXMLParseXmlIntoArgs) { ms_dbg_a(m_transaction, 9, - "XML: SecParseXMLIntoArgs is set to " \ + "XML: SecParseXmlIntoArgs is set to " \ + RulesSetProperties::configXMLParseXmlIntoArgsString(static_cast(m_transaction->m_secXMLParseXmlIntoArgs))); m_data.sax_handler = std::make_unique(); memset(m_data.sax_handler.get(), 0, sizeof(xmlSAXHandler));