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

Adds addArgument method to transaction class

Browse Source 
There was a bit of refactoring to use the addArgument function, instead
of adding the items manually.
This commit is contained in:
Felipe Zimmerle 2016-06-17 14:34:22 -03:00
parent ebe8424758
commit 5c088c8be4
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
2 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
headers/modsecurity/transaction.h
View File

@ -144,6 +144,9 @@ class Transaction {
bool intervention(ModSecurityIntervention *it); bool intervention(ModSecurityIntervention *it);
bool addArgument(const std::string& orig, const std::string& key,
const std::string& value);
const char *getResponseBody(); const char *getResponseBody();
int getResponseBodyLenth(); int getResponseBodyLenth();

80
src/transaction.cc
View File

@ -231,6 +231,44 @@ int Transaction::processConnection(const char *client, int cPort,
} }
bool Transaction::addArgument(const std::string& orig, const std::string& key,
const std::string& value) {
debug(4, "Adding request argument (" + orig + "): name \"" + \
key + "\", value \"" + value + "\"");
m_collections.store("ARGS:" + key, value);
if (orig == "GET") {
m_collections.store("ARGS_GET:" + key, value);
if (m_namesArgsGet->empty()) {
m_namesArgsGet->assign(key);
} else {
m_namesArgsGet->assign(*m_namesArgsGet + " " + key);
}
}
if (orig == "POST") {
m_collections.store("ARGS_POST:" + key, value);
if (m_namesArgsPost->empty()) {
m_namesArgsPost->assign(key);
} else {
m_namesArgsPost->assign(*m_namesArgsPost + " " + key);
}
}
if (m_namesArgs->empty()) {
m_namesArgs->assign(key);
} else {
m_namesArgs->assign(*m_namesArgs + " " + key);
}
this->m_ARGScombinedSize = this->m_ARGScombinedSize + \
key.length() + value.length();
this->m_ARGScombinedSizeStr->assign(
std::to_string(this->m_ARGScombinedSize));
return true;
}
/** /**
* @name processURI * @name processURI
* @brief Perform the analysis on the URI and all the query string variables. * @brief Perform the analysis on the URI and all the query string variables.
@ -361,28 +399,7 @@ int Transaction::processURI(const char *uri, const char *method,
i--; i--;
} }
m_collections.store("ARGS:" + key, value); addArgument("GET", key, value);
m_collections.store("ARGS_GET:" + key, value);
if (m_namesArgs->empty()) {
m_namesArgs->assign(key);
} else {
m_namesArgs->assign(*m_namesArgs + " " + key);
}
if (m_namesArgsGet->empty()) {
m_namesArgsGet->assign(key);
} else {
m_namesArgsGet->assign(*m_namesArgsGet + " " + key);
}
this->m_ARGScombinedSize = this->m_ARGScombinedSize + \
key.length() + value.length();
this->m_ARGScombinedSizeStr->assign(
std::to_string(this->m_ARGScombinedSize));
#ifndef NO_LOGS
debug(4, "Adding request argument (QUERY_STRING): name \"" + \
key + "\", value \"" + value + "\"");
#endif
} }
} }
return true; return true;
@ -676,24 +693,7 @@ int Transaction::processRequestBody() {
} }
} }
m_collections.store("ARGS:" + key, value); addArgument("POST", key, value);
m_collections.store("ARGS_POST:" + key, value);
if (m_namesArgs->empty()) {
m_namesArgs->assign(key);
} else {
m_namesArgs->assign(*m_namesArgs + " " + key);
}
if (m_namesArgsPost->empty()) {
m_namesArgsPost->assign(key);
} else {
m_namesArgsPost->assign(*m_namesArgsPost + " " + key);
}
this->m_ARGScombinedSize = this->m_ARGScombinedSize + \
key.length() + value.length();
this->m_ARGScombinedSizeStr->assign(
std::to_string(this->m_ARGScombinedSize));
} }
} else { } else {
std::string *a = m_collections.resolveFirst( std::string *a = m_collections.resolveFirst(