12918406633

Committed 22 Jan 2025 10:39PM UTC coverage: 65.801% (-6.3%) from 72.12%

Build # 12918406633

Build Type

Pull #502

github

Committed by

web-flow

Commit Message

Merge 2152c4b39 into 7d8116e03

Pull Request Pull Request #502: Introduce `directory` feature module

Coverage Stats

69 of 129 new or added lines in 11 files covered. (53.49%)

270 existing lines in 14 files now uncovered.

3219 of 4892 relevant lines covered (65.8%)

933.94 hits per line

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

0.0

/payjoin/src/receive/v2/error.rs

use core::fmt;
use std::error;

use super::Error;
use crate::hpke::HpkeError;
use crate::ohttp::OhttpEncapsulationError;

/// Error that may occur during a v2 session typestate change
///
/// This is currently opaque type because we aren't sure which variants will stay.
/// You can only display it.
#[derive(Debug)]
pub struct SessionError(InternalSessionError);

impl From<InternalSessionError> for SessionError {
    fn from(value: InternalSessionError) -> Self { SessionError(value) }
}

impl From<InternalSessionError> for super::Error {
    fn from(e: InternalSessionError) -> Self { super::Error::Validation(e.into()) }
}

#[derive(Debug)]
pub(crate) enum InternalSessionError {
    /// The session has expired
    Expired(std::time::SystemTime),
    /// OHTTP Encapsulation failed
    OhttpEncapsulation(OhttpEncapsulationError),
    /// Hybrid Public Key Encryption failed
    Hpke(HpkeError),
    /// Unexpected response size
    UnexpectedResponseSize(usize),
    /// Unexpected status code
    UnexpectedStatusCode(http::StatusCode),
}

impl From<std::time::SystemTime> for Error {
    fn from(e: std::time::SystemTime) -> Self { InternalSessionError::Expired(e).into() }
}

impl From<OhttpEncapsulationError> for Error {
    fn from(e: OhttpEncapsulationError) -> Self {
        InternalSessionError::OhttpEncapsulation(e).into()
    }
}

impl From<HpkeError> for Error {
    fn from(e: HpkeError) -> Self { InternalSessionError::Hpke(e).into() }
}

impl fmt::Display for SessionError {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
        match &self.0 {
            InternalSessionError::Expired(expiry) => write!(f, "Session expired at {:?}", expiry),
            InternalSessionError::OhttpEncapsulation(e) =>
                write!(f, "OHTTP Encapsulation Error: {}", e),
            InternalSessionError::Hpke(e) => write!(f, "Hpke decryption failed: {}", e),
            InternalSessionError::UnexpectedResponseSize(size) => write!(
                f,
                "Unexpected response size {}, expected {} bytes",
                size,
                crate::directory::ENCAPSULATED_MESSAGE_BYTES
            ),
            InternalSessionError::UnexpectedStatusCode(status) =>
                write!(f, "Unexpected status code: {}", status),
        }
    }
}

impl error::Error for SessionError {
    fn source(&self) -> Option<&(dyn error::Error + 'static)> {
        match &self.0 {
            InternalSessionError::Expired(_) => None,
            InternalSessionError::OhttpEncapsulation(e) => Some(e),
            InternalSessionError::Hpke(e) => Some(e),
            InternalSessionError::UnexpectedResponseSize(_) => None,
            InternalSessionError::UnexpectedStatusCode(_) => None,
        }
    }
}

1	use core::fmt;
2	use std::error;
3
4	use super::Error;
5	use crate::hpke::HpkeError;
6	use crate::ohttp::OhttpEncapsulationError;
7
8	/// Error that may occur during a v2 session typestate change
9	///
10	/// This is currently opaque type because we aren't sure which variants will stay.
11	/// You can only display it.
12	#[derive(Debug)]
13	pub struct SessionError(InternalSessionError);
14
15	impl From<InternalSessionError> for SessionError {
UNCOV 16	fn from(value: InternalSessionError) -> Self { SessionError(value) }	×
17	}
18
19	impl From<InternalSessionError> for super::Error {
UNCOV 20	fn from(e: InternalSessionError) -> Self { super::Error::Validation(e.into()) }	×
21	}
22
23	#[derive(Debug)]
24	pub(crate) enum InternalSessionError {
25	/// The session has expired
26	Expired(std::time::SystemTime),
27	/// OHTTP Encapsulation failed
28	OhttpEncapsulation(OhttpEncapsulationError),
29	/// Hybrid Public Key Encryption failed
30	Hpke(HpkeError),
31	/// Unexpected response size
32	UnexpectedResponseSize(usize),
33	/// Unexpected status code
34	UnexpectedStatusCode(http::StatusCode),
35	}
36
37	impl From<std::time::SystemTime> for Error {
38	fn from(e: std::time::SystemTime) -> Self { InternalSessionError::Expired(e).into() }	×
39	}
40
41	impl From<OhttpEncapsulationError> for Error {
42	fn from(e: OhttpEncapsulationError) -> Self {	×
43	InternalSessionError::OhttpEncapsulation(e).into()	×
44	}	×
45	}
46
47	impl From<HpkeError> for Error {
48	fn from(e: HpkeError) -> Self { InternalSessionError::Hpke(e).into() }	×
49	}
50
51	impl fmt::Display for SessionError {
UNCOV 52	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {	×
UNCOV 53	match &self.0 {	×
UNCOV 54	InternalSessionError::Expired(expiry) => write!(f, "Session expired at {:?}", expiry),	×
55	InternalSessionError::OhttpEncapsulation(e) =>	×
56	write!(f, "OHTTP Encapsulation Error: {}", e),	×
57	InternalSessionError::Hpke(e) => write!(f, "Hpke decryption failed: {}", e),	×
58	InternalSessionError::UnexpectedResponseSize(size) => write!(	×
59	f,	×
60	"Unexpected response size {}, expected {} bytes",	×
61	size,	×
NEW 62	crate::directory::ENCAPSULATED_MESSAGE_BYTES	×
63	),	×
64	InternalSessionError::UnexpectedStatusCode(status) =>	×
65	write!(f, "Unexpected status code: {}", status),	×
66	}
UNCOV 67	}	×
68	}
69
70	impl error::Error for SessionError {
71	fn source(&self) -> Option<&(dyn error::Error + 'static)> {	×
72	match &self.0 {	×
73	InternalSessionError::Expired(_) => None,	×
74	InternalSessionError::OhttpEncapsulation(e) => Some(e),	×
75	InternalSessionError::Hpke(e) => Some(e),	×
76	InternalSessionError::UnexpectedResponseSize(_) => None,	×
77	InternalSessionError::UnexpectedStatusCode(_) => None,	×
78	}
79	}	×
80	}

payjoin / rust-payjoin / 12918406633

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