mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-09-30 03:34:29 +03:00
Introduce ModSecurityTestContext to encapsulate setup of objects required to execute transactions
- Simplifies memory management on error conditions - Context will be used in unit tests too, in order to provide Transaction related instances.
This commit is contained in:
53
test/common/custom_debug_log.cc
Normal file
53
test/common/custom_debug_log.cc
Normal file
@@ -0,0 +1,53 @@
|
||||
/*
|
||||
* ModSecurity, http://www.modsecurity.org/
|
||||
* Copyright (c) 2015 - 2021 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 "custom_debug_log.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
|
||||
#include "modsecurity/debug_log.h"
|
||||
#include "src/utils/regex.h"
|
||||
|
||||
namespace modsecurity_test {
|
||||
|
||||
CustomDebugLog::~CustomDebugLog() {}
|
||||
|
||||
void CustomDebugLog::write(int level, const std::string &message) {
|
||||
m_log << "[" << level << "] " << message << std::endl;
|
||||
}
|
||||
|
||||
void CustomDebugLog::write(int level, const std::string &id,
|
||||
const std::string &uri, const std::string &msg) {
|
||||
std::string msgf = "[" + std::to_string(level) + "] " + msg;
|
||||
msgf = "[" + id + "] [" + uri + "] " + msgf;
|
||||
m_log << msgf << std::endl;
|
||||
}
|
||||
|
||||
bool const CustomDebugLog::contains(const std::string &pattern) const {
|
||||
modsecurity::Utils::Regex re(pattern);
|
||||
std::string s = m_log.str();
|
||||
return modsecurity::Utils::regex_search(s, re);
|
||||
}
|
||||
|
||||
std::string const CustomDebugLog::log_messages() const {
|
||||
return m_log.str();
|
||||
}
|
||||
|
||||
int CustomDebugLog::getDebugLogLevel() {
|
||||
return 9;
|
||||
}
|
||||
|
||||
} // namespace modsecurity_test
|
45
test/common/custom_debug_log.h
Normal file
45
test/common/custom_debug_log.h
Normal file
@@ -0,0 +1,45 @@
|
||||
/*
|
||||
* ModSecurity, http://www.modsecurity.org/
|
||||
* Copyright (c) 2015 - 2021 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 <sstream>
|
||||
#include <string>
|
||||
|
||||
#include "modsecurity/debug_log.h"
|
||||
|
||||
#ifndef TEST_REGRESSION_CUSTOM_DEBUG_LOG_H_
|
||||
#define TEST_REGRESSION_CUSTOM_DEBUG_LOG_H_
|
||||
|
||||
namespace modsecurity_test {
|
||||
|
||||
class CustomDebugLog : public modsecurity::debug_log::DebugLog {
|
||||
public:
|
||||
CustomDebugLog *new_instance();
|
||||
~CustomDebugLog();
|
||||
|
||||
void write(int level, const std::string& message) override;
|
||||
void write(int level, const std::string &id,
|
||||
const std::string &uri, const std::string &msg) override;
|
||||
bool const contains(const std::string& pattern) const;
|
||||
std::string const log_messages() const;
|
||||
std::string error_log_messages();
|
||||
int getDebugLogLevel() override;
|
||||
|
||||
private:
|
||||
std::stringstream m_log;
|
||||
};
|
||||
|
||||
} // namespace modsecurity_test
|
||||
|
||||
#endif // TEST_REGRESSION_CUSTOM_DEBUG_LOG_H_
|
42
test/common/modsecurity_test_context.h
Normal file
42
test/common/modsecurity_test_context.h
Normal file
@@ -0,0 +1,42 @@
|
||||
#ifndef TEST_COMMON_MODSECURITY_TEST_CONTEXT_H_
|
||||
#define TEST_COMMON_MODSECURITY_TEST_CONTEXT_H_
|
||||
|
||||
#include "modsecurity/modsecurity.h"
|
||||
#include "modsecurity/rules_set.h"
|
||||
#include "modsecurity/transaction.h"
|
||||
#include "custom_debug_log.h"
|
||||
|
||||
#include <sstream>
|
||||
|
||||
namespace modsecurity_test {
|
||||
|
||||
class ModSecurityTestContext {
|
||||
public:
|
||||
explicit ModSecurityTestContext(const std::string &connector)
|
||||
: m_modsec_rules(new CustomDebugLog) {
|
||||
m_modsec.setConnectorInformation(connector);
|
||||
m_modsec.setServerLogCb(logCb);
|
||||
}
|
||||
~ModSecurityTestContext() = default;
|
||||
|
||||
modsecurity::Transaction create_transaction() {
|
||||
return modsecurity::Transaction(&m_modsec,
|
||||
&m_modsec_rules,
|
||||
&m_server_log);
|
||||
}
|
||||
|
||||
modsecurity::ModSecurity m_modsec;
|
||||
modsecurity::RulesSet m_modsec_rules;
|
||||
std::stringstream m_server_log;
|
||||
|
||||
private:
|
||||
static void logCb(void *data, const void *msgv) {
|
||||
const char *msg = reinterpret_cast<const char *>(msgv);
|
||||
std::stringstream *ss = (std::stringstream *)data;
|
||||
*ss << msg << std::endl;
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace modsecurity_test
|
||||
|
||||
#endif // TEST_COMMON_MODSECURITY_TEST_H_
|
Reference in New Issue
Block a user