Fix enode URL parse failure due to enode prefix (#8339)

paradigmxyz · May 23, 2024 · cdfdaff · cdfdaff
1 parent f17b065
commit cdfdaff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/crates/net/discv5/src/config.rs b/crates/net/discv5/src/config.rs
@@ -129,7 +129,7 @@ impl ConfigBuilder {
         self
     }
 
-    /// Adds boot nodes in the form a list of [`NodeRecord`]s, parsed enodes.
+    /// Adds boot nodes in the form a list of [`DNSNodeRecord`]s, parsed enodes.
     pub fn add_unsigned_boot_nodes<T: Into<DNSNodeRecord>>(
         mut self,
         enodes: impl Iterator<Item = T>,

diff --git a/crates/net/types/src/dns_node_record.rs b/crates/net/types/src/dns_node_record.rs
@@ -78,7 +78,11 @@ impl FromStr for DNSNodeRecord {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         use url::Url;
 
-        let url = Url::parse(s).map_err(|e| NodeRecordParseError::InvalidUrl(e.to_string()))?;
+        // Parse the URL with enode prefix replaced with http.
+        // The enode prefix causes the parser to use parse_opaque() on
+        // the host str which only handles domains and ipv6, not ipv4.
+        let url = Url::parse(s.replace("enode://", "http://").as_str())
+            .map_err(|e| NodeRecordParseError::InvalidUrl(e.to_string()))?;
 
         let host = url
             .host()