fix blasthttp headers type and event loop, fix fetch_asns list/set bug, bump app-token and docker tags, add .so to gitignore

Author: liquidsec

.github/workflows/daily-update.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
     - name: Generate app token
       id: app-token
-      uses: actions/create-github-app-token@v1
+      uses: actions/create-github-app-token@v3
       with:
         app-id: ${{ secrets.CLOUDCHECK_APP_ID }}
         private-key: ${{ secrets.CLOUDCHECK_APP_PRIVATE_KEY }}

.github/workflows/docker-tests.yml

@@ -60,9 +60,9 @@ jobs:
           type=ref,event=pr
           type=sha,prefix=sha-
           type=raw,value=latest,enable={{is_default_branch}}
-          type=raw,value=v9
-          type=raw,value=v9.2
-          type=raw,value=v9.2.0
+          type=raw,value=v11
+          type=raw,value=v11.0
+          type=raw,value=v11.0.0
 
     - name: Build and push Docker image
       uses: docker/build-push-action@v7

.github/workflows/python-tests.yml

@@ -52,7 +52,7 @@ jobs:
     steps:
       - name: Generate app token
         id: app-token
-        uses: actions/create-github-app-token@v1
+        uses: actions/create-github-app-token@v3
         with:
           app-id: ${{ secrets.CLOUDCHECK_APP_ID }}
           private-key: ${{ secrets.CLOUDCHECK_APP_PRIVATE_KEY }}

.gitignore

@@ -4,3 +4,4 @@
 
 # Python
 __pycache__/
+*.so

Cargo.lock

@@ -228,11 +228,15 @@ def request(url, include_api_key=False, browser_headers=False, timeout=60, **kwa
                 "running the update.",
                 file=sys.stderr,
             )
-    kwargs["headers"] = headers
+    kwargs["headers"] = list(headers.items())
     kwargs["timeout"] = timeout
     kwargs.setdefault("follow_redirects", True)
     kwargs.setdefault("verify_certs", True)
-    return asyncio.run(_client.request(url, **kwargs))
+
+    async def _send():
+        return await _client.request(url, **kwargs)
+
+    return asyncio.run(_send())
 
 
 def parse_v2fly_domain_file(file_path: Path) -> Set[str]:

cloudcheck/helpers.py

@@ -222,7 +222,7 @@ def fetch_org_ids(
 
     def fetch_asns(self) -> List[Union[ipaddress.IPv4Network, ipaddress.IPv6Network]]:
         """Fetch CIDRs for a given list of ASNs from ASNDB."""
-        cidrs = []
+        cidrs = set()
         errors = []
         print(f"Fetching {len(self.asns)} ASNs for {self.name}")
         for asn in self.asns:

cloudcheck/providers/base.py

@@ -29,11 +29,15 @@ class Microsoft(BaseProvider):
         ],
     }
 
-    _ips_confirmation_url = "https://www.microsoft.com/en-us/download/confirmation.aspx?id=56519"
+    _ips_confirmation_url = (
+        "https://www.microsoft.com/en-us/download/confirmation.aspx?id=56519"
+    )
 
     def fetch_cidrs(self):
         confirmation = self.request(self._ips_confirmation_url, browser_headers=True)
-        match = re.search(r'https://download\.microsoft\.com/download/[^"]+\.json', confirmation.text)
+        match = re.search(
+            r'https://download\.microsoft\.com/download/[^"]+\.json', confirmation.text
+        )
         if not match:
             raise ValueError("Could not find Azure IP ranges download URL")
         response = self.request(match.group(0))