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

Use initialization list to initialize m_service

Browse Source 
- This is correct because base class is initialized before members are
  initialized.
- Removes cppcheck suppression by addressing reported issue.
- Leverage C++11's 'default member initializer' to initialize m_provider
  & m_demandsPassword and address Sonarcloud issue.
This commit is contained in:
Eduardo Arias 2024-10-21 15:28:21 -03:00
parent b0497d9cb9
commit ce9a3167fa
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/operators/rbl.h
View File

@ -33,8 +33,8 @@
#include "src/operators/operator.h" #include "src/operators/operator.h"
namespace modsecurity { namespace modsecurity::operators {
namespace operators {
class Rbl : public Operator { class Rbl : public Operator {
public: public:
@ -66,21 +66,18 @@ class Rbl : public Operator {
/** @ingroup ModSecurity_Operator */ /** @ingroup ModSecurity_Operator */
explicit Rbl(std::unique_ptr<RunTimeString> param) explicit Rbl(std::unique_ptr<RunTimeString> param)
: m_service(), : Operator("Rbl", std::move(param)),
m_demandsPassword(false), m_service(m_string->evaluate()) {
m_provider(RblProvider::UnknownProvider),
Operator("Rbl", std::move(param)) {
m_service = m_string->evaluate(); // cppcheck-suppress useInitializationList
if (m_service.find("httpbl.org") != std::string::npos) if (m_service.find("httpbl.org") != std::string::npos)
{ {
m_demandsPassword = true; m_demandsPassword = true;
m_provider = RblProvider::httpbl; m_provider = RblProvider::httpbl;
} else if (m_service.find("uribl.com") != std::string::npos) { } else if (m_service.find("uribl.com") != std::string::npos) {
m_provider = RblProvider::uribl; m_provider = RblProvider::uribl;
} else if (m_service.find("spamhaus.org") != std::string::npos) { } else if (m_service.find("spamhaus.org") != std::string::npos) {
m_provider = RblProvider::spamhaus; m_provider = RblProvider::spamhaus;
}
} }
}
bool evaluate(Transaction *transaction, RuleWithActions *rule, bool evaluate(Transaction *transaction, RuleWithActions *rule,
const std::string& input, const std::string& input,
RuleMessage &ruleMessage) override; RuleMessage &ruleMessage) override;
@ -98,12 +95,12 @@ class Rbl : public Operator {
private: private:
std::string m_service; std::string m_service;
bool m_demandsPassword; bool m_demandsPassword = false;
RblProvider m_provider; RblProvider m_provider = RblProvider::UnknownProvider;
}; };
} // namespace operators
} // namespace modsecurity } // namespace modsecurity::operators
#endif // SRC_OPERATORS_RBL_H_ #endif // SRC_OPERATORS_RBL_H_