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

Implement validator support for function objects

Browse Source 
fixes #8291
This commit is contained in:
Gunnar Beutner 2015-01-27 10:55:14 +01:00
parent a11cdbdc39
commit 13917e07b0
5 changed files with 93 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/config/config_lexer.ll
View File

@ -174,6 +174,7 @@ do { \
%string { yylval->type = TypeString; return T_TYPE_STRING; } %string { yylval->type = TypeString; return T_TYPE_STRING; }
%scalar { yylval->type = TypeScalar; return T_TYPE_SCALAR; } %scalar { yylval->type = TypeScalar; return T_TYPE_SCALAR; }
%any { yylval->type = TypeAny; return T_TYPE_ANY; } %any { yylval->type = TypeAny; return T_TYPE_ANY; }
%function { yylval->type = TypeFunction; return T_TYPE_FUNCTION; }
%name { yylval->type = TypeName; return T_TYPE_NAME; } %name { yylval->type = TypeName; return T_TYPE_NAME; }
%validator { return T_VALIDATOR; } %validator { return T_VALIDATOR; }
%require { return T_REQUIRE; } %require { return T_REQUIRE; }

2
lib/config/config_parser.yy
View File

@ -152,6 +152,7 @@ static void MakeRBinaryOp(Expression** result, Expression *left, Expression *rig
%token <type> T_TYPE_STRING "string (T_TYPE_STRING)" %token <type> T_TYPE_STRING "string (T_TYPE_STRING)"
%token <type> T_TYPE_SCALAR "scalar (T_TYPE_SCALAR)" %token <type> T_TYPE_SCALAR "scalar (T_TYPE_SCALAR)"
%token <type> T_TYPE_ANY "any (T_TYPE_ANY)" %token <type> T_TYPE_ANY "any (T_TYPE_ANY)"
%token <type> T_TYPE_FUNCTION "function (T_TYPE_FUNCTION)"
%token <type> T_TYPE_NAME "name (T_TYPE_NAME)" %token <type> T_TYPE_NAME "name (T_TYPE_NAME)"
%token T_VALIDATOR "%validator (T_VALIDATOR)" %token T_VALIDATOR "%validator (T_VALIDATOR)"
%token T_REQUIRE "%require (T_REQUIRE)" %token T_REQUIRE "%require (T_REQUIRE)"
@ -435,6 +436,7 @@ type: T_TYPE_DICTIONARY
| T_TYPE_STRING | T_TYPE_STRING
| T_TYPE_SCALAR | T_TYPE_SCALAR
| T_TYPE_ANY | T_TYPE_ANY
| T_TYPE_FUNCTION
| T_TYPE_NAME | T_TYPE_NAME
; ;

3
lib/config/typerule.cpp
View File

@ -73,6 +73,9 @@ bool TypeRule::MatchValue(const Value& value, String *hint, const TypeRuleUtilit
case TypeArray: case TypeArray:
return value.IsObjectType<Array>(); return value.IsObjectType<Array>();
case TypeFunction:
return value.IsObjectType<Function>();
case TypeName: case TypeName:
if (!value.IsScalar()) if (!value.IsScalar())
return false; return false;

169
lib/config/typerule.hpp
View File

@ -1,84 +1,85 @@
/****************************************************************************** /******************************************************************************
* Icinga 2 * * Icinga 2 *
* Copyright (C) 2012-2015 Icinga Development Team (http://www.icinga.org) * * Copyright (C) 2012-2015 Icinga Development Team (http://www.icinga.org) *
* * * *
* This program is free software; you can redistribute it and/or * * This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License * * modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2 * * as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. * * of the License, or (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. * * GNU General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License * * You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software Foundation * * along with this program; if not, write to the Free Software Foundation *
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/ ******************************************************************************/
#ifndef TYPERULE_H #ifndef TYPERULE_H
#define TYPERULE_H #define TYPERULE_H
#include "config/i2-config.hpp" #include "config/i2-config.hpp"
#include "config/typerulelist.hpp" #include "config/typerulelist.hpp"
#include "base/debuginfo.hpp" #include "base/debuginfo.hpp"
namespace icinga namespace icinga
{ {
/** /**
* Utilities for type rules. * Utilities for type rules.
* *
* @ingroup config * @ingroup config
*/ */
class I2_CONFIG_API TypeRuleUtilities class I2_CONFIG_API TypeRuleUtilities
{ {
public: public:
virtual bool ValidateName(const String& type, const String& name, String *hint) const; virtual bool ValidateName(const String& type, const String& name, String *hint) const;
}; };
/** /**
* The allowed type for a type rule. * The allowed type for a type rule.
* *
* @ingroup config * @ingroup config
*/ */
enum TypeSpecifier enum TypeSpecifier
{ {
TypeAny, TypeAny,
TypeScalar, TypeScalar,
TypeNumber, TypeNumber,
TypeString, TypeString,
TypeDictionary, TypeDictionary,
TypeArray, TypeArray,
TypeName TypeFunction,
}; TypeName
};
/**
* A configuration type rule. /**
* * A configuration type rule.
* @ingroup config *
*/ * @ingroup config
struct I2_CONFIG_API TypeRule */
{ struct I2_CONFIG_API TypeRule
public: {
TypeRule(TypeSpecifier type, const String& nameType, public:
const String& namePattern, const TypeRuleList::Ptr& subRules, TypeRule(TypeSpecifier type, const String& nameType,
const DebugInfo& debuginfo); const String& namePattern, const TypeRuleList::Ptr& subRules,
const DebugInfo& debuginfo);
TypeRuleList::Ptr GetSubRules(void) const;
TypeRuleList::Ptr GetSubRules(void) const;
bool MatchName(const String& name) const;
bool MatchValue(const Value& value, String *hint, const TypeRuleUtilities *utils) const; bool MatchName(const String& name) const;
bool MatchValue(const Value& value, String *hint, const TypeRuleUtilities *utils) const;
private:
TypeSpecifier m_Type; private:
String m_NameType; TypeSpecifier m_Type;
String m_NamePattern; String m_NameType;
TypeRuleList::Ptr m_SubRules; String m_NamePattern;
DebugInfo m_DebugInfo; TypeRuleList::Ptr m_SubRules;
}; DebugInfo m_DebugInfo;
};
}
}
#endif /* TYPERULE_H */
#endif /* TYPERULE_H */

4
lib/icinga/icinga-type.conf
View File

@ -174,7 +174,7 @@
%attribute %string "display_name", %attribute %string "display_name",
%require "update", %require "update",
%attribute %any "update", %attribute %function "update",
/* %if (methods.update == "LegacyTimePeriod") { */ /* %if (methods.update == "LegacyTimePeriod") { */
// %require "ranges", // %require "ranges",
@ -188,7 +188,7 @@
%validator "ValidateCommandAttributes", %validator "ValidateCommandAttributes",
%require "execute", %require "execute",
%attribute %any "execute", %attribute %function "execute",
/* %if (methods.execute == "PluginNotification" || methods.execute == "PluginCheck" || methods.execute == "PluginEvent") { */ /* %if (methods.execute == "PluginNotification" || methods.execute == "PluginCheck" || methods.execute == "PluginEvent") { */
// %require "command", // %require "command",