thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 00:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

throw syntax error instead of bad arguments in case of add not identified

Browse Source
This commit is contained in:
Arthur Passos 2024-08-20 14:17:05 -03:00
parent 623c507e5f
commit 27ee4dd611
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Parsers/Access/ParserCreateUserQuery.cpp
View File

@ -223,14 +223,6 @@ namespace
{ {
return IParserBase::wrapParseImpl(pos, [&] return IParserBase::wrapParseImpl(pos, [&]
{ {
if (ParserKeyword{Keyword::NOT_IDENTIFIED}.ignore(pos, expected))
{
authentication_methods.emplace_back(std::make_shared<ASTAuthenticationData>());
authentication_methods.back()->type = AuthenticationType::NO_PASSWORD;
return true;
}
if (!ParserKeyword{Keyword::IDENTIFIED}.ignore(pos, expected)) if (!ParserKeyword{Keyword::IDENTIFIED}.ignore(pos, expected))
return false; return false;
@ -269,6 +261,22 @@ namespace
}); });
} }
bool parseIdentifiedOrNotIdentified(IParserBase::Pos & pos, Expected & expected, std::vector<std::shared_ptr<ASTAuthenticationData>> & authentication_methods)
{
return IParserBase::wrapParseImpl(pos, [&]
{
if (ParserKeyword{Keyword::NOT_IDENTIFIED}.ignore(pos, expected))
{
authentication_methods.emplace_back(std::make_shared<ASTAuthenticationData>());
authentication_methods.back()->type = AuthenticationType::NO_PASSWORD;
return true;
}
return parseIdentifiedWith(pos, expected, authentication_methods);
});
}
bool parseHostsWithoutPrefix(IParserBase::Pos & pos, Expected & expected, AllowedClientHosts & hosts) bool parseHostsWithoutPrefix(IParserBase::Pos & pos, Expected & expected, AllowedClientHosts & hosts)
{ {
@ -545,7 +553,7 @@ bool ParserCreateUserQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
{ {
if (auth_data.empty()) if (auth_data.empty())
{ {
parsed_identified_with = parseIdentifiedWith(pos, expected, auth_data); parsed_identified_with = parseIdentifiedOrNotIdentified(pos, expected, auth_data);
if (!parsed_identified_with) if (!parsed_identified_with)
{ {

2
tests/queries/0_stateless/03174_multiple_authentication_methods.reference
View File

@ -53,3 +53,5 @@ First auth method can't specify type if WITH keyword is not present
SYNTAX_ERROR SYNTAX_ERROR
RESET AUTHENTICATION METHODS TO NEW can only be used on alter statement RESET AUTHENTICATION METHODS TO NEW can only be used on alter statement
BAD_ARGUMENTS BAD_ARGUMENTS
ADD NOT IDENTIFIED should result in syntax error
SYNTAX_ERROR

3
tests/queries/0_stateless/03174_multiple_authentication_methods.sh
View File

@ -147,4 +147,7 @@ ${CLICKHOUSE_CLIENT} --query "CREATE USER ${user} IDENTIFIED plaintext_password
echo "RESET AUTHENTICATION METHODS TO NEW can only be used on alter statement" echo "RESET AUTHENTICATION METHODS TO NEW can only be used on alter statement"
${CLICKHOUSE_CLIENT} --query "CREATE USER ${user} RESET AUTHENTICATION METHODS TO NEW" 2>&1 | grep -m1 -o "BAD_ARGUMENTS" ${CLICKHOUSE_CLIENT} --query "CREATE USER ${user} RESET AUTHENTICATION METHODS TO NEW" 2>&1 | grep -m1 -o "BAD_ARGUMENTS"
echo "ADD NOT IDENTIFIED should result in syntax error"
${CLICKHOUSE_CLIENT} --query "ALTER USER ${user} ADD NOT IDENTIFIED" 2>&1 | grep -m1 -o "SYNTAX_ERROR"
${CLICKHOUSE_CLIENT} --query "DROP USER IF EXISTS ${user}" ${CLICKHOUSE_CLIENT} --query "DROP USER IF EXISTS ${user}"