mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-08-13 13:26:01 +03:00
9f47f1473c
- 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.
112 lines
2.7 KiB
C++
112 lines
2.7 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 <sys/stat.h>
|
|
#include <unistd.h>
|
|
|
|
#include <ctime>
|
|
#include <iostream>
|
|
#include <string>
|
|
|
|
#include "modsecurity/rules_set.h"
|
|
#include "modsecurity/modsecurity.h"
|
|
|
|
|
|
void print_help(const char *name) {
|
|
std::cout << "Use: " << name << " [<filename>|SecLangCommand]" << std::endl;
|
|
std::cout << std::endl;
|
|
}
|
|
|
|
|
|
int main(int argc, char **argv) {
|
|
modsecurity::RulesSet *rules;
|
|
char **args = argv;
|
|
rules = new modsecurity::RulesSet();
|
|
int ret = 0;
|
|
|
|
args++;
|
|
|
|
if (*args == NULL) {
|
|
print_help(argv[0]);
|
|
goto ret;
|
|
}
|
|
|
|
while (*args != NULL) {
|
|
struct stat buffer;
|
|
std::string argFull("");
|
|
const char *arg = *args;
|
|
std::string err;
|
|
int r;
|
|
|
|
if (argFull.empty() == false) {
|
|
if (arg[strlen(arg)-1] == '\"') {
|
|
argFull.append(arg, strlen(arg)-1);
|
|
goto next;
|
|
} else {
|
|
argFull.append(arg);
|
|
goto next;
|
|
}
|
|
}
|
|
|
|
if (arg[0] == '\"' && argFull.empty() == true) {
|
|
if (arg[strlen(arg)-1] == '\"') {
|
|
argFull.append(arg+1, strlen(arg) - 2);
|
|
} else {
|
|
argFull.append(arg+1);
|
|
goto next;
|
|
}
|
|
}
|
|
|
|
if (argFull.empty() == false) {
|
|
arg = strdup(argFull.c_str());
|
|
argFull.clear();
|
|
}
|
|
|
|
std::cout << " : " << arg << " -- ";
|
|
if (stat(arg, &buffer) == 0) {
|
|
r = rules->loadFromUri(arg);
|
|
} else {
|
|
r = rules->load(arg);
|
|
}
|
|
if (r < 0) {
|
|
err.assign(rules->m_parserError.str());
|
|
rules->m_parserError.str("");
|
|
rules->m_parserError.clear();
|
|
ret = -1;
|
|
}
|
|
std::cout << "Loaded " << std::to_string(r) << " rules." << std::endl;
|
|
if (err.empty() == false) {
|
|
std::cerr << " " << err << std::endl;
|
|
goto end;
|
|
}
|
|
rules->dump();
|
|
next:
|
|
args++;
|
|
}
|
|
|
|
end:
|
|
if (ret < 0) {
|
|
std::cout << "Test failed." << std::endl;
|
|
} else {
|
|
std::cout << "Test ok." << std::endl;
|
|
}
|
|
|
|
ret:
|
|
delete rules;
|
|
|
|
return ret;
|
|
}
|