Propagate ParseError when retrieving ohttp parameter

Author: shinghim

payjoin/src/uri/error.rs

@@ -20,6 +20,13 @@ pub(crate) enum ParseReceiverPubkeyError {
     InvalidPubkey(crate::hpke::HpkeError),
 }
 
+#[cfg(feature = "v2")]
+#[derive(Debug)]
+pub(crate) enum ParseOhttpError {
+    MissingOhttp,
+    InvalidOhttpKeys
+}
+
 #[cfg(feature = "v2")]
 impl std::fmt::Display for ParseReceiverPubkeyError {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {

payjoin/src/uri/url_ext.rs

@@ -5,17 +5,17 @@ use bitcoin::consensus::encode::Decodable;
 use bitcoin::consensus::Encodable;
 use url::Url;
 
-use super::error::ParseReceiverPubkeyError;
+use super::error::{ParseExpError, ParseOhttpError, ParseReceiverPubkeyError};
 use crate::hpke::HpkePublicKey;
 use crate::OhttpKeys;
 
 /// Parse and set fragment parameters from `&pj=` URI parameter URLs
 pub(crate) trait UrlExt {
     fn receiver_pubkey(&self) -> Result<HpkePublicKey, ParseReceiverPubkeyError>;
     fn set_receiver_pubkey(&mut self, exp: HpkePublicKey);
-    fn ohttp(&self) -> Option<OhttpKeys>;
+    fn ohttp(&self) ->Result<OhttpKeys, ParseOhttpError>;
     fn set_ohttp(&mut self, ohttp: OhttpKeys);
-    fn exp(&self) -> Option<std::time::SystemTime>;
+    fn exp(&self) -> Result<std::time::SystemTime, ParseExpError>;
     fn set_exp(&mut self, exp: std::time::SystemTime);
 }
 
@@ -50,8 +50,10 @@ impl UrlExt for Url {
     }
 
     /// Retrieve the ohttp parameter from the URL fragment
-    fn ohttp(&self) -> Option<OhttpKeys> {
-        get_param(self, "OH1", |value| OhttpKeys::from_str(value).ok())
+    fn ohttp(&self) -> Result<OhttpKeys, ParseOhttpError> {
+        let value = get_param(self, "ohttp=", |v| Some(v.to_owned()))
+            .ok_or(ParseOhttpError::MissingOhttp)?;
+        OhttpKeys::from_str(&value).ok_or(ParseOhttpError::InvalidOhttpKeys)
     }
 
     /// Set the ohttp parameter in the URL fragment
@@ -142,7 +144,16 @@ mod tests {
         url.set_ohttp(ohttp_keys.clone());
 
         assert_eq!(url.fragment(), Some(serialized));
-        assert_eq!(url.ohttp(), Some(ohttp_keys));
+        assert_eq!(url.ohttp(), Ok(ohttp_keys));
+    }
+
+    #[test]
+    fn test_errors_when_parsing_ohttp() {
+        let missing_ohttp_url = Url::parse("https://example.com").unwrap();
+        assert!(matches!(missing_ohttp_url.ohttp(), Err(ParseOhttpError::MissingOhttp)));
+
+        let invalid_ohttp_url = Url::parse("https://example.com?ohttp=@@@@@@@").unwrap();
+        assert!(matches!(invalid_ohttp_url.ohttp(), Err(ParseOhttpError::InvalidOhttpKeys)));
     }
 
     #[test]