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 m_uri_no_query_string_decoded to transaction

Browse Source
This commit is contained in:
Felipe Zimmerle 2016-11-22 15:14:39 -03:00
parent ab88083159
commit 293a849668
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
headers/modsecurity/transaction.h
View File

@ -215,10 +215,15 @@ class Transaction {
const char *m_serverIpAddress; const char *m_serverIpAddress;
/** /**
* Holds the raw URI that was requestd. * Holds the raw URI that was requested.
*/ */
const char *m_uri; const char *m_uri;
/**
* Holds the URI that was requests (without the query string).
*/
std::string m_uri_no_query_string_decoded;
/** /**
* Holds the combined size of all arguments, later used to fill the * Holds the combined size of all arguments, later used to fill the
* variable ARGS_COMBINED_SIZE. * variable ARGS_COMBINED_SIZE.

2
src/rule_message.cc
View File

@ -45,7 +45,7 @@ std::string RuleMessage::errorLog(Transaction *trans) {
} }
msg.append(" [hostname \"" + std::string(trans->m_serverIpAddress) \ msg.append(" [hostname \"" + std::string(trans->m_serverIpAddress) \
+ "\"]"); + "\"]");
msg.append(" [uri \"" + std::string(trans->m_uri) + "\"]"); msg.append(" [uri \"" + trans->m_uri_no_query_string_decoded + "\"]");
msg.append(" [unique_id \"" + trans->m_id + "\"]"); msg.append(" [unique_id \"" + trans->m_id + "\"]");
return modsecurity::utils::string::toHexIfNeeded(msg); return modsecurity::utils::string::toHexIfNeeded(msg);

7
src/transaction.cc
View File

@ -102,6 +102,7 @@ Transaction::Transaction(ModSecurity *ms, Rules *rules, void *logCbData)
m_clientPort(0), m_clientPort(0),
m_serverPort(0), m_serverPort(0),
m_uri(""), m_uri(""),
m_uri_no_query_string_decoded(""),
m_method(""), m_method(""),
m_httpVersion(""), m_httpVersion(""),
m_rules(rules), m_rules(rules),
@ -384,6 +385,12 @@ int Transaction::processURI(const char *uri, const char *method,
m_collections.store("REQUEST_LINE", std::string(method) + " " + m_collections.store("REQUEST_LINE", std::string(method) + " " +
std::string(uri) + " HTTP/" + std::string(http_version)); std::string(uri) + " HTTP/" + std::string(http_version));
if (pos != std::string::npos) {
m_uri_no_query_string_decoded = std::string(m_uri_decoded, 0, pos);
} else {
m_uri_no_query_string_decoded = std::string(m_uri_decoded);
}
if (pos_raw != std::string::npos) { if (pos_raw != std::string::npos) {
m_collections.store("QUERY_STRING", std::string(uri_s, pos_raw + 1, m_collections.store("QUERY_STRING", std::string(uri_s, pos_raw + 1,
uri_s.length() - (pos_raw + 1))); uri_s.length() - (pos_raw + 1)));