Skip to content

add support for CA file for postgress #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

add support for CA file for postgress #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions crates/postgres/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ use std::{
ops::Bound,
pin::Pin,
str::FromStr,
env,
fs,
path::Path,
sync::{
atomic::{
AtomicBool,
Expand Down Expand Up @@ -110,7 +113,7 @@ use itertools::{
iproduct,
Itertools,
};
use native_tls::TlsConnector;
use native_tls::{Certificate,TlsConnector};
use postgres_native_tls::MakeTlsConnector;
use serde::Deserialize as _;
use serde_json::Value as JsonValue;
Expand Down Expand Up @@ -197,7 +200,17 @@ impl PostgresPersistence {

fn create_pool(url: &str) -> anyhow::Result<ConvexPgPool> {
let pg_config = tokio_postgres::Config::from_str(url)?;
let connector = TlsConnector::builder().build()?;
let mut builder = TlsConnector::builder();
if let Ok(ca_file_path) = env::var("PG_CA_FILE") {
if Path::new(&ca_file_path).exists() {
if let Ok(ca_file_content) = fs::read(Path::new(&ca_file_path)) {
if let Ok(ca_cert) = Certificate::from_pem(&ca_file_content) {
builder.add_root_certificate(ca_cert);
}
}
}
}
let connector = builder.build()?;
let connector = MakeTlsConnector::new(connector);

let manager = Manager::new(pg_config, connector);
Expand Down