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

Renames collection::Variable to VariableValue

Browse Source
This commit is contained in:
Felipe Zimmerle
2018-02-02 18:50:04 -03:00
parent de7c5c89bb
commit eeec7efb68
137 changed files with 304 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/variables/args.h
View File

@@ -37,7 +37,7 @@ class Args_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableArgs.resolve(m_dictElement, l);
}
@@ -52,7 +52,7 @@ class Args_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableArgs.resolve(l);
}
};
@@ -67,7 +67,7 @@ class Args_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableArgs.resolveRegularExpression(&m_r, l);
}

2
src/variables/args_combined_size.h
View File

@@ -36,7 +36,7 @@ class ArgsCombinedSize : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableARGScombinedSize.evaluate(l);
}
};

6
src/variables/args_get.h
View File

@@ -37,7 +37,7 @@ class ArgsGet_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableArgsGet.resolve(m_dictElement, l);
}
@@ -52,7 +52,7 @@ class ArgsGet_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableArgsGet.resolve(l);
}
};
@@ -66,7 +66,7 @@ class ArgsGet_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableArgsGet.resolveRegularExpression(&m_r, l);
}

6
src/variables/args_get_names.h
View File

@@ -38,7 +38,7 @@ class ArgsGetNames_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableArgsGetNames.resolve(m_dictElement, l);
}
@@ -52,7 +52,7 @@ class ArgsGetNames_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableArgsGetNames.resolve(l);
}
};
@@ -65,7 +65,7 @@ class ArgsGetNames_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableArgsGetNames.resolveRegularExpression(
&m_r, l);
}

6
src/variables/args_names.h
View File

@@ -38,7 +38,7 @@ class ArgsNames_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableArgsNames.resolve(m_dictElement, l);
}
@@ -52,7 +52,7 @@ class ArgsNames_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableArgsNames.resolve(l);
}
};
@@ -65,7 +65,7 @@ class ArgsNames_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableArgsNames.resolveRegularExpression(
&m_r, l);
}

6
src/variables/args_post.h
View File

@@ -37,7 +37,7 @@ class ArgsPost_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableArgsPost.resolve(m_dictElement, l);
}
@@ -52,7 +52,7 @@ class ArgsPost_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableArgsPost.resolve(l);
}
};
@@ -66,7 +66,7 @@ class ArgsPost_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableArgsPost.resolveRegularExpression(&m_r, l);
}

6
src/variables/args_post_names.h
View File

@@ -38,7 +38,7 @@ class ArgsPostNames_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableArgsPostNames.resolve(m_dictElement, l);
}
@@ -52,7 +52,7 @@ class ArgsPostNames_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableArgsPostNames.resolve(l);
}
};
@@ -65,7 +65,7 @@ class ArgsPostNames_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableArgsPostNames.resolveRegularExpression(
&m_r, l);
}

2
src/variables/auth_type.h
View File

@@ -36,7 +36,7 @@ class AuthType : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableAuthType.evaluate(l);
}
};

4
src/variables/duration.cc
View File

@@ -29,12 +29,12 @@ namespace Variables {
void Duration::evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
double e = utils::cpu_seconds() - transaction->m_creationTimeStamp;
transaction->m_variableDuration.assign(std::to_string(e));
l->push_back(new collection::Variable(&m_retName,
l->push_back(new VariableValue(&m_retName,
&transaction->m_variableDuration));
}

2
src/variables/duration.h
View File

@@ -36,7 +36,7 @@ class Duration : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override;
std::vector<const VariableValue *> *l) override;
std::string m_retName;
};

4
src/variables/env.cc
View File

@@ -34,7 +34,7 @@ namespace Variables {
void Env::evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
for (char **current = environ; *current; current++) {
std::string env = std::string(*current);
size_t pos = env.find_first_of("=");
@@ -51,7 +51,7 @@ void Env::evaluate(Transaction *transaction,
if (x.first != m_name && m_name.length() > 0) {
continue;
}
l->push_back(new collection::Variable(&m_collectionName, &x.first, &x.second));
l->push_back(new VariableValue(&m_collectionName, &x.first, &x.second));
}
}

2
src/variables/env.h
View File

@@ -35,7 +35,7 @@ class Env : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override;
std::vector<const VariableValue *> *l) override;
};

6
src/variables/files.h
View File

@@ -38,7 +38,7 @@ class Files_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableFiles.resolve(m_dictElement, l);
}
@@ -53,7 +53,7 @@ class Files_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableFiles.resolve(l);
}
};
@@ -67,7 +67,7 @@ class Files_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableFiles.resolveRegularExpression(
&m_r, l);
}

2
src/variables/files_combined_size.h
View File

@@ -36,7 +36,7 @@ class FilesCombinedSize : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableFilesCombinedSize.evaluate(l);
}
};

6
src/variables/files_names.h
View File

@@ -38,7 +38,7 @@ class FilesNames_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableFilesNames.resolve(m_dictElement, l);
}
@@ -53,7 +53,7 @@ class FilesNames_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableFilesNames.resolve(l);
}
};
@@ -68,7 +68,7 @@ class FilesNames_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableFilesNames.resolveRegularExpression(
&m_r, l);
}

6
src/variables/files_sizes.h
View File

@@ -38,7 +38,7 @@ class FilesSizes_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableFilesSizes.resolve(m_dictElement, l);
}
@@ -53,7 +53,7 @@ class FilesSizes_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableFilesSizes.resolve(l);
}
};
@@ -67,7 +67,7 @@ class FilesSizes_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableFilesSizes.resolveRegularExpression(
&m_r, l);
}

6
src/variables/files_tmp_content.h
View File

@@ -38,7 +38,7 @@ class FilesTmpContent_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableFilesTmpContent.resolve(m_dictElement, l);
}
@@ -53,7 +53,7 @@ class FilesTmpContent_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableFilesTmpContent.resolve(l);
}
};
@@ -67,7 +67,7 @@ class FilesTmpContent_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableFilesTmpContent.resolveRegularExpression(
&m_r, l);
}

6
src/variables/files_tmp_names.h
View File

@@ -37,7 +37,7 @@ class FilesTmpNames_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableFilesTmpNames.resolve(m_dictElement, l);
}
@@ -52,7 +52,7 @@ class FilesTmpNames_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableFilesTmpNames.resolve(l);
}
};
@@ -66,7 +66,7 @@ class FilesTmpNames_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableFilesTmpNames.resolveRegularExpression(
&m_r, l);
}

2
src/variables/full_request.h
View File

@@ -36,7 +36,7 @@ class FullRequest : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableFullRequest.evaluate(l);
}
};

2
src/variables/full_request_length.h
View File

@@ -36,7 +36,7 @@ class FullRequestLength : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableFullRequestLength.evaluate(l);
}
};

6
src/variables/geo.h
View File

@@ -38,7 +38,7 @@ class Geo_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableGeo.resolve(m_dictElement, l);
}
@@ -53,7 +53,7 @@ class Geo_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableGeo.resolve(l);
}
};
@@ -67,7 +67,7 @@ class Geo_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableGeo.resolveRegularExpression(
&m_r, l);
}

8
src/variables/global.h
View File

@@ -39,7 +39,7 @@ class Global_DictElement : public Variable {
void evaluate(Transaction *t,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
t->m_collections.m_global_collection->resolveMultiMatches(
m_dictElement, t->m_collections.m_global_collection_key, l);
}
@@ -55,7 +55,7 @@ class Global_NoDictElement : public Variable {
void evaluate(Transaction *t,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
t->m_collections.m_global_collection->resolveMultiMatches(m_name,
t->m_collections.m_global_collection_key, l);
}
@@ -71,7 +71,7 @@ class Global_DictElementRegexp : public Variable {
void evaluate(Transaction *t,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
t->m_collections.m_global_collection->resolveRegularExpression(
m_dictElement, t->m_collections.m_global_collection_key, l);
}
@@ -89,7 +89,7 @@ class Global_DynamicElement : public Variable {
void evaluate(Transaction *t,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
std::string string = m_string->evaluate(t);
t->m_collections.m_global_collection->resolveMultiMatches(
string, t->m_collections.m_global_collection_key, l);

4
src/variables/highest_severity.cc
View File

@@ -28,10 +28,10 @@ namespace Variables {
void HighestSeverity::evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableHighestSeverityAction.assign(
std::to_string(transaction->m_highestSeverityAction));
l->push_back(new collection::Variable(m_fullName,
l->push_back(new VariableValue(m_fullName,
&transaction->m_variableHighestSeverityAction));
}

2
src/variables/highest_severity.h
View File

@@ -36,7 +36,7 @@ class HighestSeverity : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override;
std::vector<const VariableValue *> *l) override;
std::string m_retName;
};

2
src/variables/inbound_data_error.h
View File

@@ -36,7 +36,7 @@ class InboundDataError : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableInboundDataError.evaluate(l);
}
};

8
src/variables/ip.h
View File

@@ -39,7 +39,7 @@ class Ip_DictElement : public Variable {
void evaluate(Transaction *t,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
t->m_collections.m_ip_collection->resolveMultiMatches(m_dictElement,
t->m_collections.m_ip_collection_key, l);
@@ -56,7 +56,7 @@ class Ip_NoDictElement : public Variable {
void evaluate(Transaction *t,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
t->m_collections.m_ip_collection->resolveMultiMatches(m_name,
t->m_collections.m_ip_collection_key, l);
}
@@ -72,7 +72,7 @@ class Ip_DictElementRegexp : public Variable {
void evaluate(Transaction *t,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
t->m_collections.m_ip_collection->resolveRegularExpression(m_dictElement,
t->m_collections.m_ip_collection_key, l);
}
@@ -90,7 +90,7 @@ class Ip_DynamicElement : public Variable {
void evaluate(Transaction *t,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
std::string string = m_string->evaluate(t);
t->m_collections.m_ip_collection->resolveMultiMatches("IP:" + string,
t->m_collections.m_ip_collection_key, l);

2
src/variables/matched_var.h
View File

@@ -36,7 +36,7 @@ class MatchedVar : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableMatchedVar.evaluate(l);
}
};

2
src/variables/matched_var_name.h
View File

@@ -36,7 +36,7 @@ class MatchedVarName : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableMatchedVarName.evaluate(l);
}
};

6
src/variables/matched_vars.h
View File

@@ -38,7 +38,7 @@ class MatchedVars_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableMatchedVars.resolve(m_dictElement, l);
}
@@ -53,7 +53,7 @@ class MatchedVars_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableMatchedVars.resolve(l);
}
};
@@ -67,7 +67,7 @@ class MatchedVars_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableMatchedVars.resolveRegularExpression(
&m_r, l);
}

6
src/variables/matched_vars_names.h
View File

@@ -38,7 +38,7 @@ class MatchedVarsNames_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableMatchedVarsNames.resolve(m_dictElement, l);
}
@@ -53,7 +53,7 @@ class MatchedVarsNames_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableMatchedVarsNames.resolve(l);
}
};
@@ -67,7 +67,7 @@ class MatchedVarsNames_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableMatchedVarsNames.resolveRegularExpression(
&m_r, l);
}

4
src/variables/modsec_build.cc
View File

@@ -26,9 +26,9 @@ namespace Variables {
void ModsecBuild::evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
l->push_back(new collection::Variable(&m_retName, &m_build));
l->push_back(new VariableValue(&m_retName, &m_build));
}

2
src/variables/modsec_build.h
View File

@@ -45,7 +45,7 @@ class ModsecBuild : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override;
std::vector<const VariableValue *> *l) override;
std::string m_build;
std::string m_retName;

2
src/variables/multipart_boundary_quoted.h
View File

@@ -36,7 +36,7 @@ class MultipartBoundaryQuoted : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableMultipartBoundaryQuoted.evaluate(l);
}
};

2
src/variables/multipart_boundary_whitespace.h
View File

@@ -36,7 +36,7 @@ class MultipartBoundaryWhiteSpace : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableMultipartBoundaryWhiteSpace.evaluate(l);
}
};

2
src/variables/multipart_crlf_lf_lines.h
View File

@@ -36,7 +36,7 @@ class MultipartCrlfLFLines : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableMultipartCrlfLFLines.evaluate(l);
}
};

2
src/variables/multipart_data_after.h
View File

@@ -36,7 +36,7 @@ class MultipartDateAfter : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableMultipartDataAfter.evaluate(l);
}
};

2
src/variables/multipart_data_before.h
View File

@@ -36,7 +36,7 @@ class MultipartDateBefore : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableMultipartDataBefore.evaluate(l);
}
};

2
src/variables/multipart_file_limit_exceeded.h
View File

@@ -36,7 +36,7 @@ class MultipartFileLimitExceeded : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableMultipartFileLimitExceeded.evaluate(l);
}
};

6
src/variables/multipart_file_name.h
View File

@@ -38,7 +38,7 @@ class MultiPartFileName_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableMultipartFileName.resolve(m_dictElement, l);
}
@@ -53,7 +53,7 @@ class MultiPartFileName_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableMultipartFileName.resolve(l);
}
};
@@ -67,7 +67,7 @@ class MultiPartFileName_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableMultipartFileName.resolveRegularExpression(
&m_r, l);
}

2
src/variables/multipart_header_folding.h
View File

@@ -36,7 +36,7 @@ class MultipartHeaderFolding : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableMultipartHeaderFolding.evaluate(l);
}
};

2
src/variables/multipart_invalid_header_folding.h
View File

@@ -36,7 +36,7 @@ class MultipartInvalidHeaderFolding : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableMultipartInvalidHeaderFolding.evaluate(l);
}
};

2
src/variables/multipart_invalid_part.h
View File

@@ -36,7 +36,7 @@ class MultipartInvalidPart : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableMultipartInvalidPart.evaluate(l);
}
};

2
src/variables/multipart_invalid_quoting.h
View File

@@ -35,7 +35,7 @@ class MultipartInvalidQuoting : public Variable {
: Variable("MULTIPART_INVALID_QUOTING") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableMultipartInvalidQuoting.evaluate(l);
}
};

2
src/variables/multipart_lf_line.h
View File

@@ -36,7 +36,7 @@ class MultipartLFLine : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableMultipartLFLine.evaluate(l);
}
};

2
src/variables/multipart_missing_semicolon.h
View File

@@ -36,7 +36,7 @@ class MultipartMissingSemicolon : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableMultipartMissingSemicolon.evaluate(l);
}
};

6
src/variables/multipart_name.h
View File

@@ -38,7 +38,7 @@ class MultiPartName_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableMultipartName.resolve(m_dictElement, l);
}
@@ -53,7 +53,7 @@ class MultiPartName_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableMultipartName.resolve(l);
}
};
@@ -67,7 +67,7 @@ class MultiPartName_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableMultipartName.resolveRegularExpression(
&m_r, l);
}

2
src/variables/multipart_strict_error.h
View File

@@ -36,7 +36,7 @@ class MultipartStrictError : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableMultipartStrictError.evaluate(l);
}
};

2
src/variables/multipart_unmatched_boundary.h
View File

@@ -36,7 +36,7 @@ class MultipartUnmatchedBoundary : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableMultipartUnmatchedBoundary.evaluate(l);
}
};

2
src/variables/outbound_data_error.h
View File

@@ -36,7 +36,7 @@ class OutboundDataError : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableOutboundDataError.evaluate(l);
}
};

2
src/variables/path_info.h
View File

@@ -36,7 +36,7 @@ class PathInfo : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variablePathInfo.evaluate(l);
}
};

2
src/variables/query_string.h
View File

@@ -36,7 +36,7 @@ class QueryString : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableQueryString.evaluate(l);
}
};

2
src/variables/remote_addr.h
View File

@@ -36,7 +36,7 @@ class RemoteAddr : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableRemoteAddr.evaluate(l);
}
};

2
src/variables/remote_host.h
View File

@@ -36,7 +36,7 @@ class RemoteHost : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableRemoteHost.evaluate(l);
}
};

2
src/variables/remote_port.h
View File

@@ -36,7 +36,7 @@ class RemotePort : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableRemotePort.evaluate(l);
}
};

10
src/variables/remote_user.cc
View File

@@ -38,14 +38,14 @@ namespace Variables {
void RemoteUser::evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
size_t pos;
std::string base64;
collection::Variable *var;
VariableValue *var;
std::string header;
std::vector<const collection::Variable *> *l2 = \
new std::vector<const collection::Variable *>();
std::vector<const VariableValue *> *l2 = \
new std::vector<const VariableValue *>();
transaction->m_variableRequestHeaders.resolve("authorization", l2);
if (l2->size() < 1) {
@@ -66,7 +66,7 @@ void RemoteUser::evaluate(Transaction *transaction,
}
transaction->m_variableRemoteUser.assign(std::string(base64, 0, pos));
var = new collection::Variable(&l2->at(0)->m_key,
var = new VariableValue(&l2->at(0)->m_key,
&transaction->m_variableRemoteUser);
for (auto &i : l2->at(0)->m_orign) {

2
src/variables/remote_user.h
View File

@@ -38,7 +38,7 @@ class RemoteUser : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override;
std::vector<const VariableValue *> *l) override;
std::string m_retName;
};

2
src/variables/reqbody_error.h
View File

@@ -36,7 +36,7 @@ class ReqbodyError : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableReqbodyError.evaluate(l);
}
};

2
src/variables/reqbody_error_msg.h
View File

@@ -35,7 +35,7 @@ class ReqbodyErrorMsg : public Variable {
: Variable("REQBODY_ERROR_MSG") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableReqbodyErrorMsg.evaluate(l);
}
};

2
src/variables/reqbody_processor.h
View File

@@ -35,7 +35,7 @@ class ReqbodyProcessor : public Variable {
: Variable("REQBODY_PROCESSOR") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableReqbodyProcessor.evaluate(l);
}
};

2
src/variables/reqbody_processor_error.h
View File

@@ -36,7 +36,7 @@ class ReqbodyProcessorError : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableReqbodyProcessorError.evaluate(l);
}
};

2
src/variables/reqbody_processor_error_msg.h
View File

@@ -36,7 +36,7 @@ class ReqbodyProcessorErrorMsg : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableReqbodyProcessorErrorMsg.evaluate(l);
}
};

2
src/variables/request_base_name.h
View File

@@ -36,7 +36,7 @@ class RequestBasename : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableRequestBasename.evaluate(l);
}
};

2
src/variables/request_body.h
View File

@@ -35,7 +35,7 @@ class RequestBody : public Variable {
: Variable("REQUEST_BODY") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableRequestBody.evaluate(l);
}
};

2
src/variables/request_body_length.h
View File

@@ -35,7 +35,7 @@ class RequestBodyLength : public Variable {
: Variable("REQUEST_BODY_LENGTH") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableRequestBodyLength.evaluate(l);
}
};

6
src/variables/request_cookies.h
View File

@@ -38,7 +38,7 @@ class RequestCookies_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableRequestCookies.resolve(m_dictElement, l);
}
@@ -53,7 +53,7 @@ class RequestCookies_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableRequestCookies.resolve(l);
}
};
@@ -67,7 +67,7 @@ class RequestCookies_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableRequestCookies.resolveRegularExpression(
&m_r, l);
}

6
src/variables/request_cookies_names.h
View File

@@ -38,7 +38,7 @@ class RequestCookiesNames_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableRequestCookiesNames.resolve(m_dictElement, l);
}
@@ -53,7 +53,7 @@ class RequestCookiesNames_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableRequestCookiesNames.resolve(l);
}
};
@@ -67,7 +67,7 @@ class RequestCookiesNames_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableRequestCookiesNames.resolveRegularExpression(
&m_r, l);
}

2
src/variables/request_file_name.h
View File

@@ -35,7 +35,7 @@ class RequestFilename : public Variable {
: Variable("REQUEST_FILENAME") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableRequestFilename.evaluate(l);
}
};

6
src/variables/request_headers.h
View File

@@ -38,7 +38,7 @@ class RequestHeaders_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableRequestHeaders.resolve(m_dictElement, l);
}
@@ -53,7 +53,7 @@ class RequestHeaders_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableRequestHeaders.resolve(l);
}
};
@@ -67,7 +67,7 @@ class RequestHeaders_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableRequestHeaders.resolveRegularExpression(
&m_r, l);
}

6
src/variables/request_headers_names.h
View File

@@ -38,7 +38,7 @@ class RequestHeadersNames_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableRequestHeadersNames.resolve(m_dictElement, l);
}
@@ -52,7 +52,7 @@ class RequestHeadersNames_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableRequestHeadersNames.resolve(l);
}
};
@@ -65,7 +65,7 @@ class RequestHeadersNames_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableRequestHeadersNames.resolveRegularExpression(
&m_r, l);
}

2
src/variables/request_line.h
View File

@@ -35,7 +35,7 @@ class RequestLine : public Variable {
: Variable("REQUEST_LINE") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableRequestLine.evaluate(l);
}
};

2
src/variables/request_method.h
View File

@@ -35,7 +35,7 @@ class RequestMethod : public Variable {
: Variable("REQUEST_METHOD") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableRequestMethod.evaluate(l);
}
};

2
src/variables/request_protocol.h
View File

@@ -35,7 +35,7 @@ class RequestProtocol : public Variable {
: Variable("REQUEST_PROTOCOL") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableRequestProtocol.evaluate(l);
}
};

2
src/variables/request_uri.h
View File

@@ -35,7 +35,7 @@ class RequestURI : public Variable {
: Variable("REQUEST_URI") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableRequestURI.evaluate(l);
}
};

2
src/variables/request_uri_raw.h
View File

@@ -35,7 +35,7 @@ class RequestURIRaw : public Variable {
: Variable("REQUEST_URI_RAW") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableRequestURIRaw.evaluate(l);
}
};

8
src/variables/resource.h
View File

@@ -39,7 +39,7 @@ class Resource_DictElement : public Variable {
void evaluate(Transaction *t,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
t->m_collections.m_resource_collection->resolveMultiMatches(m_dictElement,
t->m_collections.m_resource_collection_key,
t->m_rules->m_secWebAppId.m_value, l);
@@ -56,7 +56,7 @@ class Resource_NoDictElement : public Variable {
void evaluate(Transaction *t,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
t->m_collections.m_resource_collection->resolveMultiMatches(m_name,
t->m_collections.m_resource_collection_key,
t->m_rules->m_secWebAppId.m_value, l);
@@ -73,7 +73,7 @@ class Resource_DictElementRegexp : public Variable {
void evaluate(Transaction *t,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
t->m_collections.m_resource_collection->resolveRegularExpression(
m_dictElement, t->m_collections.m_resource_collection_key,
t->m_rules->m_secWebAppId.m_value, l);
@@ -92,7 +92,7 @@ class Resource_DynamicElement : public Variable {
void evaluate(Transaction *t,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
std::string string = m_string->evaluate(t);
t->m_collections.m_resource_collection->resolveMultiMatches(
string,

2
src/variables/response_body.h
View File

@@ -35,7 +35,7 @@ class ResponseBody : public Variable {
: Variable("RESPONSE_BODY") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableResponseBody.evaluate(l);
}
};

2
src/variables/response_content_length.h
View File

@@ -35,7 +35,7 @@ class ResponseContentLength : public Variable {
: Variable("RESPONSE_CONTENT_LENGTH") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableResponseContentLength.evaluate(l);
}
};

2
src/variables/response_content_type.h
View File

@@ -35,7 +35,7 @@ class ResponseContentType : public Variable {
: Variable("RESPONSE_CONTENT_TYPE") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableResponseContentType.evaluate(l);
}
};

6
src/variables/response_headers.h
View File

@@ -38,7 +38,7 @@ class ResponseHeaders_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableResponseHeaders.resolve(m_dictElement, l);
}
@@ -53,7 +53,7 @@ class ResponseHeaders_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableResponseHeaders.resolve(l);
}
};
@@ -67,7 +67,7 @@ class ResponseHeaders_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableResponseHeaders.resolveRegularExpression(
&m_r, l);
}

6
src/variables/response_headers_names.h
View File

@@ -38,7 +38,7 @@ class ResponseHeadersNames_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableResponseHeadersNames.resolve(m_dictElement, l);
}
@@ -52,7 +52,7 @@ class ResponseHeadersNames_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableResponseHeadersNames.resolve(l);
}
};
@@ -65,7 +65,7 @@ class ResponseHeadersNames_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableResponseHeadersNames.resolveRegularExpression(
&m_r, l);
}

2
src/variables/response_protocol.h
View File

@@ -35,7 +35,7 @@ class ResponseProtocol : public Variable {
: Variable("RESPONSE_PROTOCOL") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableResponseProtocol.evaluate(l);
}
};

2
src/variables/response_status.h
View File

@@ -35,7 +35,7 @@ class ResponseStatus : public Variable {
: Variable("RESPONSE_STATUS") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableResponseStatus.evaluate(l);
}
};

6
src/variables/rule.h
View File

@@ -36,7 +36,7 @@ class Rule_DictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableRule.resolve(m_dictElement, l);
}
@@ -51,7 +51,7 @@ class Rule_NoDictElement : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableRule.resolve(l);
}
};
@@ -65,7 +65,7 @@ class Rule_DictElementRegexp : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
transaction->m_variableRule.resolveRegularExpression(
&m_r, l);
}

2
src/variables/server_addr.h
View File

@@ -36,7 +36,7 @@ class ServerAddr : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableServerAddr.evaluate(l);
}
};

2
src/variables/server_name.h
View File

@@ -36,7 +36,7 @@ class ServerName : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableServerName.evaluate(l);
}
};

2
src/variables/server_port.h
View File

@@ -36,7 +36,7 @@ class ServerPort : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableServerPort.evaluate(l);
}
};

8
src/variables/session.h
View File

@@ -39,7 +39,7 @@ class Session_DictElement : public Variable {
void evaluate(Transaction *t,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
t->m_collections.m_session_collection->resolveMultiMatches(
m_dictElement, t->m_collections.m_session_collection_key,
t->m_rules->m_secWebAppId.m_value, l);
@@ -56,7 +56,7 @@ class Session_NoDictElement : public Variable {
void evaluate(Transaction *t,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
t->m_collections.m_session_collection->resolveMultiMatches(m_name,
t->m_collections.m_session_collection_key,
t->m_rules->m_secWebAppId.m_value, l);
@@ -73,7 +73,7 @@ class Session_DictElementRegexp : public Variable {
void evaluate(Transaction *t,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
t->m_collections.m_session_collection->resolveRegularExpression(m_dictElement,
t->m_collections.m_session_collection_key,
t->m_rules->m_secWebAppId.m_value, l);
@@ -92,7 +92,7 @@ class Session_DynamicElement : public Variable {
void evaluate(Transaction *t,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
std::vector<const VariableValue *> *l) override {
std::string string = m_string->evaluate(t);
t->m_collections.m_session_collection->resolveMultiMatches(
string,

2
src/variables/session_id.h
View File

@@ -36,7 +36,7 @@ class SessionID : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableSessionID.evaluate(l);
}
};

2
src/variables/status.h
View File

@@ -36,7 +36,7 @@ class Status : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableResponseStatus.evaluate(l);
}
};

4
src/variables/time.cc
View File

@@ -35,7 +35,7 @@ namespace Variables {
void Time::evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
char tstr[200];
struct tm timeinfo;
@@ -48,7 +48,7 @@ void Time::evaluate(Transaction *transaction,
strftime(tstr, 200, "%H:%M:%S", &timeinfo);
transaction->m_variableTime.assign(tstr);
l->push_back(new collection::Variable(&m_retName,
l->push_back(new VariableValue(&m_retName,
&transaction->m_variableTime));
}

2
src/variables/time.h
View File

@@ -37,7 +37,7 @@ class Time : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override;
std::vector<const VariableValue *> *l) override;
std::string m_retName;
};

4
src/variables/time_day.cc
View File

@@ -35,7 +35,7 @@ namespace Variables {
void TimeDay::evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
char tstr[200];
struct tm timeinfo;
time_t timer;
@@ -48,7 +48,7 @@ void TimeDay::evaluate(Transaction *transaction,
transaction->m_variableTimeDay.assign(tstr);
l->push_back(new collection::Variable(&m_retName,
l->push_back(new VariableValue(&m_retName,
&transaction->m_variableTimeDay));
}

2
src/variables/time_day.h
View File

@@ -36,7 +36,7 @@ class TimeDay : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override;
std::vector<const VariableValue *> *l) override;
std::string m_retName;
};

4
src/variables/time_epoch.cc
View File

@@ -35,10 +35,10 @@ namespace Variables {
void TimeEpoch::evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
transaction->m_variableTimeEpoch.assign(
std::to_string(std::time(nullptr)));
l->push_back(new collection::Variable(&m_retName,
l->push_back(new VariableValue(&m_retName,
&transaction->m_variableTimeEpoch));
}

2
src/variables/time_epoch.h
View File

@@ -36,7 +36,7 @@ class TimeEpoch : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override;
std::vector<const VariableValue *> *l) override;
std::string m_retName;
};

4
src/variables/time_hour.cc
View File

@@ -35,7 +35,7 @@ namespace Variables {
void TimeHour::evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
char tstr[200];
struct tm timeinfo;
time_t timer;
@@ -48,7 +48,7 @@ void TimeHour::evaluate(Transaction *transaction,
transaction->m_variableTimeHour.assign(tstr);
l->push_back(new collection::Variable(&m_retName,
l->push_back(new VariableValue(&m_retName,
&transaction->m_variableTimeHour));
}

2
src/variables/time_hour.h
View File

@@ -36,7 +36,7 @@ class TimeHour : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override;
std::vector<const VariableValue *> *l) override;
std::string m_retName;
};

4
src/variables/time_min.cc
View File

@@ -35,7 +35,7 @@ namespace Variables {
void TimeMin::evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
char tstr[200];
struct tm timeinfo;
time_t timer;
@@ -48,7 +48,7 @@ void TimeMin::evaluate(Transaction *transaction,
transaction->m_variableTimeMin.assign(tstr);
l->push_back(new collection::Variable(&m_retName,
l->push_back(new VariableValue(&m_retName,
&transaction->m_variableTimeMin));
}

2
src/variables/time_min.h
View File

@@ -36,7 +36,7 @@ class TimeMin : public Variable {
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override;
std::vector<const VariableValue *> *l) override;
std::string m_retName;
};

4
src/variables/time_mon.cc
View File

@@ -35,7 +35,7 @@ namespace Variables {
void TimeMon::evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
char tstr[200];
struct tm timeinfo;
time_t timer;
@@ -50,7 +50,7 @@ void TimeMon::evaluate(Transaction *transaction,
transaction->m_variableTimeMin.assign(std::to_string(a));
l->push_back(new collection::Variable(&m_retName,
l->push_back(new VariableValue(&m_retName,
&transaction->m_variableTimeMin));
}

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