Fix S3 table function argument validation in secret masking, preventing possible LOGICAL_ERROR

vdimir · vdimir · commit 222fdecd305f · 2025-06-17T17:54:14.000Z
diff --git a/src/Interpreters/InterpreterExplainQuery.cpp b/src/Interpreters/InterpreterExplainQuery.cpp
@@ -109,14 +109,25 @@ namespace
 
             if (FunctionSecretArgumentsFinder::Result secret_arguments = TableFunctionSecretArgumentsFinderTreeNode(*table_function_node_ptr).getResult(); secret_arguments.count)
             {
-                auto & argument_nodes = table_function_node_ptr->getArgumentsNode()->as<ListNode &>().getNodes();
+                auto & argument_nodes = table_function_node_ptr->getArguments().getNodes();
 
                 for (size_t n = secret_arguments.start; n < secret_arguments.start + secret_arguments.count; ++n)
                 {
+                    ConstantNode * constant_node = nullptr;
                     if (secret_arguments.are_named)
-                        argument_nodes[n]->as<FunctionNode&>().getArguments().getNodes()[1]->as<ConstantNode&>().setMaskId();
-                    else
-                        argument_nodes[n]->as<ConstantNode&>().setMaskId();
+                    {
+                        auto * function_node = argument_nodes[n]->as<FunctionNode>();
+                        if (function_node && function_node->getArguments().getNodes().size() >= 2)
+                            constant_node = function_node->getArguments().getNodes().at(1)->as<ConstantNode>();
+                    }
+
+                    if (!constant_node)
+                    {
+                        constant_node = argument_nodes[n]->as<ConstantNode>();
+                    }
+
+                    if (constant_node)
+                        constant_node->setMaskId();
                 }
             }
         }
diff --git a/tests/queries/0_stateless/02772_s3_crash.sql b/tests/queries/0_stateless/02772_s3_crash.sql
@@ -3,3 +3,5 @@
 
 SELECT * FROM s3(headers('random_header' = 'value')); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 SELECT * FROM s3Cluster('test_cluster_two_shards_localhost', headers('random_header' = 'value')); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+SET enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT 1 FROM s3('a', 1, CSV); -- { serverError BAD_ARGUMENTS }

Original file line number	Diff line number	Diff line change
`@@ -109,14 +109,25 @@ namespace`
`109`	`109`
`110`	`110`	`if (FunctionSecretArgumentsFinder::Result secret_arguments = TableFunctionSecretArgumentsFinderTreeNode(*table_function_node_ptr).getResult(); secret_arguments.count)`
`111`	`111`	`{`
`112`		`- auto & argument_nodes = table_function_node_ptr->getArgumentsNode()->as<ListNode &>().getNodes();`
	`112`	`+ auto & argument_nodes = table_function_node_ptr->getArguments().getNodes();`
`113`	`113`
`114`	`114`	`for (size_t n = secret_arguments.start; n < secret_arguments.start + secret_arguments.count; ++n)`
`115`	`115`	`{`
	`116`	`+ ConstantNode * constant_node = nullptr;`
`116`	`117`	`if (secret_arguments.are_named)`
`117`		`- argument_nodes[n]->as<FunctionNode&>().getArguments().getNodes()[1]->as<ConstantNode&>().setMaskId();`
`118`		`- else`
`119`		`- argument_nodes[n]->as<ConstantNode&>().setMaskId();`
	`118`	`+ {`
	`119`	`+ auto * function_node = argument_nodes[n]->as<FunctionNode>();`
	`120`	`+ if (function_node && function_node->getArguments().getNodes().size() >= 2)`
	`121`	`+ constant_node = function_node->getArguments().getNodes().at(1)->as<ConstantNode>();`
	`122`	`+ }`
	`123`	`+`
	`124`	`+ if (!constant_node)`
	`125`	`+ {`
	`126`	`+ constant_node = argument_nodes[n]->as<ConstantNode>();`
	`127`	`+ }`
	`128`	`+`
	`129`	`+ if (constant_node)`
	`130`	`+ constant_node->setMaskId();`
`120`	`131`	`}`
`121`	`132`	`}`
`122`	`133`	`}`