Skip to content

Add default database settting, and env var overrides #73

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

Open
tankyleo wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add default database settting, and env var overrides #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d127bd1
Add option to verify JWT tokens in the HTTP Authorization header
tankyleo Dec 6, 2025
55b7f54
Add option to specify default postgres db name
tankyleo Dec 6, 2025
485243d
Add env var override to all postgresql configuration settings
tankyleo Dec 6, 2025
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
1 change: 1 addition & 0 deletions rust/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion rust/auth-impls/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@
use api::auth::{AuthResponse, Authorizer};
use api::error::VssError;
use async_trait::async_trait;
use jsonwebtoken::{decode, Algorithm, DecodingKey, Validation};
use jsonwebtoken::{decode, Algorithm, Validation};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;

pub use jsonwebtoken::DecodingKey;

/// A JWT based authorizer, only allows requests with verified 'JsonWebToken' signed by the given
/// issuer key.
///
Expand Down
89 changes: 56 additions & 33 deletions rust/impls/src/postgres_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,16 @@ pub type PostgresPlaintextBackend = PostgresBackend<NoTls>;
/// A postgres backend with TLS connections to the database
pub type PostgresTlsBackend = PostgresBackend<MakeTlsConnector>;

async fn make_postgres_db_connection<T>(postgres_endpoint: &str, tls: T) -> Result<Client, Error>
async fn make_db_connection<T>(
postgres_endpoint: &str, db_name: &str, tls: T,
) -> Result<Client, Error>
where
T: MakeTlsConnect<Socket> + Clone + Send + Sync + 'static,
T::Stream: Send + Sync,
T::TlsConnect: Send,
<<T as MakeTlsConnect<Socket>>::TlsConnect as TlsConnect<Socket>>::Future: Send,
{
let dsn = format!("{}/{}", postgres_endpoint, "postgres");
let dsn = format!("{}/{}", postgres_endpoint, db_name);
let (client, connection) = tokio_postgres::connect(&dsn, tls)
.await
.map_err(|e| Error::new(ErrorKind::Other, format!("Connection error: {}", e)))?;
Expand All @@ -84,16 +86,16 @@ where
Ok(client)
}

async fn initialize_vss_database<T>(
postgres_endpoint: &str, db_name: &str, tls: T,
async fn create_database<T>(
postgres_endpoint: &str, default_db: &str, db_name: &str, tls: T,
) -> Result<(), Error>
where
T: MakeTlsConnect<Socket> + Clone + Send + Sync + 'static,
T::Stream: Send + Sync,
T::TlsConnect: Send,
<<T as MakeTlsConnect<Socket>>::TlsConnect as TlsConnect<Socket>>::Future: Send,
{
let client = make_postgres_db_connection(&postgres_endpoint, tls).await?;
let client = make_db_connection(postgres_endpoint, default_db, tls).await?;

let num_rows = client.execute(CHECK_DB_STMT, &[&db_name]).await.map_err(|e| {
Error::new(
Expand All @@ -113,14 +115,16 @@ where
}

#[cfg(test)]
async fn drop_database<T>(postgres_endpoint: &str, db_name: &str, tls: T) -> Result<(), Error>
async fn drop_database<T>(
postgres_endpoint: &str, default_db: &str, db_name: &str, tls: T,
) -> Result<(), Error>
where
T: MakeTlsConnect<Socket> + Clone + Send + Sync + 'static,
T::Stream: Send + Sync,
T::TlsConnect: Send,
<<T as MakeTlsConnect<Socket>>::TlsConnect as TlsConnect<Socket>>::Future: Send,
{
let client = make_postgres_db_connection(&postgres_endpoint, tls).await?;
let client = make_db_connection(postgres_endpoint, default_db, tls).await?;

let drop_database_statement = format!("{} {};", DROP_DB_CMD, db_name);
let num_rows = client.execute(&drop_database_statement, &[]).await.map_err(|e| {
Expand All @@ -133,25 +137,32 @@ where

impl PostgresPlaintextBackend {
/// Constructs a [`PostgresPlaintextBackend`] using `postgres_endpoint` for PostgreSQL connection information.
pub async fn new(postgres_endpoint: &str, db_name: &str) -> Result<Self, Error> {
PostgresBackend::new_internal(postgres_endpoint, db_name, NoTls).await
pub async fn new(
postgres_endpoint: &str, default_db: &str, vss_db: &str,
) -> Result<Self, Error> {
PostgresBackend::new_internal(postgres_endpoint, default_db, vss_db, NoTls).await
}
}

impl PostgresTlsBackend {
/// Constructs a [`PostgresTlsBackend`] using `postgres_endpoint` for PostgreSQL connection information.
pub async fn new(
postgres_endpoint: &str, db_name: &str, additional_certificate: Option<Certificate>,
postgres_endpoint: &str, default_db: &str, vss_db: &str, certificate: Option<Certificate>,
) -> Result<Self, Error> {
let mut builder = TlsConnector::builder();
if let Some(cert) = additional_certificate {
if let Some(cert) = certificate {
builder.add_root_certificate(cert);
}
let connector = builder.build().map_err(|e| {
Error::new(ErrorKind::Other, format!("Error building tls connector: {}", e))
})?;
PostgresBackend::new_internal(postgres_endpoint, db_name, MakeTlsConnector::new(connector))
.await
PostgresBackend::new_internal(
postgres_endpoint,
default_db,
vss_db,
MakeTlsConnector::new(connector),
)
.await
}
}

Expand All @@ -162,9 +173,11 @@ where
T::TlsConnect: Send,
<<T as MakeTlsConnect<Socket>>::TlsConnect as TlsConnect<Socket>>::Future: Send,
{
async fn new_internal(postgres_endpoint: &str, db_name: &str, tls: T) -> Result<Self, Error> {
initialize_vss_database(postgres_endpoint, db_name, tls.clone()).await?;
let vss_dsn = format!("{}/{}", postgres_endpoint, db_name);
async fn new_internal(
postgres_endpoint: &str, default_db: &str, vss_db: &str, tls: T,
) -> Result<Self, Error> {
create_database(postgres_endpoint, default_db, vss_db, tls.clone()).await?;
let vss_dsn = format!("{}/{}", postgres_endpoint, vss_db);
let manager =
PostgresConnectionManager::new_from_stringlike(vss_dsn, tls).map_err(|e| {
Error::new(
Expand Down Expand Up @@ -649,24 +662,27 @@ mod tests {
use tokio_postgres::NoTls;

const POSTGRES_ENDPOINT: &str = "postgresql://postgres:postgres@localhost:5432";
const DEFAULT_DB: &str = "postgres";
const MIGRATIONS_START: usize = 0;
const MIGRATIONS_END: usize = MIGRATIONS.len();

static START: OnceCell<()> = OnceCell::const_new();

define_kv_store_tests!(PostgresKvStoreTest, PostgresPlaintextBackend, {
let db_name = "postgres_kv_store_tests";
let vss_db = "postgres_kv_store_tests";
START
.get_or_init(|| async {
let _ = drop_database(POSTGRES_ENDPOINT, db_name, NoTls).await;
let store =
PostgresPlaintextBackend::new(POSTGRES_ENDPOINT, db_name).await.unwrap();
let _ = drop_database(POSTGRES_ENDPOINT, DEFAULT_DB, vss_db, NoTls).await;
let store = PostgresPlaintextBackend::new(POSTGRES_ENDPOINT, DEFAULT_DB, vss_db)
.await
.unwrap();
let (start, end) = store.migrate_vss_database(MIGRATIONS).await.unwrap();
assert_eq!(start, MIGRATIONS_START);
assert_eq!(end, MIGRATIONS_END);
})
.await;
let store = PostgresPlaintextBackend::new(POSTGRES_ENDPOINT, db_name).await.unwrap();
let store =
PostgresPlaintextBackend::new(POSTGRES_ENDPOINT, DEFAULT_DB, vss_db).await.unwrap();
let (start, end) = store.migrate_vss_database(MIGRATIONS).await.unwrap();
assert_eq!(start, MIGRATIONS_END);
assert_eq!(end, MIGRATIONS_END);
Expand All @@ -678,36 +694,40 @@ mod tests {
#[tokio::test]
#[should_panic(expected = "We do not allow downgrades")]
async fn panic_on_downgrade() {
let db_name = "panic_on_downgrade_test";
let _ = drop_database(POSTGRES_ENDPOINT, db_name, NoTls).await;
let vss_db = "panic_on_downgrade_test";
let _ = drop_database(POSTGRES_ENDPOINT, DEFAULT_DB, vss_db, NoTls).await;
{
let mut migrations = MIGRATIONS.to_vec();
migrations.push(DUMMY_MIGRATION);
let store = PostgresPlaintextBackend::new(POSTGRES_ENDPOINT, db_name).await.unwrap();
let store =
PostgresPlaintextBackend::new(POSTGRES_ENDPOINT, DEFAULT_DB, vss_db).await.unwrap();
let (start, end) = store.migrate_vss_database(&migrations).await.unwrap();
assert_eq!(start, MIGRATIONS_START);
assert_eq!(end, MIGRATIONS_END + 1);
};
{
let store = PostgresPlaintextBackend::new(POSTGRES_ENDPOINT, db_name).await.unwrap();
let store =
PostgresPlaintextBackend::new(POSTGRES_ENDPOINT, DEFAULT_DB, vss_db).await.unwrap();
let _ = store.migrate_vss_database(MIGRATIONS).await.unwrap();
};
}

#[tokio::test]
async fn new_migrations_increments_upgrades() {
let db_name = "new_migrations_increments_upgrades_test";
let _ = drop_database(POSTGRES_ENDPOINT, db_name, NoTls).await;
let vss_db = "new_migrations_increments_upgrades_test";
let _ = drop_database(POSTGRES_ENDPOINT, DEFAULT_DB, vss_db, NoTls).await;
{
let store = PostgresPlaintextBackend::new(POSTGRES_ENDPOINT, db_name).await.unwrap();
let store =
PostgresPlaintextBackend::new(POSTGRES_ENDPOINT, DEFAULT_DB, vss_db).await.unwrap();
let (start, end) = store.migrate_vss_database(MIGRATIONS).await.unwrap();
assert_eq!(start, MIGRATIONS_START);
assert_eq!(end, MIGRATIONS_END);
assert_eq!(store.get_upgrades_list().await, [MIGRATIONS_START]);
assert_eq!(store.get_schema_version().await, MIGRATIONS_END);
};
{
let store = PostgresPlaintextBackend::new(POSTGRES_ENDPOINT, db_name).await.unwrap();
let store =
PostgresPlaintextBackend::new(POSTGRES_ENDPOINT, DEFAULT_DB, vss_db).await.unwrap();
let (start, end) = store.migrate_vss_database(MIGRATIONS).await.unwrap();
assert_eq!(start, MIGRATIONS_END);
assert_eq!(end, MIGRATIONS_END);
Expand All @@ -718,7 +738,8 @@ mod tests {
let mut migrations = MIGRATIONS.to_vec();
migrations.push(DUMMY_MIGRATION);
{
let store = PostgresPlaintextBackend::new(POSTGRES_ENDPOINT, db_name).await.unwrap();
let store =
PostgresPlaintextBackend::new(POSTGRES_ENDPOINT, DEFAULT_DB, vss_db).await.unwrap();
let (start, end) = store.migrate_vss_database(&migrations).await.unwrap();
assert_eq!(start, MIGRATIONS_END);
assert_eq!(end, MIGRATIONS_END + 1);
Expand All @@ -729,7 +750,8 @@ mod tests {
migrations.push(DUMMY_MIGRATION);
migrations.push(DUMMY_MIGRATION);
{
let store = PostgresPlaintextBackend::new(POSTGRES_ENDPOINT, db_name).await.unwrap();
let store =
PostgresPlaintextBackend::new(POSTGRES_ENDPOINT, DEFAULT_DB, vss_db).await.unwrap();
let (start, end) = store.migrate_vss_database(&migrations).await.unwrap();
assert_eq!(start, MIGRATIONS_END + 1);
assert_eq!(end, MIGRATIONS_END + 3);
Expand All @@ -741,13 +763,14 @@ mod tests {
};

{
let store = PostgresPlaintextBackend::new(POSTGRES_ENDPOINT, db_name).await.unwrap();
let store =
PostgresPlaintextBackend::new(POSTGRES_ENDPOINT, DEFAULT_DB, vss_db).await.unwrap();
let list = store.get_upgrades_list().await;
assert_eq!(list, [MIGRATIONS_START, MIGRATIONS_END, MIGRATIONS_END + 1]);
let version = store.get_schema_version().await;
assert_eq!(version, MIGRATIONS_END + 3);
}

drop_database(POSTGRES_ENDPOINT, db_name, NoTls).await.unwrap();
drop_database(POSTGRES_ENDPOINT, DEFAULT_DB, vss_db, NoTls).await.unwrap();
}
}
1 change: 1 addition & 0 deletions rust/server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ edition = "2021"

[dependencies]
api = { path = "../api" }
auth-impls = { path = "../auth-impls" }
impls = { path = "../impls" }

hyper = { version = "1", default-features = false, features = ["server", "http1"] }
Expand Down
Loading