github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2026-01-02 06:34:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Lets reserve some memory for rule message

Browse Source
This commit is contained in:
Felipe Zimmerle
2019-02-12 16:13:15 -03:00
parent 221baa6e79
commit 7a6c20b931
2 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
headers/modsecurity/rule_message.h
View File

@@ -88,8 +88,8 @@ class RuleMessage {
return RuleMessage::log(rm, 0); return RuleMessage::log(rm, 0);
} }
static inline void _details(const RuleMessage *rm, std::string *msg); static std::string _details(const RuleMessage *rm);
static inline void _errorLogTail(const RuleMessage *rm, std::string *msg); static std::string _errorLogTail(const RuleMessage *rm);
int m_accuracy; int m_accuracy;
std::shared_ptr<std::string> m_clientIpAddress; std::shared_ptr<std::string> m_clientIpAddress;

70
src/rule_message.cc
View File

@@ -23,32 +23,41 @@
namespace modsecurity { namespace modsecurity {
inline void RuleMessage::_details(const RuleMessage *rm, std::string *msg) { std::string RuleMessage::_details(const RuleMessage *rm) {
*msg += " [file \"" + std::string(*rm->m_ruleFile.get()) + "\"]" \ std::string msg;
" [line \"" + std::to_string(rm->m_ruleLine) + "\"]" \
" [id \"" + std::to_string(rm->m_ruleId) + "\"]" \ msg.append(" [file \"" + std::string(*rm->m_ruleFile.get()) + "\"]");
" [rev \"" + rm->m_rev + "\"]" \ msg.append(" [line \"" + std::to_string(rm->m_ruleLine) + "\"]");
" [msg \"" + rm->m_message + "\"]" \ msg.append(" [id \"" + std::to_string(rm->m_ruleId) + "\"]");
" [data \"" + rm->m_data + "\"]" \ msg.append(" [rev \"" + rm->m_rev + "\"]");
" [severity \"" + std::to_string(rm->m_severity) + "\"]" \ msg.append(" [msg \"" + rm->m_message + "\"]");
" [ver \"" + rm->m_ver + "\"]" \ msg.append(" [data \"" + rm->m_data + "\"]");
" [maturity \"" + std::to_string(rm->m_maturity) + "\"]" \ msg.append(" [severity \"" +
" [accuracy \"" + std::to_string(rm->m_accuracy) + "\"]"; std::to_string(rm->m_severity) + "\"]");
msg.append(" [ver \"" + rm->m_ver + "\"]");
msg.append(" [maturity \"" + std::to_string(rm->m_maturity) + "\"]");
msg.append(" [accuracy \"" + std::to_string(rm->m_accuracy) + "\"]");
for (auto &a : rm->m_tags) { for (auto &a : rm->m_tags) {
*msg += " [tag \"" + a + "\"]"; msg.append(" [tag \"" + a + "\"]");
} }
*msg += " [hostname \"" + *rm->m_serverIpAddress.get() + "\"]" \ msg.append(" [hostname \"" + *rm->m_serverIpAddress.get() \
" [uri \"" + *rm->m_uriNoQueryStringDecoded.get() + "\"]" \ + "\"]");
" [unique_id \"" + *rm->m_id.get() + "\"]" \ msg.append(" [uri \"" + *rm->m_uriNoQueryStringDecoded.get() + "\"]");
" [ref \"" + rm->m_reference + "\"]"; msg.append(" [unique_id \"" + *rm->m_id + "\"]");
msg.append(" [ref \"" + rm->m_reference + "\"]");
return msg;
} }
inline void RuleMessage::_errorLogTail(const RuleMessage *rm, std::string RuleMessage::_errorLogTail(const RuleMessage *rm) {
std::string *msg) { std::string msg;
*msg += " [hostname \"" + *rm->m_serverIpAddress.get() + "\"]" \
" [uri \"" + *rm->m_uriNoQueryStringDecoded.get() + "\"]" \ msg.append("[hostname \"" + *rm->m_serverIpAddress.get() + "\"]");
" [unique_id \"" + *rm->m_id.get() + "\"]"; msg.append(" [uri \"" + *rm->m_uriNoQueryStringDecoded.get() + "\"]");
msg.append(" [unique_id \"" + *rm->m_id + "\"]");
return msg;
} }
@@ -57,26 +66,27 @@ std::string RuleMessage::log(const RuleMessage *rm, int props, int code) {
msg.reserve(2048); msg.reserve(2048);
if (props & ClientLogMessageInfo) { if (props & ClientLogMessageInfo) {
msg += "[client " + std::string(*rm->m_clientIpAddress.get()) + "] "; msg.append("[client " + std::string(*rm->m_clientIpAddress.get()) + "] ");
} }
if (rm->m_isDisruptive) { if (rm->m_isDisruptive) {
msg += "ModSecurity: Access denied with code "; msg.append("ModSecurity: Access denied with code ");
if (code == -1) { if (code == -1) {
msg += "%d"; msg.append("%d");
} else { } else {
msg += std::to_string(code); msg.append(std::to_string(code));
} }
msg += " (phase " + std::to_string(rm->m_rule->m_phase - 1) + "). "; msg.append(" (phase ");
msg.append(std::to_string(rm->m_rule->m_phase - 1) + "). ");
} else { } else {
msg += "ModSecurity: Warning. "; msg.append("ModSecurity: Warning. ");
} }
msg += (rm->m_match); msg.append(rm->m_match);
_details(rm, &msg); msg.append(_details(rm));
if (props & ErrorLogTailLogMessageInfo) { if (props & ErrorLogTailLogMessageInfo) {
_errorLogTail(rm, &msg); msg.append(" " + _errorLogTail(rm));
} }
return modsecurity::utils::string::toHexIfNeeded(msg); return modsecurity::utils::string::toHexIfNeeded(msg);