cloudcheck 5.0.1.595__py3-none-any.whl → 6.0.0.602__py3-none-any.whl

cloudcheck/providers/__init__.py

@@ -44,48 +44,48 @@ class CloudProviders:
 
     def load_from_json(self, force=False):
         # loading from a pickled cache is about 1 second faster than loading from JSON
-        if (not force) and self.cache_path.is_file():
-            self.load_from_cache()
-        else:
-            if self.json_path.is_file():
-                with open(self.json_path) as f:
-                    try:
-                        j = json.load(f)
-                        for k in list(j):
-                            j[k.lower()] = j.pop(k)
-                    except Exception as e:
-                        log.warning(f"Failed to parse JSON at {self.json_path}: {e}")
-                        return
-                    for provider_name, provider_class in providers.items():
-                        provider_name = provider_name.lower()
-                        provider_json = j.get(provider_name, {})
-                        self.providers[provider_name] = provider_class(provider_json)
-                    self.cache_key = self.json_path.stat()
-            else:
+        # if (not force) and self.cache_path.is_file():
+        #     self.load_from_cache()
+        # else:
+        if self.json_path.is_file():
+            with open(self.json_path) as f:
+                try:
+                    j = json.load(f)
+                    for k in list(j):
+                        j[k.lower()] = j.pop(k)
+                except Exception as e:
+                    log.warning(f"Failed to parse JSON at {self.json_path}: {e}")
+                    return
                 for provider_name, provider_class in providers.items():
                     provider_name = provider_name.lower()
-                    self.providers[provider_name] = provider_class(None)
-            self.write_cache()
-
-    def load_from_cache(self):
-        with open(self.cache_path, "rb") as f:
-            try:
-                self.providers = pickle.load(f)
-            except Exception as e:
-                with suppress(Exception):
-                    self.cache_path.unlink()
-                log.warning(
-                    f"Failed to load cloudcheck cache at {self.cache_path}: {e}"
-                )
-
-    def write_cache(self):
-        with open(self.cache_path, "wb") as f:
-            try:
-                pickle.dump(self.providers, f)
-            except Exception as e:
-                log.warning(
-                    f"Failed to write cloudcheck cache to {self.cache_path}: {e}"
-                )
+                    provider_json = j.get(provider_name, {})
+                    self.providers[provider_name] = provider_class(provider_json)
+                self.cache_key = self.json_path.stat()
+        else:
+            for provider_name, provider_class in providers.items():
+                provider_name = provider_name.lower()
+                self.providers[provider_name] = provider_class(None)
+        # self.write_cache()
+
+    # def load_from_cache(self):
+    #     with open(self.cache_path, "rb") as f:
+    #         try:
+    #             self.providers = pickle.load(f)
+    #         except Exception as e:
+    #             with suppress(Exception):
+    #                 self.cache_path.unlink()
+    #             log.warning(
+    #                 f"Failed to load cloudcheck cache at {self.cache_path}: {e}"
+    #             )
+
+    # def write_cache(self):
+    #     with open(self.cache_path, "wb") as f:
+    #         try:
+    #             pickle.dump(self.providers, f)
+    #         except Exception as e:
+    #             log.warning(
+    #                 f"Failed to write cloudcheck cache to {self.cache_path}: {e}"
+    #             )
 
     def check(self, host):
         host = make_ip_type(host)

cloudcheck/providers/base.py

@@ -4,7 +4,7 @@ import ipaddress
 import traceback
 import regex as re
 from datetime import datetime
-from radixtarget import RadixTarget
+from radixtarget import Target
 from typing import Dict, List, Union
 from pydantic import BaseModel, field_validator
 
@@ -17,7 +17,21 @@ asndb = None
 
 
 base_headers = {
-    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36"
+    "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
+    "accept-language": "en-US,en;q=0.9",
+    "cache-control": "no-cache",
+    "pragma": "no-cache",
+    "priority": "u=0, i",
+    "referer": "https://www.google.com/",
+    "sec-ch-ua": '"Chromium";v="127", "Not)A;Brand";v="99"',
+    "sec-ch-ua-mobile": "?0",
+    "sec-ch-ua-platform": '"Linux"',
+    "sec-fetch-dest": "document",
+    "sec-fetch-mode": "navigate",
+    "sec-fetch-site": "cross-site",
+    "sec-fetch-user": "?1",
+    "upgrade-insecure-requests": "1",
+    "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36",
 }
 
 
@@ -49,7 +63,7 @@ class BaseCloudProvider:
     def __init__(self, j):
         self._log = None
         self.ranges = set()
-        self.radix = RadixTarget()
+        self.radix = Target()
         if j is not None:
             p = CloudProviderJSON(**j)
             self.update_domains(
@@ -142,10 +156,9 @@ class BaseCloudProvider:
     def parse_response(self, response):
         pass
 
-    @classmethod
     @property
-    def name(cls):
-        return cls.__name__
+    def name(self):
+        return self.__class__.__name__
 
     @property
     def log(self):

{cloudcheck-5.0.1.595.dist-info → cloudcheck-6.0.0.602.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudcheck
-Version: 5.0.1.595
+Version: 6.0.0.602
 Summary: Check whether an IP address belongs to a cloud provider
 Home-page: https://github.com/blacklanternsecurity/cloudcheck
 License: GPL-3.0
@@ -12,9 +12,10 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: httpx (>=0.26,<0.28)
 Requires-Dist: pydantic (>=2.4.2,<3.0.0)
-Requires-Dist: radixtarget (>=1.0.0.14,<2.0.0.0)
+Requires-Dist: radixtarget (>=2.0.0.32,<3.0.0.0)
 Requires-Dist: regex (>=2024.4.16,<2025.0.0)
 Project-URL: Discord, https://discord.com/invite/PZqkgxu5SA
 Project-URL: PyPi, https://pypi.org/project/cloudcheck/

{cloudcheck-5.0.1.595.dist-info → cloudcheck-6.0.0.602.dist-info}/RECORD

@@ -1,12 +1,12 @@
-cloud_providers.json,sha256=Y05amR3O_DUw7pqcsKD9yVu3986utNTLgw3XG5vkbc8,904264
+cloud_providers.json,sha256=ROE9BT-jk4MxtPprJMS9MsTZdD-fCdunTDigGYrNtcA,912727
 cloudcheck/__init__.py,sha256=FuxQNWSWrhThXVwhuaevh57mUQNtVS-KQ_HCIkfnE0M,416
 cloudcheck/cloudcheck.py,sha256=qgXzRXv6z62V2hfhVSnXf8ariaOMleakoxKdeAeGIPQ,924
 cloudcheck/helpers.py,sha256=Qn7vNh_Uw4Wpg1RWWVIkI5OILNFHQI1gYwIQYrHz9l8,605
-cloudcheck/providers/__init__.py,sha256=DPjWvGwdCkYJ2PGJw62PcaFf-oiSPT6SwOL_-CMIMPw,5397
+cloudcheck/providers/__init__.py,sha256=7kRphvQAu-lU9I_dsVY_DMgDNg202Zhmh487x5QsU88,5365
 cloudcheck/providers/akamai.py,sha256=UzuuAq_V9GwlIWMkOJ56Jfv2vdjQN0umiafAyRAW5aw,3591
 cloudcheck/providers/amazon.py,sha256=U-EF5LqQuownlEzAdqLZQCDxU2VsFEer54yC8zVcbl4,1703
 cloudcheck/providers/azure.py,sha256=TpyGhd22iAS0aCt-jH90ZdsnwDzIJ10Dog4DcCeltno,4702
-cloudcheck/providers/base.py,sha256=GMYPiNGpL_b5vV1pNozk1pgDRcQ55wOAVfb-OjmNbiA,4784
+cloudcheck/providers/base.py,sha256=yi6IWV7ANWXal7vnvqibjbbM6jhKoJ-Rmo6DOrI_ygM,5379
 cloudcheck/providers/cloudflare.py,sha256=4iHQEiNEsW08cdyQlrH-7qJa-cgpezJfJbtg13SyJKs,1452
 cloudcheck/providers/digitalocean.py,sha256=yqunC2QNlkRP6ol6pG3XJQl8fwW9baCDmNVfETj1yuM,762
 cloudcheck/providers/fastly.py,sha256=c3Y5cm5R0PMRXGSWDxAiij50X9Mh9ga2xrbHO6RTfKU,575
@@ -16,7 +16,7 @@ cloudcheck/providers/oracle.py,sha256=Xbi9M0dJf6jlGZuZe6vKCyGFQJNBKopQkyBnwEdjb0
 cloudcheck/providers/zoho.py,sha256=4fo0unvG-oVgsKPz5Xa3viq5P5sf69VNu-v0kt1aQK4,477
 cloudcheck/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudcheck/test/test_cloudcheck.py,sha256=CK6npWw6i1LCAlW0u6y53ee1RXwbyeAcwcH0mPEHNmg,2198
-cloudcheck-5.0.1.595.dist-info/METADATA,sha256=ttlvKHx2FXn_fQivW-rm1akejb09-C8uugi7MYi--fo,2612
-cloudcheck-5.0.1.595.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-cloudcheck-5.0.1.595.dist-info/entry_points.txt,sha256=SzYzxS8FPIBJdwNT4pQhhSostZyrQMxLqzpyuKkJxDU,57
-cloudcheck-5.0.1.595.dist-info/RECORD,,
+cloudcheck-6.0.0.602.dist-info/METADATA,sha256=dOxE-2bwTOCASPiRGkyYH4ZdxbH46_0CuV619RzhxAI,2663
+cloudcheck-6.0.0.602.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+cloudcheck-6.0.0.602.dist-info/entry_points.txt,sha256=SzYzxS8FPIBJdwNT4pQhhSostZyrQMxLqzpyuKkJxDU,57
+cloudcheck-6.0.0.602.dist-info/RECORD,,

{cloudcheck-5.0.1.595.dist-info → cloudcheck-6.0.0.602.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any