mirror of
https://github.com/hanzo-ds/cpp.git
synced 2026-10-30 20:31:26 +00:00
zeekay
286f257aae
Pure rename applied on top of upstream tag v2.6.2 (8d2415d6), not HEAD.
The fork was cut at 737145d = v2.6.2-57, which still declared version 2.6.2
in version.h; renaming there would have shipped 57 unreleased commits wearing
a 2.6.2 label. Reset to the tag first so this commit changes names only.
clickhouse/ -> datastore/ (public include root)
namespace clickhouse -> namespace datastore
CLICKHOUSE_CPP_VERSION -> DATASTORE_CPP_VERSION
clickhouse-cpp-lib/-ut -> datastore-cpp-lib/-ut (CMake, Bazel)
CH_MAP_BOOL_TO_UINT8 -> DS_MAP_BOOL_TO_UINT8
CLICKHOUSE_* -> DATASTORE_* (test env vars)
doc links -> docs.hanzo.ai/datastore
This client speaks the NATIVE binary protocol only - there is no HTTP path
and no X-ClickHouse-* header anywhere in it, so the header rename that the
HTTP clients required does not apply and nothing here was broken.
The one string that reaches the wire is CLIENT_NAME, sent by both SendHello
and SendQuery's ClientInfo from a single macro, and it lands in
system.query_log.client_name. Both sites still read the one macro, so they
stay consistent and the server's Hello/Query consistency check is satisfied.
Old rows keep the old name; that is a reporting discontinuity, not a
migration, since nothing keys on it.
CI is repointed at our own server: ghcr.io/hanzoai/datastore:26.2.3.2, the
image production runs. Its entrypoint honours DATASTORE_SKIP_USER_SETUP, not
the CLICKHOUSE_ spelling the compose file used, and its config lives in
/etc/hanzo-datastore-server. ci/docker-compose/config.xml is now layered in
as a config.d drop-in so the image keeps its own white-labelling. That file
and users.xml deliberately keep a <clickhouse> root: it must match the roots
of the drop-ins the image ships, and a mismatch fails silently - the server
logs "Merging bypassed" and starts with every drop-in discarded.
The remote-TLS suites used to default to the third-party host
play.clickhouse.com. They now read DATASTORE_SECURE*_HOST and skip when it is
unset rather than point at a host we do not run.
Dropped as upstream infrastructure with no meaning here: AI_POLICY.md
(upstream's policy about their codebase), .travis.yml (dead CI referencing a
third-party apt repo), cross-repo-bug-relay.yml (relays our issues into an
upstream triage repo). LICENSE keeps its copyright notice, as Apache-2.0
requires.
Verified: cmake configure + 115-target build clean; the full suite is green
against ghcr.io/hanzoai/datastore:26.2.3.2 (894 passed, 0 failed); the
pristine v2.6.2 build run against that same server passes the identical set,
and both logged the same 3914 queries under their respective client names.
112 lines
2.6 KiB
C++
112 lines
2.6 KiB
C++
#pragma once
|
|
|
|
#include "socket.h"
|
|
|
|
#include <memory>
|
|
#include <optional>
|
|
#include <vector>
|
|
|
|
typedef struct ssl_ctx_st SSL_CTX;
|
|
typedef struct ssl_st SSL;
|
|
|
|
namespace datastore {
|
|
|
|
struct SSLParams
|
|
{
|
|
std::vector<std::string> path_to_ca_files;
|
|
std::string path_to_ca_directory;
|
|
bool use_default_ca_locations;
|
|
int context_options;
|
|
int min_protocol_version;
|
|
int max_protocol_version;
|
|
bool use_SNI;
|
|
bool skip_verification;
|
|
int host_flags;
|
|
using ConfigurationType = std::vector<std::pair<std::string, std::optional<std::string>>>;
|
|
ConfigurationType configuration;
|
|
};
|
|
|
|
class SSLContext
|
|
{
|
|
public:
|
|
explicit SSLContext(SSL_CTX & context);
|
|
explicit SSLContext(const SSLParams & context_params);
|
|
~SSLContext() = default;
|
|
|
|
SSLContext(const SSLContext &) = delete;
|
|
SSLContext& operator=(const SSLContext &) = delete;
|
|
SSLContext(SSLContext &&) = delete;
|
|
SSLContext& operator=(SSLContext &) = delete;
|
|
|
|
private:
|
|
friend class SSLSocket;
|
|
SSL_CTX * getContext();
|
|
|
|
private:
|
|
std::unique_ptr<SSL_CTX, void (*)(SSL_CTX*)> context_;
|
|
};
|
|
|
|
class SSLSocket : public Socket {
|
|
public:
|
|
explicit SSLSocket(const NetworkAddress& addr, const SocketTimeoutParams& timeout_params,
|
|
const SSLParams& ssl_params, SSLContext& context);
|
|
|
|
SSLSocket(SSLSocket &&) = default;
|
|
~SSLSocket() override = default;
|
|
|
|
SSLSocket(const SSLSocket & ) = delete;
|
|
SSLSocket& operator=(const SSLSocket & ) = delete;
|
|
|
|
std::unique_ptr<InputStream> makeInputStream() const override;
|
|
std::unique_ptr<OutputStream> makeOutputStream() const override;
|
|
|
|
static void validateParams(const SSLParams & ssl_params);
|
|
private:
|
|
std::unique_ptr<SSL, void (*)(SSL *s)> ssl_;
|
|
};
|
|
|
|
class SSLSocketFactory : public NonSecureSocketFactory {
|
|
public:
|
|
explicit SSLSocketFactory(const ClientOptions& opts);
|
|
~SSLSocketFactory() override;
|
|
|
|
protected:
|
|
std::unique_ptr<Socket> doConnect(const NetworkAddress& address, const ClientOptions& opts) override;
|
|
|
|
private:
|
|
const SSLParams ssl_params_;
|
|
std::unique_ptr<SSLContext> ssl_context_;
|
|
};
|
|
|
|
class SSLSocketInput : public InputStream {
|
|
public:
|
|
explicit SSLSocketInput(SSL *ssl);
|
|
~SSLSocketInput() = default;
|
|
|
|
bool Skip(size_t /*bytes*/) override {
|
|
return false;
|
|
}
|
|
|
|
protected:
|
|
size_t DoRead(void* buf, size_t len) override;
|
|
|
|
private:
|
|
// Not owning
|
|
SSL *ssl_;
|
|
};
|
|
|
|
class SSLSocketOutput : public OutputStream {
|
|
public:
|
|
explicit SSLSocketOutput(SSL *ssl);
|
|
~SSLSocketOutput() = default;
|
|
|
|
protected:
|
|
size_t DoWrite(const void* data, size_t len) override;
|
|
|
|
private:
|
|
// Not owning
|
|
SSL *ssl_;
|
|
};
|
|
|
|
}
|