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

Improves rules dump for better testing

Browse Source
This commit is contained in:
Felipe Zimmerle
2019-04-11 10:18:03 -03:00
parent 78d9575dd2
commit 96efe83174
8 changed files with 58 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
headers/modsecurity/rule.h
View File

@@ -46,15 +46,14 @@ class Rule {
Rule(std::unique_ptr<std::string> fileName, int lineNumber)
: m_fileName(std::move(fileName)),
m_lineNumber(lineNumber),
m_phase(modsecurity::Phases::RequestHeadersPhase) {
}
m_phase(modsecurity::Phases::RequestHeadersPhase)
{ }
Rule(const Rule &r)
: m_fileName(r.m_fileName),
m_lineNumber(r.m_lineNumber),
m_phase(r.m_phase) {
}
m_phase(r.m_phase)
{ }
Rule &operator=(const Rule& other) {
m_fileName = other.m_fileName;
@@ -80,6 +79,18 @@ class Rule {
return *m_fileName + ":" + std::to_string(m_lineNumber);
}
virtual void dump(std::stringstream &out) {
out << getOriginInTextFormat() << std::endl;
}
protected:
std::string getOriginInTextFormat() const {
std::stringstream ss;
ss << "# File name: " << *getFileName() << std::endl;
ss << "# Line number: " << getLineNumber();
return ss.str();
}
private:
std::shared_ptr<std::string> m_fileName;
int m_lineNumber;

7
headers/modsecurity/rules.h
View File

@@ -61,7 +61,12 @@ class Rules {
std::vector<std::shared_ptr<actions::Action> > m_defaultActions;
std::vector<std::shared_ptr<actions::transformations::Transformation> > m_defaultTransformations;
void dump();
virtual void dump() {
std::stringstream ss;
dump(ss);
std::cout << ss.str();
};
virtual void dump(std::stringstream &out);
inline iterator begin() noexcept { return m_rules.begin(); }
inline const_iterator cbegin() const noexcept { return m_rules.cbegin(); }