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

temp-commit

Browse Source
This commit is contained in:
Konstantin Bogdanov 2024-08-26 20:16:57 +02:00
parent f6b3d0d029
commit 58968cadf5
No known key found for this signature in database
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Server/HTTPHandlerFactory.cpp
View File

@ -94,8 +94,6 @@ static inline auto createHandlersFactoryFromConfig(
for (const auto & key : keys) for (const auto & key : keys)
{ {
LOG_DEBUG(&Poco::Logger::get("ACME"), "HTTP handler: {}", key);
if (key == "defaults") if (key == "defaults")
{ {
addDefaultHandlersFactory(*main_handler_factory, server, config, async_metrics); addDefaultHandlersFactory(*main_handler_factory, server, config, async_metrics);
@ -151,15 +149,14 @@ static inline auto createHandlersFactoryFromConfig(
handler->addFiltersFromConfig(config, prefix + "." + key); handler->addFiltersFromConfig(config, prefix + "." + key);
main_handler_factory->addHandler(std::move(handler)); main_handler_factory->addHandler(std::move(handler));
} }
#if USE_SSL
else if (handler_type == "acme") else if (handler_type == "acme")
{ {
if (server.config().getInt("port") != 80)
throw Exception(ErrorCodes::BAD_ARGUMENTS, "ACME handler is allowed only on port 80");
auto handler = std::make_shared<HandlingRuleHTTPHandlerFactory<ACMERequestHandler>>(server); auto handler = std::make_shared<HandlingRuleHTTPHandlerFactory<ACMERequestHandler>>(server);
handler->addFiltersFromConfig(config, prefix + "." + key); handler->addFiltersFromConfig(config, prefix + "." + key);
main_handler_factory->addHandler(std::move(handler)); main_handler_factory->addHandler(std::move(handler));
} }
#endif
else if (handler_type == "binary") else if (handler_type == "binary")
{ {
auto handler = std::make_shared<HandlingRuleHTTPHandlerFactory<BinaryWebUIRequestHandler>>(server); auto handler = std::make_shared<HandlingRuleHTTPHandlerFactory<BinaryWebUIRequestHandler>>(server);
@ -261,11 +258,13 @@ void addCommonDefaultHandlersFactory(HTTPRequestHandlerFactoryMain & factory, IS
factory.addPathToHints("/binary"); factory.addPathToHints("/binary");
factory.addHandler(binary_handler); factory.addHandler(binary_handler);
#if USE_SSL
/// FIXME redundant if ACME is not enabled /// FIXME redundant if ACME is not enabled
auto acme_handler = std::make_shared<HandlingRuleHTTPHandlerFactory<ACMERequestHandler>>(server); auto acme_handler = std::make_shared<HandlingRuleHTTPHandlerFactory<ACMERequestHandler>>(server);
acme_handler->attachNonStrictPath(ACMEClient::ACME_CHALLENGE_HTTP_PATH); acme_handler->attachNonStrictPath(ACMEClient::ACME_CHALLENGE_HTTP_PATH);
acme_handler->allowGetAndHeadRequest(); acme_handler->allowGetAndHeadRequest();
factory.addHandler(acme_handler); factory.addHandler(acme_handler);
#endif
auto js_handler = std::make_shared<HandlingRuleHTTPHandlerFactory<JavaScriptWebUIRequestHandler>>(server); auto js_handler = std::make_shared<HandlingRuleHTTPHandlerFactory<JavaScriptWebUIRequestHandler>>(server);
js_handler->attachNonStrictPath("/js/"); js_handler->attachNonStrictPath("/js/");