github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 13:56:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improvements on top of #1787

Browse Source
This commit is contained in:
Felipe Zimmerle 2018-06-12 15:43:08 -03:00
parent edb5993d5f
commit e51297b436
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
1 changed files with 20 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/collection/backend/lmdb.cc
View File

@ -492,34 +492,8 @@ void LMDB::resolveMultiMatches(const std::string& var,
goto end_cursor_open; goto end_cursor_open;
} }
if (keySize == 0) {
while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) { while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
//
// I don't see what's the reason of this clause
//
// eg:
// looking for the variable: 'test', keySize will 4
// found key: 'test', key.mv_size will 4
// key.mv_size IS LESS than keySize+1, so we will continue?
//
//if (key.mv_size <= keySize + 1) {
// continue;
//}
char *a = reinterpret_cast<char *>(key.mv_data);
//
// also don't understand this part
//
// key.mv_data will 'test', but there isn't ':' at the end,
// so we will skip it?
//
//if (a[keySize] != ':') {
// continue;
//}
// this will never evaluate with the two statements above,
// but I think this is the only required check
if (strncmp(var.c_str(), a, keySize) != 0) {
continue;
}
l->insert(l->begin(), new VariableValue( l->insert(l->begin(), new VariableValue(
&m_name, &m_name,
new std::string(reinterpret_cast<char *>(key.mv_data), new std::string(reinterpret_cast<char *>(key.mv_data),
@ -528,6 +502,20 @@ void LMDB::resolveMultiMatches(const std::string& var,
data.mv_size)) data.mv_size))
); );
} }
} else {
while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
char *a = reinterpret_cast<char *>(key.mv_data);
if (strncmp(var.c_str(), a, keySize) == 0) {
l->insert(l->begin(), new VariableValue(
&m_name,
new std::string(reinterpret_cast<char *>(key.mv_data),
key.mv_size),
new std::string(reinterpret_cast<char *>(data.mv_data),
data.mv_size))
);
}
}
}
mdb_cursor_close(cursor); mdb_cursor_close(cursor);
end_cursor_open: end_cursor_open:
@ -549,30 +537,7 @@ void LMDB::resolveRegularExpression(const std::string& var,
MDB_cursor *cursor; MDB_cursor *cursor;
size_t pos; size_t pos;
pos = var.find(":"); Utils::Regex r = Utils::Regex(var);
if (pos == std::string::npos) {
return;
}
if (var.size() < pos + 3) {
return;
}
pos = var.find(":", pos + 2);
if (pos == std::string::npos) {
return;
}
if (var.size() < pos + 3) {
return;
}
std::string nameSpace = std::string(var, 0, pos);
size_t pos2 = var.find(":", pos + 1) - pos - 1;
std::string col = std::string(var, pos + 1, pos2);
pos = pos2 + pos + 3;
pos2 = var.size() - pos2 - pos;
std::string name = std::string(var, pos, pos2);
size_t keySize = nameSpace.size();
Utils::Regex r = Utils::Regex(name);
rc = mdb_txn_begin(m_env, NULL, 0, &txn); rc = mdb_txn_begin(m_env, NULL, 0, &txn);
lmdb_debug(rc, "txn", "resolveRegularExpression"); lmdb_debug(rc, "txn", "resolveRegularExpression");
@ -592,28 +557,12 @@ void LMDB::resolveRegularExpression(const std::string& var,
goto end_cursor_open; goto end_cursor_open;
} }
std::cout << std::endl;
while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) { while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
if (key.mv_size <= keySize) {
continue;
}
char *a = reinterpret_cast<char *>(key.mv_data); char *a = reinterpret_cast<char *>(key.mv_data);
if (a[keySize] != ':') { int ret = Utils::regex_search(a, r);
continue;
}
std::string ns = std::string(a, keySize);
if (ns != nameSpace) {
continue;
}
std::string content = std::string(a, keySize + 1,
key.mv_size - keySize - 1);
int ret = Utils::regex_search(content, r);
if (ret <= 0) { if (ret <= 0) {
continue; continue;
} }
VariableValue *v = new VariableValue( VariableValue *v = new VariableValue(
new std::string(reinterpret_cast<char *>(key.mv_data), new std::string(reinterpret_cast<char *>(key.mv_data),
key.mv_size), key.mv_size),