thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 01:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add exceptions during substitution processing if node already has a value

Browse Source
This commit is contained in:
Konstantin Bogdanov 2023-11-15 15:45:46 +01:00
parent e3842ebc89
commit 9edcdf41d5
Signed by: thevar1able
GPG Key ID: DB399448D9FE52F1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Common/Config/ConfigProcessor.cpp
View File

@ -522,6 +522,9 @@ void ConfigProcessor::doIncludesRecursive(
if (attr_nodes["from_zk"]) /// we have zookeeper subst if (attr_nodes["from_zk"]) /// we have zookeeper subst
{ {
if (node->hasChildNodes()) /// only allow substitution for nodes with no value
throw Poco::Exception("Element <" + node->nodeName() + "> has value, can't process from_zk substitution");
contributing_zk_paths.insert(attr_nodes["from_zk"]->getNodeValue()); contributing_zk_paths.insert(attr_nodes["from_zk"]->getNodeValue());
if (zk_node_cache) if (zk_node_cache)
@ -544,6 +547,9 @@ void ConfigProcessor::doIncludesRecursive(
if (attr_nodes["from_env"]) /// we have env subst if (attr_nodes["from_env"]) /// we have env subst
{ {
if (node->hasChildNodes()) /// only allow substitution for nodes with no value
throw Poco::Exception("Element <" + node->nodeName() + "> has value, can't process from_env substitution");
XMLDocumentPtr env_document; XMLDocumentPtr env_document;
auto get_env_node = [&](const std::string & name) -> const Node * auto get_env_node = [&](const std::string & name) -> const Node *
{ {