Skip to content

Backport of #91437: explicit POCO request for REST-polaris catalog #1224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zvonand merged 1 commit into from
Dec 17, 2025
Merged

Backport of #91437: explicit POCO request for REST-polaris catalog #1224

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 35 additions & 18 deletions src/Databases/DataLake/RestCatalog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@
#include <Poco/URI.h>
#include <Poco/JSON/Array.h>
#include <Poco/JSON/Parser.h>
#include <Poco/Net/HTTPClientSession.h>
#include <Poco/Net/HTTPResponse.h>
#include <Poco/Net/HTTPSClientSession.h>
#include <Poco/Net/SSLManager.h>
#include <Poco/StreamCopier.h>


namespace DB::ErrorCodes
Expand Down Expand Up @@ -203,12 +208,11 @@ std::string RestCatalog::retrieveAccessToken() const
/// 1. support oauth2-server-uri
/// https://github.com/apache/iceberg/blob/918f81f3c3f498f46afcea17c1ac9cdc6913cb5c/open-api/rest-catalog-open-api.yaml#L183C82-L183C99

DB::HTTPHeaderEntries headers;
headers.emplace_back("Content-Type", "application/x-www-form-urlencoded");
headers.emplace_back("Accepts", "application/json; charset=UTF-8");

Poco::URI url;
DB::ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback;
size_t body_size = 0;
String body;

if (oauth_server_uri.empty() && !oauth_server_use_request_body)
{
url = Poco::URI(base_url / oauth_tokens_endpoint);
Expand All @@ -223,11 +227,20 @@ std::string RestCatalog::retrieveAccessToken() const
}
else
{
String encoded_auth_scope;
String encoded_client_id;
String encoded_client_secret;
Poco::URI::encode(auth_scope, auth_scope, encoded_auth_scope);
Poco::URI::encode(client_id, client_id, encoded_client_id);
Poco::URI::encode(client_secret, client_secret, encoded_client_secret);

body = fmt::format(
"grant_type=client_credentials&scope={}&client_id={}&client_secret={}",
encoded_auth_scope, encoded_client_id, encoded_client_secret);
body_size = body.size();
out_stream_callback = [&](std::ostream & os)
{
os << fmt::format(
"grant_type=client_credentials&scope={}&client_id={}&client_secret={}",
auth_scope, client_id, client_secret);
os << body;
};

if (oauth_server_uri.empty())
Expand All @@ -237,19 +250,23 @@ std::string RestCatalog::retrieveAccessToken() const
}

const auto & context = getContext();
auto wb = DB::BuilderRWBufferFromHTTP(url)
.withConnectionGroup(DB::HTTPConnectionGroupType::HTTP)
.withMethod(Poco::Net::HTTPRequest::HTTP_POST)
.withSettings(context->getReadSettings())
.withTimeouts(DB::ConnectionTimeouts::getHTTPTimeouts(context->getSettingsRef(), context->getServerSettings()))
.withHostFilter(&context->getRemoteHostFilter())
.withOutCallback(std::move(out_stream_callback))
.withSkipNotFound(false)
.withHeaders(headers)
.create(credentials);
auto timeouts = DB::ConnectionTimeouts::getHTTPTimeouts(context->getSettingsRef(), context->getServerSettings());
auto session = makeHTTPSession(DB::HTTPConnectionGroupType::HTTP, url, timeouts, {});

Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, url.getPathAndQuery(),
Poco::Net::HTTPMessage::HTTP_1_1);
request.setContentType("application/x-www-form-urlencoded");
request.setContentLength(body_size);
request.set("Accept", "application/json");

std::ostream & os = session->sendRequest(request);
out_stream_callback(os);

Poco::Net::HTTPResponse response;
std::istream & rs = session->receiveResponse(response);

std::string json_str;
readJSONObjectPossiblyInvalid(json_str, *wb);
Poco::StreamCopier::copyToString(rs, json_str);

Poco::JSON::Parser parser;
Poco::Dynamic::Var res_json = parser.parse(json_str);
Expand Down
Loading