Using libpcre instead of c++11 regex

This commit is contained in:
Felipe Zimmerle
2015-08-02 19:55:16 -03:00
parent 2f4d4691c9
commit 17f88f5821
10 changed files with 233 additions and 12 deletions

55
src/utils/regex.cc Normal file
View File

@@ -0,0 +1,55 @@
/*
* ModSecurity, http://www.modsecurity.org/
* Copyright (c) 2015 Trustwave Holdings, Inc. (http://www.trustwave.com/)
*
* You may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* If any of the files related to licensing are missing or if you have any
* other questions related to licensing please contact Trustwave Holdings, Inc.
* directly using the email address security@modsecurity.org.
*
*/
#include "utils/regex.h"
#include <pcrecpp.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <string>
#include <fstream>
#include <iostream>
#include "utils/geo_lookup.h"
namespace ModSecurity {
namespace Utils {
Regex::Regex(const std::string& pattern_)
: pattern(pattern_) {
if (pattern.empty() == true) {
pattern.assign(".*");
}
}
int regex_search(const std::string& s, SMatch *match,
const Regex& regex) {
pcrecpp::RE re(regex.pattern,
pcrecpp::RE_Options(PCRE_DOTALL|PCRE_MULTILINE));
match->size_ = re.PartialMatch(s);
return match->size_;
}
int regex_search(const std::string& s, Regex regex) {
pcrecpp::RE re(regex.pattern);
return re.PartialMatch(s);
}
} // namespace Utils
} // namespace ModSecurity

53
src/utils/regex.h Normal file
View File

@@ -0,0 +1,53 @@
/*
* ModSecurity, http://www.modsecurity.org/
* Copyright (c) 2015 Trustwave Holdings, Inc. (http://www.trustwave.com/)
*
* You may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* If any of the files related to licensing are missing or if you have any
* other questions related to licensing please contact Trustwave Holdings, Inc.
* directly using the email address security@modsecurity.org.
*
*/
#include <iostream>
#include <fstream>
#include <string>
#ifndef SRC_UTILS_REGEX_H_
#define SRC_UTILS_REGEX_H_
namespace ModSecurity {
namespace Utils {
class Regex {
public:
explicit Regex(const std::string& pattern_);
std::string pattern;
};
class SMatch {
public:
SMatch() : size_(0) { }
size_t size() { return size_; }
int size_;
};
int regex_search(const std::string& s, SMatch *m,
const Regex& regex);
int regex_search(const std::string& s, Regex r);
} // namespace Utils
} // namespace ModSecurity
#endif // SRC_UTILS_REGEX_H_