add enum for error handling netaddress fromstr

Author: jbesraa

lightning/src/ln/msgs.rs

@@ -904,9 +904,23 @@ impl Readable for NetAddress {
 	}
 }
 
+/// NetAddress error variants
+#[cfg(feature = "std")]
+#[derive(Debug)]
+pub enum NetAddressError {
+	/// Socket address(IPv4/IPv6) parsing error
+	SocketAdrrParseError(std::net::AddrParseError),
+	/// Invalid input format
+	InvalidInput(String),
+	/// Invalid port
+	InvalidPort,
+	/// Invalid onion v3 address
+	InvalidOnionV3,
+}
+
 #[cfg(feature = "std")]
 impl FromStr for NetAddress {
-    type Err = std::net::AddrParseError;
+    type Err = NetAddressError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match std::net::SocketAddr::from_str(s) {
@@ -924,41 +938,42 @@ impl FromStr for NetAddress {
                 }
             },
             Err(e) => {
-                let trimmed_input = match s.rfind(":") {
-                    Some(pos) => pos,
-                    None => return Err(e),
-                };
-                let host = &s[..trimmed_input];
-                let port: u16 = match s[trimmed_input + 1..].parse() {
-                    Ok(port) => port,
-                    Err(_) => return Err(e),
-                };
-                if host.ends_with(".onion") {
-                    let onion = match host.split(".onion").nth(0) {
-                        Some(onion) => onion,
-                        None => return Err(e),
-                    };
-					let decoded_onion = base32::Alphabet::RFC4648 { padding: false }.decode(&onion);
-                    let onion = match decoded_onion {
-                        Ok(onion) => onion,
-						Err(_) => return Err(e)
-                    };
-                    let version = match onion.get(0) {
-                        Some(version) => version,
-                        None => return Err(e),
-                    };
-                    let checksum = u16::from_be_bytes([onion[1], onion[2]]);
-                    let ed25519_pubkey = match onion[3..35].try_into() {
-                        Ok(ed25519_pubkey) => ed25519_pubkey,
-                        Err(_) => return Err(e),
-                    };
-                    return Ok(NetAddress::OnionV3 { ed25519_pubkey, checksum, version: *version, port });
+				let trimmed_input = match s.rfind(":") {
+					Some(pos) => pos,
+					None => return Err(NetAddressError::InvalidInput("Invalid input. Expected format: \"<host>:<port>\"" .to_string())),
+				};
+				let host = &s[..trimmed_input];
+				let port: u16 = match s[trimmed_input + 1..].parse() {
+					Ok(port) => port,
+					Err(_) => return Err(NetAddressError::InvalidPort),
+				};
+				if host.ends_with(".onion") {
+					let onion = match host.split(".onion").nth(0) {
+						Some(onion) => onion,
+						None => return Err(NetAddressError::InvalidOnionV3),
+					};
+					let onion = match (base32::Alphabet::RFC4648 { padding: false }.decode(&onion)) {
+						Ok(onion) => onion,
+						Err(_) => return Err(NetAddressError::InvalidOnionV3),
+					};
+					match (onion.get(0), onion.get(1), onion.get(2)) {
+						(Some(version), Some(first_checksum_flag), Some(second_checksum_flag)) => {
+							let checksum = u16::from_be_bytes([*first_checksum_flag, *second_checksum_flag]);
+							let ed25519_pubkey = match onion[3..35].try_into() {
+								Ok(ed25519_pubkey) => ed25519_pubkey,
+								Err(_) => return Err(NetAddressError::InvalidOnionV3),
+							};
+							return Ok(NetAddress::OnionV3 { ed25519_pubkey, checksum, version: *version, port });
+
+						},
+						_ => return Err(NetAddressError::InvalidOnionV3),
+					}
                 }
 
                 if let Ok(hostname) = Hostname::try_from(host.to_string()) {
                     return Ok(NetAddress::Hostname { hostname, port });
                 }
-                return Err(e)
+                return Err(NetAddressError::SocketAdrrParseError(e))
             },
         }
     }