Merge pull request #237 from maarten-boot/master

add text to Domain result; but only if requested

Author: MooCow

test2.py

@@ -6,6 +6,8 @@
 import sys
 
 Verbose = False
+PrintGetRawWhoisResult = False
+
 Failures = {}
 IgnoreReturncode = False
 
@@ -20,12 +22,15 @@ def xType(x):
     return s.split("'")[1]
 
 
-def testItem(d):
+def testItem(d: str, printgetRawWhoisResult: bool = False):
+    global PrintGetRawWhoisResult
+
     w = whois.query(
         d,
         ignore_returncode=IgnoreReturncode,
         verbose=Verbose,
         internationalized=True,
+        include_raw_whois_text=PrintGetRawWhoisResult,
     )
 
     if w is None:
@@ -174,6 +179,8 @@ def usage():
         # files are processed as in the -f option so comments and empty lines are skipped
         # the option can be repeated to specify more then one directory
 
+    [ -p | --print also print text containing the raw output of whois ]
+
     # options are exclusive and without any options the test2 program does nothing
 
     # test one specific file with verbose and IgnoreReturncode
@@ -214,12 +221,14 @@ def showFailures():
 def main(argv):
     global Verbose
     global IgnoreReturncode
+    global PrintGetRawWhoisResult
 
     try:
         opts, args = getopt.getopt(
             argv,
-            "vIhaf:d:D:r:H:",
+            "pvIhaf:d:D:r:H:",
             [
+                "print",
                 "verbose",
                 "IgnoreReturncode",
                 "all",
@@ -268,6 +277,9 @@ def main(argv):
         if opt in ("-v", "--verbose"):
             Verbose = True
 
+        if opt in ("-p", "--print"):
+            PrintGetRawWhoisResult = True
+
         if opt in ("-D", "--Directory"):
             directory = arg
             isDir = os.path.isdir(directory)
@@ -325,7 +337,6 @@ def main(argv):
         return
 
     if len(domains):
-        print("## ===== TEST DOMAINS")
         testDomains(domains)
         showFailures()
         return

testdata/example.com/output

@@ -1,4 +1,3 @@
-## ===== TEST DOMAINS
 
 test domain: <<<<<<<<<< example.com >>>>>>>>>>>>>>>>>>>>
 name               str               'example.com'

testdata/example.net/output

@@ -1,4 +1,3 @@
-## ===== TEST DOMAINS
 
 test domain: <<<<<<<<<< example.net >>>>>>>>>>>>>>>>>>>>
 name               str               'example.net'

testdata/example.org/input

@@ -58,7 +58,7 @@ Name Server: a.iana-servers.net
 Name Server: b.iana-servers.net
 DNSSEC: signedDelegation
 URL of the ICANN Whois Inaccuracy Complaint Form: https://www.icann.org/wicf/
->>> Last update of WHOIS database: 2022-11-07T09:27:18Z <<<
+>>> Last update of WHOIS database: 2022-11-07T21:05:05Z <<<
 
 For more information on Whois status codes, please visit https://icann.org/epp
 

testdata/example.org/output

@@ -1,4 +1,3 @@
-## ===== TEST DOMAINS
 
 test domain: <<<<<<<<<< example.org >>>>>>>>>>>>>>>>>>>>
 name               str               'example.org'

testdata/make_testdata.sh

@@ -1,10 +1,11 @@
 #! /usr/bin/bash
 
 DOMAINS=(
-    example.net
-    example.com
-    example.org
-    meta.co.uk
+    example.net # has iana source
+    example.com # has iana source
+    example.org # has no iana source
+    meta.co.uk # has multiline for all relevant fields and 4 nameservers; should be fixed output has only 2
+    # xs4all.nl # has multiline nameserver and multiline registrar; outout has no nameservers should be 2
 )
 
 for str in ${DOMAINS[@]}

testdata/meta.co.uk/input

@@ -31,7 +31,7 @@
         c.ns.facebook.com
         d.ns.facebook.com
 
-    WHOIS lookup made at 09:27:19 07-Nov-2022
+    WHOIS lookup made at 21:05:06 07-Nov-2022
 
 -- 
 This WHOIS information is provided for free by Nominet UK the central registry

testdata/meta.co.uk/output

@@ -1,4 +1,3 @@
-## ===== TEST DOMAINS
 
 test domain: <<<<<<<<<< meta.co.uk >>>>>>>>>>>>>>>>>>>>
 name               str               'meta.co.uk'

whois/_3_adjust.py

@@ -33,8 +33,13 @@ class Domain:
     def __init__(
         self,
         data: Dict[str, Any],
+        whois_str: Optional[str] = None,
         verbose: bool = False,
+        include_raw_whois_text: bool = False,
     ):
+        if include_raw_whois_text and whois_str is not None:
+            self.text = whois_str
+
         self.name = data["domain_name"][0].strip().lower()
         self.tld = data["tld"]
 

whois/__init__.py

@@ -195,6 +195,7 @@ def query(
     verbose: bool = False,
     with_cleanup_results=False,
     internationalized: bool = False,
+    include_raw_whois_text: bool = False,
 ) -> Optional[Domain]:
     """
     force=True          Don't use cache.
@@ -285,7 +286,9 @@ def query(
         if pd and pd["domain_name"][0]:
             return Domain(
                 pd,
+                whois_str=q,
                 verbose=verbose,
+                include_raw_whois_text=include_raw_whois_text,
             )
 
         if len(d) > (len(tldLevel) + 1):