From 5908fb0990f03e3ec0b6af05572c1a0377d2b2fc Mon Sep 17 00:00:00 2001
From: Markus Ast <m@rkusa.st>
Date: Thu, 8 Feb 2024 11:01:05 +0100
Subject: [PATCH] upgrade to rustls 0.22

---
 postgres-macros/Cargo.toml |  2 +-
 postgres/Cargo.toml        |  6 ++--
 postgres/src/lib.rs        | 69 +++++++++++++++++++++++++++++++-------
 3 files changed, 61 insertions(+), 16 deletions(-)

diff --git a/postgres-macros/Cargo.toml b/postgres-macros/Cargo.toml
index 9b3349f..d1ce854 100644
--- a/postgres-macros/Cargo.toml
+++ b/postgres-macros/Cargo.toml
@@ -13,7 +13,7 @@ time = ["dep:time", "postgres/with-time-0_3"]
 uuid = ["dep:uuid", "postgres/with-uuid-1"]
 
 [dependencies]
-ariadne = "0.3"
+ariadne = "0.4"
 chumsky = "1.0.0-alpha.6"
 dotenvy = "0.15"
 heck = "0.4"
diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml
index 628a910..55abc51 100644
--- a/postgres/Cargo.toml
+++ b/postgres/Cargo.toml
@@ -14,18 +14,18 @@ time = ["sqlm-postgres-macros/time", "tokio-postgres/with-time-0_3", "dep:time"]
 uuid = ["sqlm-postgres-macros/uuid", "tokio-postgres/with-uuid-1", "dep:uuid"]
 
 [dependencies]
-deadpool-postgres = "0.11"
+deadpool-postgres = "0.12"
 dotenvy = "0.15"
 http-error = { version = "0.3.0-alpha.1", features = [
     "tracing",
 ] } # git = "https://github.com/rkusa/http-error.git", rev = "1f0630c" } # path = "../../http-error" }
 once_cell = "1.17"
-rustls = { version = "0.21", features = ["dangerous_configuration"] }
+rustls = { version = "0.22" }
 serde_json = { version = "1.0", optional = true }
 sqlm-postgres-macros = { path = "../postgres-macros", default-features = false }
 time = { version = "0.3", optional = true }
 tokio-postgres = "0.7"
-tokio-postgres-rustls = "0.10"
+tokio-postgres-rustls = "0.11"
 tracing = "0.1"
 uuid = { version = "1.4", optional = true }
 
diff --git a/postgres/src/lib.rs b/postgres/src/lib.rs
index 90ef362..f07198b 100644
--- a/postgres/src/lib.rs
+++ b/postgres/src/lib.rs
@@ -25,6 +25,7 @@ pub use future::SqlFuture;
 use once_cell::sync::OnceCell;
 pub use query::Query;
 pub use row::{FromRow, Row};
+use rustls::crypto::CryptoProvider;
 pub use sqlm_postgres_macros::{sql, Enum, FromRow};
 pub use tokio_postgres;
 use tokio_postgres::config::SslMode;
@@ -62,8 +63,8 @@ pub async fn connect() -> Result<Connection, Error> {
                 config,
                 {
                     let config = rustls::ClientConfig::builder()
-                        .with_safe_defaults()
-                        .with_custom_certificate_verifier(Arc::new(NoServerCertVerify))
+                        .dangerous()
+                        .with_custom_certificate_verifier(Arc::new(NoServerCertVerify::default()))
                         .with_no_client_auth();
                     tokio_postgres_rustls::MakeRustlsConnect::new(config)
                 },
@@ -157,18 +158,62 @@ impl<'a, Cols, T> Sql<'a, Cols, T> {
     }
 }
 
-struct NoServerCertVerify;
+#[derive(Debug)]
+struct NoServerCertVerify {
+    crypto_provider: CryptoProvider,
+}
 
-impl rustls::client::ServerCertVerifier for NoServerCertVerify {
+impl Default for NoServerCertVerify {
+    fn default() -> Self {
+        Self {
+            crypto_provider: rustls::crypto::ring::default_provider(),
+        }
+    }
+}
+
+impl rustls::client::danger::ServerCertVerifier for NoServerCertVerify {
     fn verify_server_cert(
         &self,
-        _end_entity: &rustls::Certificate,
-        _intermediates: &[rustls::Certificate],
-        _server_name: &rustls::ServerName,
-        _scts: &mut dyn Iterator<Item = &[u8]>,
-        _ocsp: &[u8],
-        _now: std::time::SystemTime,
-    ) -> std::result::Result<rustls::client::ServerCertVerified, rustls::Error> {
-        Ok(rustls::client::ServerCertVerified::assertion())
+        _end_entity: &rustls::pki_types::CertificateDer<'_>,
+        _intermediates: &[rustls::pki_types::CertificateDer<'_>],
+        _server_name: &rustls::pki_types::ServerName<'_>,
+        _ocsp_response: &[u8],
+        _now: rustls::pki_types::UnixTime,
+    ) -> Result<rustls::client::danger::ServerCertVerified, rustls::Error> {
+        Ok(rustls::client::danger::ServerCertVerified::assertion())
+    }
+
+    fn verify_tls12_signature(
+        &self,
+        message: &[u8],
+        cert: &rustls::pki_types::CertificateDer<'_>,
+        dss: &rustls::DigitallySignedStruct,
+    ) -> Result<rustls::client::danger::HandshakeSignatureValid, rustls::Error> {
+        rustls::crypto::verify_tls12_signature(
+            message,
+            cert,
+            dss,
+            &self.crypto_provider.signature_verification_algorithms,
+        )
+    }
+
+    fn verify_tls13_signature(
+        &self,
+        message: &[u8],
+        cert: &rustls::pki_types::CertificateDer<'_>,
+        dss: &rustls::DigitallySignedStruct,
+    ) -> Result<rustls::client::danger::HandshakeSignatureValid, rustls::Error> {
+        rustls::crypto::verify_tls13_signature(
+            message,
+            cert,
+            dss,
+            &self.crypto_provider.signature_verification_algorithms,
+        )
+    }
+
+    fn supported_verify_schemes(&self) -> Vec<rustls::SignatureScheme> {
+        rustls::crypto::ring::default_provider()
+            .signature_verification_algorithms
+            .supported_schemes()
     }
 }