github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 13:56:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Escape log field 'data' value

Browse Source
This commit is contained in:
Ervin Hegedüs 2022-12-30 12:23:00 +01:00
parent 5dfc0a256a
commit 3b7ca3e44c
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rule_message.cc
View File

@ -31,7 +31,7 @@ std::string RuleMessage::_details(const RuleMessage *rm) {
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(" [data \"" + utils::string::log_escape_hex(utils::string::limitTo(200, rm->m_data)) + "\"]");
msg.append(" [severity \"" +
std::to_string(rm->m_severity) + "\"]");
msg.append(" [ver \"" + rm->m_ver + "\"]");

22
src/utils/string.cc
View File

@ -267,6 +267,28 @@ void replaceAll(std::string *str, const std::string& from,
}
}
std::string log_escape_hex(std::string s) {
std::string ret = "";
char tchar[2];
for (std::string::size_type i = 0; i < s.size(); i++) {
if ( (s[i] == '"')
||(s[i] == '\\')
||(s[i] <= 0x1f)
||(s[i] >= 0x7f))
{
ret.append("\\x");
c2x(s[i], (unsigned char*)tchar);
ret.push_back(tchar[0]);
ret.push_back(tchar[1]);
}
else {
ret.push_back(s[i]);
}
}
return ret;
}
} // namespace string
} // namespace utils

1
src/utils/string.h
View File

@ -72,6 +72,7 @@ void replaceAll(std::string *str, const std::string& from,
const std::string& to);
std::string removeWhiteSpacesIfNeeded(std::string a);
std::string parserSanitizer(std::string a);
std::string log_escape_hex(std::string s);
unsigned char x2c(unsigned char *what);
unsigned char xsingle2c(unsigned char *what);