From 2ad87f640f4445e2b6a62dc7bf68a94d0c382d98 Mon Sep 17 00:00:00 2001 From: Eduardo Arias Date: Sun, 5 May 2024 15:15:47 -0300 Subject: [PATCH] Reference RuleWithActions & Transaction object instead of copying values in RuleMessage - Because the lifetime of the RuleMessage instances do not extend beyond the lifetime of the enclosing RuleWithActions & Transaction, RuleMessage can just reference it and simplify its definition. - Additionally, make the references const to show that it doesn't modify it. - Replace RuleMessage copy constructor with default implementations. - Removed unused RuleMessage assignment operator (which cannot be implemented now that it has reference members). - Removed constructor from RuleMessage pointer. - Addressed Sonarcloud suggestions: Do not use the constructor's initializer list for data member "xxx". Use the in-class initializer instead. --- .../reading_logs_via_rule_message.h | 4 +- .../using_bodies_in_chunks/simple_request.cc | 4 +- headers/modsecurity/rule.h | 13 +- headers/modsecurity/rule_message.h | 138 ++---------------- headers/modsecurity/rule_with_actions.h | 2 +- headers/modsecurity/transaction.h | 12 +- src/audit_log/writer/parallel.cc | 2 +- src/request_body_processor/multipart.cc | 2 +- src/rule_message.cc | 32 ++-- src/rule_with_actions.cc | 6 +- src/transaction.cc | 75 +++++----- 11 files changed, 85 insertions(+), 205 deletions(-) diff --git a/examples/reading_logs_via_rule_message/reading_logs_via_rule_message.h b/examples/reading_logs_via_rule_message/reading_logs_via_rule_message.h index 33148cd7..c91a473b 100644 --- a/examples/reading_logs_via_rule_message/reading_logs_via_rule_message.h +++ b/examples/reading_logs_via_rule_message/reading_logs_via_rule_message.h @@ -155,8 +155,8 @@ class ReadingLogsViaRuleMessage { const modsecurity::RuleMessage *ruleMessage = \ reinterpret_cast(ruleMessagev); - std::cout << "Rule Id: " << std::to_string(ruleMessage->m_ruleId); - std::cout << " phase: " << std::to_string(ruleMessage->m_phase); + std::cout << "Rule Id: " << std::to_string(ruleMessage->m_rule.m_ruleId); + std::cout << " phase: " << std::to_string(ruleMessage->getPhase()); std::cout << std::endl; if (ruleMessage->m_isDisruptive) { std::cout << " * Disruptive action: "; diff --git a/examples/using_bodies_in_chunks/simple_request.cc b/examples/using_bodies_in_chunks/simple_request.cc index 783e639b..b050f3cc 100644 --- a/examples/using_bodies_in_chunks/simple_request.cc +++ b/examples/using_bodies_in_chunks/simple_request.cc @@ -76,8 +76,8 @@ static void logCb(void *data, const void *ruleMessagev) { const modsecurity::RuleMessage *ruleMessage = \ reinterpret_cast(ruleMessagev); - std::cout << "Rule Id: " << std::to_string(ruleMessage->m_ruleId); - std::cout << " phase: " << std::to_string(ruleMessage->m_phase); + std::cout << "Rule Id: " << std::to_string(ruleMessage->m_rule.m_ruleId); + std::cout << " phase: " << std::to_string(ruleMessage->getPhase()); std::cout << std::endl; if (ruleMessage->m_isDisruptive) { std::cout << " * Disruptive action: "; diff --git a/headers/modsecurity/rule.h b/headers/modsecurity/rule.h index 34ccd064..b46abcfd 100644 --- a/headers/modsecurity/rule.h +++ b/headers/modsecurity/rule.h @@ -65,7 +65,7 @@ using MatchActions = std::vector; class Rule { public: Rule(std::unique_ptr fileName, int lineNumber) - : m_fileName(std::make_shared(*fileName)), + : m_fileName(*fileName), m_lineNumber(lineNumber), m_phase(modsecurity::Phases::RequestHeadersPhase) { } @@ -81,7 +81,7 @@ class Rule { virtual bool evaluate(Transaction *transaction, std::shared_ptr rm) = 0; - std::shared_ptr getFileName() const { + const std::string& getFileName() const { return m_fileName; } @@ -93,18 +93,15 @@ class Rule { void setPhase(int phase) { m_phase = phase; } virtual std::string getReference() { - if (m_fileName) { - return *m_fileName + ":" + std::to_string(m_lineNumber); - } - return "<>:" + std::to_string(m_lineNumber); + return m_fileName + ":" + std::to_string(m_lineNumber); } virtual bool isMarker() { return false; } private: - std::shared_ptr m_fileName; - int m_lineNumber; + const std::string m_fileName; + const int m_lineNumber; // FIXME: phase may not be neede to SecMarker. int m_phase; }; diff --git a/headers/modsecurity/rule_message.h b/headers/modsecurity/rule_message.h index 9e1ef556..330e7fce 100644 --- a/headers/modsecurity/rule_message.h +++ b/headers/modsecurity/rule_message.h @@ -42,116 +42,13 @@ class RuleMessage { ClientLogMessageInfo = 4 }; - /** - * - * FIXME: RuleMessage is currently too big, doing a lot of - * unnecessary data duplication. Needs to be shrink down. - * - */ - RuleMessage(RuleWithActions *rule, Transaction *trans) : - m_accuracy(rule->m_accuracy), - m_clientIpAddress(trans->m_clientIpAddress), - m_data(""), - m_id(trans->m_id), - m_isDisruptive(false), - m_match(""), - m_maturity(rule->m_maturity), - m_message(""), - m_noAuditLog(false), - m_phase(rule->getPhase() - 1), - m_reference(""), - m_rev(rule->m_rev), + RuleMessage(const RuleWithActions &rule, const Transaction &trans) : m_rule(rule), - m_ruleFile(rule->getFileName()), - m_ruleId(rule->m_ruleId), - m_ruleLine(rule->getLineNumber()), - m_saveMessage(true), - m_serverIpAddress(trans->m_serverIpAddress), - m_requestHostName(trans->m_requestHostName), - m_severity(0), - m_uriNoQueryStringDecoded(trans->m_uri_no_query_string_decoded), - m_ver(rule->m_ver), - m_tags() + m_transaction(trans) { } - explicit RuleMessage(RuleMessage *rule) : - m_accuracy(rule->m_accuracy), - m_clientIpAddress(rule->m_clientIpAddress), - m_data(rule->m_data), - m_id(rule->m_id), - m_isDisruptive(rule->m_isDisruptive), - m_match(rule->m_match), - m_maturity(rule->m_maturity), - m_message(rule->m_message), - m_noAuditLog(rule->m_noAuditLog), - m_phase(rule->m_phase), - m_reference(rule->m_reference), - m_rev(rule->m_rev), - m_rule(rule->m_rule), - m_ruleFile(rule->m_ruleFile), - m_ruleId(rule->m_ruleId), - m_ruleLine(rule->m_ruleLine), - m_saveMessage(rule->m_saveMessage), - m_serverIpAddress(rule->m_serverIpAddress), - m_requestHostName(rule->m_requestHostName), - m_severity(rule->m_severity), - m_uriNoQueryStringDecoded(rule->m_uriNoQueryStringDecoded), - m_ver(rule->m_ver), - m_tags(rule->m_tags) - { } - - RuleMessage(const RuleMessage& ruleMessage) - : m_accuracy(ruleMessage.m_accuracy), - m_clientIpAddress(ruleMessage.m_clientIpAddress), - m_data(ruleMessage.m_data), - m_id(ruleMessage.m_id), - m_isDisruptive(ruleMessage.m_isDisruptive), - m_match(ruleMessage.m_match), - m_maturity(ruleMessage.m_maturity), - m_message(ruleMessage.m_message), - m_noAuditLog(ruleMessage.m_noAuditLog), - m_phase(ruleMessage.m_phase), - m_reference(ruleMessage.m_reference), - m_rev(ruleMessage.m_rev), - m_rule(ruleMessage.m_rule), - m_ruleFile(ruleMessage.m_ruleFile), - m_ruleId(ruleMessage.m_ruleId), - m_ruleLine(ruleMessage.m_ruleLine), - m_saveMessage(ruleMessage.m_saveMessage), - m_serverIpAddress(ruleMessage.m_serverIpAddress), - m_requestHostName(ruleMessage.m_requestHostName), - m_severity(ruleMessage.m_severity), - m_uriNoQueryStringDecoded(ruleMessage.m_uriNoQueryStringDecoded), - m_ver(ruleMessage.m_ver), - m_tags(ruleMessage.m_tags) - { } - - RuleMessage &operator=(const RuleMessage& ruleMessage) { - m_accuracy = ruleMessage.m_accuracy; - m_clientIpAddress = ruleMessage.m_clientIpAddress; - m_data = ruleMessage.m_data; - m_id = ruleMessage.m_id; - m_isDisruptive = ruleMessage.m_isDisruptive; - m_match = ruleMessage.m_match; - m_maturity = ruleMessage.m_maturity; - m_message = ruleMessage.m_message; - m_noAuditLog = ruleMessage.m_noAuditLog; - m_phase = ruleMessage.m_phase; - m_reference = ruleMessage.m_reference; - m_rev = ruleMessage.m_rev; - m_rule = ruleMessage.m_rule; - m_ruleFile = ruleMessage.m_ruleFile; - m_ruleId = ruleMessage.m_ruleId; - m_ruleLine = ruleMessage.m_ruleLine; - m_saveMessage = ruleMessage.m_saveMessage; - m_serverIpAddress = ruleMessage.m_serverIpAddress; - m_requestHostName = ruleMessage.m_requestHostName; - m_severity = ruleMessage.m_severity; - m_uriNoQueryStringDecoded = ruleMessage.m_uriNoQueryStringDecoded; - m_ver = ruleMessage.m_ver; - m_tags = ruleMessage.m_tags; - return *this; - } + RuleMessage(const RuleMessage &ruleMessage) = default; + RuleMessage &operator=(const RuleMessage &ruleMessage) = delete; void clean() { m_data = ""; @@ -159,7 +56,6 @@ class RuleMessage { m_isDisruptive = false; m_reference = ""; m_severity = 0; - m_ver = ""; } std::string log() { @@ -187,28 +83,18 @@ class RuleMessage { static std::string _details(const RuleMessage *rm); static std::string _errorLogTail(const RuleMessage *rm); - int m_accuracy; - std::shared_ptr m_clientIpAddress; + int getPhase() const { return m_rule.getPhase() - 1; } + + const RuleWithActions &m_rule; + const Transaction &m_transaction; std::string m_data; - std::shared_ptr m_id; - bool m_isDisruptive; + bool m_isDisruptive = false; std::string m_match; - int m_maturity; std::string m_message; - bool m_noAuditLog; - int m_phase; + bool m_noAuditLog = false; std::string m_reference; - std::string m_rev; - RuleWithActions *m_rule; - std::shared_ptr m_ruleFile; - int m_ruleId; - int m_ruleLine; - bool m_saveMessage; - std::shared_ptr m_serverIpAddress; - std::shared_ptr m_requestHostName; - int m_severity; - std::shared_ptr m_uriNoQueryStringDecoded; - std::string m_ver; + bool m_saveMessage = true; + int m_severity = 0; std::list m_tags; }; diff --git a/headers/modsecurity/rule_with_actions.h b/headers/modsecurity/rule_with_actions.h index 65411c45..d4a87b9e 100644 --- a/headers/modsecurity/rule_with_actions.h +++ b/headers/modsecurity/rule_with_actions.h @@ -76,7 +76,7 @@ class RuleWithActions : public Rule { void performLogging(Transaction *trans, std::shared_ptr ruleMessage, bool lastLog = true, - bool chainedParentNull = false); + bool chainedParentNull = false) const; std::vector getActionsByName(const std::string& name, Transaction *t); diff --git a/headers/modsecurity/transaction.h b/headers/modsecurity/transaction.h index c5e8881f..ff04f43a 100644 --- a/headers/modsecurity/transaction.h +++ b/headers/modsecurity/transaction.h @@ -57,7 +57,7 @@ typedef struct Rules_t RulesSet; #define ms_dbg(b, c) \ do { \ if (m_rules && m_rules->m_debugLog && m_rules->m_debugLog->m_debugLevel >= b) { \ - m_rules->debug(b, *m_id.get(), m_uri, c); \ + m_rules->debug(b, m_id, m_uri, c); \ } \ } while (0); #else @@ -431,7 +431,7 @@ class Transaction : public TransactionAnchoredVariables, public TransactionSecMa /** * Holds the client IP address. */ - std::shared_ptr m_clientIpAddress; + std::string m_clientIpAddress; /** * Holds the HTTP version: 1.2, 2.0, 3.0 and so on.... @@ -441,12 +441,12 @@ class Transaction : public TransactionAnchoredVariables, public TransactionSecMa /** * Holds the server IP Address */ - std::shared_ptr m_serverIpAddress; + std::string m_serverIpAddress; /** * Holds the request's hostname */ - std::shared_ptr m_requestHostName; + std::string m_requestHostName; /** * Holds the raw URI that was requested. @@ -456,7 +456,7 @@ class Transaction : public TransactionAnchoredVariables, public TransactionSecMa /** * Holds the URI that was requests (without the query string). */ - std::shared_ptr m_uri_no_query_string_decoded; + std::string m_uri_no_query_string_decoded; /** * Holds the combined size of all arguments, later used to fill the @@ -568,7 +568,7 @@ class Transaction : public TransactionAnchoredVariables, public TransactionSecMa * Contains the unique ID of the transaction. Use by the variable * `UNIQUE_ID'. This unique id is also saved as part of the AuditLog. */ - std::shared_ptr m_id; + std::string m_id; /** * Holds the amount of rules that should be skipped. If bigger than 0 the diff --git a/src/audit_log/writer/parallel.cc b/src/audit_log/writer/parallel.cc index 5237adb7..5f5c8b52 100644 --- a/src/audit_log/writer/parallel.cc +++ b/src/audit_log/writer/parallel.cc @@ -123,7 +123,7 @@ bool Parallel::write(Transaction *transaction, int parts, std::string *error) { } const auto &logPath = m_audit->m_storage_dir; - fileName = logPath + fileName + "-" + *transaction->m_id.get(); + fileName = logPath + fileName + "-" + transaction->m_id; if (logPath.empty()) { error->assign("Log path is not valid."); diff --git a/src/request_body_processor/multipart.cc b/src/request_body_processor/multipart.cc index 71d0d0e8..fd140329 100644 --- a/src/request_body_processor/multipart.cc +++ b/src/request_body_processor/multipart.cc @@ -74,7 +74,7 @@ void MultipartPartTmpFile::Open() { strftime(tstr, std::size(tstr), "/%Y%m%d-%H%M%S", &timeinfo); std::string path = m_transaction->m_rules->m_uploadDirectory.m_value; - path = path + tstr + "-" + *m_transaction->m_id.get(); + path = path + tstr + "-" + m_transaction->m_id; path += "-file-XXXXXX"; #ifndef WIN32 diff --git a/src/rule_message.cc b/src/rule_message.cc index 5be23839..b2cb727a 100644 --- a/src/rule_message.cc +++ b/src/rule_message.cc @@ -26,26 +26,26 @@ namespace modsecurity { std::string RuleMessage::_details(const RuleMessage *rm) { std::string msg; - msg.append(" [file \"" + std::string(*rm->m_ruleFile.get()) + "\"]"); - msg.append(" [line \"" + std::to_string(rm->m_ruleLine) + "\"]"); - msg.append(" [id \"" + std::to_string(rm->m_ruleId) + "\"]"); - msg.append(" [rev \"" + utils::string::toHexIfNeeded(rm->m_rev, true) + "\"]"); + msg.append(" [file \"" + rm->m_rule.getFileName() + "\"]"); + msg.append(" [line \"" + std::to_string(rm->m_rule.getLineNumber()) + "\"]"); + msg.append(" [id \"" + std::to_string(rm->m_rule.m_ruleId) + "\"]"); + msg.append(" [rev \"" + utils::string::toHexIfNeeded(rm->m_rule.m_rev, true) + "\"]"); msg.append(" [msg \"" + rm->m_message + "\"]"); msg.append(" [data \"" + utils::string::toHexIfNeeded(utils::string::limitTo(200, rm->m_data), true) + "\"]"); msg.append(" [severity \"" + std::to_string(rm->m_severity) + "\"]"); - msg.append(" [ver \"" + utils::string::toHexIfNeeded(rm->m_ver, true) + "\"]"); - msg.append(" [maturity \"" + std::to_string(rm->m_maturity) + "\"]"); - msg.append(" [accuracy \"" + std::to_string(rm->m_accuracy) + "\"]"); + msg.append(" [ver \"" + utils::string::toHexIfNeeded(rm->m_rule.m_ver, true) + "\"]"); + msg.append(" [maturity \"" + std::to_string(rm->m_rule.m_maturity) + "\"]"); + msg.append(" [accuracy \"" + std::to_string(rm->m_rule.m_accuracy) + "\"]"); for (const auto &a : rm->m_tags) { msg.append(" [tag \"" + utils::string::toHexIfNeeded(a, true) + "\"]"); } - msg.append(" [hostname \"" + *rm->m_requestHostName.get() + "\"]"); - - msg.append(" [uri \"" + utils::string::limitTo(200, *rm->m_uriNoQueryStringDecoded.get()) + "\"]"); - msg.append(" [unique_id \"" + *rm->m_id + "\"]"); + msg.append(" [hostname \"" + rm->m_transaction.m_requestHostName \ + + "\"]"); + msg.append(" [uri \"" + utils::string::limitTo(200, rm->m_transaction.m_uri_no_query_string_decoded) + "\"]"); + msg.append(" [unique_id \"" + rm->m_transaction.m_id + "\"]"); msg.append(" [ref \"" + utils::string::limitTo(200, rm->m_reference) + "\"]"); return msg; @@ -55,9 +55,9 @@ std::string RuleMessage::_details(const RuleMessage *rm) { std::string RuleMessage::_errorLogTail(const RuleMessage *rm) { std::string msg; - msg.append("[hostname \"" + *rm->m_serverIpAddress.get() + "\"]"); - msg.append(" [uri \"" + utils::string::limitTo(200, *rm->m_uriNoQueryStringDecoded.get()) + "\"]"); - msg.append(" [unique_id \"" + *rm->m_id + "\"]"); + msg.append("[hostname \"" + rm->m_transaction.m_serverIpAddress + "\"]"); + msg.append(" [uri \"" + utils::string::limitTo(200, rm->m_transaction.m_uri_no_query_string_decoded) + "\"]"); + msg.append(" [unique_id \"" + rm->m_transaction.m_id + "\"]"); return msg; } @@ -68,7 +68,7 @@ std::string RuleMessage::log(const RuleMessage *rm, int props, int code) { msg.reserve(2048); if (props & ClientLogMessageInfo) { - msg.append("[client " + std::string(*rm->m_clientIpAddress.get()) + "] "); + msg.append("[client " + rm->m_transaction.m_clientIpAddress + "] "); } if (rm->m_isDisruptive) { @@ -79,7 +79,7 @@ std::string RuleMessage::log(const RuleMessage *rm, int props, int code) { msg.append(std::to_string(code)); } msg.append(" (phase "); - msg.append(std::to_string(rm->m_rule->getPhase() - 1) + "). "); + msg.append(std::to_string(rm->getPhase()) + "). "); } else { msg.append("ModSecurity: Warning. "); } diff --git a/src/rule_with_actions.cc b/src/rule_with_actions.cc index 1cde8005..82ed64fc 100644 --- a/src/rule_with_actions.cc +++ b/src/rule_with_actions.cc @@ -179,7 +179,7 @@ RuleWithActions::~RuleWithActions() { bool RuleWithActions::evaluate(Transaction *transaction) { - return evaluate(transaction, std::make_shared(this, transaction)); + return evaluate(transaction, std::make_shared(*this, *transaction)); } @@ -494,7 +494,7 @@ std::vector RuleWithActions::getActionsByName(const std::stri void RuleWithActions::performLogging(Transaction *trans, std::shared_ptr ruleMessage, bool lastLog, - bool chainedParentNull) { + bool chainedParentNull) const { /* last rule in the chain. */ bool isItToBeLogged = ruleMessage->m_saveMessage; @@ -551,7 +551,7 @@ void RuleWithActions::performLogging(Transaction *trans, trans->serverLog(ruleMessage); } - RuleMessage *rm = new RuleMessage(this, trans); + RuleMessage *rm = new RuleMessage(*this, *trans); rm->m_saveMessage = ruleMessage->m_saveMessage; ruleMessage.reset(rm); } diff --git a/src/transaction.cc b/src/transaction.cc index 8c9dd669..16fef641 100644 --- a/src/transaction.cc +++ b/src/transaction.cc @@ -104,12 +104,12 @@ namespace modsecurity { */ Transaction::Transaction(ModSecurity *ms, RulesSet *rules, void *logCbData) : m_creationTimeStamp(utils::cpu_seconds()), - m_clientIpAddress(std::make_shared("")), + m_clientIpAddress(""), m_httpVersion(""), - m_serverIpAddress(std::make_shared("")), - m_requestHostName(std::make_shared("")), + m_serverIpAddress(""), + m_requestHostName(""), m_uri(""), - m_uri_no_query_string_decoded(std::make_shared("")), + m_uri_no_query_string_decoded(""), m_ARGScombinedSizeDouble(0), m_clientPort(0), m_highestSeverityAction(255), @@ -166,9 +166,8 @@ Transaction::Transaction(ModSecurity *ms, RulesSet *rules, void *logCbData) m_variableTimeYear(""), m_logCbData(logCbData), TransactionAnchoredVariables(this) { - m_id = std::unique_ptr( new std::string( - std::to_string(m_timeStamp) - + std::to_string(modsecurity::utils::generate_transaction_unique_id()))); + m_id = std::to_string(m_timeStamp) + + std::to_string(modsecurity::utils::generate_transaction_unique_id()); m_variableUrlEncodedError.set("0", 0); m_variableMscPcreError.set("0", 0); @@ -181,12 +180,12 @@ Transaction::Transaction(ModSecurity *ms, RulesSet *rules, void *logCbData) Transaction::Transaction(ModSecurity *ms, RulesSet *rules, char *id, void *logCbData) : m_creationTimeStamp(utils::cpu_seconds()), - m_clientIpAddress(std::make_shared("")), + m_clientIpAddress(""), m_httpVersion(""), - m_serverIpAddress(std::make_shared("")), - m_requestHostName(std::make_shared("")), + m_serverIpAddress(""), + m_requestHostName(""), m_uri(""), - m_uri_no_query_string_decoded(std::make_shared("")), + m_uri_no_query_string_decoded(""), m_ARGScombinedSizeDouble(0), m_clientPort(0), m_highestSeverityAction(255), @@ -207,7 +206,7 @@ Transaction::Transaction(ModSecurity *ms, RulesSet *rules, char *id, void *logCb m_rulesMessages(), m_requestBody(), m_responseBody(), - m_id(std::unique_ptr(new std::string(id))), + m_id(id), m_skip_next(0), m_allowType(modsecurity::actions::disruptive::NoneAllowType), m_uri_decoded(""), @@ -292,7 +291,7 @@ void Transaction::debug(int level, const std::string& message) const { return; } - m_rules->debug(level, *m_id.get(), m_uri, message); + m_rules->debug(level, m_id, m_uri, message); } #endif @@ -319,19 +318,19 @@ void Transaction::debug(int level, const std::string& message) const { */ int Transaction::processConnection(const char *client, int cPort, const char *server, int sPort) { - m_clientIpAddress = std::unique_ptr(new std::string(client)); - m_serverIpAddress = std::unique_ptr(new std::string(server)); - m_requestHostName = std::unique_ptr(new std::string(server)); + m_clientIpAddress = client; + m_serverIpAddress = server; + m_requestHostName = server; this->m_clientPort = cPort; this->m_serverPort = sPort; ms_dbg(4, "Transaction context created."); ms_dbg(4, "Starting phase CONNECTION. (SecRules 0)"); - m_variableRemoteHost.set(*m_clientIpAddress.get(), m_variableOffset); - m_variableUniqueID.set(*m_id.get(), m_variableOffset); - m_variableRemoteAddr.set(*m_clientIpAddress.get(), m_variableOffset); - m_variableServerAddr.set(*m_serverIpAddress.get(), m_variableOffset); + m_variableRemoteHost.set(m_clientIpAddress, m_variableOffset); + m_variableUniqueID.set(m_id, m_variableOffset); + m_variableRemoteAddr.set(m_clientIpAddress, m_variableOffset); + m_variableServerAddr.set(m_serverIpAddress, m_variableOffset); m_variableServerPort.set(std::to_string(this->m_serverPort), m_variableOffset); m_variableRemotePort.set(std::to_string(this->m_clientPort), @@ -467,9 +466,7 @@ int Transaction::processURI(const char *uri, const char *method, m_variableRequestProtocol.set("HTTP/" + std::string(http_version), m_variableOffset + requestLine.size() + 1); - m_uri_no_query_string_decoded = std::unique_ptr( - new std::string(path_info)); - + m_uri_no_query_string_decoded = path_info; if (pos_raw_query != std::string::npos) { std::string qry = std::string(uri_s, pos_raw_query + 1, @@ -1495,7 +1492,7 @@ std::string Transaction::toOldAuditLogFormatIndex(const std::string &filename, ss << utils::string::dash_if_empty( m_variableRequestHeaders.resolveFirst("Host").get()) << " "; - ss << utils::string::dash_if_empty(this->m_clientIpAddress.get()) << " "; + ss << utils::string::dash_if_empty(&this->m_clientIpAddress) << " "; /** TODO: Check variable */ variables::RemoteUser *r = new variables::RemoteUser("REMOTE_USER"); std::vector l; @@ -1530,7 +1527,7 @@ std::string Transaction::toOldAuditLogFormatIndex(const std::string &filename, ss << utils::string::dash_if_empty( m_variableRequestHeaders.resolveFirst("User-Agent").get()); ss << "\" "; - ss << *m_id.get() << " "; + ss << m_id << " "; /** TODO: Check variable */ ss << utils::string::dash_if_empty( m_variableRequestHeaders.resolveFirst("REFERER").get()) << " "; @@ -1556,10 +1553,10 @@ std::string Transaction::toOldAuditLogFormat(int parts, audit_log << "--" << trailer << "-" << "A--" << std::endl; audit_log << tstr; - audit_log << " " << m_id->c_str(); - audit_log << " " << this->m_clientIpAddress->c_str(); + audit_log << " " << m_id; + audit_log << " " << this->m_clientIpAddress; audit_log << " " << this->m_clientPort; - audit_log << " " << m_serverIpAddress->c_str(); + audit_log << " " << m_serverIpAddress; audit_log << " " << this->m_serverPort; audit_log << std::endl; @@ -1676,13 +1673,13 @@ std::string Transaction::toJSON(int parts) { yajl_gen_map_open(g); /* Part: A (header mandatory) */ - LOGFY_ADD("client_ip", this->m_clientIpAddress->c_str()); + LOGFY_ADD("client_ip", m_clientIpAddress.c_str()); LOGFY_ADD("time_stamp", ts.c_str()); LOGFY_ADD("server_id", uniqueId.c_str()); LOGFY_ADD_NUM("client_port", m_clientPort); - LOGFY_ADD("host_ip", m_serverIpAddress->c_str()); + LOGFY_ADD("host_ip", m_serverIpAddress.c_str()); LOGFY_ADD_NUM("host_port", m_serverPort); - LOGFY_ADD("unique_id", m_id->c_str()); + LOGFY_ADD("unique_id", m_id.c_str()); /* request */ yajl_gen_string(g, reinterpret_cast("request"), @@ -1797,13 +1794,13 @@ std::string Transaction::toJSON(int parts) { yajl_gen_map_open(g); LOGFY_ADD("match", a.m_match.c_str()); LOGFY_ADD("reference", a.m_reference.c_str()); - LOGFY_ADD("ruleId", std::to_string(a.m_ruleId).c_str()); - LOGFY_ADD("file", a.m_ruleFile->c_str()); - LOGFY_ADD("lineNumber", std::to_string(a.m_ruleLine).c_str()); + LOGFY_ADD("ruleId", std::to_string(a.m_rule.m_ruleId).c_str()); + LOGFY_ADD("file", a.m_rule.getFileName().c_str()); + LOGFY_ADD("lineNumber", std::to_string(a.m_rule.getLineNumber()).c_str()); LOGFY_ADD("data", a.m_data.c_str()); LOGFY_ADD("severity", std::to_string(a.m_severity).c_str()); - LOGFY_ADD("ver", a.m_ver.c_str()); - LOGFY_ADD("rev", a.m_rev.c_str()); + LOGFY_ADD("ver", a.m_rule.m_ver.c_str()); + LOGFY_ADD("rev", a.m_rule.m_rev.c_str()); yajl_gen_string(g, reinterpret_cast("tags"), @@ -1816,8 +1813,8 @@ std::string Transaction::toJSON(int parts) { } yajl_gen_array_close(g); - LOGFY_ADD("maturity", std::to_string(a.m_maturity).c_str()); - LOGFY_ADD("accuracy", std::to_string(a.m_accuracy).c_str()); + LOGFY_ADD("maturity", std::to_string(a.m_rule.m_maturity).c_str()); + LOGFY_ADD("accuracy", std::to_string(a.m_rule.m_accuracy).c_str()); yajl_gen_map_close(g); yajl_gen_map_close(g); } @@ -2384,7 +2381,7 @@ extern "C" int msc_update_status_code(Transaction *transaction, int status) { int Transaction::setRequestHostName(const std::string& hostname) { if (hostname != "") { - m_requestHostName = std::unique_ptr(new std::string(hostname)); + m_requestHostName = hostname; } return true;