Adds support for @fuzzyHash

Issue #997
This commit is contained in:
Felipe Zimmerle
2017-10-25 19:11:09 -03:00
parent 4ecfed3163
commit 7622866f97
20 changed files with 1234 additions and 719 deletions

View File

@@ -19,16 +19,96 @@
#include "src/operators/operator.h"
#include "src/macro_expansion.h"
#include "src/utils/system.h"
namespace modsecurity {
namespace operators {
bool FuzzyHash::evaluate(Transaction *transaction, const std::string &str) {
/**
* @todo Implement the operator FuzzyHash.
* Reference: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#fuzzyhash
*/
bool FuzzyHash::init(const std::string &param2, std::string *error) {
#ifdef WITH_SSDEEP
std::string digit;
std::string file;
std::istream *iss;
struct fuzzy_hash_chunk *chunk, *t;
std::string err;
auto pos = m_param.find_last_of(' ');
if (pos == std::string::npos) {
error->assign("Please use @fuzzyHash with filename and value");
return false;
}
digit.append(std::string(m_param, pos+1));
file.append(std::string(m_param, 0, pos));
try {
m_threshold = std::stoi(digit);
} catch (...) {
error->assign("Expecting a digit, got: " + digit);
return false;
}
std::string resource = utils::find_resource(file, param2, &err);
iss = new std::ifstream(resource, std::ios::in);
if (((std::ifstream *)iss)->is_open() == false) {
error->assign("Failed to open file: " + m_param + ". " + err);
delete iss;
return false;
}
for (std::string line; std::getline(*iss, line); ) {
chunk = (struct fuzzy_hash_chunk *)calloc(1, sizeof(struct fuzzy_hash_chunk));
chunk->data = strdup(line.c_str());
chunk->next = NULL;
if (m_head == NULL) {
m_head = chunk;
} else {
t = m_head;
while (t->next) {
t = t->next;
}
t->next = chunk;
}
}
delete iss;
return true;
#else
error->assign("@fuzzyHash: SSDEEP support was not enabled during the compilation.");
return false;
#endif
}
bool FuzzyHash::evaluate(Transaction *t, const std::string &str) {
#ifdef WITH_SSDEEP
char result[FUZZY_MAX_RESULT];
struct fuzzy_hash_chunk *chunk = m_head;
if (fuzzy_hash_buf((const unsigned char*)str.c_str(), str.size(), result))
{
t->debug(4, "Problems generating fuzzy hash");
return false;
}
while (chunk != NULL)
{
int i = fuzzy_compare(chunk->data, result);
if (i >= m_threshold)
{
t->debug(4, "Fuzzy hash: matched " \
"with score: " + std::to_string(i) + ".");
return true;
}
chunk = chunk->next;
}
#endif
/* No match. */
return false;
}
} // namespace operators

View File

@@ -18,20 +18,38 @@
#include <string>
#include "src/operators/operator.h"
#ifdef WITH_SSDEEP
#include "fuzzy.h"
#endif
#include "src/operators/operator.h"
namespace modsecurity {
namespace operators {
struct fuzzy_hash_chunk {
const char *data;
struct fuzzy_hash_chunk *next;
};
class FuzzyHash : public Operator {
public:
/** @ingroup ModSecurity_Operator */
FuzzyHash(std::string o, std::string p, bool n)
: Operator(o, p, n) { }
: Operator(o, p, n),
m_head(NULL),
m_threshold(0) { }
explicit FuzzyHash(std::string param)
: Operator("FuzzyHash", param) { }
: Operator("FuzzyHash", param),
m_head(NULL),
m_threshold(0) { }
bool evaluate(Transaction *transaction, const std::string &std) override;
bool init(const std::string &param, std::string *error) override;
private:
int m_threshold;
struct fuzzy_hash_chunk *m_head;
};
} // namespace operators