From 8e682ce9b162ccbf71b1ff65727e43b91c77ec5c Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Fri, 27 Jul 2018 16:34:50 +0200
Subject: [PATCH] Improve error logging for match/regex/cidr_match functions
and unsupported dictionary usage
fixes #6442
---
lib/base/scriptutils.cpp | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/lib/base/scriptutils.cpp b/lib/base/scriptutils.cpp
index cbedd9f97..2c65fae3b 100644
--- a/lib/base/scriptutils.cpp
+++ b/lib/base/scriptutils.cpp
@@ -108,10 +108,14 @@ bool ScriptUtils::CastBool(const Value& value)
bool ScriptUtils::Regex(const std::vector<Value>& args)
{
if (args.size() < 2)
- BOOST_THROW_EXCEPTION(std::invalid_argument("Regular expression and text must be specified."));
+ BOOST_THROW_EXCEPTION(std::invalid_argument("Regular expression and text must be specified for regex()."));
String pattern = args[0];
const Value& argTexts = args[1];
+
+ if (argTexts.IsObjectType<Dictionary>())
+ BOOST_THROW_EXCEPTION(std::invalid_argument("Dictionaries are not supported by regex()."));
+
MatchType mode;
if (args.size() > 2)
@@ -158,10 +162,14 @@ bool ScriptUtils::Regex(const std::vector<Value>& args)
bool ScriptUtils::Match(const std::vector<Value>& args)
{
if (args.size() < 2)
- BOOST_THROW_EXCEPTION(std::invalid_argument("Pattern and text must be specified."));
+ BOOST_THROW_EXCEPTION(std::invalid_argument("Pattern and text must be specified for match()."));
String pattern = args[0];
const Value& argTexts = args[1];
+
+ if (argTexts.IsObjectType<Dictionary>())
+ BOOST_THROW_EXCEPTION(std::invalid_argument("Dictionaries are not supported by match()."));
+
MatchType mode;
if (args.size() > 2)
@@ -199,10 +207,14 @@ bool ScriptUtils::Match(const std::vector<Value>& args)
bool ScriptUtils::CidrMatch(const std::vector<Value>& args)
{
if (args.size() < 2)
- BOOST_THROW_EXCEPTION(std::invalid_argument("CIDR and IP address must be specified."));
+ BOOST_THROW_EXCEPTION(std::invalid_argument("CIDR and IP address must be specified for cidr_match()."));
String pattern = args[0];
const Value& argIps = args[1];
+
+ if (argIps.IsObjectType<Dictionary>())
+ BOOST_THROW_EXCEPTION(std::invalid_argument("Dictionaries are not supported by cidr_match()."));
+
MatchType mode;
if (args.size() > 2)