Fix ipv6 query and parsing

pogzyb · Feb 9, 2024 · c2798d3 · c2798d3
1 parent f6a7748
commit c2798d3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/asyncwhois/client.py b/asyncwhois/client.py
@@ -149,9 +149,9 @@ def whois(
             ip = convert_to_ip(ip)
         query_chain: list[str] = self.query_obj.run(ip)
         authoritative_answer = query_chain[-1]
-        parsed_dict: dict[IPBaseKeys, Any] = self.parse_obj.parse(
-            authoritative_answer, ip
-        )
+        parsed_dict: dict[IPBaseKeys, Any] = {}
+        if isinstance(ip, ipaddress.IPv4Address):
+            parsed_dict = self.parse_obj.parse(authoritative_answer, ip)
         query_string = (
             authoritative_answer if self.authoritative_only else "\n".join(query_chain)
         )

diff --git a/asyncwhois/query.py b/asyncwhois/query.py
@@ -110,7 +110,10 @@ async def _aio_send_and_recv(
     def run(self, search_term: str, server: str = None) -> list[str]:
         data = search_term + "\r\n"
         if not server:
-            server_regex = self.refer_regex
+            if ":" in data:  # ipv6
+                server_regex = r"whois: *(.+)"
+            else:
+                server_regex = self.refer_regex
             server = self.iana_server
         else:
             server_regex = self.whois_server_regex
@@ -119,7 +122,10 @@ def run(self, search_term: str, server: str = None) -> list[str]:
     async def aio_run(self, search_term: str, server: str = None) -> list[str]:
         data = search_term + "\r\n"
         if not server:
-            server_regex = self.refer_regex
+            if ":" in data:  # ipv6
+                server_regex = r"whois: *(.+)"
+            else:
+                server_regex = self.refer_regex
             server = self.iana_server
         else:
             server_regex = self.whois_server_regex