cloudcheck 6.0.0.686__py3-none-any.whl → 7.0.7__py3-none-any.whl

cloudcheck/cloudcheck.py

@@ -8,9 +8,7 @@ from cloudcheck.providers import cloud_providers
 async def _main():
     ips = sys.argv[1:]
     if not ips:
-        print(
-            "usage: cloudcheck 1.2.3.4 [update | forceupdate | [ips...] | [domains...]]"
-        )
+        print("usage: cloudcheck 1.2.3.4 [update | forceupdate | [ips...] | [domains...]]")
     elif len(ips) == 1 and ips[0].lower() == "update":
         await cloud_providers.update()
         return

cloudcheck/helpers.py

@@ -9,7 +9,7 @@ def is_ip_type(i):
 
 def make_ip_type(host):
     if not host:
-        raise ValueError(f"Invalid host")
+        raise ValueError("Invalid host")
     try:
         host = ipaddress.ip_network(host, strict=False)
     except Exception:

cloudcheck/providers/__init__.py

@@ -23,11 +23,7 @@ for file in Path(__file__).parent.glob("*.py"):
         module_variables = importlib.import_module(import_path, "cloudcheck")
         for variable in module_variables.__dict__.keys():
             value = getattr(module_variables, variable)
-            if (
-                hasattr(value, "__mro__")
-                and not value == BaseCloudProvider
-                and BaseCloudProvider in value.__mro__
-            ):
+            if hasattr(value, "__mro__") and not value == BaseCloudProvider and BaseCloudProvider in value.__mro__:
                 provider_name = value.__name__.lower()
                 providers[provider_name] = value
 
@@ -103,9 +99,7 @@ class CloudProviders:
         if self.last_updated > oldest_allowed and not force:
             return
         try:
-            async with httpx.AsyncClient(
-                transport=httpx.AsyncHTTPTransport(verify=False)
-            ) as client:
+            async with httpx.AsyncClient(transport=httpx.AsyncHTTPTransport(verify=False)) as client:
                 response = await client.get(self.json_url)
         except Exception as e:
             error = e
@@ -113,10 +107,10 @@ class CloudProviders:
             with open(self.json_path, "wb") as f:
                 f.write(response.content)
             self.load_from_json(force=True)
+            for provider in self:
+                provider.radix.defrag()
         else:
-            log.warning(
-                f"Failed to retrieve update from {self.json_url} (response: {response}, error: {error})"
-            )
+            log.warning(f"Failed to retrieve update from {self.json_url} (response: {response}, error: {error})")
 
     async def update_from_sources(self):
         tasks = [asyncio.create_task(p.update()) for p in self]
@@ -124,9 +118,7 @@ class CloudProviders:
         j = self.to_json()
         if j:
             with open(self.json_path, "w") as f:
-                json.dump(
-                    self.to_json(), f, sort_keys=True, indent=4, cls=CustomJSONEncoder
-                )
+                json.dump(self.to_json(), f, sort_keys=True, cls=CustomJSONEncoder)
             self.load_from_json(force=True)
 
     def to_json(self):

cloudcheck/providers/amazon.py

@@ -47,11 +47,7 @@ class Amazon(BaseCloudProvider):
         "thinkboxsoftware.com",
     ]
     bucket_name_regex = r"[a-z0-9_][a-z0-9-\.]{1,61}[a-z0-9]"
-    regexes = {
-        "STORAGE_BUCKET": [
-            r"(" + bucket_name_regex + r")\.(s3-?(?:[a-z0-9-]*\.){1,2}amazonaws\.com)"
-        ]
-    }
+    regexes = {"STORAGE_BUCKET": [r"(" + bucket_name_regex + r")\.(s3-?(?:[a-z0-9-]*\.){1,2}amazonaws\.com)"]}
 
     ips_url = "https://ip-ranges.amazonaws.com/ip-ranges.json"
 

cloudcheck/providers/azure.py

@@ -144,11 +144,11 @@ class Azure(BaseCloudProvider):
         "windowsazurestatus.cn",
     ]
     bucket_name_regex = r"[a-z0-9][a-z0-9-_\.]{1,61}[a-z0-9]"
-    regexes = {
-        "STORAGE_BUCKET": [r"(" + bucket_name_regex + r")\.(blob\.core\.windows\.net)"]
-    }
+    regexes = {"STORAGE_BUCKET": [r"(" + bucket_name_regex + r")\.(blob\.core\.windows\.net)"]}
 
-    ips_url = "https://download.microsoft.com/download/0/1/8/018E208D-54F8-44CD-AA26-CD7BC9524A8C/PublicIPs_20200824.xml"
+    ips_url = (
+        "https://download.microsoft.com/download/0/1/8/018E208D-54F8-44CD-AA26-CD7BC9524A8C/PublicIPs_20200824.xml"
+    )
 
     def parse_response(self, response):
         ranges = set()

cloudcheck/providers/base.py

@@ -66,9 +66,7 @@ class BaseCloudProvider:
         self.radix = Target()
         if j is not None:
             p = CloudProviderJSON(**j)
-            self.update_domains(
-                [d.lower() for d in set(list(self.domains) + list(p.domains))]
-            )
+            self.update_domains([d.lower() for d in set(list(self.domains) + list(p.domains))])
             self.update_ranges(p.cidrs)
             self.last_updated = p.last_updated
 
@@ -95,9 +93,7 @@ class BaseCloudProvider:
         try:
             self.ranges = self.get_subnets()
             if self.ips_url:
-                async with httpx.AsyncClient(
-                    transport=httpx.AsyncHTTPTransport(verify=False)
-                ) as client:
+                async with httpx.AsyncClient(transport=httpx.AsyncHTTPTransport(verify=False)) as client:
                     response = await client.get(
                         self.ips_url,
                         follow_redirects=True,

cloudcheck/providers/digitalocean.py

@@ -12,11 +12,7 @@ class DigitalOcean(BaseCloudProvider):
     ]
 
     bucket_name_regex = r"[a-z0-9][a-z0-9-]{2,62}"
-    regexes = {
-        "STORAGE_BUCKET": [
-            r"(" + bucket_name_regex + r")\.([a-z]{3}[\d]{1}\.digitaloceanspaces\.com)"
-        ]
-    }
+    regexes = {"STORAGE_BUCKET": [r"(" + bucket_name_regex + r")\.([a-z]{3}[\d]{1}\.digitaloceanspaces\.com)"]}
 
     ips_url = "https://digitalocean.com/geo/google.csv"
 

cloudcheck/test/test_cloudcheck.py

@@ -31,7 +31,7 @@ async def test_cloudcheck():
 
     google = cloud_providers.providers["google"]
     assert google.check("test.asdf.google") == "google"
-    assert google.check("test.asdf.google.asdf") == None
+    assert google.check("test.asdf.google.asdf") is None
 
     assert cloud_providers.check("asdf.google") == [("Google", "cloud", "google")]
     assert cloud_providers.check("asdf.googles") == []
@@ -72,7 +72,6 @@ async def test_cloudcheck():
 
 @pytest.mark.asyncio
 async def test_cloudcheck_cli(monkeypatch, capsys):
-
     from cloudcheck.cloudcheck import _main
 
     monkeypatch.setattr(sys, "exit", lambda *args, **kwargs: True)

{cloudcheck-6.0.0.686.dist-info → cloudcheck-7.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudcheck
-Version: 6.0.0.686
+Version: 7.0.7
 Summary: Check whether an IP address belongs to a cloud provider
 Home-page: https://github.com/blacklanternsecurity/cloudcheck
 License: GPL-3.0
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: httpx (>=0.26,<0.29)
 Requires-Dist: pydantic (>=2.4.2,<3.0.0)
-Requires-Dist: radixtarget (>=2.0.0.32,<3.0.0.0)
+Requires-Dist: radixtarget (>=3.0.13,<4.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-6.0.0.686.dist-info → cloudcheck-7.0.7.dist-info}/RECORD

@@ -1,16 +1,16 @@
-cloud_providers.json,sha256=9ol6YxmNWYRIqy6AT9ABz0RjsosIg8QZtrHfNMCKoRQ,952463
+cloud_providers.json,sha256=OGW2klguxufiKJe4GrY-EOOsfH9LFNFP71KJL6H65e8,586419
 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=7kRphvQAu-lU9I_dsVY_DMgDNg202Zhmh487x5QsU88,5365
+cloudcheck/cloudcheck.py,sha256=U9kiSiRYS6SXPDQMrFJcZDyMPvmkmgvAPLNOViVYDXw,902
+cloudcheck/helpers.py,sha256=Qw_dyJQ_HF71-1j6-9X1hZu1beA8UvnVj7i4Alrgumw,604
+cloudcheck/providers/__init__.py,sha256=XHPNfvK7uL-8ziGAoaL6fz-is3IY2TDuy5RYlJr-3fQ,5267
 cloudcheck/providers/akamai.py,sha256=UzuuAq_V9GwlIWMkOJ56Jfv2vdjQN0umiafAyRAW5aw,3591
-cloudcheck/providers/amazon.py,sha256=U-EF5LqQuownlEzAdqLZQCDxU2VsFEer54yC8zVcbl4,1703
+cloudcheck/providers/amazon.py,sha256=fkDOOQLhlasXQcLywlh-VfQbcjHeNCUXBKFYFhfNfwc,1667
 cloudcheck/providers/arvancloud.py,sha256=ModvIi15JVLYiqEqIJtq89oXQ0l03MZrkLaW0Sf_1I4,479
-cloudcheck/providers/azure.py,sha256=TpyGhd22iAS0aCt-jH90ZdsnwDzIJ10Dog4DcCeltno,4702
-cloudcheck/providers/base.py,sha256=S0APy6rYr4ur1ox9x3-rB6jzFauOtlVQFWMiD_3Ag1Y,5446
+cloudcheck/providers/azure.py,sha256=Sk3ZhfdFJ2PciXVKRCRUiH8ht_yNdwzXNSMIO72dw-U,4704
+cloudcheck/providers/base.py,sha256=9ay5NmOi4K1OoxS1q9rqPVIMpIHRYXxzHC6CXwh9cvg,5378
 cloudcheck/providers/cloudflare.py,sha256=lsinVyEVLXcKRBCuNnhTv3I99dq5lp3sol6RJcNp63Q,1725
 cloudcheck/providers/cloudfront.py,sha256=Lk894kwiFwqi2C1tU-0pRHDMx3N7r_VVHqCJEW-Bvdg,680
-cloudcheck/providers/digitalocean.py,sha256=yqunC2QNlkRP6ol6pG3XJQl8fwW9baCDmNVfETj1yuM,762
+cloudcheck/providers/digitalocean.py,sha256=m_uurDwkdZMSXR2pUSNwNJaJYTHmXjUGuSYSPyExhZw,726
 cloudcheck/providers/fastly.py,sha256=c3Y5cm5R0PMRXGSWDxAiij50X9Mh9ga2xrbHO6RTfKU,575
 cloudcheck/providers/github.py,sha256=iUqdoVQkQbp6lYMzajHCNKgRAIlPrvYEBbWlK6Oj5gM,600
 cloudcheck/providers/google.py,sha256=Digp6ONhLQHT3HDkTEyhHoljoygFQmUm6SW2EPMTv6s,929
@@ -19,8 +19,8 @@ cloudcheck/providers/imperva.py,sha256=3RxumRb5Ye5V_3STMWSI2JcAVtb_gijkb-y3wSe_3
 cloudcheck/providers/oracle.py,sha256=Xbi9M0dJf6jlGZuZe6vKCyGFQJNBKopQkyBnwEdjb0I,667
 cloudcheck/providers/zoho.py,sha256=4fo0unvG-oVgsKPz5Xa3viq5P5sf69VNu-v0kt1aQK4,477
 cloudcheck/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cloudcheck/test/test_cloudcheck.py,sha256=lXIQl-uvZt2GBi-cxaIsL8CU0KVONmbaOyrnKvpY1Yk,2280
-cloudcheck-6.0.0.686.dist-info/METADATA,sha256=lzyRrhyNpa9lJI83BqnKMaDr3gP61Bf2h0V5mmo3NWI,2880
-cloudcheck-6.0.0.686.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-cloudcheck-6.0.0.686.dist-info/entry_points.txt,sha256=SzYzxS8FPIBJdwNT4pQhhSostZyrQMxLqzpyuKkJxDU,57
-cloudcheck-6.0.0.686.dist-info/RECORD,,
+cloudcheck/test/test_cloudcheck.py,sha256=BaTwFFcr4vO9U7yhCTaXJXbWE_DUpCtN_x59j_CEHwU,2279
+cloudcheck-7.0.7.dist-info/METADATA,sha256=kd6PyDdBufA8eN91HDOt359J4vuYJrDxPa_xxQdsf5I,2872
+cloudcheck-7.0.7.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+cloudcheck-7.0.7.dist-info/entry_points.txt,sha256=SzYzxS8FPIBJdwNT4pQhhSostZyrQMxLqzpyuKkJxDU,57
+cloudcheck-7.0.7.dist-info/RECORD,,