Merge pull request #250 from maarten-boot/master

fix nameservers it

Author: MooCow

testdata/example.com/nameservers

@@ -0,0 +1,2 @@
+example.com name server a.iana-servers.net.
+example.com name server b.iana-servers.net.

testdata/example.net/nameservers

@@ -0,0 +1,2 @@
+example.net name server b.iana-servers.net.
+example.net name server a.iana-servers.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-17T10:47:37Z <<<
+>>> Last update of WHOIS database: 2023-01-04T15:03:07Z <<<
 
 For more information on Whois status codes, please visit https://icann.org/epp
 

testdata/example.org/nameservers

@@ -0,0 +1,2 @@
+example.org name server b.iana-servers.net.
+example.org name server a.iana-servers.net.

testdata/google.com/input

@@ -31,13 +31,13 @@ Tech Organization: Google LLC
 Tech State/Province: CA
 Tech Country: US
 Tech Email: Select Request Email Form at https://domains.markmonitor.com/whois/google.com
-Name Server: ns4.google.com
-Name Server: ns3.google.com
 Name Server: ns1.google.com
 Name Server: ns2.google.com
+Name Server: ns3.google.com
+Name Server: ns4.google.com
 DNSSEC: unsigned
 URL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/
->>> Last update of WHOIS database: 2022-11-17T22:52:22+0000 <<<
+>>> Last update of WHOIS database: 2023-01-04T14:55:04+0000 <<<
 
 For more information on WHOIS status codes, please visit:
   https://www.icann.org/resources/pages/epp-status-codes

testdata/google.com/nameservers

@@ -0,0 +1,4 @@
+google.com name server ns2.google.com.
+google.com name server ns4.google.com.
+google.com name server ns3.google.com.
+google.com name server ns1.google.com.

testdata/google.com/output

@@ -12,4 +12,4 @@ statuses           list              ['clientDeleteProhibited (https://www.icann
 dnssec             bool              False
 name_servers       list              ['ns1.google.com', 'ns2.google.com', 'ns3.google.com', 'ns4.google.com']
 registrant         str               'Google LLC'
-emails             list              ['[email protected]']
+emails             list              ['[email protected]', '[email protected]']

testdata/make_testdata.sh

@@ -18,6 +18,14 @@ getDomains()
     )
 }
 
+verifyNameservers()
+{
+    local str="$1"
+
+    grep name_servers  "./$str/output" | awk '{ $1 = $2 = ""; print }' | awk -F, '{print NF}'
+    grep "name server" "./$str/nameservers" | wc -l
+
+}
 makeDataForDomain()
 {
     local str="$1"
@@ -32,6 +40,12 @@ makeDataForDomain()
     # dump the expected output as output
     ../test2.py -d "$str" |
     tee "./$str/output"
+
+    # dump the nameservers via host
+    host -t ns "$str" |
+    tee "./$str/nameservers"
+
+    # verifyNameservers "$str"
 }
 
 makeDataIfNotExist()
@@ -43,10 +57,22 @@ makeDataIfNotExist()
     done
 }
 
+makeDataIfExist()
+{
+    for str in ${DOMAINS[@]}
+    do
+        makeDataForDomain "$str"
+    done
+}
+
 main()
 {
+    local force="$1"
     getDomains
     makeDataIfNotExist
+    [ "$force" == "force" ] && {
+        makeDataIfExist
+    }
 }
 
-main
+main $*

testdata/meta.co.jp/nameservers

@@ -0,0 +1,3 @@
+meta.co.jp name server ns2.meta.co.jp.
+meta.co.jp name server ns2.sphere.ad.jp.
+meta.co.jp name server ns.meta.co.jp.

testdata/meta.co.uk/input

@@ -31,13 +31,13 @@
         c.ns.facebook.com
         d.ns.facebook.com
 
-    WHOIS lookup made at 10:47:38 17-Nov-2022
+    WHOIS lookup made at 15:03:07 04-Jan-2023
 
 -- 
 This WHOIS information is provided for free by Nominet UK the central registry
 for .uk domain names. This information and the .uk WHOIS are:
 
-    Copyright Nominet UK 1996 - 2022.
+    Copyright Nominet UK 1996 - 2023.
 
 You may not access the .uk WHOIS or use any data from it except as permitted
 by the terms of use available in full at https://www.nominet.uk/whoisterms,