utilize socketaddress for ipv4 and ipv6

Author: jbesraa

lightning/src/ln/msgs.rs

@@ -40,12 +40,13 @@ use core::convert::TryFrom;
 use core::fmt;
 use core::fmt::Debug;
 use core::str::FromStr;
-use std::net::{AddrParseError, Ipv4Addr, SocketAddrV4, SocketAddrV6, Ipv6Addr};
+use std::net::{AddrParseError, Ipv4Addr, Ipv6Addr, SocketAddr};
 use crate::io::{self, Read};
 use crate::io_extras::read_to_end;
 
 use crate::util::events::{MessageSendEventsProvider, OnionMessageProvider};
 use crate::util::logger;
+use crate::util::base32;
 use crate::util::ser::{LengthReadable, Readable, ReadableArgs, Writeable, Writer, FixedLengthReader, HighZeroBytesDroppedBigSize, Hostname};
 
 use crate::ln::{PaymentPreimage, PaymentHash, PaymentSecret};
@@ -638,42 +639,43 @@ impl Readable for NetAddress {
 	}
 }
 
-fn rem_first_and_last(value: &str) -> &str {
-    let mut chars = value.chars();
-    chars.next();
-    chars.next_back();
-    chars.as_str()
-}
-
 impl FromStr for NetAddress {
     type Err = AddrParseError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let trim_s_by_latest_colon = s.rfind(":").unwrap();
-        let host = &s[..trim_s_by_latest_colon];
-        let port: u16 = s[trim_s_by_latest_colon + 1..].parse().expect("Invalid port");
-        if let Ok(addr) = host.parse::<Ipv4Addr>() {
-            let addr = SocketAddrV4::new(addr, port);
-            return Ok(NetAddress::IPv4 { addr: addr.ip().octets(), port });
-        }
-        if let Ok(addr) = rem_first_and_last(host).parse::<Ipv6Addr>() {
-            let addr = SocketAddrV6::new(addr, port, 0, 0);
-            return Ok(NetAddress::IPv6 { addr: addr.ip().octets(), port });
-        };
-        if host.ends_with(".onion") {
-            let onion = host.split(".onion").collect::<Vec<&str>>()[0];
-            let onion = base32::decode(base32::Alphabet::RFC4648 { padding: false }, &onion).expect("error in onion");
-            let version = onion[0];
-            let checksum = u16::from_be_bytes([onion[1], onion[2]]);
-            let ed25519_pubkey = onion[3..35].try_into().expect("Invalid onion address");
-            return Ok(NetAddress::OnionV3 { ed25519_pubkey, checksum, version, port });
+        match SocketAddr::from_str(s) {
+            Ok(addr) => {
+                let port: u16 = addr.port();
+                match addr {
+                    SocketAddr::V4(addr) => {
+                        let addr = addr.ip().to_string().parse::<Ipv4Addr>()?;
+                        return Ok(NetAddress::IPv4 { addr: addr.octets(), port });
+                    },
+                    SocketAddr::V6(addr) => {
+                        let addr = addr.ip().to_string().parse::<Ipv6Addr>()?;
+                        return Ok(NetAddress::IPv6 { addr: addr.octets(), port });
+                    },
+                }
+            },
+            Err(e) => {
+                let trimmed_input = s.rfind(":").expect("Invalid input, needs to include seperator \":\"");
+                let host = &s[..trimmed_input];
+                let port: u16 = s[trimmed_input + 1..].parse().expect("Invalid input, port needs to be u16");
+                if host.ends_with(".onion") {
+                    let onion = host.split(".onion").collect::<Vec<&str>>()[0];
+                    let onion = base32::decode(base32::Alphabet::RFC4648 { padding: false }, &onion).expect("Error decoding onion address");
+                    let version = onion[0];
+                    let checksum = u16::from_be_bytes([onion[1], onion[2]]);
+                    let ed25519_pubkey = onion[3..35].try_into().expect("Invalid onion address");
+                    return Ok(NetAddress::OnionV3 { ed25519_pubkey, checksum, version, port });
+                }
+
+                if let Ok(hostname) = Hostname::try_from(host.to_string()) {
+                    return Ok(NetAddress::Hostname { hostname, port });
+                }
+                return Err(e)
+            },
         }
-
-        if let Ok(hostname) = Hostname::try_from(host.to_string()) {
-            return Ok(NetAddress::Hostname { hostname, port });
-        }
-
-        panic!("cant parse input");
     }
 }
 
@@ -3077,6 +3079,6 @@ mod tests {
         assert_eq!(ipv4_net_address, result_ipv4);
         assert_eq!(ipv6_net_address, result_ipv6);
         assert_eq!(hostname_net_address, result_hostname);
-        assert_eq!(onionv3_net_address, result_onionv3); // failing
+        assert_eq!(onionv3_net_address, result_onionv3);
     }
 }