Merge pull request #114 from DomainTools/dev

Dev

Author: CAMIRO

.gitignore

@@ -72,3 +72,6 @@ venv/
 
 # Cython
 *.c
+
+# Testing folders
+proxyTest/

CHANGELOG.md

@@ -1,65 +1,87 @@
-Changelog
-=========
+# Changelog
+
+### 1.0.1
+
+- Adds support for the hourly query limit on the Account API endpoint
+- Fixes an issue with handling of proxies
 
 ### 1.0.0
+
 - Adding support for Iris Detect API endpoints
 - Update underlying HTTP client
 - Addition of helper functions for common tasks
 - Documentation and example code updates
 
 ### 0.6.2
+
 - Update README with Iris trademarks
 
 ### 0.6.1
+
 - Fix an invalid response type error for available_api_calls on CLI
 - Add better error messaging for users when proxy info is not set correctly
 - Fix typo on limit_exceeded when outputting formats other than JSON when using non-async results
 
 ### 0.6.0
 
 ### 0.3.3
+
 - Python 3.5.2 installation fix
 
 ### 0.3.1
+
 - Python 3.7.0 Python version check for async fixed
 
 ### 0.3.0
+
 - Python 3.7 support as well as general Async fixes and improvements (Thanks @jnwatson)
 
 ### 0.2.4
+
 - Enabled rate-limiting support for Iris API endpoints
 
 ### 0.2.3
+
 - Added support for Iris Investigate and Enrich
 
 ### 0.2.2
+
 - HTTP Authentication fixes
 - Initial proxy support
 
 ### 0.2.1
+
 - Separated out IncompleteResponseException; enabling partial results to still be read
 - Fixed unknown exception handling
 
 ### 0.2.0
+
 - Ensure connections are cleaned up
 
 ### 0.1.9
+
 - Added support for `risk` and `risk_evidence` API calls
 
 ### 0.1.8
+
 - Updated defaults for domain_search call
 
 ### 0.1.7
+
 - Fixed typo in registrar information assignment
 
 ### 0.1.6
+
 - Added support for Iris endpoint
 
 ### 0.1.5
+
 - Made Results a subclass of both MutableMapping and MutableSequence for more natural interaction
 
 ### 0.1.4
+
 - Wait to make account information call for rate limiting till a call is made against another API endpoint
 
 ### 0.0.1
+
 - Initial Release

domaintools/_version.py

@@ -19,4 +19,4 @@
 OTHER DEALINGS IN THE SOFTWARE.
 
 """
-current = "1.0.0"
+current = "1.0.1"

domaintools/api.py

@@ -57,15 +57,25 @@ def __init__(self, username, key, https=True, verify_ssl=True, rate_limit=True,
             raise Exception("The DomainTools API endpoints no longer support http traffic. Please make sure https=True.")
         if proxy_url:
             if isinstance(proxy_url, str):
-                self.extra_request_params['proxies'] = {'http': proxy_url, 'https': proxy_url}
+                self.proxy_url = {'http://': proxy_url, 'https://': proxy_url}
             else:
                 raise Exception("Proxy URL must be a string. For example: '127.0.0.1:8888'")
 
     def _rate_limit(self):
         """Pulls in and enforces the latest rate limits for the specified user"""
         self.limits_set = True
         for product in self.account_information():
-            self.limits[product['id']] = {'interval': timedelta(seconds=60 / float(product['per_minute_limit']))}
+            limit_minutes = product['per_minute_limit'] or None
+            limit_hours = product['per_hour_limit'] or None
+
+            default = 3600 
+            hours = limit_hours and 3600 / float(limit_hours)
+            minutes = limit_minutes and 60 / float(limit_minutes)
+
+            self.limits[product['id']] = {'interval': timedelta(
+                seconds = minutes or hours or default 
+            )
+        }
 
     def _results(self, product, path, cls=Results, **kwargs):
         """Returns _results for the specified API path with the specified **kwargs parameters"""

domaintools/base_results.py

@@ -57,7 +57,8 @@ def _wait_time(self):
         return wait_for
 
     def _make_request(self):
-        with Client(verify=self.api.verify_ssl, proxies=self.api.extra_request_params.get('proxies'), timeout=None) as session:
+
+        with Client(verify=self.api.verify_ssl, proxies=self.api.proxy_url, timeout=None) as session:
             if self.product in ['iris-investigate', 'iris-enrich', 'iris-detect-escalate-domains']:
                 post_data = self.kwargs.copy()
                 post_data.update(self.api.extra_request_params)

domaintools_async/__init__.py

@@ -59,7 +59,8 @@ async def _make_async_request(self, session):
 
     async def __awaitable__(self):
         if self._data is None:
-            async with AsyncClient(verify=self.api.verify_ssl, proxies=self.api.extra_request_params.get('proxies'), timeout=None) as session:
+
+            async with AsyncClient(verify=self.api.verify_ssl, proxies=self.api.proxy_url, timeout=None) as session:
                 wait_time = self._wait_time()
                 if wait_time is None and self.api:
                     try:

setup.py

@@ -66,7 +66,7 @@ def run_tests(self):
    readme = ''
 
 setup(name='domaintools_api',
-      version='1.0.0',
+      version='1.0.1',
       description="DomainTools Official Python API",
       long_description=readme,
       long_description_content_type="text/markdown",

tests/fixtures/vcr/test_account_information.yaml

@@ -1,34 +1,34 @@
 interactions:
-- request:
-    body: ''
-    headers:
-      accept:
-      - '*/*'
-      accept-encoding:
-      - gzip, deflate
-      connection:
-      - keep-alive
-      host:
-      - api.domaintools.com
-      user-agent:
-      - python-httpx/0.22.0
-    method: GET
-    uri: https://api.domaintools.com/v1/account?app_name=python_wrapper&app_version=1.0.0
-  response:
-    content: '{"response":{"account":{"api_username":"integrations_testing","active":true},"products":[{"id":"account-information","per_month_limit":"100000","per_minute_limit":"5","absolute_limit":null,"usage":{"today":"0","month":"12"},"expiration_date":null},{"id":"iris-investigate","per_month_limit":"1000","per_minute_limit":"20","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"iris-enrich","per_month_limit":"1000","per_minute_limit":"20","absolute_limit":null,"usage":{"today":"0","month":"5"},"expiration_date":null},{"id":"iris-detect-escalate-domains","per_month_limit":"1500","per_minute_limit":"30","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"iris-detect-ignored-domains","per_month_limit":"1500","per_minute_limit":"30","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"iris-detect-manage-watchlist-domains","per_month_limit":"1500","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"iris-detect-monitors","per_month_limit":"1500","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"iris-detect-new-domains","per_month_limit":"1500","per_minute_limit":"30","absolute_limit":null,"usage":{"today":"0","month":"8"},"expiration_date":null},{"id":"iris-detect-watched-domains","per_month_limit":"1500","per_minute_limit":"30","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"phisheye","per_month_limit":"10000","per_minute_limit":"10","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"domain-profile","per_month_limit":"100000","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"domain-search","per_month_limit":"100000","per_minute_limit":"500","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"hosting-history","per_month_limit":"100000","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"ip-monitor","per_month_limit":"100000","per_minute_limit":"5","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"ip-registrant-monitor","per_month_limit":"100000","per_minute_limit":"5","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"iris","per_month_limit":"1000","per_minute_limit":"10","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"reputation","per_month_limit":"100000","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"reverse-ip","per_month_limit":"100000","per_minute_limit":"10","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"reverse-ip-whois","per_month_limit":"100000","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"risk","per_month_limit":"100000","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"risk-evidence","per_month_limit":"100000","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"reverse-name-server","per_month_limit":"100000","per_minute_limit":"10","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"reverse-whois","per_month_limit":"100000","per_minute_limit":"10","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"mark-alert","per_month_limit":"100000","per_minute_limit":"5","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"parsed-whois","per_month_limit":"100000","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"name-server-monitor","per_month_limit":"100000","per_minute_limit":"5","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"whois","per_month_limit":"100000","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"whois-history","per_month_limit":"5000","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"parsed-whois-live","per_month_limit":"120","per_minute_limit":"5","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"registrant-alert","per_month_limit":"100000","per_minute_limit":"5","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null}]}}'
-    headers:
-      Content-Encoding:
-      - gzip
-      Content-Type:
-      - application/json;charset=utf-8
-      Date:
-      - Thu, 16 Jun 2022 15:01:58 GMT
-      Transfer-Encoding:
-      - chunked
-      Vary:
-      - Accept-Encoding
-      X-TIME:
-      - '120038'
-    http_version: HTTP/1.1
-    status_code: 200
+  - request:
+      body: ""
+      headers:
+        accept:
+          - "*/*"
+        accept-encoding:
+          - gzip, deflate
+        connection:
+          - keep-alive
+        host:
+          - api.domaintools.com
+        user-agent:
+          - python-httpx/0.22.0
+      method: GET
+      uri: https://api.domaintools.com/v1/account?app_name=python_wrapper&app_version=1.0.1
+    response:
+      content: '{"response":{"account":{"api_username":"integrations_testing","active":true},"products":[{"id":"account-information","per_month_limit":"100000","per_hour_limit":"1","per_minute_limit":"5","absolute_limit":null,"usage":{"today":"0","month":"12"},"expiration_date":null},{"id":"iris-investigate","per_month_limit":"1000","per_hour_limit":"1","per_minute_limit":"20","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"iris-enrich","per_month_limit":"1000","per_hour_limit":"1","per_minute_limit":"20","absolute_limit":null,"usage":{"today":"0","month":"5"},"expiration_date":null},{"id":"iris-detect-escalate-domains","per_month_limit":"1500","per_hour_limit":"1","per_minute_limit":"30","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"iris-detect-ignored-domains","per_month_limit":"1500","per_hour_limit":"1","per_minute_limit":"30","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"iris-detect-manage-watchlist-domains","per_month_limit":"1500","per_hour_limit":"1","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"iris-detect-monitors","per_month_limit":"1500","per_hour_limit":"1","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"iris-detect-new-domains","per_month_limit":"1500","per_hour_limit":"1","per_minute_limit":"30","absolute_limit":null,"usage":{"today":"0","month":"8"},"expiration_date":null},{"id":"iris-detect-watched-domains","per_month_limit":"1500","per_hour_limit":"1","per_minute_limit":"30","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"phisheye","per_month_limit":"10000","per_hour_limit":"1","per_minute_limit":"10","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"domain-profile","per_month_limit":"100000","per_hour_limit":"1","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"domain-search","per_month_limit":"100000","per_hour_limit":"1","per_minute_limit":"500","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"hosting-history","per_month_limit":"100000","per_hour_limit":"1","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"ip-monitor","per_month_limit":"100000","per_hour_limit":"1","per_minute_limit":"5","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"ip-registrant-monitor","per_month_limit":"100000","per_hour_limit":"1","per_minute_limit":"5","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"iris","per_month_limit":"1000","per_hour_limit":"1","per_minute_limit":"10","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"reputation","per_month_limit":"100000","per_hour_limit":"1","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"reverse-ip","per_month_limit":"100000","per_hour_limit":"1","per_minute_limit":"10","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"reverse-ip-whois","per_month_limit":"100000","per_hour_limit":"1","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"risk","per_month_limit":"100000","per_hour_limit":"1","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"risk-evidence","per_month_limit":"100000","per_hour_limit":"1","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"reverse-name-server","per_month_limit":"100000","per_hour_limit":"1","per_minute_limit":"10","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"reverse-whois","per_month_limit":"100000","per_hour_limit":"1","per_minute_limit":"10","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"mark-alert","per_month_limit":"100000","per_hour_limit":"1","per_minute_limit":"5","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"parsed-whois","per_month_limit":"100000","per_hour_limit":"1","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"name-server-monitor","per_month_limit":"100000","per_hour_limit":"1","per_minute_limit":"5","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"whois","per_month_limit":"100000","per_hour_limit":"1","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"whois-history","per_month_limit":"5000","per_hour_limit":"1","per_minute_limit":"120","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"parsed-whois-live","per_month_limit":"120","per_hour_limit":"1","per_minute_limit":"5","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null},{"id":"registrant-alert","per_month_limit":"100000","per_hour_limit":"1","per_minute_limit":"5","absolute_limit":null,"usage":{"today":"0","month":"0"},"expiration_date":null}]}}'
+      headers:
+        Content-Encoding:
+          - gzip
+        Content-Type:
+          - application/json;charset=utf-8
+        Date:
+          - Thu, 16 Jun 2022 15:01:58 GMT
+        Transfer-Encoding:
+          - chunked
+        Vary:
+          - Accept-Encoding
+        X-TIME:
+          - "120038"
+      http_version: HTTP/1.1
+      status_code: 200
 version: 1