Merge pull request #78 from knownsec/dev

Dev
knownsec · Aug 26, 2022 · 24bbfd0 · 24bbfd0
2 parents 30b4a69 + abbbb88
commit 24bbfd0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 18 deletions.
diff --git a/zoomeye/__init__.py b/zoomeye/__init__.py
@@ -11,5 +11,5 @@
 
 __name__ = 'zoomeye'
 __package__ = 'zoomeye'
-__version__ = 'v2.1.1'
+__version__ = 'v2.1.2'
 __site__ = "https://www.zoomeye.org/doc"
diff --git a/zoomeye/sdk.py b/zoomeye/sdk.py
@@ -115,10 +115,11 @@ def _request(self, url, params=None, headers=None, method='GET'):
         """
         # if method is "GET" use requests.get
         if method == "GET":
-            resp = requests.get(url, data=params, headers=headers)
+            resp = requests.get(url, params=params, headers=headers)
         # request method is "POST"
         else:
-            resp = requests.post(url, params, headers)
+            resp = requests.post(url, data=params, headers=headers)
+            print(resp.text)
         # if response succeed and status code is 200 return json data
         if resp and resp.status_code == 200:
             data = resp.json()
@@ -133,6 +134,21 @@ def _request(self, url, params=None, headers=None, method='GET'):
         else:
             raise ValueError(resp.json().get('message'))
 
+    def _check_header(self):
+        if self.api_key:
+            headers = {
+                'API-KEY': self.api_key,
+            }
+        elif self.access_token:
+            headers = {
+                'Authorization': 'JWT %s' % self.access_token
+            }
+        else:
+            headers = {}
+        # add user agent
+        headers["User-Agent"] = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36"
+        return headers
+
     def login(self):
         """
         please see: https://www.zoomeye.org/doc#login
@@ -167,9 +183,7 @@ def dork_search(self, dork, page=0, resource="host", facets=None):
         search_api = self.search_api.format(resource)
         if isinstance(facets, (tuple, list)):
             facets = ','.join(facets)
-        headers = {'Authorization': 'JWT %s' % self.access_token,
-                   'API-KEY': self.api_key,
-                   }
+        headers = self._check_header()
         params = {'query': dork, 'page': page, 'facets': facets}
         resp = self._request(search_api, params=params, headers=headers)
         if resp and "matches" in resp:
@@ -207,10 +221,7 @@ def multi_page_search(self, dork, page=1, resource="host",
         self.search_type = resource
         search_api = self.search_api.format(resource)
 
-        headers = {
-            'Authorization': 'JWT %s' % self.access_token,
-            'API-KEY': self.api_key,
-        }
+        headers = self._check_header()
 
         dork_data = []
         all_data = []
@@ -246,9 +257,7 @@ def resources_info(self) -> dict:
         see: https://www.zoomeye.org/doc#resources-info
         :return: dict
         """
-        headers = {'Authorization': 'JWT %s' % self.access_token,
-                   'API-KEY': self.api_key,
-                   }
+        headers = self._check_header()
         result = self._request(self.user_info_api, headers=headers)
         return result
 
@@ -301,9 +310,7 @@ def history_ip(self, ip):
         result = {}
 
         zoomeye_api = self.history_api.format(ip)
-        headers = {'Authorization': 'JWT %s' % self.access_token,
-                   'API-KEY': self.api_key,
-                   }
+        headers = self._check_header()
         resp = self._request(zoomeye_api, headers=headers)
         if resp and 'data' in resp:
             result = resp
@@ -321,7 +328,7 @@ def domain_search(self, q, source=0, page=1) -> list:
                 list
         """
         search_api = self.search_api.format('domain')
-        headers = {'Authorization': 'JWT %s' % self.access_token, 'API-KEY': self.api_key}
+        headers = self._check_header()
         request_result = self._request(search_api, params={"q": q, "type": source, "page": page}, headers=headers)
         if request_result:
             self.raw_data = request_result  # json字符串
@@ -336,7 +343,7 @@ def generate_dot(self, q, source=0, page=1):
         """
         error_info = ''
         search_api = self.search_api.format('domain')
-        headers = {'Authorization': 'JWT %s' % self.access_token, 'API-KEY': self.api_key}
+        headers = self._check_header()
         try:
             request_result = self._request(search_api, params={"q": q, "type": source, "page": page}, headers=headers)
         except Exception as e: