From 105c5909a12c075355a43510b27b1d2e397e7c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ervin=20Heged=C3=BCs?= Date: Tue, 17 Jan 2023 20:57:51 +0100 Subject: [PATCH] Add more fields to encode filter: rev, ver and tag --- src/rule_message.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rule_message.cc b/src/rule_message.cc index 09b6ea16..496fe7ca 100644 --- a/src/rule_message.cc +++ b/src/rule_message.cc @@ -29,17 +29,17 @@ std::string RuleMessage::_details(const RuleMessage *rm) { msg.append(" [file \"" + std::string(*rm->m_ruleFile.get()) + "\"]"); msg.append(" [line \"" + std::to_string(rm->m_ruleLine) + "\"]"); msg.append(" [id \"" + std::to_string(rm->m_ruleId) + "\"]"); - msg.append(" [rev \"" + rm->m_rev + "\"]"); + msg.append(" [rev \"" + utils::string::toHexIfNeeded(rm->m_rev, true) + "\"]"); msg.append(" [msg \"" + rm->m_message + "\"]"); - msg.append(" [data \"" + utils::string::log_escape_hex(utils::string::limitTo(200, rm->m_data)) + "\"]"); + msg.append(" [data \"" + utils::string::toHexIfNeeded(utils::string::limitTo(200, rm->m_data), true) + "\"]"); msg.append(" [severity \"" + std::to_string(rm->m_severity) + "\"]"); - msg.append(" [ver \"" + rm->m_ver + "\"]"); + msg.append(" [ver \"" + utils::string::toHexIfNeeded(rm->m_ver, true) + "\"]"); msg.append(" [maturity \"" + std::to_string(rm->m_maturity) + "\"]"); msg.append(" [accuracy \"" + std::to_string(rm->m_accuracy) + "\"]"); for (auto &a : rm->m_tags) { - msg.append(" [tag \"" + a + "\"]"); + msg.append(" [tag \"" + utils::string::toHexIfNeeded(a, true) + "\"]"); } msg.append(" [hostname \"" + *rm->m_serverIpAddress.get() \