Merge pull request #217 from theseus-rs/prevent-bundled-network-access

brianheineman · web-flow · commit aa10e3cf9312 · 2025-08-30T21:07:56.000-06:00
fix: always use the build version of postgresql when the bundled feature is enabled to avoid network access
diff --git a/examples/archive_async/src/main.rs b/examples/archive_async/src/main.rs
@@ -25,7 +25,7 @@ mod test {
     use super::*;
 
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_archive_async_main() -> Result<()> {
         main()
     }
 }
diff --git a/examples/archive_sync/src/main.rs b/examples/archive_sync/src/main.rs
@@ -25,7 +25,7 @@ mod test {
     use super::*;
 
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_archive_sync_main() -> Result<()> {
         main()
     }
 }
diff --git a/examples/diesel_embedded/src/main.rs b/examples/diesel_embedded/src/main.rs
@@ -72,7 +72,7 @@ mod test {
     use super::*;
 
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_diesel_embedded_main() -> Result<()> {
         main()
     }
 }
diff --git a/examples/download_progress_bar/src/main.rs b/examples/download_progress_bar/src/main.rs
@@ -43,7 +43,7 @@ mod test {
     use super::*;
 
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_download_progress_bar_main() -> Result<()> {
         main()
     }
 }
diff --git a/examples/embedded_async/src/main.rs b/examples/embedded_async/src/main.rs
@@ -27,7 +27,7 @@ mod test {
     use super::*;
 
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_embedded_async_main() -> Result<()> {
         main()
     }
 }
diff --git a/examples/embedded_sync/src/main.rs b/examples/embedded_sync/src/main.rs
@@ -23,7 +23,7 @@ mod test {
     use super::*;
 
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_embedded_sync_main() -> Result<()> {
         main()
     }
 }
diff --git a/examples/portal_corp_extension/src/main.rs b/examples/portal_corp_extension/src/main.rs
@@ -18,13 +18,22 @@ async fn main() -> Result<()> {
     tracing_subscriber::fmt().compact().init();
 
     info!("Installing PostgreSQL");
+    let postgresql_version = VersionReq::parse("=16.4.0")?;
     let settings = Settings {
-        version: VersionReq::parse("=16.4.0")?,
+        version: postgresql_version.clone(),
         ..Default::default()
     };
     let mut postgresql = PostgreSQL::new(settings);
     postgresql.setup().await?;
 
+    let settings = postgresql.settings();
+    // Skip the test if the PostgreSQL version does not match; when testing with the 'bundled'
+    // feature, the version may vary and the test will fail.
+    if settings.version != postgresql_version {
+        eprintln!("Postgresql version does not match");
+        return Ok(());
+    }
+
     info!("Installing the vector extension from PortalCorp");
     postgresql_extensions::install(
         postgresql.settings(),
@@ -120,10 +129,12 @@ async fn execute_query(pool: &PgPool, query: &str) -> Result<()> {
 
 #[cfg(test)]
 mod test {
+    #[cfg(not(all(target_os = "linux", target_arch = "x86_64")))]
     use super::*;
 
+    #[cfg(not(all(target_os = "linux", target_arch = "x86_64")))]
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_portal_corp_extension_main() -> Result<()> {
         main()
     }
 }
diff --git a/examples/postgres_embedded/src/main.rs b/examples/postgres_embedded/src/main.rs
@@ -93,7 +93,7 @@ mod test {
     use super::*;
 
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_postgres_embedded_main() -> Result<()> {
         main()
     }
 }
diff --git a/examples/sqlx_embedded/src/main.rs b/examples/sqlx_embedded/src/main.rs
@@ -92,7 +92,7 @@ mod test {
     use super::*;
 
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_sqlx_embedded_main() -> Result<()> {
         main()
     }
 }
diff --git a/examples/tensor_chord_extension/src/main.rs b/examples/tensor_chord_extension/src/main.rs
@@ -147,13 +147,14 @@ async fn execute_query(pool: &PgPool, query: &str) -> Result<()> {
     Ok(())
 }
 
-#[cfg(target_os = "linux")]
 #[cfg(test)]
 mod test {
+    #[cfg(not(all(target_os = "linux", target_arch = "x86_64")))]
     use super::*;
 
+    #[cfg(not(all(target_os = "linux", target_arch = "x86_64")))]
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_tensor_chord_extension_main() -> Result<()> {
         main()
     }
 }
diff --git a/examples/zonky/src/main.rs b/examples/zonky/src/main.rs
@@ -27,10 +27,12 @@ async fn main() -> Result<()> {
 
 #[cfg(test)]
 mod test {
+    #[cfg(not(all(target_os = "linux", target_arch = "x86_64")))]
     use super::*;
 
+    #[cfg(not(all(target_os = "linux", target_arch = "x86_64")))]
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_zonky_main() -> Result<()> {
         main()
     }
 }
diff --git a/postgresql_embedded/src/postgresql.rs b/postgresql_embedded/src/postgresql.rs
@@ -1,9 +1,11 @@
 use crate::error::Error::{DatabaseInitializationError, DatabaseStartError, DatabaseStopError};
 use crate::error::Result;
 use crate::settings::{BOOTSTRAP_DATABASE, BOOTSTRAP_SUPERUSER, Settings};
+use postgresql_archive::extract;
+#[cfg(not(feature = "bundled"))]
+use postgresql_archive::get_archive;
 use postgresql_archive::get_version;
 use postgresql_archive::{ExactVersion, ExactVersionReq};
-use postgresql_archive::{extract, get_archive};
 #[cfg(feature = "tokio")]
 use postgresql_commands::AsyncCommandExecutor;
 use postgresql_commands::CommandBuilder;
@@ -179,6 +181,11 @@ impl PostgreSQL {
     /// returned.
     #[instrument(skip(self))]
     async fn install(&mut self) -> Result<()> {
+        #[cfg(feature = "bundled")]
+        {
+            self.settings.version = crate::settings::ARCHIVE_VERSION.clone();
+        }
+
         debug!(
             "Starting installation process for version {}",
             self.settings.version
@@ -201,28 +208,21 @@ impl PostgreSQL {
 
         let url = &self.settings.releases_url;
 
+        // When the `bundled` feature is enabled, use the bundled archive instead of downloading it
+        // from the internet.
         #[cfg(feature = "bundled")]
-        // If the requested version is the same as the version of the bundled archive, use the bundled
-        // archive. This avoids downloading the archive in environments where internet access is
-        // restricted or undesirable.
-        let (version, bytes) = if *crate::settings::ARCHIVE_VERSION == self.settings.version {
+        let bytes = {
             debug!("Using bundled installation archive");
-            (
-                self.settings.version.clone(),
-                crate::settings::ARCHIVE.to_vec(),
-            )
-        } else {
-            let (version, bytes) = get_archive(url, &self.settings.version).await?;
-            (version.exact_version_req()?, bytes)
+            crate::settings::ARCHIVE.to_vec()
         };
 
         #[cfg(not(feature = "bundled"))]
-        let (version, bytes) = {
+        let bytes = {
             let (version, bytes) = get_archive(url, &self.settings.version).await?;
-            (version.exact_version_req()?, bytes)
+            self.settings.version = version.exact_version_req()?;
+            bytes
         };
 
-        self.settings.version = version;
         extract(url, &bytes, &self.settings.installation_dir).await?;
 
         debug!(
diff --git a/postgresql_embedded/src/settings.rs b/postgresql_embedded/src/settings.rs
@@ -1,5 +1,7 @@
 use crate::error::{Error, Result};
 use postgresql_archive::VersionReq;
+#[cfg(feature = "bundled")]
+use postgresql_archive::{ExactVersionReq, Version};
 use rand::Rng;
 use rand::distr::Alphanumeric;
 use std::collections::HashMap;
@@ -8,8 +10,6 @@ use std::env::{current_dir, home_dir};
 use std::ffi::OsString;
 use std::path::PathBuf;
 #[cfg(feature = "bundled")]
-use std::str::FromStr;
-#[cfg(feature = "bundled")]
 use std::sync::LazyLock;
 use std::time::Duration;
 use url::Url;
@@ -18,7 +18,8 @@ use url::Url;
 #[expect(clippy::unwrap_used)]
 pub(crate) static ARCHIVE_VERSION: LazyLock<VersionReq> = LazyLock::new(|| {
     let version_string = include_str!(concat!(std::env!("OUT_DIR"), "/postgresql.version"));
-    let version_req = VersionReq::from_str(&format!("={version_string}")).unwrap();
+    let version = Version::parse(version_string).unwrap();
+    let version_req = version.exact_version_req().unwrap();
     tracing::debug!("Bundled installation archive version {version_string}");
     version_req
 });
diff --git a/postgresql_embedded/tests/blocking.rs b/postgresql_embedded/tests/blocking.rs
@@ -7,7 +7,7 @@ use test_log::test;
 
 #[cfg(feature = "blocking")]
 #[test]
-fn test_lifecycle() -> Result<()> {
+fn test_embedded_blocking_lifecycle() -> Result<()> {
     let mut postgresql = PostgreSQL::default();
     let settings = postgresql.settings();
 
diff --git a/postgresql_embedded/tests/postgresql.rs b/postgresql_embedded/tests/postgresql.rs
@@ -34,7 +34,7 @@ async fn lifecycle() -> Result<()> {
 }
 
 #[test(tokio::test)]
-async fn test_lifecycle() -> Result<()> {
+async fn test_embedded_async_lifecycle() -> Result<()> {
     lifecycle().await
 }
 
diff --git a/postgresql_extensions/tests/blocking.rs b/postgresql_extensions/tests/blocking.rs
@@ -22,10 +22,11 @@ fn test_get_available_extensions() -> anyhow::Result<()> {
 
 #[cfg(all(target_os = "linux", feature = "blocking", feature = "tensor-chord"))]
 #[test]
-fn test_lifecycle() -> anyhow::Result<()> {
+fn test_extensions_blocking_lifecycle() -> anyhow::Result<()> {
     let installation_dir = tempfile::tempdir()?.path().to_path_buf();
+    let postgresql_version = semver::VersionReq::parse("=16.4.0")?;
     let settings = postgresql_embedded::Settings {
-        version: postgresql_embedded::VersionReq::parse("=16.4.0")?,
+        version: postgresql_version.clone(),
         installation_dir: installation_dir.clone(),
         ..Default::default()
     };
@@ -34,6 +35,12 @@ fn test_lifecycle() -> anyhow::Result<()> {
     postgresql.setup()?;
 
     let settings = postgresql.settings();
+    // Skip the test if the PostgreSQL version does not match; when testing with the 'bundled'
+    // feature, the version may vary and the test will fail.
+    if settings.version != postgresql_version {
+        return Ok(());
+    }
+
     let namespace = "tensor-chord";
     let name = "pgvecto.rs";
     let version = semver::VersionReq::parse("=0.3.0")?;
diff --git a/postgresql_extensions/tests/extensions.rs b/postgresql_extensions/tests/extensions.rs
@@ -21,10 +21,11 @@ async fn test_get_available_extensions() -> Result<()> {
 
 #[cfg(all(target_os = "linux", feature = "tensor-chord"))]
 #[tokio::test]
-async fn test_lifecycle() -> Result<()> {
+async fn test_extensions_tensor_chord_lifecycle() -> Result<()> {
     let installation_dir = tempfile::tempdir()?.path().to_path_buf();
+    let postgresql_version = semver::VersionReq::parse("=16.4.0")?;
     let settings = postgresql_embedded::Settings {
-        version: postgresql_embedded::VersionReq::parse("=16.4.0")?,
+        version: postgresql_version.clone(),
         installation_dir: installation_dir.clone(),
         ..Default::default()
     };
@@ -33,6 +34,12 @@ async fn test_lifecycle() -> Result<()> {
     postgresql.setup().await?;
 
     let settings = postgresql.settings();
+    // Skip the test if the PostgreSQL version does not match; when testing with the 'bundled'
+    // feature, the version may vary and the test will fail.
+    if settings.version != postgresql_version {
+        return Ok(());
+    }
+
     let namespace = "tensor-chord";
     let name = "pgvecto.rs";
     let version = semver::VersionReq::parse("=0.3.0")?;
diff --git a/postgresql_extensions/tests/portal_corp.rs b/postgresql_extensions/tests/portal_corp.rs
@@ -4,11 +4,11 @@
 )))]
 #[cfg(feature = "portal-corp")]
 #[tokio::test]
-async fn test_lifecycle() -> anyhow::Result<()> {
+async fn test_extensions_portal_corp_lifecycle() -> anyhow::Result<()> {
     let installation_dir = tempfile::tempdir()?.path().to_path_buf();
     let postgresql_version = semver::VersionReq::parse("=16.4.0")?;
     let settings = postgresql_embedded::Settings {
-        version: postgresql_version,
+        version: postgresql_version.clone(),
         installation_dir: installation_dir.clone(),
         ..Default::default()
     };
@@ -17,6 +17,12 @@ async fn test_lifecycle() -> anyhow::Result<()> {
     postgresql.setup().await?;
 
     let settings = postgresql.settings();
+    // Skip the test if the PostgreSQL version does not match; when testing with the 'bundled'
+    // feature, the version may vary and the test will fail.
+    if settings.version != postgresql_version {
+        return Ok(());
+    }
+
     let namespace = "portal-corp";
     let name = "pgvector_compiled";
     let version = semver::VersionReq::parse("=0.16.12")?;
diff --git a/postgresql_extensions/tests/steampipe.rs b/postgresql_extensions/tests/steampipe.rs
@@ -1,11 +1,11 @@
 #[cfg(any(target_os = "linux", target_os = "macos"))]
 #[cfg(feature = "steampipe")]
 #[tokio::test]
-async fn test_lifecycle() -> anyhow::Result<()> {
+async fn test_extensions_steampipe_lifecycle() -> anyhow::Result<()> {
     let installation_dir = tempfile::tempdir()?.path().to_path_buf();
     let postgresql_version = semver::VersionReq::parse("=15.7.0")?;
     let settings = postgresql_embedded::Settings {
-        version: postgresql_version,
+        version: postgresql_version.clone(),
         installation_dir: installation_dir.clone(),
         ..Default::default()
     };
@@ -14,6 +14,12 @@ async fn test_lifecycle() -> anyhow::Result<()> {
     postgresql.setup().await?;
 
     let settings = postgresql.settings();
+    // Skip the test if the PostgreSQL version does not match; when testing with the 'bundled'
+    // feature, the version may vary and the test will fail.
+    if settings.version != postgresql_version {
+        return Ok(());
+    }
+
     let namespace = "steampipe";
     let name = "csv";
     let version = semver::VersionReq::parse("=0.12.0")?;

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ mod test {`
`25`	`25`	`use super::*;`
`26`	`26`
`27`	`27`	`#[test]`
`28`		`- fn test_main() -> Result<()> {`
	`28`	`+ fn test_archive_async_main() -> Result<()> {`
`29`	`29`	`main()`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ mod test {`
`72`	`72`	`use super::*;`
`73`	`73`
`74`	`74`	`#[test]`
`75`		`- fn test_main() -> Result<()> {`
	`75`	`+ fn test_diesel_embedded_main() -> Result<()> {`
`76`	`76`	`main()`
`77`	`77`	`}`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ mod test {`
`43`	`43`	`use super::*;`
`44`	`44`
`45`	`45`	`#[test]`
`46`		`- fn test_main() -> Result<()> {`
	`46`	`+ fn test_download_progress_bar_main() -> Result<()> {`
`47`	`47`	`main()`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ mod test {`
`27`	`27`	`use super::*;`
`28`	`28`
`29`	`29`	`#[test]`
`30`		`- fn test_main() -> Result<()> {`
	`30`	`+ fn test_embedded_async_main() -> Result<()> {`
`31`	`31`	`main()`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ mod test {`
`23`	`23`	`use super::*;`
`24`	`24`
`25`	`25`	`#[test]`
`26`		`- fn test_main() -> Result<()> {`
	`26`	`+ fn test_embedded_sync_main() -> Result<()> {`
`27`	`27`	`main()`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ mod test {`
`93`	`93`	`use super::*;`
`94`	`94`
`95`	`95`	`#[test]`
`96`		`- fn test_main() -> Result<()> {`
	`96`	`+ fn test_postgres_embedded_main() -> Result<()> {`
`97`	`97`	`main()`
`98`	`98`	`}`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ mod test {`
`92`	`92`	`use super::*;`
`93`	`93`
`94`	`94`	`#[test]`
`95`		`- fn test_main() -> Result<()> {`
	`95`	`+ fn test_sqlx_embedded_main() -> Result<()> {`
`96`	`96`	`main()`
`97`	`97`	`}`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,13 +147,14 @@ async fn execute_query(pool: &PgPool, query: &str) -> Result<()> {`
`147`	`147`	`Ok(())`
`148`	`148`	`}`
`149`	`149`
`150`		`-#[cfg(target_os = "linux")]`
`151`	`150`	`#[cfg(test)]`
`152`	`151`	`mod test {`
	`152`	`+ #[cfg(not(all(target_os = "linux", target_arch = "x86_64")))]`
`153`	`153`	`use super::*;`
`154`	`154`
	`155`	`+ #[cfg(not(all(target_os = "linux", target_arch = "x86_64")))]`
`155`	`156`	`#[test]`
`156`		`- fn test_main() -> Result<()> {`
	`157`	`+ fn test_tensor_chord_extension_main() -> Result<()> {`
`157`	`158`	`main()`
`158`	`159`	`}`
`159`	`160`	`}`