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

rx:exit after full match; fix TX population after unused group

Browse Source
This commit is contained in:
martinhsv
2020-06-29 06:13:45 -07:00
parent a1a8c0fda7
commit b9620c26a0
5 changed files with 184 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/utils/regex.h
View File

@@ -19,6 +19,7 @@
#include <fstream>
#include <string>
#include <list>
#include <vector>
#ifndef SRC_UTILS_REGEX_H_
#define SRC_UTILS_REGEX_H_
@@ -47,6 +48,16 @@ class SMatch {
size_t m_offset;
};
struct SMatchCapture {
SMatchCapture(size_t group, size_t offset, size_t length) :
m_group(group),
m_offset(offset),
m_length(length) { }
size_t m_group; // E.g. 0 = full match; 6 = capture group 6
size_t m_offset; // offset of match within the analyzed string
size_t m_length;
};
class Regex {
public:
@@ -58,6 +69,7 @@ class Regex {
Regex& operator=(const Regex&) = delete;
std::list<SMatch> searchAll(const std::string& s) const;
bool searchOneMatch(const std::string& s, std::vector<SMatchCapture>& captures) const;
int search(const std::string &s, SMatch *match) const;
int search(const std::string &s) const;