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

Code cosmetic: Having the code following our coding style

Browse Source 
This commit also update some methods parameters to const.
This commit is contained in:
Felipe Zimmerle
2015-07-08 17:33:29 -03:00
parent 73154b51a1
commit 7ea9ff8836
19 changed files with 70 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
test/benchmark/benchmark.cc
View File

@@ -93,30 +93,30 @@ int main(int argc, char *argv[]) {
continue;
}
modsecAssay->addRequestHeader((char *) "Host",
(char *) "net.tutsplus.com");
modsecAssay->addRequestHeader((char *) "User-Agent", (char *)
modsecAssay->addRequestHeader("Host",
"net.tutsplus.com");
modsecAssay->addRequestHeader("User-Agent",
"Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.5) " \
"Gecko/20091102 Firefox/3.5.5 (.NET CLR 3.5.30729)\n\r");
modsecAssay->addRequestHeader((char *) "Accept",
(char *) "text/html,application/xhtml+xml,application/xml;" \
modsecAssay->addRequestHeader("Accept",
"text/html,application/xhtml+xml,application/xml;" \
"q=0.9,*/*;q=0.8");
modsecAssay->addRequestHeader((char *) "Accept-Language",
(char *) "en-us,en;q=0.5");
modsecAssay->addRequestHeader((char *) "Accept-Encoding",
(char *) "gzip,deflate");
modsecAssay->addRequestHeader((char *) "Accept-Charset",
(char *) "ISO-8859-1,utf-8;q=0.7,*;q=0.7");
modsecAssay->addRequestHeader((char *) "Keep-Alive",
(char *) "300");
modsecAssay->addRequestHeader((char *) "Connection",
(char *) "keep-alive");
modsecAssay->addRequestHeader((char *) "Cookie",
(char *) "PHPSESSID=r2t5uvjq435r4q7ib3vtdjq120");
modsecAssay->addRequestHeader((char *) "Pragma",
(char *) "no-cache");
modsecAssay->addRequestHeader((char *) "Cache-Control",
(char *) "no-cache");
modsecAssay->addRequestHeader("Accept-Language",
"en-us,en;q=0.5");
modsecAssay->addRequestHeader("Accept-Encoding",
"gzip,deflate");
modsecAssay->addRequestHeader("Accept-Charset",
"ISO-8859-1,utf-8;q=0.7,*;q=0.7");
modsecAssay->addRequestHeader("Keep-Alive",
"300");
modsecAssay->addRequestHeader("Connection",
"keep-alive");
modsecAssay->addRequestHeader("Cookie",
"PHPSESSID=r2t5uvjq435r4q7ib3vtdjq120");
modsecAssay->addRequestHeader("Pragma",
"no-cache");
modsecAssay->addRequestHeader("Cache-Control",
"no-cache");
modsecAssay->processRequestHeaders();
if (modsecAssay->intervention()) {
@@ -132,12 +132,12 @@ int main(int argc, char *argv[]) {
continue;
}
modsecAssay->addResponseHeader((char *) "HTTP/1.1",
(char *) "200 OK");
modsecAssay->addResponseHeader((char *) "Content-Type",
(char *) "text/xml; charset=utf-8");
modsecAssay->addResponseHeader((char *) "Content-Length",
(char *) "200");
modsecAssay->addResponseHeader("HTTP/1.1",
"200 OK");
modsecAssay->addResponseHeader("Content-Type",
"text/xml; charset=utf-8");
modsecAssay->addResponseHeader("Content-Length",
"200");
modsecAssay->processResponseHeaders();

14
test/regression/regression.cc
View File

@@ -72,7 +72,7 @@ void perform_unit_test(std::vector<RegressionTest *> *tests,
modsec = new ModSecurity::ModSecurity();
modsec_rules = new ModSecurity::Rules(debug_log);
if (modsec_rules->load((char *)(t->rules.c_str())) == false) {
if (modsec_rules->load(t->rules.c_str()) == false) {
std::cerr << "Problems parsing the rules, aborting!" << std::endl;
return;
}
@@ -80,14 +80,14 @@ void perform_unit_test(std::vector<RegressionTest *> *tests,
if (t->ip.empty() == false) {
// FIXME: no cast please.
modsec_assay->processConnection((char *)(t->ip.c_str()));
modsec_assay->processConnection(t->ip.c_str());
actions(&r, modsec_assay->intervention());
if (r.status != 200) {
goto end;
}
}
if (t->uri.empty() == false) {
modsec_assay->processURI((char *)(t->uri.c_str()));
modsec_assay->processURI(t->uri.c_str());
actions(&r, modsec_assay->intervention());
if (r.status != 200) {
goto end;
@@ -96,8 +96,8 @@ void perform_unit_test(std::vector<RegressionTest *> *tests,
for (std::pair<std::string, std::string> headers :
t->request_headers) {
modsec_assay->addRequestHeader((char *)headers.first.c_str(),
(char *)headers.second.c_str());
modsec_assay->addRequestHeader(headers.first.c_str(),
headers.second.c_str());
}
modsec_assay->processRequestHeaders();
@@ -117,8 +117,8 @@ void perform_unit_test(std::vector<RegressionTest *> *tests,
for (std::pair<std::string, std::string> headers :
t->response_headers) {
modsec_assay->addResponseHeader((char *)headers.first.c_str(),
(char *)headers.second.c_str());
modsec_assay->addResponseHeader(headers.first.c_str(),
headers.second.c_str());
}
modsec_assay->processResponseHeaders();