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

Update operator verifyCC to use Regex class

Browse Source
This commit is contained in:
WGH 2019-01-30 14:46:11 +03:00 committed by Felipe Zimmerle
parent 55b81f0e10
commit 9c3c4dc587
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
3 changed files with 34 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/operators/verify_cc.cc
View File

@ -15,38 +15,15 @@
#include "src/operators/verify_cc.h"
#include <pcre.h>
#include <iostream>
#include <cstring>
#include <vector>
#include "src/operators/operator.h"
#if PCRE_HAVE_JIT
#define pcre_study_opt PCRE_STUDY_JIT_COMPILE
#else
#define pcre_study_opt 0
#endif
namespace modsecurity {
namespace operators {
VerifyCC::~VerifyCC() {
if (m_pc != NULL) {
pcre_free(m_pc);
m_pc = NULL;
}
if (m_pce != NULL) {
#if PCRE_HAVE_JIT
pcre_free_study(m_pce);
#else
pcre_free(m_pce);
#endif
m_pce = NULL;
}
}
/**
* Luhn Mod-10 Method (ISO 2894/ANSI 4.13)
*/
@ -90,70 +67,36 @@ int VerifyCC::luhnVerify(const char *ccnumber, int len) {
bool VerifyCC::init(const std::string &param2, std::string *error) {
const char *errptr = NULL;
int erroffset = 0;
m_re.reset(new modsecurity::regex::Regex(m_param));
m_pc = pcre_compile(m_param.c_str(), PCRE_DOTALL|PCRE_MULTILINE,
&errptr, &erroffset, NULL);
if (m_pc == NULL) {
error->assign(errptr);
if (!m_re->ok()) {
*error = "Failed to compile regular expression " + m_re->getPattern();
return false;
}
m_pce = pcre_study(m_pc, pcre_study_opt, &errptr);
if (m_pce == NULL) {
if (errptr == NULL) {
/*
* Per pcre_study(3) m_pce == NULL && errptr == NULL means
* that no addional information is found, so no need to study
*/
return true;
}
error->assign(errptr);
return false;
}
return true;
}
bool VerifyCC::evaluate(Transaction *t, Rule *rule,
const std::string& i, std::shared_ptr<RuleMessage> ruleMessage) {
int offset = 0;
bool is_cc = false;
int target_length = i.length();
for (offset = 0; offset < target_length; offset++) {
std::string match;
int ovector[33];
memset(ovector, 0, sizeof(ovector));
int ret = pcre_exec(m_pc, m_pce, i.c_str(), i.size(), offset,
0, ovector, 33) > 0;
/* If there was no match, then we are done. */
if (ret == PCRE_ERROR_NOMATCH) {
break;
}
if (ret < 0) {
return false;
}
if (ret > 0) {
match = std::string(i, ovector[0], ovector[1] - ovector[0]);
is_cc = luhnVerify(match.c_str(), match.size());
if (is_cc) {
if (t) {
if (rule && t && rule->m_containsCaptureAction) {
t->m_collections.m_tx_collection->storeOrUpdateFirst(
"0", std::string(match));
ms_dbg_a(t, 7, "Added VerifyCC match TX.0: " + \
std::string(match));
}
ms_dbg_a(t, 9, "CC# match \"" + m_param +
"\" at " + i + ". [offset " +
std::to_string(offset) + "]");
// ModSecurity v2 chacked for overlapping matches here,
// so do we here
for (const auto &m : m_re->searchAll(i, /* overlapping */ true)) {
const auto &s = m.group(0).string;
bool is_cc = luhnVerify(s.data(), s.size());
if (is_cc) {
if (t) {
if (rule && t && rule->m_containsCaptureAction) {
t->m_collections.m_tx_collection->storeOrUpdateFirst(
"0", s);
ms_dbg_a(t, 7, "Added VerifyCC match TX.0: " + s);
}
return true;
ms_dbg_a(t, 9, "CC# match \"" + m_param +
"\" at " + i + ". [offset " +
std::to_string(m.group(0).offset) + "]");
}
return true;
}
}

10
src/operators/verify_cc.h
View File

@ -16,7 +16,6 @@
#ifndef SRC_OPERATORS_VERIFY_CC_H_
#define SRC_OPERATORS_VERIFY_CC_H_
#include <pcre.h>
#include <string>
#include <memory>
#include <utility>
@ -30,10 +29,8 @@ class VerifyCC : public Operator {
public:
/** @ingroup ModSecurity_Operator */
explicit VerifyCC(std::unique_ptr<RunTimeString> param)
: Operator("VerifyCC", std::move(param)),
m_pc(NULL),
m_pce(NULL) { }
~VerifyCC();
: Operator("VerifyCC", std::move(param))
{ }
int luhnVerify(const char *ccnumber, int len);
bool evaluate(Transaction *t, Rule *rule,
@ -41,8 +38,7 @@ class VerifyCC : public Operator {
std::shared_ptr<RuleMessage> ruleMessage) override;
bool init(const std::string &param, std::string *error) override;
private:
pcre *m_pc;
pcre_extra *m_pce;
std::unique_ptr<modsecurity::regex::Regex> m_re;
};
} // namespace operators

13
test/test-cases/regression/operator-verifycc.json
View File

@ -42,5 +42,18 @@
"SecRuleEngine On",
"SecRule ARGS \"@verifycc \\d{13,16}\" \"id:1,phase:2,capture,pass,t:trim\""
]
},
{
"enabled":1,
"version_min":300000,
"version_max":0,
"title":"Testing Operator :: @verifycc with invalid regular expression",
"expected":{
"parser_error":"Rules error.*Failed to compile regular expression \\\\d\\{13\\,16\\}\\("
},
"rules":[
"SecRuleEngine On",
"SecRule ARGS \"@verifycc \\d{13,16}(\" \"id:1,phase:2,pass,t:trim\""
]
}
]