18230715366

Committed 03 Oct 2025 06:34PM UTC coverage: 84.18% (-0.06%) from 84.237%

Build # 18230715366

Build Type

Pull #1141

github

Committed by

web-flow

Commit Message

Merge 1460d24bb into 5335134f3

Pull Request Pull Request #1141: Return String instead of Url for endpoint accessors

Run Details

97 of 99 new or added lines in 8 files covered. (97.98%)

4 existing lines in 3 files now uncovered.

8934 of 10613 relevant lines covered (84.18%)

466.0 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

74.24

/payjoin-cli/src/app/v2/ohttp.rs

use std::sync::{Arc, Mutex};

use anyhow::{anyhow, Result};

use super::Config;

#[derive(Debug, Clone)]
pub struct RelayManager {
    selected_relay: Option<url::Url>,
    failed_relays: Vec<url::Url>,
}

impl RelayManager {
    pub fn new() -> Self { RelayManager { selected_relay: None, failed_relays: Vec::new() } }

    pub fn set_selected_relay(&mut self, relay: url::Url) { self.selected_relay = Some(relay); }

    pub fn get_selected_relay(&self) -> Option<url::Url> { self.selected_relay.clone() }

    pub fn add_failed_relay(&mut self, relay: url::Url) { self.failed_relays.push(relay); }

    pub fn get_failed_relays(&self) -> Vec<url::Url> { self.failed_relays.clone() }
}

pub(crate) struct ValidatedOhttpKeys {
    pub(crate) ohttp_keys: payjoin::OhttpKeys,
    pub(crate) relay_url: url::Url,
}

pub(crate) async fn unwrap_ohttp_keys_or_else_fetch(
    config: &Config,
    directory: Option<url::Url>,
    relay_manager: Arc<Mutex<RelayManager>>,
) -> Result<ValidatedOhttpKeys> {
    if let Some(ohttp_keys) = config.v2()?.ohttp_keys.clone() {
        println!("Using OHTTP Keys from config");
        return Ok(ValidatedOhttpKeys {
            ohttp_keys,
            relay_url: config.v2()?.ohttp_relays[0].clone(),
        });
    } else {
        println!("Bootstrapping private network transport over Oblivious HTTP");
        let fetched_keys = fetch_ohttp_keys(config, directory, relay_manager).await?;

        Ok(fetched_keys)
    }
}

async fn fetch_ohttp_keys(
    config: &Config,
    directory: Option<url::Url>,
    relay_manager: Arc<Mutex<RelayManager>>,
) -> Result<ValidatedOhttpKeys> {
    use payjoin::bitcoin::secp256k1::rand::prelude::SliceRandom;
    let payjoin_directory = directory.unwrap_or(config.v2()?.pj_directory.clone());
    let relays = config.v2()?.ohttp_relays.clone();

    loop {
        let failed_relays =
            relay_manager.lock().expect("Lock should not be poisoned").get_failed_relays();

        let remaining_relays: Vec<_> =
            relays.iter().filter(|r| !failed_relays.contains(r)).cloned().collect();

        if remaining_relays.is_empty() {
            return Err(anyhow!("No valid relays available"));
        }

        let selected_relay =
            match remaining_relays.choose(&mut payjoin::bitcoin::key::rand::thread_rng()) {
                Some(relay) => relay.clone(),
                None => return Err(anyhow!("Failed to select from remaining relays")),
            };

        relay_manager
            .lock()
            .expect("Lock should not be poisoned")
            .set_selected_relay(selected_relay.clone());

        let ohttp_keys = {
            #[cfg(feature = "_manual-tls")]
            {
                if let Some(cert_path) = config.root_certificate.as_ref() {
                    let cert_der = std::fs::read(cert_path)?;
                    payjoin::io::fetch_ohttp_keys_with_cert(
                        selected_relay.as_str(),
                        payjoin_directory.as_str(),
                        cert_der,
                    )
                    .await
                } else {
                    payjoin::io::fetch_ohttp_keys(
                        selected_relay.as_str(),
                        payjoin_directory.as_str(),
                    )
                    .await
                }
            }
            #[cfg(not(feature = "_manual-tls"))]
            payjoin::io::fetch_ohttp_keys(selected_relay.as_str(), payjoin_directory.as_str()).await
        };

        match ohttp_keys {
            Ok(keys) =>
                return Ok(ValidatedOhttpKeys { ohttp_keys: keys, relay_url: selected_relay }),
            Err(payjoin::io::Error::UnexpectedStatusCode(e)) => {
                return Err(payjoin::io::Error::UnexpectedStatusCode(e).into());
            }
            Err(e) => {
                tracing::debug!("Failed to connect to relay: {selected_relay}, {e:?}");
                relay_manager
                    .lock()
                    .expect("Lock should not be poisoned")
                    .add_failed_relay(selected_relay);
            }
        }
    }
}

1	use std::sync::{Arc, Mutex};
2
3	use anyhow::{anyhow, Result};
4
5	use super::Config;
6
7	#[derive(Debug, Clone)]
8	pub struct RelayManager {
9	selected_relay: Option<url::Url>,
10	failed_relays: Vec<url::Url>,
11	}
12
13	impl RelayManager {
14	pub fn new() -> Self { RelayManager { selected_relay: None, failed_relays: Vec::new() } }	8✔
15
16	pub fn set_selected_relay(&mut self, relay: url::Url) { self.selected_relay = Some(relay); }	3✔
17
18	pub fn get_selected_relay(&self) -> Option<url::Url> { self.selected_relay.clone() }	7✔
19
NEW 20	pub fn add_failed_relay(&mut self, relay: url::Url) { self.failed_relays.push(relay); }	×
21
22	pub fn get_failed_relays(&self) -> Vec<url::Url> { self.failed_relays.clone() }	3✔
23	}
24
25	pub(crate) struct ValidatedOhttpKeys {
26	pub(crate) ohttp_keys: payjoin::OhttpKeys,
27	pub(crate) relay_url: url::Url,
28	}
29
30	pub(crate) async fn unwrap_ohttp_keys_or_else_fetch(	5✔
31	config: &Config,	5✔
32	directory: Option<url::Url>,	5✔
33	relay_manager: Arc<Mutex<RelayManager>>,	5✔
34	) -> Result<ValidatedOhttpKeys> {	5✔
35	if let Some(ohttp_keys) = config.v2()?.ohttp_keys.clone() {	5✔
36	println!("Using OHTTP Keys from config");	2✔
37	return Ok(ValidatedOhttpKeys {
38	ohttp_keys,	2✔
39	relay_url: config.v2()?.ohttp_relays[0].clone(),	2✔
40	});
41	} else {
42	println!("Bootstrapping private network transport over Oblivious HTTP");	3✔
43	let fetched_keys = fetch_ohttp_keys(config, directory, relay_manager).await?;	3✔
44
45	Ok(fetched_keys)	3✔
46	}
47	}	5✔
48
49	async fn fetch_ohttp_keys(	3✔
50	config: &Config,	3✔
51	directory: Option<url::Url>,	3✔
52	relay_manager: Arc<Mutex<RelayManager>>,	3✔
53	) -> Result<ValidatedOhttpKeys> {	3✔
54	use payjoin::bitcoin::secp256k1::rand::prelude::SliceRandom;
55	let payjoin_directory = directory.unwrap_or(config.v2()?.pj_directory.clone());	3✔
56	let relays = config.v2()?.ohttp_relays.clone();	3✔
57
58	loop {
59	let failed_relays =	3✔
60	relay_manager.lock().expect("Lock should not be poisoned").get_failed_relays();	3✔
61
62	let remaining_relays: Vec<_> =	3✔
63	relays.iter().filter(\|r\| !failed_relays.contains(r)).cloned().collect();	3✔
64
65	if remaining_relays.is_empty() {	3✔
66	return Err(anyhow!("No valid relays available"));	×
67	}	3✔
68
69	let selected_relay =	3✔
70	match remaining_relays.choose(&mut payjoin::bitcoin::key::rand::thread_rng()) {	3✔
71	Some(relay) => relay.clone(),	3✔
72	None => return Err(anyhow!("Failed to select from remaining relays")),	×
73	};
74
75	relay_manager	3✔
76	.lock()	3✔
77	.expect("Lock should not be poisoned")	3✔
78	.set_selected_relay(selected_relay.clone());	3✔
79
80	let ohttp_keys = {	3✔
81	#[cfg(feature = "_manual-tls")]
82	{
83	if let Some(cert_path) = config.root_certificate.as_ref() {	3✔
84	let cert_der = std::fs::read(cert_path)?;	3✔
85	payjoin::io::fetch_ohttp_keys_with_cert(	3✔
86	selected_relay.as_str(),	3✔
87	payjoin_directory.as_str(),	3✔
88	cert_der,	3✔
89	)	3✔
90	.await	3✔
91	} else {
92	payjoin::io::fetch_ohttp_keys(	×
93	selected_relay.as_str(),	×
94	payjoin_directory.as_str(),	×
95	)	×
96	.await	×
97	}
98	}
99	#[cfg(not(feature = "_manual-tls"))]
100	payjoin::io::fetch_ohttp_keys(selected_relay.as_str(), payjoin_directory.as_str()).await
101	};
102
103	match ohttp_keys {	×
104	Ok(keys) =>	3✔
105	return Ok(ValidatedOhttpKeys { ohttp_keys: keys, relay_url: selected_relay }),	3✔
106	Err(payjoin::io::Error::UnexpectedStatusCode(e)) => {	×
107	return Err(payjoin::io::Error::UnexpectedStatusCode(e).into());	×
108	}
109	Err(e) => {	×
110	tracing::debug!("Failed to connect to relay: {selected_relay}, {e:?}");	×
111	relay_manager	×
112	.lock()	×
113	.expect("Lock should not be poisoned")	×
114	.add_failed_relay(selected_relay);	×
115	}
116	}
117	}
118	}	3✔

payjoin / rust-payjoin / 18230715366

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous