github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-11-16 01:22:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup on Action class

Browse Source
This commit is contained in:
Felipe Zimmerle
2019-03-15 01:56:40 -03:00
parent 7da4c9a007
commit 7bbc5c3441
112 changed files with 299 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile.am
View File

@@ -42,10 +42,6 @@ pkginclude_HEADERS = \
../headers/modsecurity/intervention.h \
../headers/modsecurity/modsecurity.h \
../headers/modsecurity/rule.h \
../headers/modsecurity/rule_marker.h \
../headers/modsecurity/rule_unconditional.h \
../headers/modsecurity/rule_with_actions.h \
../headers/modsecurity/rule_with_operator.h \
../headers/modsecurity/rules.h \
../headers/modsecurity/rule_message.h \
../headers/modsecurity/rules_set.h \
@@ -287,6 +283,7 @@ libmodsecurity_la_SOURCES = \
debug_log/debug_log_writer.cc \
run_time_string.cc \
rule.cc \
rules.cc \
rule_unconditional.cc \
rule_with_actions.cc \
rule_with_operator.cc \

2
src/actions/accuracy.cc
View File

@@ -21,7 +21,7 @@
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#include "modsecurity/rule.h"
#include "modsecurity/rule_with_actions.h"
namespace modsecurity {
namespace actions {

1
src/actions/block.cc
View File

@@ -24,6 +24,7 @@
#include "modsecurity/rule.h"
#include "modsecurity/intervention.h"
#include "src/actions/data/status.h"
#include "modsecurity/rule_with_actions.h"
namespace modsecurity {
namespace actions {

2
src/actions/chain.cc
View File

@@ -20,6 +20,8 @@
#include "modsecurity/transaction.h"
#include "modsecurity/rule.h"
#include "modsecurity/rule_with_actions.h"
namespace modsecurity {
namespace actions {

2
src/actions/maturity.cc
View File

@@ -21,7 +21,7 @@
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#include "modsecurity/rule.h"
#include "modsecurity/rule_with_actions.h"
namespace modsecurity {
namespace actions {

1
src/actions/phase.cc
View File

@@ -22,6 +22,7 @@
#include "modsecurity/rule.h"
#include "modsecurity/modsecurity.h"
#include "src/utils/string.h"
#include "modsecurity/rule_with_actions.h"
namespace modsecurity {

1
src/actions/rev.cc
View File

@@ -21,6 +21,7 @@
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#include "modsecurity/rule.h"
#include "modsecurity/rule_with_actions.h"
namespace modsecurity {

2
src/actions/rule_id.cc
View File

@@ -20,6 +20,8 @@
#include "modsecurity/transaction.h"
#include "modsecurity/rule.h"
#include "modsecurity/rule_with_actions.h"
namespace modsecurity {
namespace actions {

2
src/actions/set_env.cc
View File

@@ -21,6 +21,8 @@
#include "modsecurity/transaction.h"
#include "modsecurity/rule.h"
#include "src/utils/string.h"
#include "modsecurity/rule_with_actions.h"
namespace modsecurity {
namespace actions {

1
src/actions/set_var.cc
View File

@@ -30,6 +30,7 @@
#include "src/variables/tx.h"
#include "src/variables/user.h"
#include "src/variables/variable.h"
#include "modsecurity/rule_with_operator.h"
namespace modsecurity {
namespace actions {

4
src/actions/transformations/base64_decode.cc
View File

@@ -33,8 +33,8 @@ namespace transformations {
void Base64Decode::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
std::string value(in.c_str(), in.size());
std::string ret = Utils::Base64::decode(value);
out.assign(ret.c_str(), ret.size());

4
src/actions/transformations/base64_decode.h
View File

@@ -34,8 +34,8 @@ class Base64Decode : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

4
src/actions/transformations/base64_decode_ext.cc
View File

@@ -33,8 +33,8 @@ namespace transformations {
void Base64DecodeExt::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
std::string ret = Utils::Base64::decode_forgiven(in.c_str());
out.assign(ret.c_str(), ret.size());
}

4
src/actions/transformations/base64_decode_ext.h
View File

@@ -34,8 +34,8 @@ class Base64DecodeExt : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

4
src/actions/transformations/base64_encode.cc
View File

@@ -33,8 +33,8 @@ namespace transformations {
void Base64Encode::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
std::string ret = Utils::Base64::encode(
std::string(in.c_str(), in.size()));
out.assign(ret.c_str(), ret.size());

4
src/actions/transformations/base64_encode.h
View File

@@ -34,8 +34,8 @@ class Base64Encode : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

4
src/actions/transformations/cmd_line.cc
View File

@@ -32,8 +32,8 @@ namespace transformations {
void CmdLine::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
int space = 0;
for (auto& a : in) {

4
src/actions/transformations/cmd_line.h
View File

@@ -34,8 +34,8 @@ class CmdLine : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

4
src/actions/transformations/compress_whitespace.cc
View File

@@ -32,8 +32,8 @@ namespace transformations {
void CompressWhitespace::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
int inWhiteSpace = 0;
size_t i = 0;
out.reserve(in.size());

4
src/actions/transformations/compress_whitespace.h
View File

@@ -34,8 +34,8 @@ class CompressWhitespace : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

18
src/actions/transformations/css_decode.cc
View File

@@ -35,17 +35,19 @@ namespace transformations {
void CssDecode::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
size_t s = in.size();
char *tmp = reinterpret_cast<char *>(
malloc(sizeof(char) * in.size() + 1));
memcpy(tmp, in.c_str(), in.size() + 1);
tmp[in.size()] = '\0';
malloc(sizeof(char) * s + 1));
memcpy(tmp, in.c_str(), s + 1);
tmp[s] = '\0';
CssDecode::css_decode_inplace(reinterpret_cast<unsigned char *>(tmp),
in.size());
size_t r = CssDecode::css_decode_inplace(reinterpret_cast<unsigned char *>(tmp),
s);
out.assign(tmp, 0, in.size());
out.assign(tmp, r);
free(tmp);
}

4
src/actions/transformations/css_decode.h
View File

@@ -35,8 +35,8 @@ class CssDecode : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
static int css_decode_inplace(unsigned char *input, int64_t input_len);
};

4
src/actions/transformations/escape_seq_decode.cc
View File

@@ -136,8 +136,8 @@ int EscapeSeqDecode::ansi_c_sequences_decode_inplace(unsigned char *input,
void EscapeSeqDecode::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
unsigned char *tmp = (unsigned char *) malloc(sizeof(char)
* in.size() + 1);
memcpy(tmp, in.c_str(), in.size() + 1);

4
src/actions/transformations/escape_seq_decode.h
View File

@@ -34,8 +34,8 @@ class EscapeSeqDecode : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
static int ansi_c_sequences_decode_inplace(unsigned char *input, int input_len);
};

4
src/actions/transformations/hex_decode.cc
View File

@@ -33,8 +33,8 @@ namespace transformations {
void HexDecode::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
unsigned char *input;
int size = 0;

4
src/actions/transformations/hex_decode.h
View File

@@ -34,8 +34,8 @@ class HexDecode : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
static int inplace(unsigned char *data, int len);
};

4
src/actions/transformations/hex_encode.cc
View File

@@ -33,8 +33,8 @@ namespace transformations {
void HexEncode::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
std::stringstream result;
for (std::size_t i=0; i < in.length(); i++) {
int ii = reinterpret_cast<char>(in[i]);

4
src/actions/transformations/hex_encode.h
View File

@@ -34,8 +34,8 @@ class HexEncode : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};

4
src/actions/transformations/html_entity_decode.cc
View File

@@ -34,8 +34,8 @@ namespace transformations {
void HtmlEntityDecode::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
unsigned char *input;
input = reinterpret_cast<unsigned char *>

4
src/actions/transformations/html_entity_decode.h
View File

@@ -37,8 +37,8 @@ class HtmlEntityDecode : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
static int inplace(unsigned char *input, uint64_t input_len);
};

4
src/actions/transformations/js_decode.cc
View File

@@ -35,8 +35,8 @@ namespace transformations {
void JsDecode::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
unsigned char *input;
input = reinterpret_cast<unsigned char *>

4
src/actions/transformations/js_decode.h
View File

@@ -34,8 +34,8 @@ class JsDecode : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
static int inplace(unsigned char *input, uint64_t input_len);
};

4
src/actions/transformations/length.cc
View File

@@ -32,8 +32,8 @@ namespace transformations {
void Length::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
out.assign(std::to_string(in.size()).c_str());
}

4
src/actions/transformations/length.h
View File

@@ -34,8 +34,8 @@ class Length : public Transformation {
: Transformation(action) { };
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

4
src/actions/transformations/lower_case.cc
View File

@@ -28,8 +28,8 @@ namespace transformations {
void LowerCase::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
std::locale loc;
out.resize(in.size());
for (std::string::size_type i=0; i < in.size(); ++i) {

4
src/actions/transformations/lower_case.h
View File

@@ -36,8 +36,8 @@ class LowerCase : public Transformation {
: Transformation(action) { };
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

4
src/actions/transformations/md5.cc
View File

@@ -32,8 +32,8 @@ namespace transformations {
void Md5::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
std::string ret = Utils::Md5::digest(std::string(in.c_str(), in.size()));
out.assign(ret.c_str(), ret.size());

4
src/actions/transformations/md5.h
View File

@@ -34,8 +34,8 @@ class Md5 : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

4
src/actions/transformations/none.cc
View File

@@ -32,8 +32,8 @@ namespace transformations {
void None::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) { }
ModSecString &in,
ModSecString &out) { }
} // namespace transformations

10
src/actions/transformations/none.h
View File

@@ -32,11 +32,15 @@ class None : public Transformation {
public:
explicit None(const std::string &action)
: Transformation(action)
{ m_isNone = true; }
{ }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
bool isNone() override {
return true;
}
};
} // namespace transformations

4
src/actions/transformations/normalise_path.cc
View File

@@ -34,8 +34,8 @@ namespace transformations {
void NormalisePath::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
int changed = 0;
char *tmp = reinterpret_cast<char *>(

4
src/actions/transformations/normalise_path.h
View File

@@ -34,8 +34,8 @@ class NormalisePath : public Transformation {
: Transformation(action) { };
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
static int normalize_path_inplace(unsigned char *input, int input_len,
int win, int *changed);

4
src/actions/transformations/normalise_path_win.cc
View File

@@ -35,8 +35,8 @@ namespace transformations {
void NormalisePathWin::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
int changed;
char *tmp = reinterpret_cast<char *>(

4
src/actions/transformations/normalise_path_win.h
View File

@@ -34,8 +34,8 @@ class NormalisePathWin : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

4
src/actions/transformations/parity_even_7bit.cc
View File

@@ -33,8 +33,8 @@ namespace transformations {
void ParityEven7bit::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
unsigned char *input;
input = reinterpret_cast<unsigned char *>

4
src/actions/transformations/parity_even_7bit.h
View File

@@ -34,8 +34,8 @@ class ParityEven7bit : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
static bool inplace(unsigned char *input, uint64_t input_len);
};

4
src/actions/transformations/parity_odd_7bit.cc
View File

@@ -33,8 +33,8 @@ namespace transformations {
void ParityOdd7bit::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
unsigned char *input;
input = reinterpret_cast<unsigned char *>

4
src/actions/transformations/parity_odd_7bit.h
View File

@@ -34,8 +34,8 @@ class ParityOdd7bit : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
static bool inplace(unsigned char *input, uint64_t input_len);
};

4
src/actions/transformations/parity_zero_7bit.cc
View File

@@ -33,8 +33,8 @@ namespace transformations {
void ParityZero7bit::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
unsigned char *input;
input = reinterpret_cast<unsigned char *>

4
src/actions/transformations/parity_zero_7bit.h
View File

@@ -34,8 +34,8 @@ class ParityZero7bit : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
static bool inplace(unsigned char *input, uint64_t input_len);
};

4
src/actions/transformations/remove_comments.cc
View File

@@ -33,8 +33,8 @@ namespace transformations {
void RemoveComments::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
unsigned char *input;
input = reinterpret_cast<unsigned char *>

4
src/actions/transformations/remove_comments.h
View File

@@ -35,8 +35,8 @@ class RemoveComments : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;;
ModSecString &in,
ModSecString &out) override;;
};

4
src/actions/transformations/remove_comments_char.cc
View File

@@ -32,8 +32,8 @@ namespace transformations {
void RemoveCommentsChar::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
int64_t i;
out = in;

4
src/actions/transformations/remove_comments_char.h
View File

@@ -34,8 +34,8 @@ class RemoveCommentsChar : public Transformation {
: Transformation(action) { };
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

4
src/actions/transformations/remove_nulls.cc
View File

@@ -34,8 +34,8 @@ namespace transformations {
void RemoveNulls::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
int64_t i;
out = in;

4
src/actions/transformations/remove_nulls.h
View File

@@ -34,8 +34,8 @@ class RemoveNulls : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

4
src/actions/transformations/remove_whitespace.cc
View File

@@ -33,8 +33,8 @@ namespace transformations {
void RemoveWhitespace::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
out = in;
int64_t i = 0;

4
src/actions/transformations/remove_whitespace.h
View File

@@ -34,8 +34,8 @@ class RemoveWhitespace : public Transformation {
: Transformation(action) { };
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

4
src/actions/transformations/replace_comments.cc
View File

@@ -33,8 +33,8 @@ namespace transformations {
void ReplaceComments::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
uint64_t i, j, incomment;
char *input = reinterpret_cast<char *>(

4
src/actions/transformations/replace_comments.h
View File

@@ -34,8 +34,8 @@ class ReplaceComments : public Transformation {
: Transformation(action) { };
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

4
src/actions/transformations/replace_nulls.cc
View File

@@ -32,8 +32,8 @@ namespace transformations {
void ReplaceNulls::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
int64_t i;
out = in;

4
src/actions/transformations/replace_nulls.h
View File

@@ -34,8 +34,8 @@ class ReplaceNulls : public Transformation {
: Transformation(action) { };
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

4
src/actions/transformations/sha1.cc
View File

@@ -33,8 +33,8 @@ namespace transformations {
void Sha1::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
auto a = Utils::Sha1::digest(
std::string(in.c_str(), in.size())

4
src/actions/transformations/sha1.h
View File

@@ -34,8 +34,8 @@ class Sha1 : public Transformation {
: Transformation(action) { };
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

4
src/actions/transformations/sql_hex_decode.cc
View File

@@ -42,8 +42,8 @@ namespace transformations {
#endif
void SqlHexDecode::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
unsigned char *input;
int size = 0;

4
src/actions/transformations/sql_hex_decode.h
View File

@@ -34,8 +34,8 @@ class SqlHexDecode : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
static int inplace(unsigned char *data, int len);

1
src/actions/transformations/transformation.cc
View File

@@ -114,6 +114,7 @@ Transformation* Transformation::instantiate(std::string a) {
return new Transformation(a);
}
} // namespace transformations
} // namespace actions
} // namespace modsecurity

7
src/actions/transformations/transformation.h
View File

@@ -32,12 +32,7 @@ class Transformation : public Action {
explicit Transformation(const std::string& _action)
: Action(_action, RunTimeBeforeMatchAttemptKind) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override {
// FIXME: this should be remove as soon as #1974 got fixed.
out.assign(in.c_str(), in.length());
}
virtual bool isNone() { return false; }
static Transformation* instantiate(std::string a);
};

10
src/actions/transformations/trim.cc
View File

@@ -31,27 +31,27 @@ namespace actions {
namespace transformations {
void Trim::ltrim(ModSecStackString *s) {
void Trim::ltrim(ModSecString *s) {
s->erase(s->begin(), std::find_if(s->begin(), s->end(),
std::not1(std::ptr_fun<int, int>(std::isspace))));
}
void Trim::rtrim(ModSecStackString *s) {
void Trim::rtrim(ModSecString *s) {
s->erase(std::find_if(s->rbegin(), s->rend(),
std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s->end());
}
void Trim::trim(ModSecStackString *s) {
void Trim::trim(ModSecString *s) {
rtrim(s);
ltrim(s);
}
void Trim::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
out = in;
trim(&out);
};

10
src/actions/transformations/trim.h
View File

@@ -34,12 +34,12 @@ class Trim : public Transformation {
: Transformation(action) { };
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
void ltrim(ModSecStackString *s);
void rtrim(ModSecStackString *s);
void trim(ModSecStackString *s);
void ltrim(ModSecString *s);
void rtrim(ModSecString *s);
void trim(ModSecString *s);
};
} // namespace transformations

4
src/actions/transformations/trim_left.cc
View File

@@ -33,8 +33,8 @@ namespace transformations {
void TrimLeft::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
out = in;
ltrim(&out);
};

4
src/actions/transformations/trim_left.h
View File

@@ -35,8 +35,8 @@ class TrimLeft : public Trim {
: Trim(action) { };
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

4
src/actions/transformations/trim_right.cc
View File

@@ -32,8 +32,8 @@ namespace transformations {
void TrimRight::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
out = in;
rtrim(&out);
};

4
src/actions/transformations/trim_right.h
View File

@@ -35,8 +35,8 @@ class TrimRight : public Trim {
: Trim(action) { };
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

4
src/actions/transformations/upper_case.cc
View File

@@ -28,8 +28,8 @@ namespace transformations {
void UpperCase::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
std::locale loc;
out.reserve(in.size());
for (std::string::size_type i=0; i < in.size(); ++i) {

4
src/actions/transformations/upper_case.h
View File

@@ -36,8 +36,8 @@ class UpperCase : public Transformation {
: Transformation(action) { };
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

4
src/actions/transformations/url_decode.cc
View File

@@ -33,8 +33,8 @@ namespace transformations {
void UrlDecode::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
unsigned char *val(NULL);
int invalid_count = 0;
int changed;

4
src/actions/transformations/url_decode.h
View File

@@ -36,8 +36,8 @@ class UrlDecode : public Transformation {
: Transformation(action) { };
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
};
} // namespace transformations

4
src/actions/transformations/url_decode_uni.cc
View File

@@ -39,8 +39,8 @@ namespace transformations {
void UrlDecodeUni::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
unsigned char *input;
input = reinterpret_cast<unsigned char *>

4
src/actions/transformations/url_decode_uni.h
View File

@@ -35,8 +35,8 @@ class UrlDecodeUni : public Transformation {
: Transformation(action) { }
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
static int inplace(unsigned char *input, uint64_t input_len,
Transaction *transaction);

4
src/actions/transformations/url_encode.cc
View File

@@ -82,8 +82,8 @@ std::string UrlEncode::url_enc(const char *input,
void UrlEncode::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
int changed;
std::string ret = url_enc(in.c_str(), in.size(), &changed);

4
src/actions/transformations/url_encode.h
View File

@@ -34,8 +34,8 @@ class UrlEncode : public Transformation {
: Transformation(action) { };
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
static std::string url_enc(const char *input,
unsigned int input_len, int *changed);

4
src/actions/transformations/utf8_to_unicode.cc
View File

@@ -34,8 +34,8 @@ namespace transformations {
void Utf8ToUnicode::execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) {
ModSecString &in,
ModSecString &out) {
unsigned char *input;
int changed = 0;

4
src/actions/transformations/utf8_to_unicode.h
View File

@@ -40,8 +40,8 @@ class Utf8ToUnicode : public Transformation {
void execute(Transaction *t,
ModSecStackString &in,
ModSecStackString &out) override;
ModSecString &in,
ModSecString &out) override;
static char *inplace(unsigned char *input, uint64_t input_len,
int *changed);

1
src/actions/ver.cc
View File

@@ -21,6 +21,7 @@
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#include "modsecurity/rule.h"
#include "modsecurity/rule_with_actions.h"
namespace modsecurity {

8
src/engine/lua.cc
View File

@@ -439,8 +439,8 @@ std::string Lua::applyTransformations(lua_State *L, Transaction *t,
"t:" + std::string(name));
// FIXME: transformation is not yet returning null.
if (tfn) {
ModSecStackString in;
ModSecStackString out;
ModSecString in;
ModSecString out;
in.assign(newVar.c_str(), newVar.size());
tfn->execute(t, in, out);
newVar.assign(out.c_str(), out.size());
@@ -465,8 +465,8 @@ std::string Lua::applyTransformations(lua_State *L, Transaction *t,
// FIXME: transformation is not yet returning null.
if (tfn) {
ModSecStackString in;
ModSecStackString out;
ModSecString in;
ModSecString out;
in.assign(newVar.c_str(), newVar.size());
tfn->execute(t, in, out);
newVar.assign(out.c_str(), out.size());

4
src/modsecurity.cc
View File

@@ -305,8 +305,8 @@ int ModSecurity::processContentOffset(const char *content, size_t len,
while (!trans.empty()) {
modsecurity::actions::transformations::Transformation *t;
ModSecStackString in;
ModSecStackString out;
ModSecString in;
ModSecString out;
yajl_gen_map_open(g);
yajl_gen_string(g,

2
src/operators/detect_sqli.cc
View File

@@ -20,6 +20,8 @@
#include "src/operators/operator.h"
#include "others/libinjection/src/libinjection.h"
#include "modsecurity/rule_with_actions.h"
namespace modsecurity {
namespace operators {

1
src/operators/detect_xss.cc
View File

@@ -19,6 +19,7 @@
#include "src/operators/operator.h"
#include "others/libinjection/src/libinjection.h"
#include "modsecurity/rule_with_actions.h"
namespace modsecurity {

2
src/operators/pm.cc
View File

@@ -28,6 +28,8 @@
#include "src/operators/operator.h"
#include "src/utils/acmp.h"
#include "src/utils/string.h"
#include "modsecurity/rule_with_actions.h"
namespace modsecurity {
namespace operators {

2
src/operators/rbl.cc
View File

@@ -25,6 +25,8 @@
#include "modsecurity/rules_set.h"
#include "src/operators/operator.h"
#include "modsecurity/rule_with_actions.h"
namespace modsecurity {
namespace operators {

2
src/operators/rx.cc
View File

@@ -22,6 +22,8 @@
#include "src/operators/operator.h"
#include "modsecurity/rule.h"
#include "modsecurity/rule_message.h"
#include "modsecurity/rule_with_actions.h"
namespace modsecurity {
namespace operators {

2
src/operators/verify_cc.cc
View File

@@ -21,6 +21,8 @@
#include <vector>
#include "src/operators/operator.h"
#include "modsecurity/rule_with_actions.h"
#if PCRE_HAVE_JIT
#define pcre_study_opt PCRE_STUDY_JIT_COMPILE

2
src/operators/verify_cpf.cc
View File

@@ -19,6 +19,8 @@
#include <list>
#include "src/operators/operator.h"
#include "modsecurity/rule_with_actions.h"
namespace modsecurity {
namespace operators {

2
src/operators/verify_ssn.cc
View File

@@ -20,6 +20,8 @@
#include <list>
#include "src/operators/operator.h"
#include "modsecurity/rule_with_actions.h"
namespace modsecurity {
namespace operators {

1
src/operators/verify_svnr.cc
View File

@@ -9,6 +9,7 @@
#include "modsecurity/rule_message.h"
#include "modsecurity/rules_set_properties.h"
#include "modsecurity/rule_with_actions.h"
namespace modsecurity {
namespace operators {

4
src/parser/seclang-parser.cc
View File

@@ -2416,8 +2416,8 @@ namespace yy {
definedPhase = phase->m_phase;
secRuleDefinedPhase = phase->m_secRulesPhase;
delete phase;
} else if (a->action_kind == actions::Action::RunTimeOnlyIfMatchKind ||
a->action_kind == actions::Action::RunTimeBeforeMatchAttemptKind) {
} else if (a->m_actionKind == actions::Action::RunTimeOnlyIfMatchKind ||
a->m_actionKind == actions::Action::RunTimeBeforeMatchAttemptKind) {
actions::transformations::None *none = dynamic_cast<actions::transformations::None *>(a);
if (none != NULL) {
driver.error(yystack_[2].location, "The transformation none is not suitable to be part of the SecDefaultActions");

6
src/parser/seclang-parser.yy
View File

@@ -18,6 +18,8 @@ class Driver;
}
#include "modsecurity/rule_unconditional.h"
#include "modsecurity/rule_with_operator.h"
#include "modsecurity/rule_with_actions.h"
#include "src/rule_script.h"
#include "src/actions/accuracy.h"
@@ -1191,8 +1193,8 @@ expression:
definedPhase = phase->m_phase;
secRuleDefinedPhase = phase->m_secRulesPhase;
delete phase;
} else if (a->action_kind == actions::Action::RunTimeOnlyIfMatchKind ||
a->action_kind == actions::Action::RunTimeBeforeMatchAttemptKind) {
} else if (a->m_actionKind == actions::Action::RunTimeOnlyIfMatchKind ||
a->m_actionKind == actions::Action::RunTimeBeforeMatchAttemptKind) {
actions::transformations::None *none = dynamic_cast<actions::transformations::None *>(a);
if (none != NULL) {
driver.error(@0, "The transformation none is not suitable to be part of the SecDefaultActions");

2
src/rule_script.h
View File

@@ -32,6 +32,8 @@
#include "src/actions/log_data.h"
#include "src/actions/severity.h"
#include "src/variables/variable.h"
#include "modsecurity/rule_with_actions.h"
#ifndef SRC_RULE_SCRIPT_H_
#define SRC_RULE_SCRIPT_H_

32
src/rule_with_actions.cc
View File

@@ -104,12 +104,7 @@ RuleWithActions::RuleWithActions(
}
void RuleWithActions::addDefaultAction(std::shared_ptr<actions::Action> a) {
if (a->action_kind == Action::ConfigurationKind) {
a->execute(this, NULL);
return;
}
if (a->action_kind == Action::ConfigurationKind) {
if (a->m_actionKind == Action::ConfigurationKind) {
if (dynamic_cast<actions::Accuracy *>(a.get())) {
actions::Accuracy *accuracy = dynamic_cast<actions::Accuracy *>(a.get());
m_defaultAccuracy = accuracy->getAccuracy();
@@ -122,7 +117,7 @@ void RuleWithActions::addDefaultAction(std::shared_ptr<actions::Action> a) {
return;
}
if (a->action_kind == Action::RunTimeOnlyIfMatchKind) {
if (a->m_actionKind == Action::RunTimeOnlyIfMatchKind) {
if (dynamic_cast<actions::Capture *>(a.get())) {
m_defaultContainsCaptureAction = true;
} else if (dynamic_cast<actions::MultiMatch *>(a.get())) {
@@ -163,7 +158,7 @@ void RuleWithActions::addDefaultAction(std::shared_ptr<actions::Action> a) {
}
void RuleWithActions::addAction(actions::Action *a) {
if (a->action_kind == Action::ConfigurationKind) {
if (a->m_actionKind == Action::ConfigurationKind) {
if (dynamic_cast<actions::Accuracy *>(a)) {
actions::Accuracy *accuracy = dynamic_cast<actions::Accuracy *>(a);
m_accuracy = accuracy->getAccuracy();
@@ -177,7 +172,7 @@ void RuleWithActions::addAction(actions::Action *a) {
return;
}
if (a->action_kind == Action::RunTimeOnlyIfMatchKind) {
if (a->m_actionKind == Action::RunTimeOnlyIfMatchKind) {
if (dynamic_cast<actions::Capture *>(a)) {
m_containsCaptureAction = true;
delete a;
@@ -269,7 +264,7 @@ void RuleWithActions::executeActionsAfterFullMatch(Transaction *trans) {
#if 0
for (auto &a : trans->m_rules->m_defaultActions[getPhase()]) {
if (a.get()->action_kind != actions::Action::RunTimeOnlyIfMatchKind) {
if (a.get()->m_actionKind != actions::Action::RunTimeOnlyIfMatchKind) {
continue;
}
if (!a.get()->isDisruptive()) {
@@ -364,7 +359,7 @@ void RuleWithActions::executeTransformations(
TransformationsResults &results) {
int none = 0;
ModSecStackString ssin;
ModSecString ssin;
ssin.assign(in.c_str());
TransformationResult a = TransformationResult(&ssin);
@@ -375,9 +370,8 @@ void RuleWithActions::executeTransformations(
std::shared_ptr<std::string> value =
std::shared_ptr<std::string>(new std::string(in));
for (Action *action : getTransformationPtr()) {
if (action->m_isNone) {
for (Transformation *action : getTransformationPtr()) {
if (action->isNone()) {
none++;
}
}
@@ -386,7 +380,7 @@ void RuleWithActions::executeTransformations(
if (none == 0) {
executeTransformation(trans, &results, t);
}
if (t->m_isNone) {
if (t->isNone()) {
none--;
}
}
@@ -399,7 +393,7 @@ void RuleWithActions::executeTransformations(
continue;
}
Transformation *t = dynamic_cast<Transformation*>(b.second.get());
if (t->m_isNone) {
if (t->isNone()) {
none++;
}
}
@@ -413,7 +407,7 @@ void RuleWithActions::executeTransformations(
if (none == 0) {
executeTransformation(trans, &results, t);
}
if (t->m_isNone) {
if (t->isNone()) {
none--;
}
}
@@ -447,11 +441,11 @@ void RuleWithActions::executeTransformation(
void RuleWithActions::executeTransformation(
Transaction *transaction,
ModSecStackString in,
ModSecString in,
TransformationsResults *ret,
Transformation *transformation) {
ModSecStackString out;
ModSecString out;
transformation->execute(transaction, in, out);
ms_dbg_a(transaction, 9, " T (" + std::to_string(ret->size() - 1) + ") " + \

Some files were not shown because too many files have changed in this diff Show More