Fix getwebdata downloads (ivre#1668)

* update maxmind iso3166.csv url * embedded cached scanner ip list in python package added by ivre#1620 --------- Co-authored-by: Nicolas Leclercq <[email protected]>
MikeoPerfect · Oct 11, 2024 · 19f4493 · 19f4493
1 parent e31b032
commit 19f4493
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/ivre/config.py b/ivre/config.py
@@ -235,7 +235,7 @@
     # GeoLite2-* files using `ivre ipdata --import-all`. You should do
     # that if you get your files from Maxmind.
     "GeoLite2-dumps.tar.gz": "https://ivre.rocks/data/geolite/GeoLite2-dumps.tar.gz",
-    "iso3166.csv": "https://dev.maxmind.com/csv-files/codes/iso3166.csv",
+    "iso3166.csv": "https://dev.maxmind.com/static/csv/codes/iso3166.csv",
     # This one is not from maxmind -- see https://thyme.apnic.net/
     "BGP.raw": "https://thyme.apnic.net/current/data-raw-table",
 }

diff --git a/setup.py b/setup.py
@@ -214,7 +214,16 @@ def _write_pkg_file(self, file):
         ),
         ("share/ivre/honeyd", ["data/.empty"]),
         ("share/ivre/geoip", ["data/.empty"]),
-        ("share/ivre/data", ["data/ike-vendor-ids", "data/manuf"]),
+        (
+            "share/ivre/data",
+            [
+                "data/ike-vendor-ids",
+                "data/manuf",
+                "data/censys_scanners.txt",
+                "data/ssigouvfr_scanners.txt",
+                "data/ukncsc_scanners.txt",
+            ],
+        ),
         ("share/ivre/data/honeyd", ["data/honeyd/sshd"]),
         ("share/ivre/docker", ["docker/Vagrantfile"]),
         ("share/ivre/docker/agent", ["docker/agent/Dockerfile"]),