|
|
|
@ -12,7 +12,7 @@ use diesel::{
|
|
|
|
backend::Backend,
|
|
|
|
backend::Backend,
|
|
|
|
deserialize::FromSql,
|
|
|
|
deserialize::FromSql,
|
|
|
|
pg::Pg,
|
|
|
|
pg::Pg,
|
|
|
|
result::{Error as DieselError, Error::QueryBuilderError},
|
|
|
|
result::{ConnectionError, ConnectionResult, Error as DieselError, Error::QueryBuilderError},
|
|
|
|
serialize::{Output, ToSql},
|
|
|
|
serialize::{Output, ToSql},
|
|
|
|
sql_types::Text,
|
|
|
|
sql_types::Text,
|
|
|
|
PgConnection,
|
|
|
|
PgConnection,
|
|
|
|
@ -25,11 +25,21 @@ use diesel_async::{
|
|
|
|
},
|
|
|
|
},
|
|
|
|
};
|
|
|
|
};
|
|
|
|
use diesel_migrations::EmbeddedMigrations;
|
|
|
|
use diesel_migrations::EmbeddedMigrations;
|
|
|
|
|
|
|
|
use futures_util::{future::BoxFuture, FutureExt};
|
|
|
|
use lemmy_utils::{error::LemmyError, settings::structs::Settings};
|
|
|
|
use lemmy_utils::{error::LemmyError, settings::structs::Settings};
|
|
|
|
use once_cell::sync::Lazy;
|
|
|
|
use once_cell::sync::Lazy;
|
|
|
|
use regex::Regex;
|
|
|
|
use regex::Regex;
|
|
|
|
use std::{env, env::VarError, time::Duration};
|
|
|
|
use rustls::{
|
|
|
|
use tracing::info;
|
|
|
|
client::{ServerCertVerified, ServerCertVerifier},
|
|
|
|
|
|
|
|
ServerName,
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
use std::{
|
|
|
|
|
|
|
|
env,
|
|
|
|
|
|
|
|
env::VarError,
|
|
|
|
|
|
|
|
sync::Arc,
|
|
|
|
|
|
|
|
time::{Duration, SystemTime},
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
use tracing::{error, info};
|
|
|
|
use url::Url;
|
|
|
|
use url::Url;
|
|
|
|
|
|
|
|
|
|
|
|
const FETCH_LIMIT_DEFAULT: i64 = 10;
|
|
|
|
const FETCH_LIMIT_DEFAULT: i64 = 10;
|
|
|
|
@ -136,7 +146,15 @@ pub fn diesel_option_overwrite_to_url_create(
|
|
|
|
async fn build_db_pool_settings_opt(settings: Option<&Settings>) -> Result<DbPool, LemmyError> {
|
|
|
|
async fn build_db_pool_settings_opt(settings: Option<&Settings>) -> Result<DbPool, LemmyError> {
|
|
|
|
let db_url = get_database_url(settings);
|
|
|
|
let db_url = get_database_url(settings);
|
|
|
|
let pool_size = settings.map(|s| s.database.pool_size).unwrap_or(5);
|
|
|
|
let pool_size = settings.map(|s| s.database.pool_size).unwrap_or(5);
|
|
|
|
let manager = AsyncDieselConnectionManager::<AsyncPgConnection>::new(&db_url);
|
|
|
|
// We only support TLS with sslmode=require currently
|
|
|
|
|
|
|
|
let tls_enabled = db_url.contains("sslmode=require");
|
|
|
|
|
|
|
|
let manager = if tls_enabled {
|
|
|
|
|
|
|
|
// diesel-async does not support any TLS connections out of the box, so we need to manually
|
|
|
|
|
|
|
|
// provide a setup function which handles creating the connection
|
|
|
|
|
|
|
|
AsyncDieselConnectionManager::<AsyncPgConnection>::new_with_setup(&db_url, establish_connection)
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
AsyncDieselConnectionManager::<AsyncPgConnection>::new(&db_url)
|
|
|
|
|
|
|
|
};
|
|
|
|
let pool = Pool::builder(manager)
|
|
|
|
let pool = Pool::builder(manager)
|
|
|
|
.max_size(pool_size)
|
|
|
|
.max_size(pool_size)
|
|
|
|
.wait_timeout(POOL_TIMEOUT)
|
|
|
|
.wait_timeout(POOL_TIMEOUT)
|
|
|
|
@ -153,6 +171,44 @@ async fn build_db_pool_settings_opt(settings: Option<&Settings>) -> Result<DbPoo
|
|
|
|
Ok(pool)
|
|
|
|
Ok(pool)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn establish_connection(config: &str) -> BoxFuture<ConnectionResult<AsyncPgConnection>> {
|
|
|
|
|
|
|
|
let fut = async {
|
|
|
|
|
|
|
|
let rustls_config = rustls::ClientConfig::builder()
|
|
|
|
|
|
|
|
.with_safe_defaults()
|
|
|
|
|
|
|
|
.with_custom_certificate_verifier(Arc::new(NoCertVerifier {}))
|
|
|
|
|
|
|
|
.with_no_client_auth();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let tls = tokio_postgres_rustls::MakeRustlsConnect::new(rustls_config);
|
|
|
|
|
|
|
|
let (client, conn) = tokio_postgres::connect(config, tls)
|
|
|
|
|
|
|
|
.await
|
|
|
|
|
|
|
|
.map_err(|e| ConnectionError::BadConnection(e.to_string()))?;
|
|
|
|
|
|
|
|
tokio::spawn(async move {
|
|
|
|
|
|
|
|
if let Err(e) = conn.await {
|
|
|
|
|
|
|
|
error!("Database connection failed: {e}");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
AsyncPgConnection::try_from(client).await
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
fut.boxed()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
struct NoCertVerifier {}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl ServerCertVerifier for NoCertVerifier {
|
|
|
|
|
|
|
|
fn verify_server_cert(
|
|
|
|
|
|
|
|
&self,
|
|
|
|
|
|
|
|
_end_entity: &rustls::Certificate,
|
|
|
|
|
|
|
|
_intermediates: &[rustls::Certificate],
|
|
|
|
|
|
|
|
_server_name: &ServerName,
|
|
|
|
|
|
|
|
_scts: &mut dyn Iterator<Item = &[u8]>,
|
|
|
|
|
|
|
|
_ocsp_response: &[u8],
|
|
|
|
|
|
|
|
_now: SystemTime,
|
|
|
|
|
|
|
|
) -> Result<ServerCertVerified, rustls::Error> {
|
|
|
|
|
|
|
|
// Will verify all (even invalid) certs without any checks (sslmode=require)
|
|
|
|
|
|
|
|
Ok(ServerCertVerified::assertion())
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!();
|
|
|
|
pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!();
|
|
|
|
|
|
|
|
|
|
|
|
pub fn run_migrations(db_url: &str) {
|
|
|
|
pub fn run_migrations(db_url: &str) {
|
|
|
|
|
Sander Saarend
11 months ago
committed by
GitHub