cloudcheck 6.0.0.686__tar.gz → 7.0.694__tar.gz

{cloudcheck-6.0.0.686 → cloudcheck-7.0.694}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudcheck
-Version: 6.0.0.686
+Version: 7.0.694
 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 → cloudcheck-7.0.694}/cloud_providers.json

@@ -860,6 +860,7 @@
             "122.252.32.0/19",
             "122.252.40.0/21",
             "124.106.175.0/24",
+            "124.40.52.208/28",
             "125.252.192.0/18",
             "125.252.212.0/22",
             "125.252.216.0/22",
@@ -3064,6 +3065,7 @@
             "2.22.232.0/24",
             "2.22.235.0/24",
             "2.22.236.0/24",
+            "2.22.237.0/24",
             "2.22.238.0/24",
             "2.22.239.0/24",
             "2.22.24.0/22",
@@ -9316,6 +9318,7 @@
             "2a02:26f0:c6::/48",
             "2a02:26f0:c80::/48",
             "2a02:26f0:c900::/48",
+            "2a02:26f0:c9::/48",
             "2a02:26f0:cc00::/48",
             "2a02:26f0:cd00::/48",
             "2a02:26f0:ce00::/48",
@@ -11841,7 +11844,7 @@
             "srtcdn.net"
         ],
         "ips_url": "https://techdocs.akamai.com/property-manager/pdfs/akamai_ipv4_ipv6_CIDRs-txt.zip",
-        "last_updated": "2024-12-02T22:09:08.890593",
+        "last_updated": "2024-12-03T00:40:32.586686",
         "name": "Akamai",
         "provider_type": "cdn",
         "regexes": {}
@@ -12090,7 +12093,10 @@
             "13.127.70.160/29",
             "13.134.0.0/15",
             "13.184.0.0/13",
-            "13.192.0.0/13",
+            "13.192.0.0/16",
+            "13.193.0.0/16",
+            "13.194.0.0/15",
+            "13.196.0.0/14",
             "13.200.0.0/15",
             "13.200.140.0/23",
             "13.200.142.112/30",
@@ -15614,7 +15620,6 @@
             "35.96.4.0/24",
             "35.96.48.0/20",
             "35.96.5.0/24",
-            "35.96.6.0/24",
             "35.96.64.0/20",
             "35.96.8.0/24",
             "35.96.80.0/20",
@@ -18069,7 +18074,7 @@
             "thinkboxsoftware.com"
         ],
         "ips_url": "https://ip-ranges.amazonaws.com/ip-ranges.json",
-        "last_updated": "2024-12-02T22:09:08.881831",
+        "last_updated": "2024-12-03T00:40:32.584496",
         "name": "Amazon",
         "provider_type": "cloud",
         "regexes": {
@@ -18124,7 +18129,7 @@
             "arvancloud.ir"
         ],
         "ips_url": "https://www.arvancloud.ir/en/ips.txt",
-        "last_updated": "2024-12-02T22:09:09.472112",
+        "last_updated": "2024-12-03T00:40:32.866811",
         "name": "Arvancloud",
         "provider_type": "cdn",
         "regexes": {}
@@ -21817,7 +21822,7 @@
             "windowsazurestatus.cn"
         ],
         "ips_url": "https://download.microsoft.com/download/0/1/8/018E208D-54F8-44CD-AA26-CD7BC9524A8C/PublicIPs_20200824.xml",
-        "last_updated": "2024-12-02T22:09:08.415315",
+        "last_updated": "2024-12-03T00:40:31.331342",
         "name": "Azure",
         "provider_type": "cloud",
         "regexes": {
@@ -21888,7 +21893,7 @@
             "workers.dev"
         ],
         "ips_url": "https://api.cloudflare.com/client/v4/ips",
-        "last_updated": "2024-12-02T22:09:08.418059",
+        "last_updated": "2024-12-03T00:40:31.877348",
         "name": "Cloudflare",
         "provider_type": "cdn",
         "regexes": {
@@ -22090,7 +22095,7 @@
             "cloudfront.net"
         ],
         "ips_url": "https://d7uri8nf7uskq.cloudfront.net/tools/list-cloudfront-ips",
-        "last_updated": "2024-12-02T22:09:09.451540",
+        "last_updated": "2024-12-03T00:40:32.601213",
         "name": "Cloudfront",
         "provider_type": "cdn",
         "regexes": {}
@@ -23252,7 +23257,7 @@
             "nginxconfig.io"
         ],
         "ips_url": "https://digitalocean.com/geo/google.csv",
-        "last_updated": "2024-12-02T22:09:08.992128",
+        "last_updated": "2024-12-03T00:40:32.127038",
         "name": "DigitalOcean",
         "provider_type": "cloud",
         "regexes": {
@@ -23294,7 +23299,7 @@
             "zencdn.net"
         ],
         "ips_url": "https://api.fastly.com/public-ip-list",
-        "last_updated": "2024-12-02T22:09:08.888651",
+        "last_updated": "2024-12-03T00:40:31.075513",
         "name": "Fastly",
         "provider_type": "cloud",
         "regexes": {}
@@ -28484,7 +28489,7 @@
             "github.com"
         ],
         "ips_url": "https://api.github.com/meta",
-        "last_updated": "2024-12-02T22:09:08.175743",
+        "last_updated": "2024-12-03T00:40:31.874245",
         "name": "GitHub",
         "provider_type": "cdn",
         "regexes": {}
@@ -29219,7 +29224,7 @@
             "googleapis.com"
         ],
         "ips_url": "https://www.gstatic.com/ipranges/cloud.json",
-        "last_updated": "2024-12-02T22:09:07.655784",
+        "last_updated": "2024-12-03T00:40:31.951862",
         "name": "Google",
         "provider_type": "cloud",
         "regexes": {
@@ -29708,7 +29713,7 @@
             "your-server.de"
         ],
         "ips_url": "",
-        "last_updated": "2024-12-02T22:09:06.538460",
+        "last_updated": "2024-12-03T00:40:29.953743",
         "name": "Hetzner",
         "provider_type": "cloud",
         "regexes": {
@@ -29753,7 +29758,7 @@
             "imperva.com"
         ],
         "ips_url": "https://my.imperva.com/api/integration/v1/ips",
-        "last_updated": "2024-12-02T22:09:08.177061",
+        "last_updated": "2024-12-03T00:40:32.019759",
         "name": "Imperva",
         "provider_type": "cdn",
         "regexes": {}
@@ -30540,7 +30545,7 @@
             "sun.com"
         ],
         "ips_url": "https://docs.oracle.com/en-us/iaas/tools/public_ip_ranges.json",
-        "last_updated": "2024-12-02T22:09:09.044845",
+        "last_updated": "2024-12-03T00:40:32.014654",
         "name": "Oracle",
         "provider_type": "cloud",
         "regexes": {}
@@ -30621,7 +30626,7 @@
             "zohowebstatic.com"
         ],
         "ips_url": "",
-        "last_updated": "2024-12-02T22:08:53.199121",
+        "last_updated": "2024-12-03T00:40:16.300539",
         "name": "Zoho",
         "provider_type": "cloud",
         "regexes": {}

{cloudcheck-6.0.0.686 → cloudcheck-7.0.694}/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-6.0.0.686 → cloudcheck-7.0.694}/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-6.0.0.686 → cloudcheck-7.0.694}/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-6.0.0.686 → cloudcheck-7.0.694}/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-6.0.0.686 → cloudcheck-7.0.694}/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-6.0.0.686 → cloudcheck-7.0.694}/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-6.0.0.686 → cloudcheck-7.0.694}/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-6.0.0.686 → cloudcheck-7.0.694}/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 → cloudcheck-7.0.694}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cloudcheck"
-version = "6.0.0.686"
+version = "v7.0.694"
 description = "Check whether an IP address belongs to a cloud provider"
 authors = ["TheTechromancer"]
 license = "GPL-3.0"
@@ -16,19 +16,27 @@ homepage = "https://github.com/blacklanternsecurity/cloudcheck"
 [tool.poetry.scripts]
 cloudcheck = 'cloudcheck.cloudcheck:main'
 
+[tool.ruff]
+line-length = 119
+lint.ignore = ["E402", "E721", "E741", "F401", "F403", "F405", "E713"]
+
 [tool.poetry.dependencies]
 python = "^3.9"
 pydantic = "^2.4.2"
 httpx = ">=0.26,<0.29"
 regex = "^2024.4.16"
-radixtarget = "^2.0.0.32"
+radixtarget = "^3.0.13"
 
 [tool.poetry.group.dev.dependencies]
-black = ">=22.12,<25.0"
-flake8 = ">=6.1,<8.0"
 pytest-asyncio = ">=0.21.1,<0.25.0"
 pytest = "^8.1.1"
+ruff = "^0.8.1"
 
 [build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"]
+build-backend = "poetry_dynamic_versioning.backend"
+
+[tool.poetry-dynamic-versioning]
+enable = false
+metadata = false
+format-jinja = 'v7.0.{{ distance }}'