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

Moves string related functions from utils' to utils/string'

Browse Source
This commit is contained in:
Felipe Zimmerle
2016-11-01 14:59:06 -03:00
parent 9733cacd4d
commit 73c4d69174
25 changed files with 403 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/actions/allow.cc
View File

@@ -21,13 +21,16 @@
#include "modsecurity/transaction.h"
#include "modsecurity/rule.h"
#include "src/utils.h"
#include "utils/msc_string.h"
#include "modsecurity/modsecurity.h"
using modsecurity::utils::String;
namespace modsecurity {
namespace actions {
bool Allow::init(std::string *error) {
std::string a = tolower(m_parser_payload);
std::string a = String::tolower(m_parser_payload);
if (a == "phase") {
m_allowType = PhaseAllowType;

6
src/actions/ctl/rule_remove_target_by_id.cc
View File

@@ -20,6 +20,10 @@
#include <vector>
#include "modsecurity/transaction.h"
#include "utils/msc_string.h"
using modsecurity::utils::String;
namespace modsecurity {
namespace actions {
@@ -28,7 +32,7 @@ namespace ctl {
bool RuleRemoveTargetById::init(std::string *error) {
std::string what(m_parser_payload, 21, m_parser_payload.size() - 21);
std::vector<std::string> param = split(what, ';');
std::vector<std::string> param = String::split(what, ';');
if (param.size() < 2) {
error->assign(what + " is not a valid `ID;VARIABLE'");

5
src/actions/ctl/rule_remove_target_by_tag.cc
View File

@@ -20,6 +20,9 @@
#include <vector>
#include "modsecurity/transaction.h"
#include "utils/msc_string.h"
using modsecurity::utils::String;
namespace modsecurity {
namespace actions {
@@ -28,7 +31,7 @@ namespace ctl {
bool RuleRemoveTargetByTag::init(std::string *error) {
std::string what(m_parser_payload, 22, m_parser_payload.size() - 22);
std::vector<std::string> param = split(what, ';');
std::vector<std::string> param = String::split(what, ';');
if (param.size() < 2) {
error->assign(what + " is not a valid `TAG;VARIABLE'");

6
src/actions/phase.cc
View File

@@ -22,12 +22,16 @@
#include "modsecurity/rule.h"
#include "src/utils.h"
#include "modsecurity/modsecurity.h"
#include "utils/msc_string.h"
using modsecurity::utils::String;
namespace modsecurity {
namespace actions {
bool Phase::init(std::string *error) {
std::string a = tolower(m_parser_payload);
std::string a = String::tolower(m_parser_payload);
m_phase = -1;
try {

6
src/actions/set_var.cc
View File

@@ -22,6 +22,10 @@
#include "modsecurity/rule.h"
#include "src/macro_expansion.h"
#include "src/utils.h"
#include "utils/msc_string.h"
using modsecurity::utils::String;
namespace modsecurity {
namespace actions {
@@ -49,7 +53,7 @@ bool SetVar::init(std::string *error) {
pos = m_parser_payload.find(".");
if (pos != std::string::npos) {
m_collectionName = std::string(m_parser_payload, 0, pos);
m_collectionName = toupper(m_collectionName);
m_collectionName = String::toupper(m_collectionName);
} else {
error->assign("Missing the collection and/or variable name");
return false;

6
src/actions/severity.cc
View File

@@ -22,13 +22,17 @@
#include "modsecurity/transaction.h"
#include "modsecurity/rule.h"
#include "src/utils.h"
#include "utils/msc_string.h"
using modsecurity::utils::String;
namespace modsecurity {
namespace actions {
bool Severity::init(std::string *error) {
std::string a = tolower(m_parser_payload);
std::string a = String::tolower(m_parser_payload);
if (a == "emergency") {
m_severity = 0;
return true;