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

Adds refCounter to actions

Browse Source
This commit is contained in:
Felipe Zimmerle 2016-11-08 18:14:34 -03:00
parent ad05c74c3f
commit 3ee7b24928
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
102 changed files with 126 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/actions/action.h → headers/modsecurity/actions/action.h
View File

@ -13,14 +13,18 @@
*
*/
#ifdef __cplusplus
#include <string>
#include <iostream>
#endif
#include "modsecurity/intervention.h"
#include "modsecurity/rule.h"
#ifndef SRC_ACTIONS_ACTION_H_
#define SRC_ACTIONS_ACTION_H_
#ifndef HEADERS_MODSECURITY_ACTIONS_ACTION_H_
#define HEADERS_MODSECURITY_ACTIONS_ACTION_H_
#ifdef __cplusplus
@ -37,6 +41,7 @@ class Action {
: action_kind(2),
m_isNone(false),
m_name(""),
m_referenceCount(0),
m_parser_payload(""),
temporaryAction(false) {
set_name_and_payload(_action);
@ -45,6 +50,7 @@ class Action {
: action_kind(kind),
m_isNone(false),
m_name(""),
m_referenceCount(0),
m_parser_payload(""),
temporaryAction(false) {
set_name_and_payload(_action);
@ -87,6 +93,17 @@ class Action {
}
}
void refCountDecreaseAndCheck() {
this->m_referenceCount--;
if (this->m_referenceCount == 0) {
delete this;
}
}
void refCountIncrease() {
this->m_referenceCount++;
}
bool m_isNone;
bool temporaryAction;
int action_kind;
@ -124,6 +141,9 @@ class Action {
*/
RunTimeOnlyIfMatchKind,
};
private:
int m_referenceCount;
};
@ -132,4 +152,4 @@ class Action {
#endif
#endif // SRC_ACTIONS_ACTION_H_
#endif // HEADERS_MODSECURITY_ACTIONS_ACTION_H_

5
headers/modsecurity/rules_properties.h
View File

@ -31,6 +31,7 @@
#include "modsecurity/modsecurity.h"
#include "modsecurity/rule.h"
#include "modsecurity/rules_exceptions.h"
#include "modsecurity/actions/action.h"
#ifdef __cplusplus
@ -40,9 +41,6 @@ class RulesExceptions;
namespace audit_log {
class AuditLog;
}
namespace actions {
class Action;
}
namespace Parser {
class Driver;
}
@ -324,6 +322,7 @@ class RulesProperties {
std::vector<actions::Action *> *actions_to = to->defaultActions+i;
for (int j = 0; j < actions_from->size(); j++) {
actions::Action *action = actions_from->at(j);
action->refCountIncrease();
actions_to->push_back(action);
}
}

2
src/actions/accuracy.cc
View File

@ -18,7 +18,7 @@
#include <iostream>
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#include "modsecurity/rule.h"
#include "src/macro_expansion.h"

2
src/actions/accuracy.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_ACCURACY_H_
#define SRC_ACTIONS_ACCURACY_H_

2
src/actions/action.cc
View File

@ -13,7 +13,7 @@
*
*/
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include <iostream>
#include <string>

2
src/actions/allow.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_ALLOW_H_
#define SRC_ACTIONS_ALLOW_H_

2
src/actions/audit_log.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_AUDIT_LOG_H_
#define SRC_ACTIONS_AUDIT_LOG_H_

2
src/actions/block.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_BLOCK_H_
#define SRC_ACTIONS_BLOCK_H_

2
src/actions/capture.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_CAPTURE_H_
#define SRC_ACTIONS_CAPTURE_H_

2
src/actions/chain.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_CHAIN_H_
#define SRC_ACTIONS_CHAIN_H_

2
src/actions/ctl/audit_log_parts.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#ifndef SRC_ACTIONS_CTL_AUDIT_LOG_PARTS_H_

2
src/actions/ctl/request_body_access.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"

2
src/actions/ctl/request_body_processor_json.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#ifndef SRC_ACTIONS_CTL_REQUEST_BODY_PROCESSOR_JSON_H_

2
src/actions/ctl/request_body_processor_xml.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#ifndef SRC_ACTIONS_CTL_REQUEST_BODY_PROCESSOR_XML_H_

2
src/actions/ctl/rule_remove_by_id.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"

2
src/actions/ctl/rule_remove_target_by_id.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"

2
src/actions/ctl/rule_remove_target_by_tag.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"

2
src/actions/deny.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#ifndef SRC_ACTIONS_DENY_H_

2
src/actions/init_col.cc
View File

@ -18,7 +18,7 @@
#include <iostream>
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#include "modsecurity/rule.h"
#include "src/macro_expansion.h"

2
src/actions/init_col.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_INIT_COL_H_
#define SRC_ACTIONS_INIT_COL_H_

2
src/actions/log.cc
View File

@ -18,7 +18,7 @@
#include <iostream>
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#include "src/operators/operator.h"
#include "modsecurity/rule_message.h"

2
src/actions/log.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_LOG_H_
#define SRC_ACTIONS_LOG_H_

2
src/actions/log_data.cc
View File

@ -18,7 +18,7 @@
#include <iostream>
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#include "src/macro_expansion.h"
#include "modsecurity/rule.h"

2
src/actions/log_data.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_LOG_DATA_H_
#define SRC_ACTIONS_LOG_DATA_H_

2
src/actions/maturity.cc
View File

@ -18,7 +18,7 @@
#include <iostream>
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#include "modsecurity/rule.h"
#include "src/macro_expansion.h"

2
src/actions/maturity.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_MATURITY_H_
#define SRC_ACTIONS_MATURITY_H_

2
src/actions/msg.cc
View File

@ -18,7 +18,7 @@
#include <iostream>
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#include "src/macro_expansion.h"
#include "modsecurity/rule.h"

2
src/actions/msg.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_MSG_H_
#define SRC_ACTIONS_MSG_H_

2
src/actions/no_audit_log.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_NO_AUDIT_LOG_H_
#define SRC_ACTIONS_NO_AUDIT_LOG_H_

2
src/actions/no_log.cc
View File

@ -18,7 +18,7 @@
#include <iostream>
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#include "src/operators/operator.h"
#include "modsecurity/rule_message.h"

2
src/actions/no_log.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_NO_LOG_H_
#define SRC_ACTIONS_NO_LOG_H_

2
src/actions/pass.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#ifndef SRC_ACTIONS_PASS_H_

2
src/actions/phase.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_PHASE_H_
#define SRC_ACTIONS_PHASE_H_

2
src/actions/redirect.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_REDIRECT_H_
#define SRC_ACTIONS_REDIRECT_H_

2
src/actions/rev.cc
View File

@ -18,7 +18,7 @@
#include <iostream>
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#include "modsecurity/rule.h"
#include "src/macro_expansion.h"

2
src/actions/rev.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_REV_H_
#define SRC_ACTIONS_REV_H_

2
src/actions/rule_id.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_RULE_ID_H_
#define SRC_ACTIONS_RULE_ID_H_

2
src/actions/set_sid.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_SET_SID_H_
#define SRC_ACTIONS_SET_SID_H_

2
src/actions/set_uid.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_SET_UID_H_
#define SRC_ACTIONS_SET_UID_H_

2
src/actions/set_var.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_SET_VAR_H_
#define SRC_ACTIONS_SET_VAR_H_

2
src/actions/severity.cc
View File

@ -18,7 +18,7 @@
#include <iostream>
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#include "modsecurity/rule.h"
#include "src/utils/string.h"

2
src/actions/severity.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_SEVERITY_H_
#define SRC_ACTIONS_SEVERITY_H_

2
src/actions/skip.cc
View File

@ -18,7 +18,7 @@
#include <iostream>
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"

2
src/actions/skip.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_SKIP_H_
#define SRC_ACTIONS_SKIP_H_

2
src/actions/skip_after.cc
View File

@ -18,7 +18,7 @@
#include <iostream>
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"

2
src/actions/skip_after.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_SKIP_AFTER_H_
#define SRC_ACTIONS_SKIP_AFTER_H_

2
src/actions/status.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_STATUS_H_
#define SRC_ACTIONS_STATUS_H_

2
src/actions/tag.cc
View File

@ -18,7 +18,7 @@
#include <iostream>
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#include "src/macro_expansion.h"
#include "modsecurity/rule.h"

2
src/actions/tag.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_TAG_H_
#define SRC_ACTIONS_TAG_H_

2
src/actions/transformations/base64_decode.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_BASE64_DECODE_H_

2
src/actions/transformations/base64_decode_ext.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_BASE64_DECODE_EXT_H_

2
src/actions/transformations/base64_encode.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_BASE64_ENCODE_H_

2
src/actions/transformations/cmd_line.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_CMD_LINE_H_

2
src/actions/transformations/compress_whitespace.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_COMPRESS_WHITESPACE_H_

2
src/actions/transformations/css_decode.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_CSS_DECODE_H_

2
src/actions/transformations/escape_seq_decode.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_ESCAPE_SEQ_DECODE_H_

2
src/actions/transformations/hex_decode.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_HEX_DECODE_H_

2
src/actions/transformations/hex_encode.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_HEX_ENCODE_H_

2
src/actions/transformations/html_entity_decode.h
View File

@ -16,7 +16,7 @@
#include <string>
#include <unordered_map>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#include "src/utils/string.h"

2
src/actions/transformations/js_decode.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_JS_DECODE_H_

2
src/actions/transformations/length.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_LENGTH_H_

2
src/actions/transformations/lower_case.cc
View File

@ -20,7 +20,7 @@
#include "modsecurity/transaction.h"
#include "src/actions/transformations/transformation.h"
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
namespace modsecurity {
namespace actions {

2
src/actions/transformations/lower_case.h
View File

@ -16,7 +16,7 @@
#include <string>
#include <unordered_map>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_LOWER_CASE_H_

2
src/actions/transformations/md5.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_MD5_H_

2
src/actions/transformations/none.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_NONE_H_

2
src/actions/transformations/normalise_path.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_NORMALISE_PATH_H_

2
src/actions/transformations/normalise_path_win.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_NORMALISE_PATH_WIN_H_

2
src/actions/transformations/parity_even_7bit.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_PARITY_EVEN_7BIT_H_

2
src/actions/transformations/parity_odd_7bit.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_PARITY_ODD_7BIT_H_

2
src/actions/transformations/parity_zero_7bit.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_PARITY_ZERO_7BIT_H_

2
src/actions/transformations/remove_comments.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_REMOVE_COMMENTS_H_

2
src/actions/transformations/remove_comments_char.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_REMOVE_COMMENTS_CHAR_H_

2
src/actions/transformations/remove_nulls.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_REMOVE_NULLS_H_

2
src/actions/transformations/remove_whitespace.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_REMOVE_WHITESPACE_H_

2
src/actions/transformations/replace_comments.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_REPLACE_COMMENTS_H_

2
src/actions/transformations/replace_nulls.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_REPLACE_NULLS_H_

2
src/actions/transformations/sha1.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_SHA1_H_

2
src/actions/transformations/sql_hex_decode.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_SQL_HEX_DECODE_H_

2
src/actions/transformations/transformation.cc
View File

@ -21,7 +21,7 @@
#include <string>
#include "modsecurity/transaction.h"
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/base64_decode_ext.h"
#include "src/actions/transformations/base64_decode.h"
#include "src/actions/transformations/base64_encode.h"

2
src/actions/transformations/transformation.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_TRANSFORMATION_H_
#define SRC_ACTIONS_TRANSFORMATIONS_TRANSFORMATION_H_

2
src/actions/transformations/trim.cc
View File

@ -24,7 +24,7 @@
#include "modsecurity/transaction.h"
#include "src/actions/transformations/transformation.h"
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
namespace modsecurity {
namespace actions {

2
src/actions/transformations/trim.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_TRIM_H_

2
src/actions/transformations/trim_left.cc
View File

@ -25,7 +25,7 @@
#include "modsecurity/transaction.h"
#include "src/actions/transformations/transformation.h"
#include "src/actions/transformations/trim.h"
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
namespace modsecurity {
namespace actions {

2
src/actions/transformations/trim_left.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#include "src/actions/transformations/trim.h"

2
src/actions/transformations/trim_right.cc
View File

@ -24,7 +24,7 @@
#include "modsecurity/transaction.h"
#include "src/actions/transformations/transformation.h"
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
namespace modsecurity {
namespace actions {

2
src/actions/transformations/trim_right.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#include "src/actions/transformations/trim.h"

2
src/actions/transformations/url_decode.h
View File

@ -16,7 +16,7 @@
#include <string>
#include <unordered_map>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_URL_DECODE_H_

2
src/actions/transformations/url_decode_uni.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_URL_DECODE_UNI_H_

2
src/actions/transformations/url_encode.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_URL_ENCODE_H_

2
src/actions/transformations/utf8_to_unicode.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_ACTIONS_TRANSFORMATIONS_UTF8_TO_UNICODE_H_

2
src/actions/ver.cc
View File

@ -18,7 +18,7 @@
#include <iostream>
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
#include "modsecurity/rule.h"
#include "src/macro_expansion.h"

2
src/actions/ver.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_VER_H_
#define SRC_ACTIONS_VER_H_

2
src/actions/xmlns.cc
View File

@ -18,7 +18,7 @@
#include <iostream>
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/transaction.h"
namespace modsecurity {

2
src/actions/xmlns.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#ifndef SRC_ACTIONS_XMLNS_H_
#define SRC_ACTIONS_XMLNS_H_

2
src/parser/seclang-parser.yy
View File

@ -21,7 +21,7 @@ class Driver;
#include "src/actions/accuracy.h"
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/allow.h"
#include "src/actions/audit_log.h"
#include "src/actions/ctl/audit_log_parts.h"

2
src/rule.cc
View File

@ -25,7 +25,7 @@
#include <utility>
#include "src/operators/operator.h"
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "modsecurity/modsecurity.h"
#include "src/actions/transformations/none.h"
#include "src/actions/tag.h"

2
src/rules.cc
View File

@ -93,8 +93,8 @@ Rules::~Rules() {
std::vector<actions::Action *> *tmp = &defaultActions[i];
while (tmp->empty() == false) {
actions::Action *a = tmp->back();
a->refCountDecreaseAndCheck();
tmp->pop_back();
delete a;
}
}
/** Cleanup audit log */

2
src/transaction.cc
View File

@ -32,7 +32,7 @@
#include <unordered_map>
#include <vector>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/deny.h"
#include "modsecurity/intervention.h"
#include "modsecurity/modsecurity.h"

2
src/utils/md5.h
View File

@ -15,7 +15,7 @@
#include <string>
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/transformations/transformation.h"
#ifndef SRC_UTILS_MD5_H_

2
src/variables/rule.cc
View File

@ -39,7 +39,7 @@
#include "modsecurity/rules.h"
#include "src/request_body_processor/xml.h"
#include "src/actions/action.h"
#include "modsecurity/actions/action.h"
#include "src/actions/severity.h"
#include "src/actions/xmlns.h"
#include "src/actions/log_data.h"

Some files were not shown because too many files have changed in this diff Show More