feat: http download seed peers

base_layer/p2p/Cargo.toml

@@ -20,12 +20,13 @@ tari_utilities = { workspace = true }
 anyhow = "1.0.53"
 futures = { version = "^0.3.1" }
 log = "0.4.6"
-pgp = { version = "0.14.2", optional = true }
+pgp = { version = "0.14.2" }
 prost = "0.13.3"
 rand = "0.8"
-reqwest = { version = "0.11", optional = true, default-features = false }
+reqwest = { version = "0.11" }
 semver = { version = "1.0.1", optional = true }
 serde = "1.0.90"
+serde_json = "1.0.51"
 thiserror = "1.0.26"
 tokio = { version = "1.44", features = ["macros"] }
 tokio-stream = { version = "0.1.9", default-features = false, features = [
@@ -52,7 +53,7 @@ tari_common = { workspace = true, features = ["build"] }
 
 [features]
 test-mocks = []
-auto-update = ["reqwest/default", "pgp", "semver"]
+auto-update = ["semver"]
 
 [package.metadata.cargo-machete]
 ignored = []

base_layer/p2p/src/auto_update/error.rs

@@ -20,14 +20,14 @@
 //  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 //  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-use crate::dns::DnsClientError;
+use thiserror::Error;
 
-#[derive(Debug, thiserror::Error)]
+use crate::{dns::DnsClientError, signature_verification::SignatureVerificationError};
+
+#[derive(Debug, Error)]
 pub enum AutoUpdateError {
     #[error("DNS Client error: {0}")]
     DnsClientError(#[from] DnsClientError),
-    #[error("Failed to download file: {0}")]
-    DownloadError(#[from] reqwest::Error),
-    #[error("Failed to verify signature: {0}")]
-    SignatureError(#[from] pgp::errors::Error),
+    #[error("Signature verification error: {0}")]
+    SignatureVerificationError(#[from] SignatureVerificationError),
 }

base_layer/p2p/src/auto_update/mod.rs

@@ -21,7 +21,6 @@
 //  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 mod dns;
-mod signature;
 
 mod service;
 pub use service::{SoftwareUpdaterHandle, SoftwareUpdaterService};
@@ -30,15 +29,12 @@ mod error;
 use std::{
     fmt,
     fmt::{Display, Formatter},
-    io,
     str::FromStr,
     time::Duration,
 };
 
 pub use error::AutoUpdateError;
 use futures::future;
-use pgp::Deserializable;
-use reqwest::IntoUrl;
 // Re-exports of foreign types used in public interface
 pub use semver::Version;
 use serde::{Deserialize, Serialize};
@@ -54,7 +50,10 @@ use tari_common::{
 };
 use tari_utilities::hex::Hex;
 
-use crate::auto_update::{dns::UpdateSpec, signature::SignedMessageVerifier};
+use crate::{
+    auto_update::dns::UpdateSpec,
+    signature_verification::{self, SignedMessageVerifier},
+};
 
 const LOG_TARGET: &str = "p2p::auto_update";
 
@@ -122,24 +121,24 @@ pub async fn check_for_updates(
 
             );
             let (hashes, sig) = future::join(
-                download_hashes_file(&hashes_url),
-                download_hashes_sig_file(&hashes_sig_url),
+                signature_verification::download_hashes_file(&hashes_url),
+                signature_verification::download_hashes_sig_file(&hashes_sig_url),
             )
             .await;
             let hashes = hashes?;
             let sig = sig?;
-            let verifier = SignedMessageVerifier::new(maintainers().collect());
-            verifier
-                .verify_signed_update(&sig, &hashes, &update_spec)
-                .map(|(_, filename)| {
+            let verifier = SignedMessageVerifier::new(signature_verification::maintainers().collect());
+            match verifier.verify_signed_hashes(&sig, &hashes, &update_spec.hash) {
+                Ok((_, filename)) => {
                     let download_url = format!("{download_base_url}/{filename}");
                     log::info!(target: LOG_TARGET, "Valid update found at {download_url}");
-                    Ok(SoftwareUpdate {
+                    Ok(Some(SoftwareUpdate {
                         spec: update_spec,
                         download_url,
-                    })
-                })
-                .transpose()
+                    }))
+                },
+                Err(_) => Ok(None),
+            }
         },
         None => {
             log::info!("No new updates for {app} ({arch} {version})");
@@ -183,45 +182,12 @@ impl Display for SoftwareUpdate {
     }
 }
 
-async fn download_hashes_file<T: IntoUrl>(url: T) -> Result<String, AutoUpdateError> {
-    let resp = http_download(url).await?;
-    let txt = resp.text().await?;
-    Ok(txt)
-}
-
-async fn download_hashes_sig_file<T: IntoUrl>(url: T) -> Result<pgp::StandaloneSignature, AutoUpdateError> {
-    let resp = http_download(url).await?;
-    let sig_bytes = resp.bytes().await?;
-    let cursor = io::Cursor::new(&sig_bytes);
-    let sig = pgp::StandaloneSignature::from_bytes(cursor).map_err(AutoUpdateError::SignatureError)?;
-    Ok(sig)
-}
-
-async fn http_download<T: IntoUrl>(url: T) -> Result<reqwest::Response, AutoUpdateError> {
-    let resp = reqwest::get(url).await?.error_for_status()?;
-    Ok(resp)
-}
-
-const MAINTAINERS: &[&str] = &[include_str!("gpg_keys/swvheerden.asc")];
-
-fn maintainers() -> impl Iterator<Item = pgp::SignedPublicKey> {
-    MAINTAINERS.iter().map(|s| {
-        let (pk, _) = pgp::SignedPublicKey::from_string(s).expect("Malformed maintainer PGP signature");
-        pk
-    })
-}
-
 #[cfg(test)]
 mod test {
     use tari_common::DefaultConfigLoader;
 
     use super::*;
 
-    #[test]
-    fn all_maintainers_well_formed() {
-        assert_eq!(maintainers().count(), MAINTAINERS.len());
-    }
-
     fn get_config(config_name: Option<&str>) -> config::Config {
         let s = match config_name {
             Some(o) => {

base_layer/p2p/src/config.rs

@@ -67,6 +67,8 @@ pub struct PeerSeedsConfig {
     /// All DNS seed records must pass DNSSEC validation
     #[serde(default)]
     pub dns_seeds_use_dnssec: bool,
+    #[serde(default)]
+    pub download_url: String,
 }
 
 impl Default for PeerSeedsConfig {
@@ -98,6 +100,10 @@ impl Default for PeerSeedsConfig {
             )
             .expect("string is valid"),
             dns_seeds_use_dnssec: false,
+            download_url: format!(
+                "https://cdn-universe.tari.com/tari-project/tari/{}/seednodes.json",
+                Network::get_current_or_user_setting_or_default().as_key_str()
+            ),
         }
     }
 }

base_layer/p2p/src/dns/error.rs

@@ -38,4 +38,6 @@ pub enum DnsClientError {
     DnsNameRequiredForDnsSec,
     #[error("Connection error: {0}")]
     Connection(String),
+    #[error("No download URL found")]
+    NoDownloadUrlFound,
 }