15476118677

Committed 05 Jun 2025 07:59PM UTC coverage: 85.159% (+0.1%) from 85.055%

Build # 15476118677

Build Type

Pull #726

github

Committed by

web-flow

Commit Message

Merge 24874ef52 into 1063687eb

Pull Request Pull Request #726: Merge parallel feature flag local certificate logic in cli ohttp

Coverage Stats

35 of 36 new or added lines in 2 files covered. (97.22%)

11 existing lines in 1 file now uncovered.

6811 of 7998 relevant lines covered (85.16%)

580.28 hits per line

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

81.25

/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<payjoin::Url>,
    failed_relays: Vec<payjoin::Url>,
}

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

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

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

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

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

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

pub(crate) async fn unwrap_ohttp_keys_or_else_fetch(
    config: &Config,
    directory: Option<payjoin::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<payjoin::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 = "_danger-local-https")]
            {
                let cert_der = crate::app::read_local_cert()?;
                payjoin::io::fetch_ohttp_keys_with_cert(
                    selected_relay.clone(),
                    payjoin_directory.clone(),
                    cert_der,
                )
                .await
            }
            #[cfg(not(feature = "_danger-local-https"))]
            {
                payjoin::io::fetch_ohttp_keys(selected_relay.clone(), payjoin_directory.clone())
                    .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) => {
                log::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<payjoin::Url>,
10	failed_relays: Vec<payjoin::Url>,
11	}
12
13	impl RelayManager {
14	pub fn new() -> Self { RelayManager { selected_relay: None, failed_relays: Vec::new() } }	4✔
15
16	pub fn set_selected_relay(&mut self, relay: payjoin::Url) { self.selected_relay = Some(relay); }	3✔
17
18	pub fn get_selected_relay(&self) -> Option<payjoin::Url> { self.selected_relay.clone() }	6✔
19
UNCOV 20	pub fn add_failed_relay(&mut self, relay: payjoin::Url) { self.failed_relays.push(relay); }	×
21
22	pub fn get_failed_relays(&self) -> Vec<payjoin::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: payjoin::Url,
28	}
29
30	pub(crate) async fn unwrap_ohttp_keys_or_else_fetch(	6✔
31	config: &Config,	6✔
32	directory: Option<payjoin::Url>,	6✔
33	relay_manager: Arc<Mutex<RelayManager>>,	6✔
34	) -> Result<ValidatedOhttpKeys> {	6✔
35	if let Some(ohttp_keys) = config.v2()?.ohttp_keys.clone() {	6✔
36	println!("Using OHTTP Keys from config");	3✔
37	return Ok(ValidatedOhttpKeys {	3✔
38	ohttp_keys,	3✔
39	relay_url: config.v2()?.ohttp_relays[0].clone(),	3✔
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	}	6✔
48
49	async fn fetch_ohttp_keys(	3✔
50	config: &Config,	3✔
51	directory: Option<payjoin::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 {	3✔
59	let failed_relays =	3✔
60	relay_manager.lock().expect("Lock should not be poisoned").get_failed_relays();	3✔
61		3✔
62	let remaining_relays: Vec<_> =	3✔
63	relays.iter().filter(\|r\| !failed_relays.contains(r)).cloned().collect();	3✔
64		3✔
65	if remaining_relays.is_empty() {	3✔
UNCOV 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✔
UNCOV 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 = "_danger-local-https")]
82	{
83	let cert_der = crate::app::read_local_cert()?;	3✔
84	payjoin::io::fetch_ohttp_keys_with_cert(	3✔
85	selected_relay.clone(),	3✔
86	payjoin_directory.clone(),	3✔
87	cert_der,	3✔
88	)	3✔
89	.await	3✔
90	}
91	#[cfg(not(feature = "_danger-local-https"))]
92	{
93	payjoin::io::fetch_ohttp_keys(selected_relay.clone(), payjoin_directory.clone())
94	.await
95	}
96	};
97
NEW 98	match ohttp_keys {	×
99	Ok(keys) =>	3✔
100	return Ok(ValidatedOhttpKeys { ohttp_keys: keys, relay_url: selected_relay }),	3✔
UNCOV 101	Err(payjoin::io::Error::UnexpectedStatusCode(e)) => {	×
UNCOV 102	return Err(payjoin::io::Error::UnexpectedStatusCode(e).into());	×
103	}
UNCOV 104	Err(e) => {	×
UNCOV 105	log::debug!("Failed to connect to relay: {selected_relay}, {e:?}");	×
UNCOV 106	relay_manager	×
UNCOV 107	.lock()	×
UNCOV 108	.expect("Lock should not be poisoned")	×
UNCOV 109	.add_failed_relay(selected_relay);	×
110	}
111	}
112	}
113	}	3✔

payjoin / rust-payjoin / 15476118677

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