Fixed the problems with threads that cannot be stopped (#18)

* fixed threads; change iplist

Co-authored-by: root <root@DESKTOP-FU09PBQ.localdomain>
Co-authored-by: ZYA <zyazhb@yahoo.com>

Author: 3 people

main.py

@@ -1,5 +1,4 @@
 #! /usr/bin/env python3
-from fake_useragent import UserAgent
 import argparse
 import myutils
 

multi.py

@@ -42,10 +42,18 @@ def __init__(self, ip, domain):
         self.domain = domain
 
     def run(self):
-        response = subprocess.check_output(
-            "dig @{0} {1}".format(self.ip, self.domain), shell=True)
-        if r";; connection timed out; no servers could be reached" not in str(response):
-            iplist.append(self.ip)
+        # response = subprocess.check_output(
+        #     "dig @{0} {1} +short".format(self.ip, self.domain), shell=True)
+
+        proc = subprocess.Popen(
+            "dig @{0} {1} +short".format(self.ip, self.domain), shell=True, stdout=subprocess.PIPE)
+        response = proc.stdout.read()
+        proc.kill()
+        if r";; connection timed out; no servers could be reached" not in str(response) and \
+            response.decode() != '':
+            ans = str(response).split("\\n")[1]
+            if 'github.com.' not in ans:
+                iplist.append(ans)
 
 
 def multi_local_dns(domain):
@@ -60,5 +68,7 @@ def multi_local_dns(domain):
             T_thread[i].start()
         time.sleep(3)
 
-        print("[+]Got domain! \n" + str(iplist))
-    return domain, iplist
+        # 去重
+        iplist_change = list(set(iplist))
+        print("[+]Got domain! \n" + str(iplist_change))
+    return domain, iplist_change

myutils.py

@@ -1,7 +1,7 @@
+import multi
+from fake_useragent import UserAgent
 import requests
 import re
-from ping3 import ping
-import multi
 from prettytable import PrettyTable
 
 
@@ -11,8 +11,18 @@ def run_core(domain, area):
         iplist = ['220.181.38.148', '39.156.69.79', '210.23.129.34', '210.23.129.34', '220.181.38.148', '39.156.69.79', '202.108.22.220', '220.181.33.31', '112.80.248.64', '14.215.178.80', '180.76.76.92', '210.23.129.34', '210.23.129.34', '39.156.69.79', '220.181.38.148', '203.12.160.35', '203.12.160.35', '39.156.69.79', '220.181.38.148',
                   '202.108.22.220', '220.181.33.31', '112.80.248.64', '14.215.178.80', '180.76.76.92', '203.12.160.35', '203.12.160.35', '220.181.38.148', '39.156.69.79', '61.8.0.113', '61.8.0.113', '220.181.38.148', '39.156.69.79', '202.108.22.220', '220.181.33.31', '112.80.248.64', '14.215.178.80', '180.76.76.92', '61.8.0.113', '61.8.0.113']
     else:
-        domain, ipll = multi.multi_local_dns(domain)
-    return domain, ipll
+        domain, iplist = multi.multi_local_dns(domain)
+    return domain, iplist
+
+
+def run_remote_core(domain, area):
+    ua = UserAgent()
+    headers = {"User-Agent": ua.random, }
+    r = requests.get("https://en.ipip.net/dns.php?a=dig&host=" +
+                     domain+"&area%5B%5D="+area, headers=headers)
+    iplist = re.findall("\\d+\\.\\d+\\.\\d+\\.\\d+", r.text)
+    print("[+]Got domain! \n" + str(iplist))
+    return domain, iplist
 
 
 def clean(iplist):