tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

`ClassCompiler`: Don't allow to define an int as a group name in `groups` attr (#9057)

This commit is contained in:
Yonas Habteab 2021-11-22 14:02:50 +01:00 committed by GitHub
parent d09925189a
commit a64089ffc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/mkclass/classcompiler.cpp
View File

@ -517,7 +517,17 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&)
}
if (field.Type.IsName) {
m_Impl << "\t" << "if (";
if (field.Type.ArrayRank > 0) {
m_Impl << "\t\t\t" << "if (!" << valName << ".IsEmpty() && ";
m_Impl << "!" << valName << ".IsString())" << std::endl
<< "\t\t\t\t" << "BOOST_THROW_EXCEPTION(ValidationError(dynamic_cast<ConfigObject *>(this), { \""
<< field.Name << R"(" }, "It is not allowed to specify '" + )" << valName << R"( + "' of type '" + )"
<< valName << ".GetTypeName()" << R"( + "' as ')" << field.Type.TypeName
<< "' name. Expected type of '" << field.Type.TypeName << "' name: 'String'.\"));" << std::endl;
}
m_Impl << "\t\t\t" << "if (";
if (field.Type.ArrayRank > 0)
m_Impl << valName << ".IsEmpty() || ";
@ -525,7 +535,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&)
m_Impl << "!" << valName << ".IsEmpty() && ";
m_Impl << "!utils.ValidateName(\"" << field.Type.TypeName << "\", " << valName << "))" << std::endl
<< "\t\t" << "BOOST_THROW_EXCEPTION(ValidationError(dynamic_cast<ConfigObject *>(this), { \"" << field.Name << R"(" }, "Object '" + )" << valName << R"( + "' of type ')" << field.Type.TypeName
<< "\t\t\t\t" << "BOOST_THROW_EXCEPTION(ValidationError(dynamic_cast<ConfigObject *>(this), { \"" << field.Name << R"(" }, "Object '" + )" << valName << R"( + "' of type ')" << field.Type.TypeName
<< "' does not exist.\"));" << std::endl;
} else if (field.Type.ArrayRank > 0 && (ftype == "Number" || ftype == "Boolean")) {
m_Impl << "\t" << "try {" << std::endl