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

Refactor parse() error message setting, this reduces code complexity (SonarCloud issue)

Browse Source
This commit is contained in:
Ervin Hegedus 2025-07-23 21:31:04 +02:00
parent 8ea580c164
commit a319ec733f
No known key found for this signature in database
GPG Key ID: 5FA5BC3F5EC41F61
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
headers/modsecurity/rules_set_properties.h
View File

@ -111,17 +111,18 @@ public:
} }
catch (const std::invalid_argument&) { catch (const std::invalid_argument&) {
// probably can't occur, but we handle it anyway // probably can't occur, but we handle it anyway
if (errmsg) *errmsg = "Invalid number format (not numeric)"; set_error(errmsg, "Invalid number format (not numeric)");
return false; return false;
} }
catch (const std::out_of_range&) { catch (const std::out_of_range&) {
if (errmsg) *errmsg = "Number out of range"; // the value is out of range, we can not handle it
set_error(errmsg, "Number out of range");
return false; return false;
} }
catch (...) { catch (...) {
// we don't need to handle all exceptions, the engine's BISON parser // we don't need to handle all exceptions, the engine's BISON parser
// does not allow other symbols than numbers // does not allow other symbols than numbers
if (errmsg) *errmsg = "An unknown error occurred while parsed the value."; set_error(errmsg, "An unknown error occurred while parsed the value.");
return false; return false;
} }
@ -135,7 +136,7 @@ public:
(val > static_cast<unsigned long long>(maxValue())) (val > static_cast<unsigned long long>(maxValue()))
) { ) {
if (errmsg) *errmsg = "Value is too big."; set_error(errmsg, "Value is too big.");
return false; return false;
} }
@ -149,7 +150,7 @@ public:
|| ||
(val < static_cast<unsigned long long>(minValue())) (val < static_cast<unsigned long long>(minValue()))
) { ) {
if (errmsg) *errmsg = "Value is too small."; set_error(errmsg, "Value is too small.");
return false; return false;
} }
} }
@ -161,7 +162,7 @@ public:
|| ||
(val < static_cast<long long>(minValue())) (val < static_cast<long long>(minValue()))
) { ) {
if (errmsg) *errmsg = "Value is too small."; set_error(errmsg, "Value is too small.");
return false; return false;
} }
} }
@ -178,6 +179,11 @@ protected:
virtual T maxValue() const = 0; virtual T maxValue() const = 0;
// minValue is optional // minValue is optional
virtual T minValue() const { return 0; } virtual T minValue() const { return 0; }
private:
static inline void set_error(std::string* err, const char* msg) {
if (err) *err = msg;
}
}; };
/** @ingroup ModSecurity_CPP_API */ /** @ingroup ModSecurity_CPP_API */