github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-11-19 02:40:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add support for capturing group test cases

Browse Source 
This enables unit tests to compare the matching groups as well,
not just binary match-no match.
This commit is contained in:
WGH
2019-01-22 22:48:31 +03:00
committed by Felipe Zimmerle
parent 22136788c8
commit cce85c4d31
3 changed files with 79 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
test/unit/unit_test.cc
View File

@@ -88,6 +88,20 @@ void json2bin(std::string *str) {
// replaceAll(str, "\\f", '\f');
}
static void print_array(std::stringstream &i,
const std::vector<std::string> array) {
i << "[";
bool first = true;
for (const auto &s : array) {
if (first) {
first = false;
} else {
i << ", ";
}
i << "\"" << modsecurity::utils::string::toHexIfNeeded(s) << "\"";
}
i << "]";
}
std::string UnitTest::print() {
std::stringstream i;
@@ -101,6 +115,12 @@ std::string UnitTest::print() {
i << " \"input\": \"" << this->input << "\"" << std::endl;
i << " \"param\": \"" << this->param << "\"" << std::endl;
i << " \"output\": \"" << this->output << "\"" << std::endl;
if (this->re_groups.size() != 0) {
i << " \"re_groups\": ";
print_array(i, this->re_groups);
i << std::endl;
}
i << "}" << std::endl;
if (this->ret != this->obtained) {
i << "Expecting: \"" << this->ret << "\" - returned: \"";
@@ -114,6 +134,13 @@ std::string UnitTest::print() {
i << "\"";
i << std::endl;
}
if (this->re_groups.size() && this->re_groups != this->obtained_re_groups) {
i << "Expecting:\n ";
print_array(i, this->re_groups);
i << "\nObtained:\n ";
print_array(i, this->obtained_re_groups);
i << std::endl;
}
return i.str();
}
@@ -149,6 +176,16 @@ UnitTest *UnitTest::from_yajl_node(yajl_val &node) {
* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53690
*
*/
} else if (strcmp(key, "re_groups") == 0) {
auto arr = YAJL_GET_ARRAY(val);
if (arr == NULL) {
continue;
}
for (int i = 0; i < arr->len; i++) {
const char *s = YAJL_GET_STRING(arr->values[i]);
if (s == NULL) continue;
u->re_groups.push_back(s);
}
}
}