mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-08-13 13:26:01 +03:00
- Parser location is now a custom class. It holds a shared pointer with the file name; If the parser fails, the resource is deleted. - To follow the parser change, the Rule class now holds the file name in a shared pointer instead of a unique pointer. As a shared pointer we avoid duplication of the file name in memory, plus, it frees itself when not in use anymore. - Operator init also accepting the filename as a shared pointer. - Driver is treating m_location was privative. Now it holds a std::list<std::shared_ptr<yy::seclang_parser::location_type>> instead of: std::list<yy::seclang_parser::location_type *>. - Fix: addSecRule on Driver() was changed from RuleWithAction to RuleWithOperator. - Minor changes on the regression and rules-check utility to force deletion of resources even when they fail. - Couple of virtual destructors were placed to force the shared pointer decrementing on shared variables. - Deleted constructors for copy were placed for the sake of readability.
237 lines
6.6 KiB
C++
237 lines
6.6 KiB
C++
/*
|
|
* ModSecurity, http://www.modsecurity.org/
|
|
* Copyright (c) 2015 - 2020 Trustwave Holdings, Inc. (http://www.trustwave.com/)
|
|
*
|
|
* You may not use this file except in compliance with
|
|
* the License. You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* If any of the files related to licensing are missing or if you have any
|
|
* other questions related to licensing please contact Trustwave Holdings, Inc.
|
|
* directly using the email address security@modsecurity.org.
|
|
*
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <cstring>
|
|
|
|
#include <iostream>
|
|
#include <ctime>
|
|
#include <string>
|
|
|
|
#include "modsecurity/rules_set.h"
|
|
#include "modsecurity/modsecurity.h"
|
|
#include "src/operators/operator.h"
|
|
#include "src/actions/transformations/transformation.h"
|
|
#include "modsecurity/transaction.h"
|
|
#include "modsecurity/actions/action.h"
|
|
|
|
|
|
#include "test/common/modsecurity_test.h"
|
|
#include "test/common/modsecurity_test_results.h"
|
|
#include "test/common/colors.h"
|
|
#include "test/unit/unit_test.h"
|
|
#include "src/utils/string.h"
|
|
|
|
|
|
|
|
|
|
using modsecurity_test::UnitTest;
|
|
using modsecurity_test::ModSecurityTest;
|
|
using modsecurity_test::ModSecurityTestResults;
|
|
using modsecurity::actions::transformations::Transformation;
|
|
using modsecurity::operators::Operator;
|
|
|
|
std::string default_test_path = "test-cases/secrules-language-tests/operators";
|
|
static std::list<std::string> resources;
|
|
|
|
void print_help() {
|
|
std::cout << "Use ./unit /path/to/file" << std::endl;
|
|
std::cout << std::endl;
|
|
std::cout << std::endl;
|
|
}
|
|
|
|
|
|
void perform_unit_test(ModSecurityTest<UnitTest> *test, UnitTest *t,
|
|
ModSecurityTestResults<UnitTest>* res) {
|
|
std::string error;
|
|
bool found = true;
|
|
|
|
if (test->m_automake_output) {
|
|
std::cout << ":test-result: ";
|
|
}
|
|
|
|
if (t->resource.empty() == false) {
|
|
found = (std::find(resources.begin(), resources.end(), t->resource)
|
|
!= resources.end());
|
|
}
|
|
|
|
if (!found) {
|
|
t->skipped = true;
|
|
res->push_back(t);
|
|
if (test->m_automake_output) {
|
|
std::cout << "SKIP ";
|
|
}
|
|
}
|
|
|
|
if (t->type == "op") {
|
|
Operator *op = Operator::instantiate(t->name, t->param);
|
|
std::shared_ptr<std::string> fileName = std::make_shared<std::string>(t->filename);
|
|
op->init(fileName, &error);
|
|
int ret = op->evaluate(NULL, NULL, t->input, NULL);
|
|
t->obtained = ret;
|
|
if (ret != t->ret) {
|
|
res->push_back(t);
|
|
if (test->m_automake_output) {
|
|
std::cout << "FAIL ";
|
|
}
|
|
} else if (test->m_automake_output) {
|
|
std::cout << "PASS ";
|
|
}
|
|
delete op;
|
|
} else if (t->type == "tfn") {
|
|
modsecurity::ModSecString in;
|
|
modsecurity::ModSecString out;
|
|
std::string ret;
|
|
in.assign(t->input.c_str(), t->input.size());
|
|
Transformation *tfn = Transformation::instantiate("t:" + t->name);
|
|
tfn->execute(NULL, in, out);
|
|
ret.assign(out.c_str(), out.size());
|
|
|
|
t->obtained = 1;
|
|
t->obtainedOutput = ret;
|
|
if (ret != t->output) {
|
|
res->push_back(t);
|
|
if (test->m_automake_output) {
|
|
std::cout << "FAIL ";
|
|
}
|
|
} else if (test->m_automake_output) {
|
|
std::cout << "PASS ";
|
|
}
|
|
delete tfn;
|
|
} else {
|
|
std::cerr << "Failed. Test type is unknown: << " << t->type;
|
|
std::cerr << std::endl;
|
|
}
|
|
|
|
if (test->m_automake_output) {
|
|
std::cout << t->name << " "
|
|
<< modsecurity::utils::string::toHexIfNeeded(t->input)
|
|
<< std::endl;
|
|
}
|
|
}
|
|
|
|
|
|
int main(int argc, char **argv) {
|
|
int total = 0;
|
|
ModSecurityTest<UnitTest> test;
|
|
ModSecurityTestResults<UnitTest> results;
|
|
|
|
#if defined(WITH_GEOIP) or defined(WITH_MAXMIND)
|
|
resources.push_back("geoip-or-maxmind");
|
|
#endif
|
|
|
|
#if defined(WITH_MAXMIND)
|
|
resources.push_back("maxmind");
|
|
#endif
|
|
|
|
#if defined(WITH_GEOIP)
|
|
resources.push_back("geoip");
|
|
#endif
|
|
|
|
#ifdef WITH_CURL
|
|
resources.push_back("curl");
|
|
#endif
|
|
#ifdef WITH_SSDEEP
|
|
resources.push_back("ssdeep");
|
|
#endif
|
|
|
|
|
|
test.cmd_options(argc, argv);
|
|
if (!test.m_automake_output) {
|
|
std::cout << test.header();
|
|
}
|
|
|
|
test.load_tests();
|
|
if (test.target == default_test_path) {
|
|
test.load_tests("test-cases/secrules-language-tests/transformations");
|
|
}
|
|
|
|
for (std::pair<std::string, std::vector<UnitTest *> *> a : test) {
|
|
std::vector<UnitTest *> *tests = a.second;
|
|
|
|
total += tests->size();
|
|
for (UnitTest *t : *tests) {
|
|
ModSecurityTestResults<UnitTest> r;
|
|
|
|
if (!test.m_automake_output) {
|
|
std::cout << " " << a.first << "...\t";
|
|
}
|
|
perform_unit_test(&test, t, &r);
|
|
|
|
if (!test.m_automake_output) {
|
|
int skp = 0;
|
|
if (r.size() == 0) {
|
|
std::cout << KGRN << "0 tests failed.";
|
|
} else {
|
|
for (auto &i : r) {
|
|
if (i->skipped == true) {
|
|
skp++;
|
|
}
|
|
}
|
|
std::cout << KRED << r.size()-skp << " tests failed.";
|
|
}
|
|
std::cout << RESET;
|
|
if (skp > 0) {
|
|
std::cout << " " << std::to_string(skp) << " ";
|
|
std::cout << "skipped.";
|
|
}
|
|
std::cout << std::endl;
|
|
}
|
|
|
|
results.insert(results.end(), r.begin(), r.end());
|
|
}
|
|
}
|
|
|
|
if (!test.m_automake_output) {
|
|
std::cout << "Total >> " << total << std::endl;
|
|
}
|
|
|
|
for (UnitTest *t : results) {
|
|
std::cout << t->print() << std::endl;
|
|
}
|
|
|
|
if (!test.m_automake_output) {
|
|
std::cout << std::endl;
|
|
|
|
std::cout << "Ran a total of: " << total << " unit tests - ";
|
|
if (results.size() == 0) {
|
|
std::cout << KGRN << "All tests passed" << RESET << std::endl;
|
|
} else {
|
|
int skp = 0;
|
|
for (auto &i : results) {
|
|
if (i->skipped == true) {
|
|
skp++;
|
|
}
|
|
}
|
|
std::cout << KRED << results.size()-skp << " failed.";
|
|
std::cout << RESET << std::endl;
|
|
if (skp > 0) {
|
|
std::cout << " " << std::to_string(skp) << " ";
|
|
std::cout << "skipped.";
|
|
}
|
|
}
|
|
}
|
|
|
|
for (std::pair<std::string, std::vector<UnitTest *> *> a : test) {
|
|
std::vector<UnitTest *> *vec = a.second;
|
|
for (int i = 0; i < vec->size(); i++) {
|
|
delete vec->at(i);
|
|
}
|
|
delete vec;
|
|
}
|
|
}
|
|
|
|
|