github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-10-01 12:07:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Makes m_id a shared pointer

Browse Source
This commit is contained in:
Felipe Zimmerle
2019-01-23 10:29:36 -03:00
parent 343b86c2a7
commit a609249d64
6 changed files with 49 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/rule_message.cc
View File

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