22594006325

Committed 02 Mar 2026 08:18PM UTC coverage: 82.512% (+0.03%) from 82.484%

Build # 22594006325

Build Type

Pull #1377

github

Committed by

web-flow

Commit Message

Merge c02d1d13e into 55fbc08be

Pull Request Pull Request #1377: Url rewrite

Coverage Stats

314 of 376 new or added lines in 15 files covered. (83.51%)

1 existing line in 1 file now uncovered.

10913 of 13226 relevant lines covered (82.51%)

404.25 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 payjoin::Url;

use super::Config;

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

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

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

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

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

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

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

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

payjoin / rust-payjoin / 22594006325

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