The maintainer's login Secrets carry pg_service.conf ([evolution]), pgpass and ca.crt. Add a strict read_pg_service (known keys only, verify-full unless a local socket, bounded size) behind --pg-service in evo-server and evo-world-clone, mount each login Secret whole in the store Jobs instead of reading aevolution-db, and fix the migrate Job's PGSERVICE to the [evolution] section. Record the store node choice, per-environment databases and the backup plan. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
50 lines
2.1 KiB
C++
50 lines
2.1 KiB
C++
#pragma once
|
|
#include <array>
|
|
#include <chrono>
|
|
#include <cstdint>
|
|
#include <expected>
|
|
#include <memory>
|
|
#include <optional>
|
|
#include <span>
|
|
#include <string>
|
|
#include <string_view>
|
|
#include <vector>
|
|
|
|
namespace evo::persistence {
|
|
enum class PgError : std::uint8_t { config, connect, version, sql, unknown, bounds, closed };
|
|
struct PgFailure {
|
|
PgError kind{};
|
|
std::array<char, 6> sqlstate{}; // Sanitized SQLSTATE only, never server text.
|
|
};
|
|
struct PgOptions {
|
|
std::string host, hostaddr, port, database, user, password_file, ca_file;
|
|
};
|
|
using PgRows = std::vector<std::vector<std::optional<std::string>>>;
|
|
// Reads one section of a libpq connection service file (M8.3): host, hostaddr,
|
|
// port, dbname, user and sslrootcert (as ca_file). sslmode may only be verify-full
|
|
// (or disable for a local socket), and connect_timeout is accepted and ignored (the
|
|
// adapter has its own deadlines). Anything else (password, passfile, options, a
|
|
// missing or repeated section, a repeated key, a file over 4 KiB) is refused with
|
|
// config. password_file stays empty: the caller supplies it.
|
|
[[nodiscard]] std::expected<PgOptions, PgError> read_pg_service(const std::string& file,
|
|
std::string_view section);
|
|
// Linux I/O-owner adapter. Query text is trusted application SQL, values are parameters.
|
|
// No automatic retry. unknown means the command may have executed; connection is closed.
|
|
class Postgres {
|
|
public:
|
|
~Postgres();
|
|
Postgres(const Postgres&) = delete;
|
|
Postgres& operator=(const Postgres&) = delete;
|
|
[[nodiscard]] static std::expected<std::unique_ptr<Postgres>, PgFailure>
|
|
connect(const PgOptions& options, std::chrono::milliseconds timeout);
|
|
[[nodiscard]] std::expected<PgRows, PgFailure> query(const std::string& sql,
|
|
std::span<const std::string> parameters,
|
|
std::chrono::milliseconds timeout);
|
|
|
|
private:
|
|
struct Impl;
|
|
explicit Postgres(std::unique_ptr<Impl> impl);
|
|
std::unique_ptr<Impl> impl_;
|
|
};
|
|
} // namespace evo::persistence
|