thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-19 14:11:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed codestyle and changed Error message.

Browse Source
This commit is contained in:
millb 2019-10-06 18:33:25 +03:00
parent 31a422fdff
commit 7ab1804ebb
2 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
dbms/src/Storages/StorageURL.cpp
View File

@ -38,29 +38,10 @@ IStorageURLBase::IStorageURLBase(
const ConstraintsDescription & constraints_) const ConstraintsDescription & constraints_)
: uri(uri_), context_global(context_), format_name(format_name_), table_name(table_name_), database_name(database_name_) : uri(uri_), context_global(context_), format_name(format_name_), table_name(table_name_), database_name(database_name_)
{ {
if (!checkHostWhitelist(uri.getHost()) && if (!checkHost(uri.getHost()) &&
!checkHostWhitelist(uri.getHost() + ":" + Poco::NumberFormatter::format(uri.getPort()))) !checkHost(uri.getHost() + ":" + Poco::NumberFormatter::format(uri.getPort())))
{ {
const std::unordered_set<std::string> primary_hosts = context_global.getAllowedPrimaryUrlHosts(); throwUnacceptableURLException();
const std::vector<std::string> regexp_hosts = context_global.getAllowedRegexpUrlHosts();
std::string string_error = "\nUnacceptable URL. You can use ";
if (!primary_hosts.empty())
{
string_error += "URL like\n\n";
for (auto host : primary_hosts)
string_error += host + "\n";
string_error += '\n';
if (!regexp_hosts.empty())
string_error += "Or ";
}
if (!regexp_hosts.empty())
{
string_error += "URL that match the following regular expressions\n\n";
for (auto reg_host : regexp_hosts)
string_error += reg_host + "\n";
}
string_error += "\nIf you want to change this look at config.xml";
throw Exception(string_error, ErrorCodes::UNACCEPTABLE_URL);
} }
setColumns(columns_); setColumns(columns_);
setConstraints(constraints_); setConstraints(constraints_);
@ -250,7 +231,8 @@ void registerStorageURL(StorageFactory & factory)
}); });
} }
bool IStorageURLBase::checkHostWhitelist(const std::string & host) { bool IStorageURLBase::checkHost(const std::string & host)
{
const std::unordered_set<std::string> primary_hosts = context_global.getAllowedPrimaryUrlHosts(); const std::unordered_set<std::string> primary_hosts = context_global.getAllowedPrimaryUrlHosts();
const std::vector<std::string> regexp_hosts = context_global.getAllowedRegexpUrlHosts(); const std::vector<std::string> regexp_hosts = context_global.getAllowedRegexpUrlHosts();
if (!primary_hosts.empty() || !regexp_hosts.empty()) if (!primary_hosts.empty() || !regexp_hosts.empty())
@ -266,4 +248,26 @@ bool IStorageURLBase::checkHostWhitelist(const std::string & host) {
} }
return true; return true;
} }
void IStorageURLBase::throwUnacceptableURLException()
{
const std::unordered_set<std::string> primary_hosts = context_global.getAllowedPrimaryUrlHosts();
const std::vector<std::string> regexp_hosts = context_global.getAllowedRegexpUrlHosts();
std::string string_error = "Unacceptable URL. You can use ";
if (!primary_hosts.empty())
{
string_error += "URL like: ";
for (auto host : primary_hosts)
string_error += host + ", ";
if (!regexp_hosts.empty())
string_error += "or ";
}
if (!regexp_hosts.empty())
{
string_error += "URL that match the following regular expressions: ";
for (auto reg_host : regexp_hosts)
string_error += reg_host + ", ";
}
throw Exception(string_error.substr(0, string_error.size() - 2), ErrorCodes::UNACCEPTABLE_URL);
}
} }

4
dbms/src/Storages/StorageURL.h
View File

@ -67,7 +67,9 @@ private:
virtual Block getHeaderBlock(const Names & column_names) const = 0; virtual Block getHeaderBlock(const Names & column_names) const = 0;
bool checkHostWhitelist(const std::string & host); ///return true if host allowed bool checkHost(const std::string & host); ///return true if host allowed
void throwUnacceptableURLException();
}; };