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

Moves static methods from class String to the namespace string

Browse Source
This commit is contained in:
Felipe Zimmerle
2016-11-04 15:58:05 -03:00
parent 62a0cb468b
commit 2244e874e2
31 changed files with 151 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/decode.cc
View File

@@ -43,7 +43,7 @@ int urldecode_nonstrict_inplace(unsigned char *input,
char c1 = input[i + 1];
char c2 = input[i + 2];
if (VALID_HEX(c1) && VALID_HEX(c2)) {
uint64_t uni = x2c(&input[i + 1]);
uint64_t uni = string::x2c(&input[i + 1]);
*d++ = (wchar_t)uni;
count++;
@@ -99,8 +99,8 @@ std::string uri_decode(const std::string & sSrc) {
while (pSrc < SRC_LAST_DEC) {
if (*pSrc == '%') {
char dec1, dec2;
if (-1 != (dec1 = HEX2DEC[*(pSrc + 1)])
&& -1 != (dec2 = HEX2DEC[*(pSrc + 2)])) {
if (-1 != (dec1 = string::HEX2DEC[*(pSrc + 1)])
&& -1 != (dec2 = string::HEX2DEC[*(pSrc + 2)])) {
*pEnd++ = (dec1 << 4) + dec2;
pSrc += 3;
continue;

24
src/utils/string.cc
View File

@@ -44,16 +44,17 @@
namespace modsecurity {
namespace utils {
namespace string {
std::string String::ascTime(time_t *t) {
std::string ascTime(time_t *t) {
std::string ts = std::ctime(t);
ts.pop_back();
return ts;
}
std::string String::dash_if_empty(const std::string *str) {
std::string dash_if_empty(const std::string *str) {
if (str == NULL || str->empty()) {
return "-";
}
@@ -62,7 +63,7 @@ std::string String::dash_if_empty(const std::string *str) {
}
std::string String::dash_if_empty(const char *str) {
std::string dash_if_empty(const char *str) {
if (str == NULL || strlen(str) == 0) {
return "-";
}
@@ -71,7 +72,7 @@ std::string String::dash_if_empty(const char *str) {
}
std::string String::limitTo(int amount, const std::string &str) {
std::string limitTo(int amount, const std::string &str) {
std::string ret;
if (str.length() > amount) {
@@ -85,7 +86,7 @@ std::string String::limitTo(int amount, const std::string &str) {
}
std::string String::removeBracketsIfNeeded(std::string a) {
std::string removeBracketsIfNeeded(std::string a) {
if ((a.at(0) == '"') && (a.at(a.length()-1) == '"')) {
a.pop_back();
a.erase(0, 1);
@@ -94,7 +95,7 @@ std::string String::removeBracketsIfNeeded(std::string a) {
}
std::string String::string_to_hex(const std::string& input) {
std::string string_to_hex(const std::string& input) {
static const char* const lut = "0123456789ABCDEF";
size_t len = input.length();
@@ -109,7 +110,7 @@ std::string String::string_to_hex(const std::string& input) {
}
std::string String::toHexIfNeeded(const std::string &str) {
std::string toHexIfNeeded(const std::string &str) {
std::stringstream res;
for (int i = 0; i < str.size(); i++) {
@@ -125,7 +126,7 @@ std::string String::toHexIfNeeded(const std::string &str) {
}
std::string String::tolower(std::string str) {
std::string tolower(std::string str) {
std::string value;
value.resize(str.length());
@@ -138,7 +139,7 @@ std::string String::tolower(std::string str) {
}
std::string String::toupper(std::string str) {
std::string toupper(std::string str) {
std::locale loc;
std::string value;
@@ -150,7 +151,7 @@ std::string String::toupper(std::string str) {
}
std::vector<std::string> String::split(std::string str, char delimiter) {
std::vector<std::string> split(std::string str, char delimiter) {
std::vector<std::string> internal;
std::stringstream ss(str); // Turn the string into a stream.
std::string tok;
@@ -163,7 +164,7 @@ std::vector<std::string> String::split(std::string str, char delimiter) {
}
void String::chomp(std::string *str) {
void chomp(std::string *str) {
std::string::size_type pos = str->find_last_not_of("\n\r");
if (pos != std::string::npos) {
str->erase(pos+1, str->length()-pos-1);
@@ -205,5 +206,6 @@ unsigned char *c2x(unsigned what, unsigned char *where) {
}
} // namespace string
} // namespace utils
} // namespace modsecurity

33
src/utils/string.h
View File

@@ -18,8 +18,8 @@
#include <string>
#include <vector>
#ifndef SRC_UTILS_MSC_STRING_H_
#define SRC_UTILS_MSC_STRING_H_
#ifndef SRC_UTILS_STRING_H_
#define SRC_UTILS_STRING_H_
#define VALID_HEX(X) (((X >= '0') && (X <= '9')) || \
((X >= 'a') && (X <= 'f')) || ((X >= 'A') && (X <= 'F')))
@@ -29,6 +29,7 @@
namespace modsecurity {
namespace utils {
namespace string {
const char HEX2DEC[256] = {
/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
@@ -54,26 +55,24 @@ const char HEX2DEC[256] = {
};
class String {
public:
static std::string ascTime(time_t *t);
static std::string dash_if_empty(const char *str);
static std::string dash_if_empty(const std::string *str);
static std::string limitTo(int amount, const std::string &str);
static std::string removeBracketsIfNeeded(std::string a);
static std::string string_to_hex(const std::string& input);
static std::string toHexIfNeeded(const std::string &str);
static std::string tolower(std::string str);
static std::string toupper(std::string str);
static std::vector<std::string> split(std::string str, char delimiter);
static void chomp(std::string *str);
};
std::string ascTime(time_t *t);
std::string dash_if_empty(const char *str);
std::string dash_if_empty(const std::string *str);
std::string limitTo(int amount, const std::string &str);
std::string removeBracketsIfNeeded(std::string a);
std::string string_to_hex(const std::string& input);
std::string toHexIfNeeded(const std::string &str);
std::string tolower(std::string str);
std::string toupper(std::string str);
std::vector<std::string> split(std::string str, char delimiter);
void chomp(std::string *str);
unsigned char x2c(unsigned char *what);
unsigned char xsingle2c(unsigned char *what);
unsigned char *c2x(unsigned what, unsigned char *where);
} // namespace string
} // namespace utils
} // namespace modsecurity
#endif // SRC_UTILS_MSC_STRING_H_
#endif // SRC_UTILS_STRING_H_