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

Merge branch 'libmodsecurity' of https://github.com/SpiderLabs/ModSecurity into libmodsecurity

Browse Source
This commit is contained in:
Chaim Sanders 2015-09-25 00:42:57 -04:00
commit f6e0b447b3
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.am
View File

@ -203,7 +203,6 @@ libmodsecurity_la_CPPFLAGS = \
-fPIC \ -fPIC \
-O3 \ -O3 \
-I ../headers \ -I ../headers \
-DNO_LOGS=1 \
$(GEOIP_CFLAGS) \ $(GEOIP_CFLAGS) \
$(PCRE_CPPFLAGS) $(PCRE_CPPFLAGS)

4
src/rule.cc
View File

@ -300,7 +300,7 @@ bool Rule::evaluate(Assay *assay) {
if (std::find(exclusions.begin(), exclusions.end(), if (std::find(exclusions.begin(), exclusions.end(),
v->m_key) != exclusions.end()) { v->m_key) != exclusions.end()) {
#ifndef NO_LOGS #ifndef NO_LOGS
assay->debug(9, "Variable: " + v.m_key + " is part of the" + assay->debug(9, "Variable: " + v->m_key + " is part of the" +
" exclusion list, skipping..."); " exclusion list, skipping...");
#endif #endif
continue; continue;
@ -349,7 +349,7 @@ bool Rule::evaluate(Assay *assay) {
#ifndef NO_LOGS #ifndef NO_LOGS
assay->debug(9, "Target value: \"" + limitTo(80, toHexIfNeeded(value)) + \ assay->debug(9, "Target value: \"" + limitTo(80, toHexIfNeeded(value)) + \
"\" (Variable: " + v.m_key + ")"); "\" (Variable: " + v->m_key + ")");
#endif #endif
ret = this->op->evaluate(assay, value); ret = this->op->evaluate(assay, value);

3
test/regression/custom_debug_log.cc
View File

@ -37,8 +37,7 @@ bool CustomDebugLog::contains(const std::string& pattern) {
ModSecurity::Utils::Regex re(pattern); ModSecurity::Utils::Regex re(pattern);
ModSecurity::Utils::SMatch match; ModSecurity::Utils::SMatch match;
std::string s = m_log.str(); std::string s = m_log.str();
return (ModSecurity::Utils::regex_search(s, &match, re) return ModSecurity::Utils::regex_search(s, re);
&& match.size() >= 1);
} }
std::string CustomDebugLog::log_messages() { std::string CustomDebugLog::log_messages() {