tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-26 07:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Write a validator for method names

Browse Source 
Fixes #3637
This commit is contained in:
Gunnar Beutner 2013-02-06 13:10:14 +01:00
parent f64bdc8788
commit 671eb0110f
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
itl/types.conf
View File

@ -31,6 +31,8 @@ type DynamicObject {
%attribute string "__type", %attribute string "__type",
%attribute dictionary "methods" { %attribute dictionary "methods" {
%validator "native::ValidateMethods",
%attribute string "*", %attribute string "*",
}, },

24
lib/config/configtype.cpp
View File

@ -21,6 +21,8 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION("native::ValidateMethods", &ConfigType::ValidateMethods);
ConfigType::ConfigType(const String& name, const DebugInfo& debuginfo) ConfigType::ConfigType(const String& name, const DebugInfo& debuginfo)
: m_Name(name), m_RuleList(boost::make_shared<TypeRuleList>()), m_DebugInfo(debuginfo) : m_Name(name), m_RuleList(boost::make_shared<TypeRuleList>()), m_DebugInfo(debuginfo)
{ } { }
@ -166,3 +168,25 @@ void ConfigType::ValidateDictionary(const Dictionary::Ptr& dictionary,
} }
} }
void ConfigType::ValidateMethods(const ScriptTask::Ptr& task,
const vector<Value>& arguments)
{
if (arguments.size() < 1)
BOOST_THROW_EXCEPTION(invalid_argument("Missing argument: Location must be specified."));
if (arguments.size() < 2)
BOOST_THROW_EXCEPTION(invalid_argument("Missing argument: Attribute dictionary must be specified."));
String location = arguments[0];
Dictionary::Ptr attrs = arguments[1];
String key;
BOOST_FOREACH(tie(key, tuples::ignore), attrs) {
if (!ScriptFunction::GetByName(key)) {
ConfigCompilerContext::GetContext()->AddError(false, "Validation failed for " +
location + ": Method '" + key + "' not found.");
}
}
task->FinishResult(Empty);
}

3
lib/config/configtype.h
View File

@ -46,6 +46,9 @@ public:
void ValidateItem(const ConfigItem::Ptr& object) const; void ValidateItem(const ConfigItem::Ptr& object) const;
static void ValidateMethods(const ScriptTask::Ptr& task,
const vector<Value>& arguments);
private: private:
String m_Name; /**< The type name. */ String m_Name; /**< The type name. */
String m_Parent; /**< The parent type. */ String m_Parent; /**< The parent type. */