Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions rust/auth-impls/src/jwt.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,8 @@ const BEARER_PREFIX: &str = "Bearer ";
impl JWTAuthorizer {
/// Creates a new instance of [`JWTAuthorizer`], fails on failure to parse the PEM formatted RSA public key
pub async fn new(rsa_pem: &str) -> Result<Self, String> {
let jwt_issuer_key =
DecodingKey::from_rsa_pem(rsa_pem.as_bytes()).map_err(|e| e.to_string())?;
let jwt_issuer_key = DecodingKey::from_rsa_pem(rsa_pem.as_bytes())
.map_err(|e| format!("Failed to parse the PEM formatted RSA public key: {}", e))?;
Ok(Self { jwt_issuer_key })
}
}
Expand Down
97 changes: 63 additions & 34 deletions rust/impls/src/postgres_store.rs
Original file line numberDiff line numberDiff 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,38 @@ 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, crt_pem: Option<&str>,
) -> Result<Self, Error> {
let mut builder = TlsConnector::builder();
if let Some(cert) = additional_certificate {
builder.add_root_certificate(cert);
if let Some(pem) = crt_pem {
let crt = Certificate::from_pem(pem.as_bytes()).map_err(|e| {
Error::new(
ErrorKind::Other,
format!("Failed to parse the PEM formatted certificate: {}", e),
)
})?;
builder.add_root_certificate(crt);
}
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 +179,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 DownExpand Up@@ -649,24 +668,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 +700,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 +744,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 +756,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 +769,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();
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add default database settting, and env var overrides by tankyleo · Pull Request #73 · lightningdevkit/vss-server · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions rust/auth-impls/src/jwt.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,8 @@ const BEARER_PREFIX: &str = "Bearer ";
impl JWTAuthorizer {
/// Creates a new instance of [`JWTAuthorizer`], fails on failure to parse the PEM formatted RSA public key
pub async fn new(rsa_pem: &str) -> Result<Self, String> {
let jwt_issuer_key =
DecodingKey::from_rsa_pem(rsa_pem.as_bytes()).map_err(|e| e.to_string())?;
let jwt_issuer_key = DecodingKey::from_rsa_pem(rsa_pem.as_bytes())
.map_err(|e| format!("Failed to parse the PEM formatted RSA public key: {}", e))?;
Ok(Self { jwt_issuer_key })
}
}
Expand Down
97 changes: 63 additions & 34 deletions rust/impls/src/postgres_store.rs
Original file line numberDiff line numberDiff 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,38 @@ 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, crt_pem: Option<&str>,
) -> Result<Self, Error> {
let mut builder = TlsConnector::builder();
if let Some(cert) = additional_certificate {
builder.add_root_certificate(cert);
if let Some(pem) = crt_pem {
let crt = Certificate::from_pem(pem.as_bytes()).map_err(|e| {
Error::new(
ErrorKind::Other,
format!("Failed to parse the PEM formatted certificate: {}", e),
)
})?;
builder.add_root_certificate(crt);
}
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 +179,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 DownExpand Up@@ -649,24 +668,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 +700,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 +744,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 +756,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 +769,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();
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add default database settting, and env var overrides by tankyleo · Pull Request #73 · lightningdevkit/vss-server · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions rust/auth-impls/src/jwt.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,8 @@ const BEARER_PREFIX: &str = "Bearer ";
impl JWTAuthorizer {
/// Creates a new instance of [`JWTAuthorizer`], fails on failure to parse the PEM formatted RSA public key
pub async fn new(rsa_pem: &str) -> Result<Self, String> {
let jwt_issuer_key =
DecodingKey::from_rsa_pem(rsa_pem.as_bytes()).map_err(|e| e.to_string())?;
let jwt_issuer_key = DecodingKey::from_rsa_pem(rsa_pem.as_bytes())
.map_err(|e| format!("Failed to parse the PEM formatted RSA public key: {}", e))?;
Ok(Self { jwt_issuer_key })
}
}
Expand Down
97 changes: 63 additions & 34 deletions rust/impls/src/postgres_store.rs
Original file line numberDiff line numberDiff 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,38 @@ 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, crt_pem: Option<&str>,
) -> Result<Self, Error> {
let mut builder = TlsConnector::builder();
if let Some(cert) = additional_certificate {
builder.add_root_certificate(cert);
if let Some(pem) = crt_pem {
let crt = Certificate::from_pem(pem.as_bytes()).map_err(|e| {
Error::new(
ErrorKind::Other,
format!("Failed to parse the PEM formatted certificate: {}", e),
)
})?;
builder.add_root_certificate(crt);
}
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 +179,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 DownExpand Up@@ -649,24 +668,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 +700,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 +744,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 +756,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 +769,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();
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add default database settting, and env var overrides by tankyleo · Pull Request #73 · lightningdevkit/vss-server · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions rust/auth-impls/src/jwt.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,8 @@ const BEARER_PREFIX: &str = "Bearer ";
impl JWTAuthorizer {
/// Creates a new instance of [`JWTAuthorizer`], fails on failure to parse the PEM formatted RSA public key
pub async fn new(rsa_pem: &str) -> Result<Self, String> {
let jwt_issuer_key =
DecodingKey::from_rsa_pem(rsa_pem.as_bytes()).map_err(|e| e.to_string())?;
let jwt_issuer_key = DecodingKey::from_rsa_pem(rsa_pem.as_bytes())
.map_err(|e| format!("Failed to parse the PEM formatted RSA public key: {}", e))?;
Ok(Self { jwt_issuer_key })
}
}
Expand Down
97 changes: 63 additions & 34 deletions rust/impls/src/postgres_store.rs
Original file line numberDiff line numberDiff 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,38 @@ 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, crt_pem: Option<&str>,
) -> Result<Self, Error> {
let mut builder = TlsConnector::builder();
if let Some(cert) = additional_certificate {
builder.add_root_certificate(cert);
if let Some(pem) = crt_pem {
let crt = Certificate::from_pem(pem.as_bytes()).map_err(|e| {
Error::new(
ErrorKind::Other,
format!("Failed to parse the PEM formatted certificate: {}", e),
)
})?;
builder.add_root_certificate(crt);
}
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 +179,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 DownExpand Up@@ -649,24 +668,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 +700,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 +744,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 +756,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 +769,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();
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Add default database settting, and env var overrides by tankyleo · Pull Request #73 · lightningdevkit/vss-server · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions rust/auth-impls/src/jwt.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,8 @@ const BEARER_PREFIX: &str = "Bearer ";
impl JWTAuthorizer {
/// Creates a new instance of [`JWTAuthorizer`], fails on failure to parse the PEM formatted RSA public key
pub async fn new(rsa_pem: &str) -> Result<Self, String> {
let jwt_issuer_key =
DecodingKey::from_rsa_pem(rsa_pem.as_bytes()).map_err(|e| e.to_string())?;
let jwt_issuer_key = DecodingKey::from_rsa_pem(rsa_pem.as_bytes())
.map_err(|e| format!("Failed to parse the PEM formatted RSA public key: {}", e))?;
Ok(Self { jwt_issuer_key })
}
}
Expand Down
97 changes: 63 additions & 34 deletions rust/impls/src/postgres_store.rs
Original file line numberDiff line numberDiff 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,38 @@ 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, crt_pem: Option<&str>,
) -> Result<Self, Error> {
let mut builder = TlsConnector::builder();
if let Some(cert) = additional_certificate {
builder.add_root_certificate(cert);
if let Some(pem) = crt_pem {
let crt = Certificate::from_pem(pem.as_bytes()).map_err(|e| {
Error::new(
ErrorKind::Other,
format!("Failed to parse the PEM formatted certificate: {}", e),
)
})?;
builder.add_root_certificate(crt);
}
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 +179,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 DownExpand Up@@ -649,24 +668,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 +700,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 +744,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 +756,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 +769,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();
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add default database settting, and env var overrides by tankyleo · Pull Request #73 · lightningdevkit/vss-server · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions rust/auth-impls/src/jwt.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,8 @@ const BEARER_PREFIX: &str = "Bearer ";
impl JWTAuthorizer {
/// Creates a new instance of [`JWTAuthorizer`], fails on failure to parse the PEM formatted RSA public key
pub async fn new(rsa_pem: &str) -> Result<Self, String> {
let jwt_issuer_key =
DecodingKey::from_rsa_pem(rsa_pem.as_bytes()).map_err(|e| e.to_string())?;
let jwt_issuer_key = DecodingKey::from_rsa_pem(rsa_pem.as_bytes())
.map_err(|e| format!("Failed to parse the PEM formatted RSA public key: {}", e))?;
Ok(Self { jwt_issuer_key })
}
}
Expand Down
97 changes: 63 additions & 34 deletions rust/impls/src/postgres_store.rs
Original file line numberDiff line numberDiff 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,38 @@ 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, crt_pem: Option<&str>,
) -> Result<Self, Error> {
let mut builder = TlsConnector::builder();
if let Some(cert) = additional_certificate {
builder.add_root_certificate(cert);
if let Some(pem) = crt_pem {
let crt = Certificate::from_pem(pem.as_bytes()).map_err(|e| {
Error::new(
ErrorKind::Other,
format!("Failed to parse the PEM formatted certificate: {}", e),
)
})?;
builder.add_root_certificate(crt);
}
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 +179,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 DownExpand Up@@ -649,24 +668,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 +700,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 +744,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 +756,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 +769,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();
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add default database settting, and env var overrides by tankyleo · Pull Request #73 · lightningdevkit/vss-server · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions rust/auth-impls/src/jwt.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,8 @@ const BEARER_PREFIX: &str = "Bearer ";
impl JWTAuthorizer {
/// Creates a new instance of [`JWTAuthorizer`], fails on failure to parse the PEM formatted RSA public key
pub async fn new(rsa_pem: &str) -> Result<Self, String> {
let jwt_issuer_key =
DecodingKey::from_rsa_pem(rsa_pem.as_bytes()).map_err(|e| e.to_string())?;
let jwt_issuer_key = DecodingKey::from_rsa_pem(rsa_pem.as_bytes())
.map_err(|e| format!("Failed to parse the PEM formatted RSA public key: {}", e))?;
Ok(Self { jwt_issuer_key })
}
}
Expand Down
97 changes: 63 additions & 34 deletions rust/impls/src/postgres_store.rs
Original file line numberDiff line numberDiff 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,38 @@ 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, crt_pem: Option<&str>,
) -> Result<Self, Error> {
let mut builder = TlsConnector::builder();
if let Some(cert) = additional_certificate {
builder.add_root_certificate(cert);
if let Some(pem) = crt_pem {
let crt = Certificate::from_pem(pem.as_bytes()).map_err(|e| {
Error::new(
ErrorKind::Other,
format!("Failed to parse the PEM formatted certificate: {}", e),
)
})?;
builder.add_root_certificate(crt);
}
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 +179,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 DownExpand Up@@ -649,24 +668,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 +700,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 +744,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 +756,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 +769,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();
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Add default database settting, and env var overrides by tankyleo · Pull Request #73 · lightningdevkit/vss-server · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions rust/auth-impls/src/jwt.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,8 @@ const BEARER_PREFIX: &str = "Bearer ";
impl JWTAuthorizer {
/// Creates a new instance of [`JWTAuthorizer`], fails on failure to parse the PEM formatted RSA public key
pub async fn new(rsa_pem: &str) -> Result<Self, String> {
let jwt_issuer_key =
DecodingKey::from_rsa_pem(rsa_pem.as_bytes()).map_err(|e| e.to_string())?;
let jwt_issuer_key = DecodingKey::from_rsa_pem(rsa_pem.as_bytes())
.map_err(|e| format!("Failed to parse the PEM formatted RSA public key: {}", e))?;
Ok(Self { jwt_issuer_key })
}
}
Expand Down
97 changes: 63 additions & 34 deletions rust/impls/src/postgres_store.rs
Original file line numberDiff line numberDiff 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,38 @@ 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, crt_pem: Option<&str>,
) -> Result<Self, Error> {
let mut builder = TlsConnector::builder();
if let Some(cert) = additional_certificate {
builder.add_root_certificate(cert);
if let Some(pem) = crt_pem {
let crt = Certificate::from_pem(pem.as_bytes()).map_err(|e| {
Error::new(
ErrorKind::Other,
format!("Failed to parse the PEM formatted certificate: {}", e),
)
})?;
builder.add_root_certificate(crt);
}
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 +179,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 DownExpand Up@@ -649,24 +668,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 +700,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 +744,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 +756,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 +769,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();
}
}
Loading