Merge pull request #13 from blacklanternsecurity/asn-support

Fix actions
blacklanternsecurity · Jan 28, 2024 · 4bddf8e · 4bddf8e
2 parents 3f2c932 + 5040228
commit 4bddf8e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -36,14 +36,18 @@ jobs:
         run: |
           pip install poetry
           poetry install
+      - name: Install ASN database
+        run: |
+          pip install pyasn
+          pyasn_util_download.py --latestv46
+          pyasn_util_convert.py --single rib.*.bz2 asn.db
       - name: Run tests
         run: |
           poetry run pytest --exitfirst --disable-warnings --log-cli-level=DEBUG
   update:
     runs-on: ubuntu-latest
-    if: github.actor != 'dependabot[bot]'
     needs: test
-    if: github.event_name == 'push' || github.event_name == 'schedule'
+    if: github.actor != 'dependabot[bot]' && (github.event_name == 'push' || github.event_name == 'schedule')
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python

diff --git a/cloud_providers.json b/cloud_providers.json
@@ -104,7 +104,7 @@
             "srtcdn.net"
         ],
         "ips_url": "https://techdocs.akamai.com/property-manager/pdfs/akamai_ipv4_ipv6_CIDRs-txt.zip",
-        "last_updated": "2024-01-27T23:48:59.259783",
+        "last_updated": "2024-01-28T05:10:25.602456",
         "name": "Akamai",
         "provider_type": "cdn",
         "regexes": {}
@@ -6529,7 +6529,7 @@
             "thinkboxsoftware.com"
         ],
         "ips_url": "https://ip-ranges.amazonaws.com/ip-ranges.json",
-        "last_updated": "2024-01-27T23:48:59.258779",
+        "last_updated": "2024-01-28T05:10:25.599175",
         "name": "Amazon",
         "provider_type": "cloud",
         "regexes": {
@@ -10226,7 +10226,7 @@
             "windowsazurestatus.cn"
         ],
         "ips_url": "https://download.microsoft.com/download/0/1/8/018E208D-54F8-44CD-AA26-CD7BC9524A8C/PublicIPs_20200824.xml",
-        "last_updated": "2024-01-27T23:48:59.259920",
+        "last_updated": "2024-01-28T05:10:25.601028",
         "name": "Azure",
         "provider_type": "cloud",
         "regexes": {
@@ -10296,7 +10296,7 @@
             "workers.dev"
         ],
         "ips_url": "https://api.cloudflare.com/client/v4/ips",
-        "last_updated": "2024-01-27T23:48:58.068943",
+        "last_updated": "2024-01-28T05:10:23.602209",
         "name": "Cloudflare",
         "provider_type": "cdn",
         "regexes": {}
@@ -11911,7 +11911,7 @@
             "nginxconfig.io"
         ],
         "ips_url": "https://digitalocean.com/geo/google.csv",
-        "last_updated": "2024-01-27T23:48:58.066018",
+        "last_updated": "2024-01-28T05:10:25.598591",
         "name": "DigitalOcean",
         "provider_type": "cloud",
         "regexes": {
@@ -16189,7 +16189,7 @@
             "github.com"
         ],
         "ips_url": "https://api.github.com/meta",
-        "last_updated": "2024-01-27T23:48:58.068373",
+        "last_updated": "2024-01-28T05:10:23.624646",
         "name": "GitHub",
         "provider_type": "cdn",
         "regexes": {}
@@ -16864,7 +16864,7 @@
             "googleapis.com"
         ],
         "ips_url": "https://www.gstatic.com/ipranges/cloud.json",
-        "last_updated": "2024-01-27T23:48:59.258491",
+        "last_updated": "2024-01-28T05:10:25.602162",
         "name": "Google",
         "provider_type": "cloud",
         "regexes": {
@@ -17563,7 +17563,7 @@
             "sun.com"
         ],
         "ips_url": "https://docs.oracle.com/en-us/iaas/tools/public_ip_ranges.json",
-        "last_updated": "2024-01-27T23:48:59.259601",
+        "last_updated": "2024-01-28T05:10:25.598123",
         "name": "Oracle",
         "provider_type": "cloud",
         "regexes": {}
@@ -17635,7 +17635,7 @@
             "zohowebstatic.com"
         ],
         "ips_url": "",
-        "last_updated": "2024-01-27T23:48:58.069073",
+        "last_updated": "2024-01-28T05:10:23.625972",
         "name": "Zoho",
         "provider_type": "cloud",
         "regexes": {}

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -21,10 +21,10 @@ python = "^3.9"
 pydantic = "^2.4.2"
 httpx = "^0.26.0"
 pyasn = "^1.6.2"
+pytest = "^7.0"
 
 [tool.poetry.group.dev.dependencies]
 black = ">=22.12,<25.0"
-pytest = ">=7.4.3,<9.0.0"
 flake8 = ">=6.1,<8.0"
 pytest-asyncio = ">=0.21.1,<0.24.0"