Update hunter.py

Author: AabyssZG

inc/hunter.py

@@ -13,8 +13,12 @@
 def JSON_load(text):
     json_str = text
     data = json.loads(json_str)
-    # 提取ip和port信息
-    ip_port_list = [(match["url"]) for match in data["data"]["arr"]]
+    if data["data"]["arr"]:
+        # 提取ip和port信息
+        ip_port_list = [(match["url"]) for match in data["data"]["arr"]]
+    else:
+        cprint("[-] 没有搜索到任何资产，请确认你的语法是否正确","yellow")
+        sys.exit()
     # 打印提取的信息
     for service in ip_port_list:
         outurl = str(service)
@@ -23,7 +27,7 @@ def JSON_load(text):
         f2.close()
         print(f"Service: {outurl}")
 
-def Key_Dowload(key,proxies,choices):
+def Key_Dowload(key,proxies,choices,searchs):
     cprint("======通过Hunter密钥进行API下载数据======","green")
     Headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)",
@@ -38,13 +42,13 @@ def Key_Dowload(key,proxies,choices):
     i = 1
     while i <= pages:
         page_url = "&page=" + str(i)
-        keyurl = "https://hunter.qianxin.com/openApi/search?api-key=" + key + "&search=YXBwLm5hbWU9IlNwcmluZyBXaGl0ZWxhYmVsIEVycm9yIg==&page_size=20&is_web=1"
-        dowloadurl = keyurl + page_url
+        keyurl = "https://hunter.qianxin.com/openApi/search?api-key=" + str(key) + "&search=" + str(searchs) + "&page_size=20&is_web=1"
+        dowloadurl = str(keyurl + page_url)
         cprint("[+] 正在尝试下载第 %d 页数据" % i, "red")
         try:
             requests.packages.urllib3.disable_warnings()
             dowloadre = requests.get(url=dowloadurl, headers=Headers, timeout=10, verify=False, proxies=proxies)
-            if (dowloadre.status_code == 200) or (dowloadre.status_code == 201):
+            if ("\"code\":200" in str(dowloadre.text)):
                 JSON_load(dowloadre.text)
                 cprint("-" * 45, "red")
                 sleep(2)
@@ -55,13 +59,14 @@ def Key_Dowload(key,proxies,choices):
             print("Ctrl + C 手动终止了进程")
             sys.exit()
         except Exception as e:
+            print(e)
             print("[-] 发生错误，已记入日志error.log\n")
             f2 = open("error.log", "a")
             f2.write(str(e) + '\n')
             f2.close()
         i = i + 1
 
-def Key_Test(key,proxies,choices):
+def Key_Test(key,proxies,choices,searchs):
     cprint("======您的Hunter密钥进行API对接测试======","green")
     Headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)",
@@ -70,15 +75,16 @@ def Key_Test(key,proxies,choices):
     keytesturl = "https://hunter.qianxin.com/openApi/search?api-key=" + key + "&search=dGl0bGU9IuWMl-S6rCI=&page=1&page_size=10&is_web=1"
     try:
         requests.packages.urllib3.disable_warnings()
-        testre = requests.get(url=keytesturl, headers=Headers, timeout=6, verify=False, proxies=proxies)
+        testre = requests.get(url=keytesturl, headers=Headers, timeout=10, verify=False, proxies=proxies)
         json_str = testre.text
         data = json.loads(json_str)
         recode = data["code"]
         if str(recode) == "200":
             cprint("[+] 您的key有效，测试成功！", "red")
             rest_quota = data["data"]["rest_quota"]
             cprint("[+] %s" % rest_quota, "red")
-            Key_Dowload(key,proxies,choices)
+            sleep(2)
+            Key_Dowload(key,proxies,choices,searchs)
         else:
             cprint("[-] API返回状态码为 %d" % recode,"yellow")
             cprint("[-] 请根据返回的状态码，参考官方手册：https://hunter.qianxin.com/home/helpCenter?r=5-1-1","yellow")
@@ -96,7 +102,7 @@ def HunterDowload(key,proxies):
     cprint("======开始对接鹰图接口进行Spring资产测绘======","green")
     cprint('[+] 您的Hunter密钥为：' + key ,"green")
     try:
-        choices = input("\n请输入要测绘的资产数量（默认100条）: ")
+        choices = input("\n[.] 请输入要测绘的资产数量（默认100条）: ")
         if choices == '':
             choices = "100"
         elif int(choices) <= 0:
@@ -106,9 +112,15 @@ def HunterDowload(key,proxies):
     except Exception as e:
         print("请不要输入无意义的字符串")
         sys.exit()
+    search = input("[.] 请输入要测绘的语句（默认app.name=\"Spring Whitelabel Error\"）: ")
+    if search == "":
+        searchs = str("YXBwLm5hbWU9IlNwcmluZyBXaGl0ZWxhYmVsIEVycm9yIg==")
+    else:
+        search = base64.urlsafe_b64encode(search.encode("utf-8"))
+        searchs = str(search.decode('utf-8'))
     f2 = open("hunterout.txt", "wb+")
     f2.close()
-    Key_Test(key,proxies,choices)
+    Key_Test(key,proxies,choices,searchs)
     count = len(open("hunterout.txt", 'r').readlines())
     if count >= 1:
         cprint("[+][+][+] 已经将Hunter的资产结果导出至 hunterout.txt ，共%d行记录" % count,"red")