Consolidate all Shodan methods to use the internal _request method instead of sometimes using the shodan.helpers.api_request method.

New environment variable SHODAN_API_URL that can be used to overwrite the base_url used for the API requests.

Author: achillean

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name='shodan',
-    version='1.30.1',
+    version='1.31.0',
     description='Python library and command-line utility for Shodan (https://developer.shodan.io)',
     long_description=README,
     long_description_content_type='text/x-rst',

shodan/client.py

@@ -8,13 +8,14 @@
 :copyright: (c) 2014- by John Matherly
 """
 import math
+import os
 import time
 
 import requests
 import json
 
 from .exception import APIError
-from .helpers import api_request, create_facet_string
+from .helpers import create_facet_string
 from .stream import Stream
 
 
@@ -314,11 +315,15 @@ def __init__(self, key, proxies=None):
         self._session = requests.Session()
         self.api_rate_limit = 1  # Requests per second
         self._api_query_time = None
+
         if proxies:
             self._session.proxies.update(proxies)
             self._session.trust_env = False
+        
+        if os.environ.get('SHODAN_API_URL'):
+            self.base_url = os.environ.get('SHODAN_API_URL')
 
-    def _request(self, function, params, service='shodan', method='get'):
+    def _request(self, function, params, service='shodan', method='get', json_data=None):
         """General-purpose function to create web requests to SHODAN.
 
         Arguments:
@@ -348,7 +353,13 @@ def _request(self, function, params, service='shodan', method='get'):
         try:
             method = method.lower()
             if method == 'post':
-                data = self._session.post(base_url + function, params)
+                if json_data:
+                    data = self._session.post(base_url + function, params=params,
+                                            data=json.dumps(json_data),
+                                            headers={'content-type': 'application/json'},
+                        )
+                else:
+                    data = self._session.post(base_url + function, params)
             elif method == 'put':
                 data = self._session.put(base_url + function, params=params)
             elif method == 'delete':
@@ -711,8 +722,7 @@ def create_alert(self, name, ip, expires=0):
             'expires': expires,
         }
 
-        response = api_request(self.api_key, '/shodan/alert', data=data, params={}, method='post',
-                               proxies=self._session.proxies)
+        response = self._request('/shodan/alert', params={}, json_data=data, method='post')
 
         return response
 
@@ -732,8 +742,7 @@ def edit_alert(self, aid, ip):
             },
         }
 
-        response = api_request(self.api_key, '/shodan/alert/{}'.format(aid), data=data, params={}, method='post',
-                               proxies=self._session.proxies)
+        response = self._request('/shodan/alert/{}'.format(aid), params={}, json_data=data, method='post')
 
         return response
 
@@ -744,18 +753,17 @@ def alerts(self, aid=None, include_expired=True):
         else:
             func = '/shodan/alert/info'
 
-        response = api_request(self.api_key, func, params={
+        response = self._request(func, params={
             'include_expired': include_expired,
-        }, proxies=self._session.proxies)
+        })
 
         return response
 
     def delete_alert(self, aid):
         """Delete the alert with the given ID."""
         func = '/shodan/alert/{}'.format(aid)
 
-        response = api_request(self.api_key, func, params={}, method='delete',
-                               proxies=self._session.proxies)
+        response = self._request(func, params={}, method='delete')
 
         return response