Document how to release

Add the lock file
Bump to 1.1.0
2025-07-06 17:29:50 +02:00 · 2025-07-06 17:15:37 +02:00 · 2025-07-06 17:07:11 +02:00 · 2025-07-06 17:06:38 +02:00 · 2025-05-18 17:29:04 +02:00 · 2025-04-06 22:39:27 +02:00
45 changed files with 290655 additions and 2389717 deletions
--- a/README.md
+++ b/README.md
@ -6,28 +6,57 @@

 - `https://security.wdes.eu/scanners/stretchoid.txt` (List of all known stretchoid IPs)
 - `https://security.wdes.eu/scanners/binaryedge.txt` (List of all known binaryedge IPs)
- `https://security.wdes.eu/scanners/shadowserver.txt` (List of all known shadowserver IPs)
- `https://security.wdes.eu/scanners/censys.txt` (List of all IPs declared by censys scanner on their [FAQ](https://support.censys.io/hc/en-us/articles/360043177092-Opt-Out-of-Data-Collection)
+- `https://security.wdes.eu/scanners/shadowserver.txt` (List of all known shadowserver (shadowserver.org) IPs)
+- `https://security.wdes.eu/scanners/censys.txt` (List of all IPs declared by censys scanner (censys.io) on their [FAQ](https://docs.censys.com/docs/opt-out-of-data-collection)
 - `https://security.wdes.eu/scanners/internet-measurement.com.txt` (List of all IPs declared by internet-measurement.com on [their website](https://internet-measurement.com/#ips))
+- `https://security.wdes.eu/scanners/anssi.txt` (List of all IPs declared by CERT-FR/ANSSI on [their website](https://www.cert.ssi.gouv.fr/scans/))

 ### Collections (by vendor)

 - `https://security.wdes.eu/collections/wdes/bad-networks.txt` (List of some hand picked bad networks)
 - `https://security.wdes.eu/collections/wdes/bad-ips.txt` (List of some hand picked bad IPs that caused harm/attacks/scans to mail servers)

- `https://security.wdes.eu/collections/microsoft/email-servers.txt` (List of the Microsoft IPs for it's mail servers)
+- `https://security.wdes.eu/collections/microsoft/email-servers.txt` (List of the [Microsoft IPs for it's mail servers](https://learn.microsoft.com/en-us/microsoft-365/enterprise/urls-and-ip-address-ranges?view=o365-worldwide#exchange-online))
 - `https://security.wdes.eu/collections/amazon/cloudfront-ips.txt` (List of AWS CloudFront IPs)

 ## Other similar projects

 - https://github.com/szepeviktor/debian-server-tools/tree/master/security/myattackers-ipsets/ipset
- https://github.com/wravoc/authlog-threats/blob/main/scanners
+- https://github.com/wravoc/authlog-threats/blob/main/scanners (not updated in 2025 since two years)
 - https://github.com/stamparm/maltrail/blob/master/trails/static/mass_scanner.txt

-## Bad actors to handle
+## TODO list

- scan-*.shadowserver.org example: scan-37-1d.shadowserver.org
- *.scan.bufferover.run example: bogota.scan.bufferover.run
- security.criminalip.com
- zl-ams-nl-gr1-wk102b.internet-census.org
- optout.scanopticon.com
+### Features
+
+- https://security.wdes.eu/scanners/<scanner>.txt#commented -> Output with the name
+
+### Scanners
+
+  - *.scan.bufferover.run example: bogota.scan.bufferover.run
+  - optout.scanopticon.com
+  - pinger*.netsec.colostate.edu
+  - pinger-*.ant.isi.edu
+  - researchscanner*.eecs.berkeley.edu
+  - researchscan*.eecs.umich.edu
+  - researchscan*.comsys.rwth-aachen.de
+  - scanners.labs.rapid7.com, scanner*.labs.rapid7.com
+  - openresolverproject.org, opensnmpproject.org, openntpproject.org, openssdpproject.org, openresolverproject.org
+  - probe*.projectblindferret.com
+  - shodan.io, *.census.shodan.io, census*.shodan.io
+  - kudelskisecurity.com
+  - riskiq.com
+  - scan.sba-research.org, scanning.sba-research.org
+  - 5thcolumn.net
+  - internet-census.org, ca-san-*-*-*.internet-census.org, Example: zl-ams-nl-gr1-wk102b.internet-census.org
+  - internettl.org
+  - netsystemsresearch.com
+  - tequilaboomboom.club
+  - scanner.openportstats.com
+  - outspoken.ca
+  - phenome.ca
+  - ltx71
+  - Greenbone
+  - leakix.net
+  - [45.83.64.0/22 is ALPHASTRIKE-RESEARCH](https://www.alphastrike.io/en/log4j/)
+  - security.criminalip.com
--- a/data/collections/amazon/cloudfront-ips.txt
+++ b/data/collections/amazon/cloudfront-ips.txt
@ -6,23 +6,40 @@
 3.29.57.0/26
 3.35.130.128/25
 3.101.158.0/23
+3.107.43.128/25
+3.107.44.0/25
+3.107.44.128/25
 3.128.93.0/24
 3.134.215.0/24
+3.146.232.0/22
+3.147.164.0/22
+3.147.244.0/22
 3.160.0.0/14
 3.164.0.0/18
+3.164.64.0/18
+3.164.128.0/17
+3.165.0.0/16
+3.166.0.0/15
+3.168.0.0/14
 3.172.0.0/18
+3.172.64.0/18
+3.173.0.0/17
+3.173.128.0/18
+3.173.192.0/18
+3.174.0.0/15
 3.231.2.0/25
 3.234.232.224/27
 3.236.48.0/23
 3.236.169.192/26
 13.32.0.0/15
 13.35.0.0/16
-13.48.32.0/24
 13.54.63.128/26
 13.59.250.0/26
 13.113.196.64/26
 13.113.203.0/24
 13.124.199.0/24
+13.134.24.0/23
+13.203.133.0/26
 13.210.67.128/26
 13.224.0.0/14
 13.228.69.0/24
@ -38,10 +55,18 @@
 18.160.0.0/15
 18.164.0.0/15
 18.172.0.0/15
+18.175.65.0/24
+18.175.66.0/24
+18.175.67.0/24
 18.192.142.0/23
+18.199.68.0/22
+18.199.72.0/22
+18.199.76.0/22
 18.200.212.0/23
 18.216.170.128/25
 18.229.220.192/26
+18.230.229.0/24
+18.230.230.0/25
 18.238.0.0/15
 18.244.0.0/15
 34.195.252.0/24
@ -49,6 +74,9 @@
 34.223.12.224/27
 34.223.80.192/26
 34.226.14.0/24
+35.93.168.0/23
+35.93.170.0/23
+35.93.172.0/23
 35.158.136.0/24
 35.162.63.192/26
 35.167.191.128/26
@ -58,9 +86,18 @@
 43.218.56.128/26
 43.218.56.192/26
 43.218.71.0/26
+44.220.194.0/23
+44.220.196.0/23
+44.220.198.0/23
+44.220.200.0/23
+44.220.202.0/23
+44.222.66.0/24
 44.227.178.0/24
 44.234.90.252/30
 44.234.108.128/25
+47.129.82.0/24
+47.129.83.0/24
+47.129.84.0/24
 52.15.127.128/26
 52.46.0.0/18
 52.47.139.0/24
@ -87,6 +124,9 @@
 54.239.128.0/18
 54.239.192.0/19
 54.240.128.0/18
+56.125.46.0/24
+56.125.47.0/32
+56.125.48.0/24
 58.254.138.0/25
 58.254.138.128/26
 64.252.64.0/18
@ -135,7 +175,9 @@
 204.246.173.0/24
 204.246.174.0/23
 204.246.176.0/20
-205.251.200.0/21
+205.251.202.0/23
+205.251.204.0/23
+205.251.206.0/23
 205.251.208.0/20
 205.251.249.0/24
 205.251.250.0/23
@ -150,6 +192,7 @@
 2600:9000:2000::/36
 2600:9000:3000::/36
 2600:9000:4000::/36
+2600:9000:5200::/40
 2600:9000:5308::/45
 2600:9000:5310::/44
 2600:9000:5320::/43
--- a/data/scanners/anssi.txt
+++ b/data/scanners/anssi.txt
@ -0,0 +1,8 @@
+92.154.95.236
+185.50.66.1
+54.38.103.0
+54.38.103.1
+137.74.246.152
+147.135.160.230
+80.13.153.140
+217.108.23.109
--- a/data/scanners/binaryedge-chunk-counts.txt
+++ b/data/scanners/binaryedge-chunk-counts.txt
@ -1,333 +0,0 @@
-      1 dev-barium-fra1
-      1 dev-beryllium-fra1
-      1 dev-beryllium-lon1
-      1 prod-aluminum-tor1
-      1 prod-erbium-ams3
-      1 prod-erbium-fra1
-      1 prod-erbium-sfo3
-      1 prod-erbium-tor1
-      1 prod-fermium-sfo3
-      1 prod-fermium-tor1
-      1 prod-radium-fra1
-      1 prod-sulfur-fra1
-      2 dev-barium-sfo3
-      2 dev-barium-tor1
-      2 dev-beryllium-ams3
-      2 dev-mercury-sfo3
-      2 do-prod-eu-central-proxys-1102
-      2 do-prod-eu-west-proxys-1102
-      2 do-prod-us-east-proxys-1102
-      2 do-prod-us-north-proxys-1102
-      2 do-prod-us-west-proxys-1102
-      2 prod-jerry-se-naboo-ca-central
-      2 prod-jerry-se-naboo-syd1
-      2 prod-mendelevium-us-central
-      2 prod-mendelevium-us-east
-      2 prod-mendelevium-us-southeast
-      2 prod-mendelevium-us-west
-      2 prod-radium-ams3
-      2 prod-radium-lon1
-      2 prod-radium-nyc3
-      2 prod-radium-sfo3
-      2 prod-radium-sgp1
-      2 prod-radium-tor1
-      2 prod-radon-ams3
-      2 prod-radon-fra1
-      2 prod-radon-lon1
-      2 prod-radon-nyc3
-      2 prod-radon-sfo3
-      2 prod-radon-sgp1
-      2 prod-radon-tor1
-      3 prod-dysprosium-nyc1
-      3 prod-dysprosium-sfo2
-      3 prod-jerry-se-jakku-us-central
-      3 prod-jerry-se-jakku-us-east
-      3 prod-jerry-se-jakku-us-southeast
-      3 prod-jerry-se-jakku-us-west
-      3 prod-jerry-se-kamino-us-central
-      3 prod-jerry-se-kamino-us-east
-      3 prod-jerry-se-kamino-us-southeast
-      3 prod-jerry-se-kamino-us-west
-      3 prod-jerry-se-kashyyyk-us-central
-      3 prod-jerry-se-kashyyyk-us-east
-      3 prod-jerry-se-kashyyyk-us-southeast
-      3 prod-jerry-se-kashyyyk-us-west
-      3 prod-mendelevium-ap-northeast
-      3 prod-mendelevium-ap-south
-      3 prod-mendelevium-ap-southeast
-      3 prod-mendelevium-ap-west
-      3 prod-mendelevium-ca-central
-      3 prod-mendelevium-eu-central
-      3 prod-mendelevium-eu-west
-      4 prod-jerry-se-non-allowlisted-lon1
-      4 prod-mendelevium-syd1
-      5 prod-jerry-se-endor-ap-southeast
-      5 prod-jerry-se-endor-eu-west
-      5 prod-jerry-se-jakku-ap-southeast
-      5 prod-jerry-se-jakku-eu-west
-      5 prod-jerry-se-kamino-ap-southeast
-      5 prod-jerry-se-kamino-eu-west
-      5 prod-jerry-se-kashyyyk-ap-southeast
-      5 prod-jerry-se-kashyyyk-eu-west
-      5 prod-jerry-se-naboo-lon1
-      5 prod-jerry-se-utils-lon1
-      5 prod-mercury-sgp1
-      6 prod-aluminum-nyc1
-      6 prod-fermium-nyc1
-      6 prod-jerry-se-clients-ca-central
-      6 prod-jerry-se-clients-eu-central
-      6 prod-jerry-se-clients-eu-west
-      6 prod-jerry-se-clients-us-east
-      6 prod-jerry-se-clients-us-west
-      6 prod-jerry-se-jakku-ca-central
-      6 prod-jerry-se-kamino-ca-central
-      6 prod-jerry-se-kashyyyk-ca-central
-      6 prod-mendelevium-nyc3
-      6 prod-mendelevium-sfo3
-      6 prod-mendelevium-sgp1
-      6 prod-mercury-ams3
-      6 prod-mercury-nyc3
-      6 prod-sulfur-lon1
-      7 dev-boron-nyc3
-      7 dev-boron-sgp1
-      7 dev-mercury-nyc1
-      7 prod-aluminum-sfo2
-      7 prod-erbium-sfo2
-      7 prod-fermium-sfo2
-      7 prod-jerry-se-naboo-us-central
-      7 prod-jerry-se-naboo-us-east
-      7 prod-jerry-se-naboo-us-west
-      8 dev-boron-ams3
-      8 dev-boron-fra1
-      8 dev-boron-lon1
-      8 prod-erbium-nyc1
-      8 prod-jerry-se-naboo-us-southeast
-      9 dev-barium-sfo2
-      9 dev-boron-sfo3
-      9 dev-meitnerium-sfo3
-      9 dev-meitnerium-sgp1
-      9 dev-mercury-sfo2
-      9 prod-mendelevium-ams3
-      9 prod-mercury-sfo3
-     10 dev-barium-nyc1
-     10 dev-boron-tor1
-     10 dev-meitnerium-ams3
-     10 dev-meitnerium-nyc3
-     10 prod-beryllium-ap-northeast
-     10 prod-beryllium-ap-south
-     10 prod-beryllium-ap-southeast
-     10 prod-beryllium-ap-west
-     10 prod-beryllium-ca-central
-     10 prod-beryllium-eu-central
-     10 prod-beryllium-eu-west
-     10 prod-beryllium-us-central
-     10 prod-beryllium-us-east
-     10 prod-beryllium-us-southeast
-     10 prod-beryllium-us-west
-     10 prod-jerry-se-endor-syd1
-     10 prod-jerry-se-hoth-ap-southeast
-     10 prod-jerry-se-hoth-eu-west
-     10 prod-jerry-se-jakku-syd1
-     10 prod-jerry-se-kamino-syd1
-     10 prod-jerry-se-kashyyyk-syd1
-     10 prod-jerry-se-managers-eu-west
-     10 prod-manganese-syd1
-     11 prod-barium-nyc3
-     11 prod-meitnerium-de-fra1
-     11 prod-mercury-fra1
-     11 prod-silicon-lon1
-     11 prod-silicon-sgp1
-     12 prod-barium-ams3
-     12 prod-barium-lon1
-     12 prod-barium-sgp1
-     12 prod-silicon-ams3
-     12 prod-silicon-nyc3
-     13 prod-manganese-sgp1
-     14 prod-barium-sfo3
-     14 prod-magnesium-nyc3
-     14 prod-magnesium-sgp1
-     14 prod-manganese-sfo3
-     14 prod-silicon-fra1
-     14 prod-silicon-sfo3
-     15 dev-meitnerium-fra1
-     15 prod-barium-fra1
-     15 prod-barium-tor1
-     15 prod-jerry-se-endor-ca-central
-     15 prod-jerry-se-jakku-nyc1
-     15 prod-jerry-se-jakku-sfo2
-     15 prod-jerry-se-kamino-nyc1
-     15 prod-jerry-se-kamino-sfo2
-     15 prod-jerry-se-kashyyyk-nyc1
-     15 prod-jerry-se-kashyyyk-sfo2
-     15 prod-jerry-se-naboo-tor1
-     15 prod-manganese-ams3
-     15 prod-manganese-nyc3
-     15 prod-mendelevium-fra1
-     15 prod-silicon-tor1
-     17 prod-magnesium-ams3
-     17 prod-magnesium-sfo3
-     18 dev-beryllium-nyc1
-     18 jerry-se-do-na-east-unbounds
-     19 dev-beryllium-sfo2
-     19 prod-mercury-lon1
-     19 prod-mercury-tor1
-     20 jerry-se-do-eu-central-unbounds
-     20 jerry-se-do-eu-west-unbounds
-     20 jerry-se-do-na-central-unbounds
-     20 jerry-se-do-na-west-unbounds
-     20 prod-beryllium-syd1
-     20 prod-jerry-se-endor-lon1
-     20 prod-jerry-se-hoth-syd1
-     20 prod-magnesium-fra1
-     20 prod-manganese-fra1
-     21 prod-mercury-nyc1
-     21 prod-sulfur-nyc3
-     22 prod-jerry-se-endor-us-central
-     22 prod-jerry-se-endor-us-east
-     22 prod-jerry-se-endor-us-west
-     23 prod-jerry-se-clients-nyc1
-     23 prod-jerry-se-endor-us-southeast
-     24 prod-jerry-se-kamino-lon1
-     24 prod-sulfur-sfo3
-     25 prod-jerry-se-clients-ams3
-     25 prod-jerry-se-clients-lon1
-     25 prod-jerry-se-clients-sfo2
-     25 prod-jerry-se-clients-tor1
-     25 prod-jerry-se-jakku-lon1
-     25 prod-jerry-se-kashyyyk-lon1
-     25 prod-mendelevium-lon1
-     25 prod-mendelevium-tor1
-     25 prod-mercury-sfo2
-     27 prod-beryllium-fra1
-     28 prod-beryllium-sfo3
-     28 prod-beryllium-sgp1
-     28 prod-jerry-se-scanners-ap-south
-     29 prod-beryllium-nyc3
-     29 prod-jerry-se-scanners-ap-west
-     29 prod-radium-nyc1
-     29 prod-radon-nyc1
-     30 prod-beryllium-ams3
-     30 prod-beryllium-lon1
-     30 prod-beryllium-tor1
-     30 prod-jerry-se-jakku-tor1
-     30 prod-jerry-se-kamino-tor1
-     30 prod-jerry-se-kashyyyk-tor1
-     30 prod-sulfur-tor1
-     31 dev-meitnerium-lon1
-     31 prod-carbon-fra1
-     32 dev-meitnerium-tor1
-     32 prod-radium-sfo2
-     32 prod-radon-sfo2
-     33 prod-uranium-nyc3
-     34 prod-magnesium-lon1
-     34 prod-manganese-lon1
-     34 prod-uranium-fra1
-     36 prod-jerry-se-hoth-ca-central
-     36 prod-jerry-se-naboo-nyc1
-     37 prod-magnesium-tor1
-     40 prod-jerry-se-naboo-sfo2
-     40 prod-manganese-tor1
-     40 prod-meitnerium-us4-nyc1
-     41 prod-uranium-sgp1
-     42 prod-meitnerium-us9-nyc1
-     43 prod-carbon-nyc3
-     44 prod-meitnerium-us5-nyc1
-     44 prod-meitnerium-us8-nyc1
-     45 prod-meitnerium-us1-nyc1
-     45 prod-meitnerium-us10-nyc1
-     45 prod-meitnerium-us3-nyc1
-     45 prod-meitnerium-us6-nyc1
-     46 prod-meitnerium-us7-nyc1
-     47 prod-carbon-sgp1
-     47 prod-jerry-se-e16b-nyc1
-     47 prod-meitnerium-us2-nyc1
-     47 prod-uranium-sfo3
-     50 prod-jerry-se-e16b-ams3
-     50 prod-jerry-se-e16b-lon1
-     50 prod-jerry-se-e16b-sfo2
-     50 prod-jerry-se-e16b-tor1
-     50 prod-jerry-se-managers-tor1
-     50 prod-meitnerium-syd1
-     50 prod-meitnerium-us1-sfo2
-     50 prod-meitnerium-us10-sfo2
-     50 prod-meitnerium-us2-sfo2
-     50 prod-meitnerium-us3-sfo2
-     50 prod-meitnerium-us4-sfo2
-     50 prod-meitnerium-us5-sfo2
-     50 prod-meitnerium-us6-sfo2
-     50 prod-meitnerium-us7-sfo2
-     50 prod-meitnerium-us8-sfo2
-     50 prod-meitnerium-us9-sfo2
-     50 prod-silicon-nyc1
-     52 prod-carbon-sfo3
-     53 prod-jerry-se-scanners-ca-central
-     54 prod-uranium-ams3
-     54 prod-uranium-lon1
-     55 prod-carbon-ams3
-     55 prod-carbon-lon1
-     55 prod-jerry-se-scanners-us-east
-     55 prod-jerry-se-scanners-us-west
-     57 dev-meitnerium-nyc1
-     58 prod-carbon-tor1
-     58 prod-magnesium-nyc1
-     58 prod-uranium-tor1
-     59 prod-jerry-se-hoth-lon1
-     59 prod-jerry-se-scanners-eu-central
-     59 prod-jerry-se-scanners-eu-west
-     60 prod-jerry-se-endor-tor1
-     61 prod-silicon-sfo2
-     63 prod-manganese-nyc1
-     67 dev-meitnerium-sfo2
-     68 prod-magnesium-sfo2
-     71 dev-boron-nyc1
-     71 prod-manganese-sfo2
-     75 prod-barium-nyc1
-     75 prod-sulfur-nyc1
-     78 prod-sulfur-sfo2
-     79 prod-barium-sfo2
-     80 prod-jerry-se-scanners-blr1
-     80 prod-jerry-se-scanners-sgp1
-     81 dev-boron-sfo2
-     82 prod-meitnerium-nyc3
-     82 prod-meitnerium-sgp1
-     85 prod-meitnerium-sfo3
-     88 prod-meitnerium-fra1
-     89 prod-jerry-se-endor-nyc1
-     89 prod-jerry-se-hoth-us-east
-     89 prod-jerry-se-hoth-us-west
-     90 prod-jerry-se-hoth-us-central
-     90 prod-jerry-se-hoth-us-southeast
-     94 prod-jerry-se-endor-sfo2
-     94 prod-meitnerium-ams3
-     96 prod-jerry-se-managers-lon1
-    101 prod-meitnerium-uk-lon1
-    102 prod-meitnerium-ca-tor1
-    123 prod-mendelevium-nyc1
-    136 prod-mendelevium-sfo2
-    140 prod-boron-nyc3
-    148 prod-boron-sgp1
-    150 prod-jerry-se-scanners-tor1
-    152 prod-boron-fra1
-    159 prod-boron-sfo3
-    160 prod-boron-ams3
-    160 prod-boron-lon1
-    165 prod-boron-tor1
-    180 prod-jerry-se-scanners-lon1
-    204 prod-uranium-nyc1
-    211 prod-jerry-se-hoth-tor1
-    216 prod-carbon-nyc1
-    230 prod-carbon-sfo2
-    230 prod-uranium-sfo2
-    235 prod-jerry-se-scanners-ams3
-    237 prod-meitnerium-lon1
-    256 prod-jerry-se-scanners-nyc1
-    275 prod-meitnerium-tor1
-    289 prod-jerry-se-scanners-sfo2
-    340 prod-beryllium-nyc1
-    388 prod-beryllium-sfo2
-    712 prod-jerry-se-hoth-nyc1
-    738 prod-meitnerium-nyc1
-    745 prod-jerry-se-hoth-sfo2
-    748 prod-boron-nyc1
-    819 prod-meitnerium-sfo2
-    850 prod-boron-sfo2
--- a/data/scanners/binaryedge-full-possible-names.txt
+++ b/data/scanners/binaryedge-full-possible-names.txt
--- a/data/scanners/binaryedge-full-possible-names_with_ips.txt
+++ b/data/scanners/binaryedge-full-possible-names_with_ips.txt
--- a/data/scanners/binaryedge-full-possible-names_with_ips_clean.txt
+++ b/data/scanners/binaryedge-full-possible-names_with_ips_clean.txt
--- a/data/scanners/binaryedge-full-possible-names_with_ips_clean_ips.txt
+++ b/data/scanners/binaryedge-full-possible-names_with_ips_clean_ips.txt
--- a/data/scanners/binaryedge.txt
+++ b/data/scanners/binaryedge.txt
--- a/data/scanners/binaryedge_api_ips.txt
+++ b/data/scanners/binaryedge_api_ips.txt
--- a/data/scanners/binaryedge_digitalocean_possible_ips.txt
+++ b/data/scanners/binaryedge_digitalocean_possible_ips.txt
--- a/data/scanners/binaryedge_ranges.txt
+++ b/data/scanners/binaryedge_ranges.txt
@ -1,472 +0,0 @@
-104.131.0.0/18
-104.131.64.0/18
-104.236.0.0/18
-104.236.192.0/18
-104.248.112.0/20
-104.248.128.0/20
-104.248.144.0/20
-104.248.16.0/20
-104.248.160.0/20
-104.248.176.0/20
-104.248.192.0/20
-104.248.208.0/20
-104.248.224.0/20
-104.248.48.0/20
-104.248.64.0/20
-104.248.80.0/20
-128.199.0.0/20
-128.199.128.0/18
-128.199.16.0/20
-128.199.192.0/18
-128.199.32.0/19
-128.199.64.0/18
-134.122.0.0/20
-134.122.112.0/20
-134.122.16.0/20
-134.122.32.0/20
-134.122.48.0/20
-134.122.64.0/20
-134.122.80.0/20
-134.122.96.0/20
-134.209.0.0/20
-134.209.112.0/20
-134.209.144.0/20
-134.209.16.0/20
-134.209.160.0/20
-134.209.176.0/20
-134.209.192.0/20
-134.209.208.0/20
-134.209.224.0/20
-134.209.48.0/20
-134.209.64.0/20
-134.209.80.0/20
-134.209.96.0/20
-137.184.0.0/20
-137.184.112.0/20
-137.184.128.0/20
-137.184.144.0/20
-137.184.16.0/20
-137.184.160.0/20
-137.184.176.0/20
-137.184.192.0/20
-137.184.208.0/20
-137.184.224.0/20
-137.184.240.0/22
-137.184.244.0/22
-137.184.248.0/22
-137.184.252.0/24
-137.184.254.0/24
-137.184.32.0/20
-137.184.48.0/20
-137.184.64.0/20
-137.184.80.0/20
-138.197.0.0/20
-138.197.112.0/20
-138.197.128.0/20
-138.197.144.0/20
-138.197.16.0/20
-138.197.160.0/20
-138.197.192.0/20
-138.197.208.0/20
-138.197.80.0/20
-138.197.96.0/20
-138.68.0.0/20
-138.68.128.0/20
-138.68.144.0/20
-138.68.16.0/20
-138.68.160.0/20
-138.68.176.0/20
-138.68.224.0/20
-138.68.240.0/20
-138.68.40.0/21
-138.68.48.0/20
-138.68.80.0/20
-139.59.0.0/20
-139.59.112.0/20
-139.59.128.0/19
-139.59.160.0/20
-139.59.176.0/20
-139.59.240.0/20
-139.59.32.0/20
-139.59.52.0/22
-139.59.56.0/21
-139.59.64.0/20
-139.59.80.0/20
-139.59.96.0/20
-142.93.0.0/20
-142.93.112.0/20
-142.93.144.0/20
-142.93.16.0/20
-142.93.160.0/20
-142.93.176.0/20
-142.93.208.0/20
-142.93.224.0/20
-142.93.240.0/20
-142.93.32.0/20
-142.93.64.0/20
-142.93.80.0/20
-143.110.128.0/20
-143.110.160.0/20
-143.110.176.0/20
-143.110.192.0/20
-143.110.208.0/20
-143.110.224.0/20
-143.110.240.0/20
-143.198.0.0/20
-143.198.112.0/20
-143.198.128.0/20
-143.198.144.0/20
-143.198.16.0/20
-143.198.160.0/20
-143.198.176.0/20
-143.198.192.0/20
-143.198.208.0/20
-143.198.224.0/20
-143.198.240.0/22
-143.198.244.0/22
-143.198.248.0/22
-143.198.32.0/20
-143.198.48.0/20
-143.198.64.0/20
-143.198.80.0/20
-143.198.96.0/20
-143.244.144.0/20
-143.244.160.0/20
-143.244.176.0/20
-144.126.208.0/20
-144.126.224.0/20
-146.190.112.0/20
-146.190.16.0/20
-146.190.160.0/20
-146.190.200.0/22
-146.190.204.0/22
-146.190.208.0/20
-146.190.224.0/20
-146.190.240.0/20
-146.190.32.0/19
-146.190.64.0/20
-146.190.80.0/20
-146.190.96.0/20
-147.182.128.0/20
-147.182.144.0/20
-147.182.160.0/20
-147.182.176.0/20
-147.182.192.0/20
-147.182.208.0/20
-147.182.240.0/20
-157.230.0.0/20
-157.230.112.0/20
-157.230.128.0/20
-157.230.144.0/20
-157.230.16.0/20
-157.230.160.0/20
-157.230.176.0/20
-157.230.192.0/22
-157.230.196.0/22
-157.230.208.0/20
-157.230.224.0/20
-157.230.240.0/20
-157.230.32.0/20
-157.230.48.0/20
-157.230.64.0/22
-157.230.68.0/22
-157.230.80.0/20
-157.230.96.0/20
-157.245.0.0/20
-157.245.112.0/20
-157.245.128.0/20
-157.245.144.0/20
-157.245.160.0/20
-157.245.176.0/20
-157.245.192.0/20
-157.245.208.0/20
-157.245.224.0/20
-157.245.240.0/20
-157.245.32.0/20
-157.245.48.0/20
-157.245.64.0/20
-157.245.80.0/20
-159.203.0.0/20
-159.203.112.0/20
-159.203.128.0/20
-159.203.144.0/22
-159.203.148.0/22
-159.203.152.0/22
-159.203.156.0/22
-159.203.16.0/20
-159.203.160.0/20
-159.203.176.0/20
-159.203.192.0/20
-159.203.208.0/20
-159.203.224.0/20
-159.203.240.0/20
-159.203.32.0/20
-159.203.48.0/22
-159.203.56.0/21
-159.203.64.0/20
-159.203.80.0/20
-159.203.96.0/20
-159.223.0.0/20
-159.223.112.0/20
-159.223.128.0/20
-159.223.144.0/20
-159.223.160.0/19
-159.223.192.0/20
-159.223.208.0/20
-159.223.224.0/20
-159.223.240.0/22
-159.223.244.0/22
-159.223.248.0/22
-159.223.32.0/20
-159.223.48.0/20
-159.223.64.0/20
-159.223.96.0/20
-159.65.0.0/20
-159.65.128.0/20
-159.65.144.0/20
-159.65.16.0/20
-159.65.192.0/20
-159.65.212.0/22
-159.65.216.0/21
-159.65.224.0/20
-159.65.48.0/20
-159.65.64.0/20
-159.65.80.0/20
-159.65.96.0/20
-159.89.112.0/20
-159.89.128.0/20
-159.89.144.0/20
-159.89.16.0/20
-159.89.160.0/20
-159.89.224.0/20
-159.89.252.0/22
-159.89.32.0/20
-159.89.48.0/21
-159.89.60.0/24
-159.89.61.0/24
-159.89.62.0/24
-159.89.63.0/24
-159.89.64.0/20
-159.89.96.0/20
-161.35.0.0/20
-161.35.112.0/20
-161.35.128.0/20
-161.35.144.0/20
-161.35.160.0/20
-161.35.176.0/20
-161.35.192.0/20
-161.35.224.0/20
-161.35.32.0/20
-161.35.48.0/20
-161.35.64.0/20
-161.35.80.0/20
-161.35.96.0/20
-162.243.160.0/20
-164.90.128.0/20
-164.90.192.0/20
-164.90.208.0/20
-164.90.224.0/20
-164.92.128.0/20
-164.92.144.0/20
-164.92.160.0/20
-164.92.176.0/20
-164.92.208.0/20
-164.92.224.0/20
-164.92.64.0/19
-164.92.96.0/19
-165.22.112.0/20
-165.22.128.0/20
-165.22.144.0/20
-165.22.16.0/20
-165.22.160.0/20
-165.22.176.0/20
-165.22.192.0/20
-165.22.208.0/20
-165.22.224.0/20
-165.22.240.0/20
-165.22.32.0/20
-165.22.48.0/20
-165.22.64.0/20
-165.22.80.0/20
-165.22.96.0/20
-165.227.0.0/20
-165.227.112.0/20
-165.227.128.0/20
-165.227.16.0/20
-165.227.160.0/20
-165.227.176.0/20
-165.227.192.0/20
-165.227.224.0/20
-165.227.252.0/22
-165.227.32.0/20
-165.227.48.0/20
-165.227.64.0/20
-165.227.80.0/20
-165.227.96.0/20
-165.232.112.0/20
-165.232.128.0/20
-165.232.144.0/20
-165.232.160.0/20
-165.232.32.0/20
-165.232.48.0/20
-165.232.80.0/20
-165.232.96.0/20
-167.172.112.0/20
-167.172.144.0/20
-167.172.16.0/20
-167.172.192.0/20
-167.172.208.0/20
-167.172.224.0/20
-167.172.240.0/20
-167.172.32.0/20
-167.172.48.0/20
-167.71.0.0/20
-167.71.112.0/20
-167.71.128.0/20
-167.71.144.0/20
-167.71.16.0/20
-167.71.176.0/20
-167.71.192.0/20
-167.71.208.0/20
-167.71.224.0/20
-167.71.240.0/20
-167.71.32.0/20
-167.71.48.0/20
-167.71.64.0/20
-167.71.80.0/20
-167.71.96.0/20
-167.99.0.0/20
-167.99.112.0/20
-167.99.128.0/20
-167.99.144.0/20
-167.99.160.0/20
-167.99.176.0/20
-167.99.192.0/20
-167.99.208.0/20
-167.99.224.0/20
-167.99.240.0/20
-167.99.32.0/20
-167.99.48.0/20
-167.99.64.0/20
-167.99.80.0/20
-167.99.96.0/20
-174.138.0.0/20
-174.138.100.0/22
-174.138.104.0/22
-174.138.108.0/22
-174.138.120.0/22
-174.138.124.0/22
-174.138.32.0/20
-174.138.64.0/20
-174.138.80.0/20
-178.128.0.0/20
-178.128.112.0/20
-178.128.144.0/20
-178.128.160.0/20
-178.128.176.0/20
-178.128.192.0/20
-178.128.208.0/20
-178.128.224.0/20
-178.128.240.0/20
-178.128.32.0/20
-178.128.48.0/20
-178.128.64.0/20
-178.128.80.0/20
-178.128.96.0/20
-178.62.0.0/18
-178.62.128.0/18
-178.62.192.0/18
-178.62.64.0/18
-188.166.0.0/18
-188.166.128.0/22
-188.166.132.0/22
-188.166.136.0/22
-188.166.140.0/22
-188.166.144.0/20
-188.166.160.0/21
-188.166.168.0/21
-188.166.176.0/20
-188.166.192.0/22
-188.166.196.0/22
-188.166.208.0/20
-188.166.224.0/20
-188.166.240.0/20
-188.166.64.0/18
-192.241.128.0/19
-192.34.56.0/21
-192.34.57.0/24
-192.34.58.0/24
-192.81.216.0/22
-198.199.64.0/20
-198.211.112.0/22
-204.48.16.0/20
-206.189.0.0/20
-206.189.112.0/20
-206.189.128.0/20
-206.189.144.0/20
-206.189.16.0/20
-206.189.160.0/20
-206.189.176.0/20
-206.189.192.0/20
-206.189.208.0/20
-206.189.32.0/20
-206.189.64.0/20
-206.189.96.0/20
-206.81.16.0/20
-207.154.192.0/20
-208.68.39.0/24
-209.38.192.0/19
-209.38.224.0/19
-209.97.128.0/20
-209.97.176.0/20
-24.144.96.0/19
-24.199.112.0/20
-24.199.80.0/20
-24.199.96.0/20
-45.55.32.0/19
-45.55.64.0/19
-46.101.0.0/18
-46.101.124.0/22
-46.101.128.0/17
-46.101.72.0/21
-46.101.80.0/20
-46.101.96.0/19
-64.225.0.0/20
-64.225.112.0/20
-64.225.16.0/20
-64.225.32.0/20
-64.225.48.0/20
-64.225.64.0/20
-64.225.96.0/20
-64.226.112.0/20
-64.226.64.0/20
-64.226.80.0/20
-64.226.96.0/20
-64.227.0.0/20
-64.227.128.0/19
-64.227.16.0/20
-64.227.160.0/20
-64.227.176.0/20
-64.227.32.0/20
-64.227.48.0/20
-64.227.64.0/20
-64.227.80.0/20
-64.227.96.0/20
-67.205.128.0/20
-67.205.144.0/20
-67.205.160.0/20
-67.205.176.0/20
-67.207.80.0/20
-68.183.0.0/20
-68.183.112.0/20
-68.183.128.0/20
-68.183.144.0/20
-68.183.16.0/20
-68.183.160.0/20
-68.183.192.0/20
-68.183.252.0/22
-68.183.32.0/20
-68.183.64.0/20
-68.183.80.0/20
-68.183.96.0/20
-69.55.49.0/24
--- a/data/scanners/censys.txt
+++ b/data/scanners/censys.txt
@ -1,3 +1,4 @@
+66.132.159.0/24
 162.142.125.0/24
 167.94.138.0/24
 167.94.145.0/24
@ -6,6 +7,7 @@
 199.45.154.0/24
 199.45.155.0/24
 206.168.34.0/24
+206.168.35.0/24
 2602:80d:1000:b0cc:e::/80
 2620:96:e000:b0cc:e::/80
 2602:80d:1003::/112
--- a/data/scanners/digitalocean_announced_ips.txt
+++ b/data/scanners/digitalocean_announced_ips.txt
@ -18,8 +18,8 @@
 104.248.112.0/20
 104.248.128.0/20
 104.248.144.0/20
-104.248.160.0/20
 104.248.16.0/20
+104.248.160.0/20
 104.248.176.0/20
 104.248.192.0/20
 104.248.208.0/20
@ -48,6 +48,22 @@
 134.122.64.0/20
 134.122.80.0/20
 134.122.96.0/20
+134.199.128.0/24
+134.199.129.0/24
+134.199.130.0/23
+134.199.132.0/22
+134.199.136.0/22
+134.199.140.0/22
+134.199.144.0/20
+134.199.160.0/20
+134.199.176.0/22
+134.199.180.0/22
+134.199.184.0/22
+134.199.188.0/22
+134.199.192.0/20
+134.199.208.0/20
+134.199.224.0/20
+134.199.240.0/20
 134.209.0.0/20
 134.209.112.0/20
 134.209.128.0/22
@ -55,8 +71,8 @@
 134.209.136.0/22
 134.209.140.0/22
 134.209.144.0/20
-134.209.160.0/20
 134.209.16.0/20
+134.209.160.0/20
 134.209.176.0/20
 134.209.192.0/20
 134.209.208.0/20
@ -71,8 +87,8 @@
 137.184.112.0/20
 137.184.128.0/20
 137.184.144.0/20
-137.184.160.0/20
 137.184.16.0/20
+137.184.160.0/20
 137.184.176.0/20
 137.184.192.0/20
 137.184.208.0/20
@ -81,6 +97,7 @@
 137.184.244.0/22
 137.184.248.0/22
 137.184.252.0/24
+137.184.253.0/24
 137.184.254.0/24
 137.184.255.0/24
 137.184.32.0/20
@ -92,8 +109,8 @@
 138.197.112.0/20
 138.197.128.0/20
 138.197.144.0/20
-138.197.160.0/20
 138.197.16.0/20
+138.197.160.0/20
 138.197.176.0/20
 138.197.192.0/20
 138.197.208.0/20
@ -119,8 +136,8 @@
 138.68.124.0/22
 138.68.128.0/20
 138.68.144.0/20
-138.68.160.0/20
 138.68.16.0/20
+138.68.160.0/20
 138.68.176.0/20
 138.68.192.0/22
 138.68.196.0/22
@ -130,7 +147,6 @@
 138.68.224.0/20
 138.68.240.0/20
 138.68.32.0/24
-138.68.33.0/24
 138.68.34.0/24
 138.68.36.0/22
 138.68.40.0/21
@ -141,8 +157,8 @@
 139.59.0.0/20
 139.59.112.0/20
 139.59.128.0/19
-139.59.160.0/20
 139.59.16.0/20
+139.59.160.0/20
 139.59.176.0/20
 139.59.192.0/22
 139.59.196.0/22
@ -166,8 +182,8 @@
 142.93.112.0/20
 142.93.128.0/20
 142.93.144.0/20
-142.93.160.0/20
 142.93.16.0/20
+142.93.160.0/20
 142.93.176.0/20
 142.93.192.0/20
 142.93.208.0/20
@ -190,8 +206,8 @@
 143.198.112.0/20
 143.198.128.0/20
 143.198.144.0/20
-143.198.160.0/20
 143.198.16.0/20
+143.198.160.0/20
 143.198.176.0/20
 143.198.192.0/20
 143.198.208.0/20
@ -217,7 +233,6 @@
 143.244.218.0/24
 143.244.219.0/24
 143.244.220.0/22
-143.244.224.0/19
 144.126.192.0/20
 144.126.208.0/20
 144.126.224.0/20
@ -233,8 +248,8 @@
 146.190.112.0/20
 146.190.12.0/22
 146.190.128.0/19
-146.190.160.0/20
 146.190.16.0/20
+146.190.160.0/20
 146.190.176.0/22
 146.190.184.0/22
 146.190.188.0/22
@ -248,8 +263,8 @@
 146.190.32.0/19
 146.190.4.0/22
 146.190.64.0/20
-146.190.80.0/20
 146.190.8.0/22
+146.190.80.0/20
 146.190.96.0/20
 147.182.128.0/20
 147.182.144.0/20
@ -259,12 +274,21 @@
 147.182.208.0/20
 147.182.224.0/20
 147.182.240.0/20
+152.42.128.0/20
+152.42.144.0/22
+152.42.148.0/22
+152.42.152.0/22
+152.42.156.0/22
+152.42.160.0/19
+152.42.192.0/19
+152.42.224.0/20
+152.42.240.0/20
 157.230.0.0/20
 157.230.112.0/20
 157.230.128.0/20
 157.230.144.0/20
-157.230.160.0/20
 157.230.16.0/20
+157.230.160.0/20
 157.230.176.0/20
 157.230.192.0/22
 157.230.196.0/22
@ -285,15 +309,15 @@
 157.245.112.0/20
 157.245.128.0/20
 157.245.144.0/20
-157.245.160.0/20
 157.245.16.0/22
+157.245.160.0/20
 157.245.176.0/20
 157.245.192.0/20
 157.245.20.0/22
 157.245.208.0/20
 157.245.224.0/20
-157.245.240.0/20
 157.245.24.0/22
+157.245.240.0/20
 157.245.28.0/22
 157.245.32.0/20
 157.245.48.0/20
@ -307,8 +331,8 @@
 159.203.148.0/22
 159.203.152.0/22
 159.203.156.0/22
-159.203.160.0/20
 159.203.16.0/20
+159.203.160.0/20
 159.203.176.0/20
 159.203.192.0/20
 159.203.208.0/20
@ -325,8 +349,8 @@
 159.223.112.0/20
 159.223.128.0/20
 159.223.144.0/20
-159.223.160.0/19
 159.223.16.0/20
+159.223.160.0/19
 159.223.192.0/20
 159.223.208.0/20
 159.223.224.0/20
@ -342,8 +366,8 @@
 159.65.112.0/20
 159.65.128.0/20
 159.65.144.0/20
-159.65.160.0/20
 159.65.16.0/20
+159.65.160.0/20
 159.65.176.0/20
 159.65.192.0/20
 159.65.208.0/22
@ -360,8 +384,8 @@
 159.89.112.0/20
 159.89.128.0/20
 159.89.144.0/20
-159.89.160.0/20
 159.89.16.0/20
+159.89.160.0/20
 159.89.176.0/20
 159.89.192.0/20
 159.89.208.0/22
@ -375,7 +399,6 @@
 159.89.252.0/22
 159.89.32.0/20
 159.89.48.0/21
-159.89.56.0/24
 159.89.58.0/24
 159.89.59.0/24
 159.89.60.0/24
@ -389,8 +412,8 @@
 161.35.112.0/20
 161.35.128.0/20
 161.35.144.0/20
-161.35.160.0/20
 161.35.16.0/20
+161.35.160.0/20
 161.35.176.0/20
 161.35.192.0/20
 161.35.208.0/20
@ -440,8 +463,8 @@
 165.22.112.0/20
 165.22.128.0/20
 165.22.144.0/20
-165.22.160.0/20
 165.22.16.0/20
+165.22.160.0/20
 165.22.176.0/20
 165.22.192.0/20
 165.22.208.0/20
@ -450,12 +473,14 @@
 165.22.32.0/20
 165.22.48.0/20
 165.22.64.0/20
+165.22.80.0/20
+165.22.96.0/20
 165.227.0.0/20
 165.227.112.0/20
 165.227.128.0/20
 165.227.144.0/20
-165.227.160.0/20
 165.227.16.0/20
+165.227.160.0/20
 165.227.176.0/20
 165.227.192.0/20
 165.227.208.0/20
@ -469,8 +494,6 @@
 165.227.64.0/20
 165.227.80.0/20
 165.227.96.0/20
-165.22.80.0/20
-165.22.96.0/20
 165.232.112.0/20
 165.232.128.0/20
 165.232.144.0/20
@ -486,8 +509,8 @@
 167.172.12.0/22
 167.172.128.0/20
 167.172.144.0/20
-167.172.160.0/20
 167.172.16.0/20
+167.172.160.0/20
 167.172.176.0/20
 167.172.192.0/20
 167.172.208.0/20
@ -497,15 +520,15 @@
 167.172.4.0/22
 167.172.48.0/20
 167.172.64.0/20
-167.172.80.0/20
 167.172.8.0/22
+167.172.80.0/20
 167.172.96.0/20
 167.71.0.0/20
 167.71.112.0/20
 167.71.128.0/20
 167.71.144.0/20
-167.71.160.0/20
 167.71.16.0/20
+167.71.160.0/20
 167.71.176.0/20
 167.71.192.0/20
 167.71.208.0/20
@ -520,15 +543,15 @@
 167.99.112.0/20
 167.99.128.0/20
 167.99.144.0/20
-167.99.160.0/20
 167.99.16.0/22
+167.99.160.0/20
 167.99.176.0/20
 167.99.192.0/20
 167.99.20.0/22
 167.99.208.0/20
 167.99.224.0/20
-167.99.240.0/20
 167.99.24.0/22
+167.99.240.0/20
 167.99.28.0/22
 167.99.32.0/20
 167.99.48.0/20
@ -536,7 +559,9 @@
 167.99.80.0/20
 167.99.96.0/20
 170.64.128.0/18
-170.64.128.0/19
+170.64.192.0/19
+170.64.224.0/20
+170.64.240.0/21
 170.64.248.0/21
 174.138.0.0/20
 174.138.100.0/22
@ -559,8 +584,8 @@
 178.128.136.0/22
 178.128.140.0/22
 178.128.144.0/20
-178.128.160.0/20
 178.128.16.0/20
+178.128.160.0/20
 178.128.176.0/20
 178.128.192.0/20
 178.128.208.0/20
@ -600,23 +625,7 @@
 192.241.224.0/20
 192.241.240.0/20
 192.34.56.0/21
-192.34.56.0/24
-192.34.57.0/24
-192.34.58.0/24
-192.34.59.0/24
-192.34.60.0/24
-192.34.61.0/24
-192.34.62.0/24
-192.34.63.0/24
 192.81.208.0/21
-192.81.208.0/24
-192.81.209.0/24
-192.81.210.0/24
-192.81.211.0/24
-192.81.212.0/24
-192.81.213.0/24
-192.81.214.0/24
-192.81.215.0/24
 192.81.216.0/22
 192.81.220.0/22
 198.199.112.0/21
@ -637,8 +646,8 @@
 206.189.112.0/20
 206.189.128.0/20
 206.189.144.0/20
-206.189.160.0/20
 206.189.16.0/20
+206.189.160.0/20
 206.189.176.0/20
 206.189.192.0/20
 206.189.208.0/20
@ -659,23 +668,38 @@
 207.154.224.0/20
 207.154.240.0/20
 208.68.36.0/22
-208.68.36.0/24
-208.68.37.0/24
-208.68.38.0/24
-208.68.39.0/24
-209.38.0.0/24
-209.38.1.0/24
+209.38.0.0/22
+209.38.112.0/22
+209.38.116.0/22
+209.38.120.0/22
+209.38.124.0/22
+209.38.128.0/19
+209.38.16.0/20
+209.38.160.0/22
+209.38.164.0/22
+209.38.168.0/22
+209.38.172.0/22
+209.38.176.0/20
 209.38.192.0/19
-209.38.2.0/24
 209.38.224.0/19
+209.38.32.0/20
+209.38.4.0/22
+209.38.48.0/22
+209.38.52.0/22
+209.38.56.0/22
+209.38.60.0/22
+209.38.64.0/20
+209.38.8.0/21
+209.38.80.0/20
+209.38.96.0/20
 209.97.128.0/20
 209.97.144.0/20
 209.97.160.0/20
 209.97.176.0/20
-2400:6180:100::/40
-2400:6180:10::/48
-2400:6180::/48
 24.144.64.0/22
+24.144.68.0/22
+24.144.76.0/22
+24.144.80.0/20
 24.144.96.0/19
 24.199.112.0/20
 24.199.64.0/22
@ -683,21 +707,22 @@
 24.199.72.0/21
 24.199.80.0/20
 24.199.96.0/20
+2400:6180:100::/40
+2400:6180:10::/48
+2400:6180::/48
 2604:a880:1::/48
 2604:a880:2::/48
-2604:a880:3::/48
 2604:a880:400::/48
 2604:a880:4::/48
-2604:a880::/48
+2604:a880:5::/48
 2604:a880:800::/48
+2604:a880::/48
 2604:a880:cad::/48
-2604:a880:fffe::/48
 2a03:b0c0:1::/48
 2a03:b0c0:2::/48
 2a03:b0c0:3::/48
 2a03:b0c0::/48
 2a03:b0c0:fffc::/48
-2a03:b0c0:fffe::/48
 2a03:b0c0:ffff::/48
 37.139.0.0/19
 45.55.0.0/19
@ -714,7 +739,6 @@
 45.55.64.0/19
 45.55.96.0/22
 46.101.0.0/18
-46.101.124.0/22
 46.101.128.0/17
 46.101.64.0/22
 46.101.68.0/22
@ -745,14 +769,21 @@
 64.227.0.0/20
 64.227.112.0/20
 64.227.128.0/19
-64.227.160.0/20
 64.227.16.0/20
+64.227.160.0/20
 64.227.176.0/20
 64.227.32.0/20
 64.227.48.0/20
 64.227.64.0/20
 64.227.80.0/20
 64.227.96.0/20
+64.23.128.0/20
+64.23.144.0/20
+64.23.160.0/20
+64.23.176.0/20
+64.23.192.0/19
+64.23.224.0/20
+64.23.240.0/20
 67.205.128.0/20
 67.205.144.0/20
 67.205.160.0/20
@ -767,8 +798,8 @@
 68.183.112.0/20
 68.183.128.0/20
 68.183.144.0/20
-68.183.160.0/20
 68.183.16.0/20
+68.183.160.0/20
 68.183.176.0/20
 68.183.192.0/20
 68.183.208.0/20
@ -782,9 +813,12 @@
 68.183.64.0/20
 68.183.80.0/20
 68.183.96.0/20
+69.55.48.0/22
 69.55.49.0/24
 69.55.54.0/24
 69.55.55.0/24
+69.55.58.0/23
+69.55.60.0/22
 80.240.128.0/20
 82.196.0.0/20
 95.85.0.0/18
--- a/data/scanners/digitalocean_announced_ips_full.txt
+++ b/data/scanners/digitalocean_announced_ips_full.txt
--- a/data/scanners/digitalocean_announced_ips_simpler.txt
+++ b/data/scanners/digitalocean_announced_ips_simpler.txt
--- a/data/scanners/digitalocean_announced_ips_with_reverse.txt
+++ b/data/scanners/digitalocean_announced_ips_with_reverse.txt
@ -18,8 +18,8 @@
 104.248.112.0/20
 104.248.128.0/20
 104.248.144.0/20
-104.248.160.0/20
 104.248.16.0/20
+104.248.160.0/20
 104.248.176.0/20
 104.248.192.0/20
 104.248.208.0/20
@ -48,6 +48,22 @@
 134.122.64.0/20
 134.122.80.0/20
 134.122.96.0/20
+134.199.128.0/24
+134.199.129.0/24
+134.199.130.0/23
+134.199.132.0/22
+134.199.136.0/22
+134.199.140.0/22
+134.199.144.0/20
+134.199.160.0/20
+134.199.176.0/22
+134.199.180.0/22
+134.199.184.0/22
+134.199.188.0/22
+134.199.192.0/20
+134.199.208.0/20
+134.199.224.0/20
+134.199.240.0/20
 134.209.0.0/20
 134.209.112.0/20
 134.209.128.0/22
@ -55,8 +71,8 @@
 134.209.136.0/22
 134.209.140.0/22
 134.209.144.0/20
-134.209.160.0/20
 134.209.16.0/20
+134.209.160.0/20
 134.209.176.0/20
 134.209.192.0/20
 134.209.208.0/20
@ -71,8 +87,8 @@
 137.184.112.0/20
 137.184.128.0/20
 137.184.144.0/20
-137.184.160.0/20
 137.184.16.0/20
+137.184.160.0/20
 137.184.176.0/20
 137.184.192.0/20
 137.184.208.0/20
@ -81,7 +97,9 @@
 137.184.244.0/22
 137.184.248.0/22
 137.184.252.0/24
+137.184.253.0/24
 137.184.254.0/24
+137.184.255.0/24
 137.184.32.0/20
 137.184.48.0/20
 137.184.64.0/20
@ -91,8 +109,8 @@
 138.197.112.0/20
 138.197.128.0/20
 138.197.144.0/20
-138.197.160.0/20
 138.197.16.0/20
+138.197.160.0/20
 138.197.176.0/20
 138.197.192.0/20
 138.197.208.0/20
@ -118,8 +136,8 @@
 138.68.124.0/22
 138.68.128.0/20
 138.68.144.0/20
-138.68.160.0/20
 138.68.16.0/20
+138.68.160.0/20
 138.68.176.0/20
 138.68.192.0/22
 138.68.196.0/22
@ -129,7 +147,6 @@
 138.68.224.0/20
 138.68.240.0/20
 138.68.32.0/24
-138.68.33.0/24
 138.68.34.0/24
 138.68.36.0/22
 138.68.40.0/21
@ -140,8 +157,8 @@
 139.59.0.0/20
 139.59.112.0/20
 139.59.128.0/19
-139.59.160.0/20
 139.59.16.0/20
+139.59.160.0/20
 139.59.176.0/20
 139.59.192.0/22
 139.59.196.0/22
@ -165,8 +182,8 @@
 142.93.112.0/20
 142.93.128.0/20
 142.93.144.0/20
-142.93.160.0/20
 142.93.16.0/20
+142.93.160.0/20
 142.93.176.0/20
 142.93.192.0/20
 142.93.208.0/20
@ -189,8 +206,8 @@
 143.198.112.0/20
 143.198.128.0/20
 143.198.144.0/20
-143.198.160.0/20
 143.198.16.0/20
+143.198.160.0/20
 143.198.176.0/20
 143.198.192.0/20
 143.198.208.0/20
@ -216,7 +233,6 @@
 143.244.218.0/24
 143.244.219.0/24
 143.244.220.0/22
-143.244.224.0/19
 144.126.192.0/20
 144.126.208.0/20
 144.126.224.0/20
@ -232,8 +248,8 @@
 146.190.112.0/20
 146.190.12.0/22
 146.190.128.0/19
-146.190.160.0/20
 146.190.16.0/20
+146.190.160.0/20
 146.190.176.0/22
 146.190.184.0/22
 146.190.188.0/22
@ -247,8 +263,8 @@
 146.190.32.0/19
 146.190.4.0/22
 146.190.64.0/20
-146.190.80.0/20
 146.190.8.0/22
+146.190.80.0/20
 146.190.96.0/20
 147.182.128.0/20
 147.182.144.0/20
@ -258,12 +274,21 @@
 147.182.208.0/20
 147.182.224.0/20
 147.182.240.0/20
+152.42.128.0/20
+152.42.144.0/22
+152.42.148.0/22
+152.42.152.0/22
+152.42.156.0/22
+152.42.160.0/19
+152.42.192.0/19
+152.42.224.0/20
+152.42.240.0/20
 157.230.0.0/20
 157.230.112.0/20
 157.230.128.0/20
 157.230.144.0/20
-157.230.160.0/20
 157.230.16.0/20
+157.230.160.0/20
 157.230.176.0/20
 157.230.192.0/22
 157.230.196.0/22
@ -284,15 +309,15 @@
 157.245.112.0/20
 157.245.128.0/20
 157.245.144.0/20
-157.245.160.0/20
 157.245.16.0/22
+157.245.160.0/20
 157.245.176.0/20
 157.245.192.0/20
 157.245.20.0/22
 157.245.208.0/20
 157.245.224.0/20
-157.245.240.0/20
 157.245.24.0/22
+157.245.240.0/20
 157.245.28.0/22
 157.245.32.0/20
 157.245.48.0/20
@ -306,8 +331,8 @@
 159.203.148.0/22
 159.203.152.0/22
 159.203.156.0/22
-159.203.160.0/20
 159.203.16.0/20
+159.203.160.0/20
 159.203.176.0/20
 159.203.192.0/20
 159.203.208.0/20
@ -324,8 +349,8 @@
 159.223.112.0/20
 159.223.128.0/20
 159.223.144.0/20
-159.223.160.0/19
 159.223.16.0/20
+159.223.160.0/19
 159.223.192.0/20
 159.223.208.0/20
 159.223.224.0/20
@ -341,8 +366,8 @@
 159.65.112.0/20
 159.65.128.0/20
 159.65.144.0/20
-159.65.160.0/20
 159.65.16.0/20
+159.65.160.0/20
 159.65.176.0/20
 159.65.192.0/20
 159.65.208.0/22
@ -359,8 +384,8 @@
 159.89.112.0/20
 159.89.128.0/20
 159.89.144.0/20
-159.89.160.0/20
 159.89.16.0/20
+159.89.160.0/20
 159.89.176.0/20
 159.89.192.0/20
 159.89.208.0/22
@ -374,7 +399,6 @@
 159.89.252.0/22
 159.89.32.0/20
 159.89.48.0/21
-159.89.56.0/24
 159.89.58.0/24
 159.89.59.0/24
 159.89.60.0/24
@ -388,8 +412,8 @@
 161.35.112.0/20
 161.35.128.0/20
 161.35.144.0/20
-161.35.160.0/20
 161.35.16.0/20
+161.35.160.0/20
 161.35.176.0/20
 161.35.192.0/20
 161.35.208.0/20
@ -439,8 +463,8 @@
 165.22.112.0/20
 165.22.128.0/20
 165.22.144.0/20
-165.22.160.0/20
 165.22.16.0/20
+165.22.160.0/20
 165.22.176.0/20
 165.22.192.0/20
 165.22.208.0/20
@ -449,12 +473,14 @@
 165.22.32.0/20
 165.22.48.0/20
 165.22.64.0/20
+165.22.80.0/20
+165.22.96.0/20
 165.227.0.0/20
 165.227.112.0/20
 165.227.128.0/20
 165.227.144.0/20
-165.227.160.0/20
 165.227.16.0/20
+165.227.160.0/20
 165.227.176.0/20
 165.227.192.0/20
 165.227.208.0/20
@ -468,8 +494,6 @@
 165.227.64.0/20
 165.227.80.0/20
 165.227.96.0/20
-165.22.80.0/20
-165.22.96.0/20
 165.232.112.0/20
 165.232.128.0/20
 165.232.144.0/20
@ -485,8 +509,8 @@
 167.172.12.0/22
 167.172.128.0/20
 167.172.144.0/20
-167.172.160.0/20
 167.172.16.0/20
+167.172.160.0/20
 167.172.176.0/20
 167.172.192.0/20
 167.172.208.0/20
@ -496,15 +520,15 @@
 167.172.4.0/22
 167.172.48.0/20
 167.172.64.0/20
-167.172.80.0/20
 167.172.8.0/22
+167.172.80.0/20
 167.172.96.0/20
 167.71.0.0/20
 167.71.112.0/20
 167.71.128.0/20
 167.71.144.0/20
-167.71.160.0/20
 167.71.16.0/20
+167.71.160.0/20
 167.71.176.0/20
 167.71.192.0/20
 167.71.208.0/20
@ -519,15 +543,15 @@
 167.99.112.0/20
 167.99.128.0/20
 167.99.144.0/20
-167.99.160.0/20
 167.99.16.0/22
+167.99.160.0/20
 167.99.176.0/20
 167.99.192.0/20
 167.99.20.0/22
 167.99.208.0/20
 167.99.224.0/20
-167.99.240.0/20
 167.99.24.0/22
+167.99.240.0/20
 167.99.28.0/22
 167.99.32.0/20
 167.99.48.0/20
@ -535,7 +559,9 @@
 167.99.80.0/20
 167.99.96.0/20
 170.64.128.0/18
-170.64.128.0/19
+170.64.192.0/19
+170.64.224.0/20
+170.64.240.0/21
 170.64.248.0/21
 174.138.0.0/20
 174.138.100.0/22
@ -558,8 +584,8 @@
 178.128.136.0/22
 178.128.140.0/22
 178.128.144.0/20
-178.128.160.0/20
 178.128.16.0/20
+178.128.160.0/20
 178.128.176.0/20
 178.128.192.0/20
 178.128.208.0/20
@ -599,23 +625,7 @@
 192.241.224.0/20
 192.241.240.0/20
 192.34.56.0/21
-192.34.56.0/24
-192.34.57.0/24
-192.34.58.0/24
-192.34.59.0/24
-192.34.60.0/24
-192.34.61.0/24
-192.34.62.0/24
-192.34.63.0/24
 192.81.208.0/21
-192.81.208.0/24
-192.81.209.0/24
-192.81.210.0/24
-192.81.211.0/24
-192.81.212.0/24
-192.81.213.0/24
-192.81.214.0/24
-192.81.215.0/24
 192.81.216.0/22
 192.81.220.0/22
 198.199.112.0/21
@ -636,8 +646,8 @@
 206.189.112.0/20
 206.189.128.0/20
 206.189.144.0/20
-206.189.160.0/20
 206.189.16.0/20
+206.189.160.0/20
 206.189.176.0/20
 206.189.192.0/20
 206.189.208.0/20
@ -658,20 +668,38 @@
 207.154.224.0/20
 207.154.240.0/20
 208.68.36.0/22
-208.68.36.0/24
-208.68.37.0/24
-208.68.38.0/24
-208.68.39.0/24
-209.38.0.0/24
-209.38.1.0/24
+209.38.0.0/22
+209.38.112.0/22
+209.38.116.0/22
+209.38.120.0/22
+209.38.124.0/22
+209.38.128.0/19
+209.38.16.0/20
+209.38.160.0/22
+209.38.164.0/22
+209.38.168.0/22
+209.38.172.0/22
+209.38.176.0/20
 209.38.192.0/19
-209.38.2.0/24
 209.38.224.0/19
+209.38.32.0/20
+209.38.4.0/22
+209.38.48.0/22
+209.38.52.0/22
+209.38.56.0/22
+209.38.60.0/22
+209.38.64.0/20
+209.38.8.0/21
+209.38.80.0/20
+209.38.96.0/20
 209.97.128.0/20
 209.97.144.0/20
 209.97.160.0/20
 209.97.176.0/20
 24.144.64.0/22
+24.144.68.0/22
+24.144.76.0/22
+24.144.80.0/20
 24.144.96.0/19
 24.199.112.0/20
 24.199.64.0/22
@ -694,7 +722,6 @@
 45.55.64.0/19
 45.55.96.0/22
 46.101.0.0/18
-46.101.124.0/22
 46.101.128.0/17
 46.101.64.0/22
 46.101.68.0/22
@ -725,14 +752,21 @@
 64.227.0.0/20
 64.227.112.0/20
 64.227.128.0/19
-64.227.160.0/20
 64.227.16.0/20
+64.227.160.0/20
 64.227.176.0/20
 64.227.32.0/20
 64.227.48.0/20
 64.227.64.0/20
 64.227.80.0/20
 64.227.96.0/20
+64.23.128.0/20
+64.23.144.0/20
+64.23.160.0/20
+64.23.176.0/20
+64.23.192.0/19
+64.23.224.0/20
+64.23.240.0/20
 67.205.128.0/20
 67.205.144.0/20
 67.205.160.0/20
@ -747,8 +781,8 @@
 68.183.112.0/20
 68.183.128.0/20
 68.183.144.0/20
-68.183.160.0/20
 68.183.16.0/20
+68.183.160.0/20
 68.183.176.0/20
 68.183.192.0/20
 68.183.208.0/20
@ -762,9 +796,12 @@
 68.183.64.0/20
 68.183.80.0/20
 68.183.96.0/20
+69.55.48.0/22
 69.55.49.0/24
 69.55.54.0/24
 69.55.55.0/24
+69.55.58.0/23
+69.55.60.0/22
 80.240.128.0/20
 82.196.0.0/20
 95.85.0.0/18
--- a/data/scanners/digitalocean_ips.txt
+++ b/data/scanners/digitalocean_ips.txt
--- a/data/scanners/digitalocean_ips_vs_announced_ips.diff
+++ b/data/scanners/digitalocean_ips_vs_announced_ips.diff
--- a/data/scanners/digitalocean_ranges.txt
+++ b/data/scanners/digitalocean_ranges.txt
@ -1,234 +0,0 @@
-37.139.31.0/24
-104.131.64.0/18
-104.131.144.0/20
-45.55.0.0/24
-45.55.1.0/24
-45.55.2.0/24
-45.55.3.0/24
-45.55.4.0/24
-45.55.6.0/24
-45.55.7.0/24
-45.55.8.0/24
-45.55.9.0/24
-45.55.10.0/24
-45.55.11.0/24
-45.55.12.0/24
-45.55.13.0/24
-45.55.14.0/24
-45.55.16.0/24
-45.55.17.0/24
-45.55.18.0/24
-45.55.19.0/24
-45.55.21.0/24
-45.55.22.0/24
-45.55.26.0/24
-45.55.28.0/24
-45.55.29.0/24
-45.55.30.0/24
-103.78.132.0/24
-104.131.128.0/24
-104.131.133.0/24
-104.131.134.0/24
-104.131.135.0/24
-104.131.137.0/24
-104.131.138.0/24
-104.131.141.0/24
-104.131.144.0/24
-104.131.145.0/24
-104.131.146.0/24
-104.131.156.0/24
-104.236.128.0/24
-104.236.149.0/24
-104.236.150.0/24
-104.236.152.0/24
-104.236.154.0/24
-104.236.155.0/24
-104.236.157.0/24
-104.236.159.0/24
-104.236.162.0/24
-104.236.163.0/24
-104.236.164.0/24
-104.236.165.0/24
-104.236.168.0/24
-104.236.169.0/24
-104.236.170.0/24
-104.236.172.0/24
-104.236.175.0/24
-104.236.176.0/24
-104.236.177.0/24
-104.236.180.0/24
-104.236.182.0/24
-104.236.183.0/24
-104.236.184.0/24
-104.236.185.0/24
-104.236.186.0/24
-104.236.187.0/24
-104.236.191.0/24
-107.170.192.0/24
-107.170.193.0/24
-107.170.194.0/24
-107.170.195.0/24
-107.170.196.0/24
-107.170.197.0/24
-107.170.198.0/24
-107.170.199.0/24
-107.170.200.0/24
-107.170.201.0/24
-107.170.202.0/24
-107.170.203.0/24
-107.170.204.0/24
-107.170.207.0/24
-107.170.208.0/24
-107.170.209.0/24
-107.170.210.0/24
-107.170.211.0/24
-107.170.212.0/24
-107.170.213.0/24
-107.170.215.0/24
-107.170.216.0/24
-107.170.218.0/24
-107.170.219.0/24
-107.170.224.0/24
-107.170.225.0/24
-107.170.226.0/24
-107.170.227.0/24
-107.170.228.0/24
-107.170.229.0/24
-107.170.230.0/24
-107.170.231.0/24
-107.170.232.0/24
-107.170.233.0/24
-107.170.234.0/24
-107.170.235.0/24
-107.170.236.0/24
-107.170.237.0/24
-107.170.238.0/24
-107.170.239.0/24
-107.170.240.0/24
-107.170.241.0/24
-107.170.242.0/24
-107.170.243.0/24
-107.170.244.0/24
-107.170.245.0/24
-107.170.246.0/24
-107.170.247.0/24
-107.170.248.0/24
-107.170.249.0/24
-107.170.250.0/24
-107.170.251.0/24
-107.170.252.0/24
-107.170.253.0/24
-107.170.254.0/24
-107.170.255.0/24
-138.68.208.0/24
-159.203.192.0/24
-159.203.197.0/24
-159.203.201.0/24
-159.203.208.0/24
-159.203.224.0/24
-159.203.240.0/24
-159.203.252.0/24
-159.203.255.0/24
-162.243.128.0/24
-162.243.129.0/24
-162.243.130.0/24
-162.243.131.0/24
-162.243.132.0/24
-162.243.133.0/24
-162.243.134.0/24
-162.243.135.0/24
-162.243.136.0/24
-162.243.137.0/24
-162.243.138.0/24
-162.243.139.0/24
-162.243.140.0/24
-162.243.141.0/24
-162.243.142.0/24
-162.243.143.0/24
-162.243.144.0/24
-162.243.145.0/24
-162.243.146.0/24
-162.243.147.0/24
-162.243.148.0/24
-162.243.149.0/24
-162.243.150.0/24
-162.243.151.0/24
-162.243.152.0/24
-162.243.157.0/24
-162.243.158.0/24
-192.241.192.0/24
-192.241.193.0/24
-192.241.194.0/24
-192.241.195.0/24
-192.241.196.0/24
-192.241.197.0/24
-192.241.198.0/24
-192.241.199.0/24
-192.241.200.0/24
-192.241.201.0/24
-192.241.202.0/24
-192.241.203.0/24
-192.241.204.0/24
-192.241.205.0/24
-192.241.206.0/24
-192.241.207.0/24
-192.241.208.0/24
-192.241.209.0/24
-192.241.210.0/24
-192.241.211.0/24
-192.241.212.0/24
-192.241.213.0/24
-192.241.214.0/24
-192.241.215.0/24
-192.241.216.0/24
-192.241.217.0/24
-192.241.218.0/24
-192.241.219.0/24
-192.241.220.0/24
-192.241.221.0/24
-192.241.222.0/24
-192.241.223.0/24
-192.241.224.0/24
-192.241.225.0/24
-192.241.226.0/24
-192.241.227.0/24
-192.241.228.0/24
-192.241.229.0/24
-192.241.230.0/24
-192.241.231.0/24
-192.241.232.0/24
-192.241.233.0/24
-192.241.234.0/24
-192.241.235.0/24
-192.241.236.0/24
-192.241.237.0/24
-192.241.238.0/24
-192.241.239.0/24
-192.243.128.0/24
-198.199.92.0/24
-198.199.93.0/24
-198.199.94.0/24
-198.199.95.0/24
-198.199.96.0/24
-198.199.97.0/24
-198.199.98.0/24
-198.199.100.0/24
-198.199.101.0/24
-198.199.102.0/24
-198.199.103.0/24
-198.199.104.0/24
-198.199.105.0/24
-198.199.106.0/24
-198.199.107.0/24
-198.199.108.0/24
-198.199.109.0/24
-198.199.110.0/24
-198.199.111.0/24
-198.199.112.0/24
-198.199.113.0/24
-198.199.114.0/24
-198.199.115.0/24
-198.199.116.0/24
-198.199.117.0/24
-198.199.118.0/24
-198.199.119.0/24
--- a/data/scanners/internet-measurement.com.txt
+++ b/data/scanners/internet-measurement.com.txt
@ -1,23 +1,44 @@
+45.55.151.3/32
+45.55.153.86/32
+45.55.158.168/32
+45.55.185.224/32
+45.55.186.92/32
+64.227.99.138/32
+64.227.108.146/32
+64.227.109.89/32
+64.227.110.161/32
 87.236.176.0/24
+107.170.65.169/32
+128.199.8.140/32
+157.245.243.118/32
+157.245.245.246/32
+159.65.216.50/32
+159.65.219.252/32
+162.243.114.171/32
+162.243.116.182/32
+162.243.208.127/32
+167.99.234.119/32
+185.247.137.0/24
+192.241.179.235/32
 193.163.125.0/24
-68.183.53.77/32
-104.248.203.191/32
-104.248.204.195/32
-142.93.191.98/32
-157.245.216.203/32
-165.22.39.64/32
-167.99.209.184/32
-188.166.26.88/32
-206.189.7.178/32
-209.97.152.248/32
-2a06:4880::/32
-2604:a880:800:10::c4b:f000/124
-2604:a880:800:10::c51:a000/124
-2604:a880:800:10::c52:d000/124
-2604:a880:800:10::c55:5000/124
-2604:a880:800:10::c56:b000/124
-2a03:b0c0:2:d0::153e:a000/124
-2a03:b0c0:2:d0::1576:8000/124
-2a03:b0c0:2:d0::1577:7000/124
-2a03:b0c0:2:d0::1579:e000/124
-2a03:b0c0:2:d0::157c:a000/124
+2a06:4880::/30
+2604:a880:0:202a::b41:8000/124
+2604:a880:0:202a::b41:a000/124
+2604:a880:0:202a::b41:b000/124
+2604:a880:0:202a::b42:d000/124
+2604:a880:0:202a::b42:e000/124
+2604:a880:4:1d0::2fa6:a000/124
+2604:a880:4:1d0::2fa6:b000/124
+2604:a880:4:1d0::2fa6:c000/124
+2604:a880:4:1d0::2fa6:d000/124
+2604:a880:4:1d0::2fa6:e000/124
+2604:a880:400:d1::91e4:a000/124
+2604:a880:400:d1::91e4:b000/124
+2604:a880:400:d1::91e4:c000/124
+2604:a880:400:d1::91e4:d000/124
+2604:a880:400:d1::91e4:e000/124
+2604:a880:800:14::5633:8000/124
+2604:a880:800:14::5633:9000/124
+2604:a880:800:14::5633:a000/124
+2604:a880:800:14::5633:b000/124
+2604:a880:800:14::5633:c000/124
--- a/data/scanners/stretchoid-chunk-counts.txt
+++ b/data/scanners/stretchoid-chunk-counts.txt
@ -1,48 +0,0 @@
-      1 000.stretchoid.com.
-      1 001.stretchoid.com.
-      1 002.stretchoid.com.
-      1 003.stretchoid.com.
-      1 004.stretchoid.com.
-      1 005.stretchoid.com.
-      1 006.stretchoid.com.
-      1 007.stretchoid.com.
-      1 008.stretchoid.com.
-      1 009.stretchoid.com.
-      1 010.stretchoid.com.
-      1 011.stretchoid.com.
-      1 0331
-      1 0412
-      1 0512a
-      1 0716a
-      1 0719b
-      1 0720a
-      1 0829
-      1 1011a
-      4 0914
-     10 0727x
-     41 1220c
-     50 0720f
-     50 0725a
-     50 0728n
-     50 0728o
-     88 1220g
-     97 0719a
-     98 0720d
-     99 0721n
-    100 0720e
-    100 0721m
-    100 0721o
-    100 0721p
-    148 0720c
-    148 0729a
-    150 0720b
-    150 1220f
-    166 1220a
-    180 1220b
-    185 1220d
-    186 1220e
-    190 1220h
-    195 0727
-    196 0721
-    197 0725m
-    201 0725n
--- a/data/scanners/stretchoid.txt
+++ b/data/scanners/stretchoid.txt
--- a/data/scanners/stretchoid_possible_ips.txt
+++ b/data/scanners/stretchoid_possible_ips.txt
--- a/data/scanners/stretchoid_ranges.txt
+++ b/data/scanners/stretchoid_ranges.txt
@ -1,266 +1,18 @@
-104.131.128.0/20
-104.131.144.0/20
-104.236.128.0/18
-107.170.192.0/18
-138.68.208.0/20
-159.203.192.0/20
-159.203.208.0/20
-159.203.224.0/20
-159.203.240.0/20
-162.243.128.0/19
-192.241.192.0/19
-192.241.224.0/20
-198.199.112.0/21
-198.199.92.0/22
-198.199.96.0/20
-45.55.0.0/19
-137.184.255.0/24
-104.209.33.0/24
-104.209.34.0/24
-104.209.35.0/24
-104.209.40.0/24
-104.209.42.0/24
-104.40.49.0/24
-104.40.50.0/24
-104.40.51.0/24
-104.40.52.0/24
-104.40.56.0/24
-104.40.57.0/24
-104.40.58.0/24
-104.40.59.0/24
-104.40.60.0/24
-104.40.63.0/24
-104.40.84.0/24
-104.40.85.0/24
-104.40.88.0/24
-104.40.90.0/24
-104.40.91.0/24
-104.42.130.0/24
-104.42.134.0/24
-104.42.227.0/24
-104.42.228.0/24
-104.45.224.0/24
-104.45.227.0/24
-104.45.233.0/24
-104.45.235.0/24
-104.45.236.0/24
-104.45.237.0/24
-104.45.239.0/24
-13.64.106.0/24
-13.64.107.0/24
-13.64.108.0/24
-13.64.109.0/24
-13.64.111.0/24
-13.64.192.0/24
-13.64.193.0/24
-13.64.194.0/24
-13.64.195.0/24
-13.64.196.0/24
-13.64.197.0/24
-13.64.198.0/24
-13.64.199.0/24
-13.64.211.0/24
-13.64.212.0/24
-13.64.213.0/24
-13.64.234.0/24
-13.64.235.0/24
-13.64.249.0/24
-13.64.251.0/24
-13.64.49.0/24
-13.64.50.0/24
-13.64.51.0/24
-13.64.52.0/24
-13.64.55.0/24
-13.64.57.0/24
-13.64.58.0/24
-13.64.59.0/24
-13.83.129.0/24
-13.83.40.0/24
-13.83.41.0/24
-13.83.42.0/24
-13.83.43.0/24
-13.83.47.0/24
-13.83.49.0/24
-13.83.50.0/24
-13.83.54.0/24
-13.83.55.0/24
-13.83.81.0/24
-13.83.83.0/24
-13.83.90.0/24
-13.87.128.0/24
-13.87.132.0/24
-13.87.133.0/24
-13.87.184.0/24
-13.87.186.0/24
-13.87.187.0/24
-13.87.188.0/24
-13.87.189.0/24
-13.87.190.0/24
-13.87.191.0/24
-13.87.203.0/24
-13.87.204.0/24
-13.87.205.0/24
-13.87.242.0/24
-13.87.243.0/24
-13.87.245.0/24
-13.88.0.0/24
-13.88.1.0/24
-13.88.158.0/24
-13.88.19.0/24
-13.88.2.0/24
-13.88.3.0/24
-13.88.4.0/24
-13.88.42.0/24
-13.88.43.0/24
-13.88.5.0/24
-13.88.6.0/24
-13.88.8.0/24
-13.88.9.0/24
-13.91.182.0/24
-13.91.217.0/24
-13.91.224.0/24
-13.91.225.0/24
-13.91.226.0/24
-13.91.228.0/24
-13.91.241.0/24
-13.91.244.0/24
-13.91.41.0/24
-13.91.42.0/24
-13.91.45.0/24
-13.91.50.0/24
-13.91.82.0/24
-13.91.96.0/24
-13.93.140.0/24
-13.93.201.0/24
-13.93.203.0/24
-13.93.205.0/24
-13.93.206.0/24
-13.93.209.0/24
-13.93.228.0/24
-13.93.234.0/24
-172.202.155.0/24
-172.202.156.0/24
-172.202.157.0/24
-172.202.158.0/24
-172.206.137.0/24
-172.206.138.0/24
-172.206.139.0/24
-172.206.140.0/24
-172.206.141.0/24
-172.206.142.0/24
-172.206.143.0/24
-172.214.113.0/24
-172.214.114.0/24
-172.214.115.0/24
-20.43.228.0/24
-20.43.229.0/24
-20.43.231.0/24
-40.112.186.0/24
-40.112.187.0/24
-40.112.188.0/24
-40.112.189.0/24
-40.112.191.0/24
-40.118.131.0/24
-40.118.132.0/24
-40.118.208.0/24
-40.118.210.0/24
-40.118.211.0/24
-40.118.212.0/24
-40.118.213.0/24
-40.118.214.0/24
-40.78.120.0/24
-40.78.123.0/24
-40.78.126.0/24
-40.78.127.0/24
-40.78.88.0/24
-40.78.91.0/24
-40.78.94.0/24
-40.78.95.0/24
-40.85.152.0/24
-40.85.153.0/24
-40.85.154.0/24
-40.85.155.0/24
-40.85.156.0/24
-40.85.157.0/24
-40.85.158.0/24
-40.85.159.0/24
-40.86.176.0/24
-40.86.178.0/24
-40.86.179.0/24
-40.86.183.0/24
-4.151.219.0/24
-4.151.220.0/24
-4.151.33.0/24
-4.151.36.0/24
-4.151.37.0/24
-4.151.38.0/24
-4.156.20.0/24
-4.156.21.0/24
-4.156.233.0/24
-4.156.236.0/24
-4.156.237.0/24
-4.246.246.0/24
-4.246.247.0/24
-48.216.177.0/24
-48.216.178.0/24
-48.216.193.0/24
-48.216.195.0/24
-48.216.196.0/24
-48.216.197.0/24
-48.216.198.0/24
-48.217.211.0/24
-48.217.212.0/24
-48.217.213.0/24
-51.8.217.0/24
-51.8.219.0/24
-51.8.220.0/24
-51.8.222.0/24
-51.8.223.0/24
-51.8.58.0/24
-51.8.65.0/24
-51.8.67.0/24
-51.8.70.0/24
-51.8.71.0/24
-52.157.1.0/24
-52.157.2.0/24
-52.157.3.0/24
-52.157.4.0/24
-52.157.5.0/24
-52.157.7.0/24
-52.159.138.0/24
-52.160.32.0/24
-52.160.35.0/24
-52.160.36.0/24
-52.160.37.0/24
-52.160.38.0/24
-52.160.39.0/24
-52.160.40.0/24
-52.160.66.0/24
-52.160.67.0/24
-52.160.82.0/24
-52.160.87.0/24
-52.183.224.0/24
-52.183.225.0/24
-52.224.24.0/24
-52.226.0.0/24
-52.226.1.0/24
-52.226.2.0/24
-52.226.4.0/24
-52.226.5.0/24
-52.226.6.0/24
-52.234.232.0/24
-52.234.236.0/24
-52.234.238.0/24
-52.234.239.0/24
-57.151.48.0/24
-57.151.49.0/24
-57.152.100.0/24
-57.152.101.0/24
-57.152.102.0/24
-57.152.73.0/24
-57.152.74.0/24
-57.152.75.0/24
-57.152.77.0/24
-57.152.78.0/24
-57.152.79.0/24
-57.152.99.0/24
+4.144.0.0/12
+4.216.0.0/13
+4.224.0.0/11
+13.64.0.0/11
+20.40.0.0/14
+20.64.0.0/10
+20.192.0.0/10
+40.76.0.0/14
+40.112.0.0/13
+48.192.0.0/11
+51.8.0.0/16
+52.160.0.0/11
+52.224.0.0/11
+57.150.0.0/15
+104.40.0.0/13
+172.128.0.0/10
+172.192.0.0/12
+172.208.0.0/13
--- a/scripts/extract-scanner-ips.sh
+++ b/scripts/extract-scanner-ips.sh
@ -1,76 +0,0 @@
-#!/bin/sh
-
-set -eux
-
-grep -v -F ":" digitalocean_announced_ips.txt | xargs -I {} sh -c "echo '{} # $(dig +short -x {})'" > digitalocean_announced_ips_with_reverse.txt
-
-
-# Fetch all reverse DNS addresses
-# ns3.digitalocean.com = 198.41.222.173
-cat digitalocean_announced_ips_full.txt | xargs -n 1 -P 40 dig @198.41.222.173 +short +time=5 +tries=10 -x > digitalocean_announced_ips_full_reverse.txt
-
-# Test command
-# cat digitalocean_announced_reverse_dns.txt | grep -v -F "ip6.arpa" | sed 's/.in-addr.arpa//'  | awk -F. '{print $3"." $2"."$1}' | sort | less
-
-# A sample
-#cat digitalocean_announced_ips_full.txt | xargs -n 1 -P 40 dig @198.41.222.173 +short +time=5 +tries=10 -x > digitalocean_announced_ips_full_reverse.txt
-
-cat digitalocean_announced_ips_full.txt | xargs -P 40  -I {} sh -c 'set -eu;rev="$(dig @198.41.222.173 +short +time=5 +tries=10 -x {})";echo "{} # $rev";' > digitalocean_announced_ips_full_reverse_better.txt
-
-
-grep -F -x -v -f digitalocean_announced_ips_full_reverse_better_only_ips.txt digitalocean_announced_ips_full.txt
-sed -i 's/ # $//' digitalocean_announced_ips_full_reverse_better.txt
-sort digitalocean_announced_ips_full_reverse_better.txt > digitalocean_announced_ips_full_reverse_better2.txt
-mv digitalocean_announced_ips_full_reverse_better2.txt digitalocean_announced_ips_full_reverse_better.txt
-
-diff -u digitalocean_announced_ips_full_reverse_better_only_ips.txt digitalocean_announced_ips_full.txt | delta
-cut -d ' ' -f 1 digitalocean_announced_ips_full_reverse_better.txt > digitalocean_announced_ips_full_reverse_better_only_ips.txt
-
-# Find all results
-grep -F "stretchoid" digitalocean_announced_ips_full_reverse_better.txt | cut -d " " -f 3 | sort
-
-
-# Find all ranges
-grep -F "stretchoid" digitalocean_announced_ips_full_reverse_better.txt | cut -d " " -f 1 | cut -d '.' -f -3 | sort | uniq
-
-
-# Make a list of search keys
-grep -F "stretchoid" digitalocean_announced_ips_full_reverse_better.txt | cut -d " " -f 1 | cut -d '.' -f -3 | sort | uniq > found_ranges.txt
-
-# Find all ranges to re-scan
-cat found_ranges.txt | xargs -I {} grep -F "{}" digitalocean_announced_ips.txt | sort
-
-# Compare with debian-scripts
-grep -F "add stretchoid" stretchoid.ipset | cut -d ' ' -f 3 | cut -d '.' -f -3 | sort | uniq > found_ranges.txt
-cat found_ranges.txt | xargs -I {} grep -F "{}" digitalocean_announced_ips.txt | sort > stretchoid_ranges_debian_scripts.txt
-
-
-# Re scan
-dig -4 +noauthority +noadditional +nostats -x 107.170.202.77 @1.0.0.1
-
-cat stretchoid_ranges.txt | xargs -n1 prips | uniq | sort -V > stretchoid_possible_ips.txt
-cat binaryedge_ranges.txt | xargs -n1 prips | uniq | sort -V > binaryedge_digitalocean_possible_ips.txt
-
-# With failure handling
-cat stretchoid_digitalocean_possible_ips.txt | xargs -P 50 -I {} bash -c 'set -eu;rev="$(dig @9.9.9.9 +short +time=1 +tries=1 -x {})"; if [[ "$rev" == *";;"* ]]; then sleep 1; rev="$(dig @8.8.8.8 +short +time=1 +tries=1 -x {})"; fi; echo "{} # $rev";' 1> stretchoid_revisions/v5.txt
-
-grep -F "stretchoid" stretchoid_revisions/v5.txt | sort > stretchoid_revisions/v5.sorted.txt
-mv stretchoid_revisions/v5.sorted.txt stretchoid_revisions/v5.txt
-
-# Reverse the file
-awk -F'#' '{print $2" # "$1}' OFS=, "stretchoid_revisions/v5.txt" | awk '{$1=$1;print}' | sort > stretchoid_revisions/v5-reversed.txt
-
-# Build the count per name per ip
-cat stretchoid_revisions/v*-reversed.txt | sort | uniq -c > stretchoid_revisions/count-reversed.txt
-# Same but sorted not by name but by count
-cat stretchoid_revisions/v*-reversed.txt | sort | uniq -c | sort > stretchoid_revisions/count-reversed.txt
-
-# Generate the list of full IPs of stretchoid
-cat stretchoid_revisions/v*-reversed.txt | sort | uniq | awk -F'#' '{print $2" # "$1}' OFS='#' | awk '{$1=$1;print}' > ../stretchoid.txt
-
-
-
-# Find missing CIDRs from the IPS found in the revisions using the announced prefix list
-cat binaryedge_revisions/v*-reversed.txt | LC_ALL=C.UTF-8 sort -t "-" -n | uniq | cut -d ' ' -f 3 | sort -V | cut -d " " -f 1 | cut -d '.' -f -3 | sort | uniq | xargs -I {} grep -E "^{}\.0" digitalocean_announced_ips_simpler.txt | sort -V -t# | uniq | cut -d ' ' -f 3 | sort -V | uniq | grep -v -F -f ./binaryedge_ranges.txt
-
-cat binaryedge-full-possible-names_with_ips_clean_ips.txt | sort -V | cut -d " " -f 1 | cut -d '.' -f -3 | sort | uniq | xargs -I {} grep -E "^{}\.0" digitalocean_announced_ips_simpler.txt | sort -V -t# | uniq | cut -d ' ' -f 3 | sort -V | uniq | grep -v -F -f ./binaryedge_ranges.txt
--- a/scripts/make-aws-cloudfront-range.sh
+++ b/scripts/make-aws-cloudfront-range.sh
@ -1,10 +1,15 @@
 #!/bin/sh

+PROJECT_ROOT="$(realpath $(dirname $0)/../)"
+
+# Last checked: 05/04/2025
+echo "Running in: $PROJECT_ROOT"
+
 set -eu

 # See: https://stackoverflow.com/a/69768584/5155484
-curl -f -s -# https://ip-ranges.amazonaws.com/ip-ranges.json | jq -r '.prefixes[] | select(.service == "CLOUDFRONT") | .ip_prefix' | sort -V > cloudfront-ips.txt
-curl -f -s -# https://ip-ranges.amazonaws.com/ip-ranges.json | jq -r '.ipv6_prefixes[] | select(.service == "CLOUDFRONT") | .ipv6_prefix' | sort -V >> cloudfront-ips.txt
+curl -f -s -# https://ip-ranges.amazonaws.com/ip-ranges.json | jq -r '.prefixes[] | select(.service == "CLOUDFRONT") | .ip_prefix' | sort -V > "$PROJECT_ROOT/data/collections/amazon/cloudfront-ips.txt"
+curl -f -s -# https://ip-ranges.amazonaws.com/ip-ranges.json | jq -r '.ipv6_prefixes[] | select(.service == "CLOUDFRONT") | .ipv6_prefix' | sort -V >> "$PROJECT_ROOT/data/collections/amazon/cloudfront-ips.txt"

-# Does not seem up to date: 06-2023
-#curl https://d7uri8nf7uskq.cloudfront.net/tools/list-cloudfront-ips | jq -r '.CLOUDFRONT_GLOBAL_IP_LIST  | join("\n")' | sort > cloudfront-ips.txt
+# Does not seem up to date: 06-2023, 04-2025 (missing some ranges & all IPv6)
+#curl https://d7uri8nf7uskq.cloudfront.net/tools/list-cloudfront-ips | jq -r '.CLOUDFRONT_GLOBAL_IP_LIST  | join("\n")' | sort -V > "$PROJECT_ROOT/data/collections/amazon/cloudfront-ips.txt"
--- a/scripts/make-binaryedge.sh
+++ b/scripts/make-binaryedge.sh
@ -1,47 +1,11 @@
 #!/bin/sh

-set -eux
+PROJECT_ROOT="$(realpath $(dirname $0)/../)"

-############################################################################################
-#                                 Information                                              #
-# The program dns-ptr-resolver can be installed from cargo: cargo install dns-ptr-resolver #
-# See: https://github.com/wdes/dns-ptr-resolver                                            #
-############################################################################################
+# Last checked: 05/04/2025
+echo "Running in: $PROJECT_ROOT"

-REV="v-$(date --iso-8601=seconds)"
+set -eu

-cd ./data/
-
-if [ ! -d ./binaryedge_revisions/ ]; then
-    mkdir ./binaryedge_revisions
-fi
-
-if [ ! -d ./reverse_revisions/ ]; then
-    mkdir ./reverse_revisions
-fi
-
-curl -A "https://github.com/wdes/security" https://api.binaryedge.io/v1/minions | jq -r '.scanners[]' | sed '/^$/d' | sort -V > ./binaryedge_api_ips.txt
-curl -A "https://github.com/wdes/security" https://api.binaryedge.io/v1/minions-ipv6 | jq -r '.scanners[]' | sed '/^$/d' | sort -V >> ./binaryedge_api_ips.txt
-
-doRev () {
-    dns-ptr-resolver $PWD/$1 1> binaryedge_revisions/$REV.txt
-
-    grep -F "binaryedge" binaryedge_revisions/$REV.txt | sort -V > binaryedge_revisions/$REV.sorted.txt
-    grep -v -F "binaryedge" binaryedge_revisions/$REV.txt | sort -V > reverse_revisions/$REV.sorted.txt
-    mv binaryedge_revisions/$REV.sorted.txt binaryedge_revisions/$REV.txt
-    mv reverse_revisions/$REV.sorted.txt reverse_revisions/$REV.txt
-
-    # Reverse the file
-    awk -F'#' '{print $2" # "$1}' OFS=, "binaryedge_revisions/$REV.txt" | awk '{$1=$1;print}' | sort > binaryedge_revisions/$REV-reversed.txt
-
-    # Sort by name and reverse the list to build the list of all possible IPs
-    cat binaryedge_revisions/v*-reversed.txt | LC_ALL=C.UTF-8 sort -t "-" -n | uniq | awk -F'#' '{print "# "$1" \n "$2}' OFS='#' | awk '{$1=$1;print}' > ../binaryedge.txt
-
-    grep -F '#' ../binaryedge.txt | cut -d ' ' -f 2 | sort | cut -d. -f-1 | rev | cut -d '-' -f2- | rev | sort | uniq -c | sort > ./binaryedge-chunk-counts.txt
-}
-
-doRev "binaryedge_api_ips.txt"
-doRev "binaryedge_digitalocean_possible_ips.txt"
-
-# Search for false positives
-# dns-ptr-resolver ../binaryedge.txt | grep -v -F "binaryedge.com"
+curl -A "https://github.com/wdes/security" https://api.binaryedge.io/v1/minions | jq -r '.scanners[]' | sed '/^$/d' | sort -V > "$PROJECT_ROOT/data/scanners/binaryedge_api_ips.txt"
+curl -A "https://github.com/wdes/security" https://api.binaryedge.io/v1/minions-ipv6 | jq -r '.scanners[]' | sed '/^$/d' | sort -V >> "$PROJECT_ROOT/data/scanners/binaryedge_api_ips.txt"
--- a/scripts/make-stretchoid.sh
+++ b/scripts/make-stretchoid.sh
@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -eux
-
-############################################################################################
-#                                 Information                                              #
-# The program dns-ptr-resolver can be installed from cargo: cargo install dns-ptr-resolver #
-# See: https://github.com/wdes/dns-ptr-resolver                                            #
-############################################################################################
-
-REV="v-$(date --iso-8601=seconds)"
-
-cd ./data/
-
-if [ ! -d ./stretchoid_revisions/ ]; then
-    mkdir ./stretchoid_revisions
-fi
-
-if [ ! -d ./reverse_revisions/ ]; then
-    mkdir ./reverse_revisions
-fi
-
-dns-ptr-resolver $PWD/stretchoid_possible_ips.txt 1> stretchoid_revisions/$REV.txt
-
-grep -F "stretchoid" stretchoid_revisions/$REV.txt | sort -V > stretchoid_revisions/$REV.sorted.txt
-grep -v -F "stretchoid" stretchoid_revisions/$REV.txt | sort -V > reverse_revisions/$REV.sorted.txt
-mv stretchoid_revisions/$REV.sorted.txt stretchoid_revisions/$REV.txt
-mv reverse_revisions/$REV.sorted.txt reverse_revisions/$REV.txt
-
-# Reverse the file
-awk -F'#' '{print $2" # "$1}' OFS=, "stretchoid_revisions/$REV.txt" | awk '{$1=$1;print}' | sort > stretchoid_revisions/$REV-reversed.txt
-
-# Sort by name and reverse the list to build the list of all possible IPs
-cat stretchoid_revisions/v*-reversed.txt | LC_ALL=C.UTF-8 sort -t "-" -n | uniq | awk -F'#' '{print "# "$1" \n "$2}' OFS='#' | awk '{$1=$1;print}' > ../stretchoid.txt
-
-grep -F '#' ../stretchoid.txt | cut -d- -f2 | grep -P '^[0-9]{3,}+' | sort | uniq -c | sort > ./stretchoid-chunk-counts.txt
-
-# Search for false positives
-# dns-ptr-resolver ../stretchoid.txt | grep -v -F "stretchoid.com"
--- a/scripts/update-announced-ips.sh
+++ b/scripts/update-announced-ips.sh
@ -11,7 +11,12 @@ UA="$1"

 set -x

-cd ./data/
+PROJECT_ROOT="$(realpath $(dirname $0)/../)"
+
+# Last checked: 05/04/2025
+echo "Running in: $PROJECT_ROOT"
+
+cd "$PROJECT_ROOT/data/scanners/"

 # Fetch digitalocean declared IPs
 curl https://digitalocean.com/geo/google.csv -s -L -# -o - | cut -d ',' -f 1 | sort | uniq > digitalocean_ips.txt
@ -23,7 +28,7 @@ curl https://bgp.tools/table.txt -A "$UA" -s | grep -e ' 14061$' | wc -l
 curl https://bgp.tools/table.txt -A "$UA" -s | grep -e ' 14061$' | cut -d ' ' -f 1 | sort | uniq > digitalocean_announced_ips.txt

 # Compare the declared IPs and announced IPs
-diff -u digitalocean_ips.txt digitalocean_announced_ips.txt > digitalocean_ips_vs_announced_ips.diff
+diff -u digitalocean_ips.txt digitalocean_announced_ips.txt > digitalocean_ips_vs_announced_ips.diff | true

 # Generate the full IP list to check PTRs
 grep -v -F ":" digitalocean_announced_ips.txt | xargs -n1 prips > digitalocean_announced_ips_full.txt
--- a/snow-scanner/.gitignore
+++ b/snow-scanner/.gitignore
@ -5,7 +5,7 @@ target/

 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
-Cargo.lock
+#Cargo.lock

 # These are backup files generated by rustfmt
 **/*.rs.bk
--- a/snow-scanner/Cargo.lock
+++ b/snow-scanner/Cargo.lock
--- a/snow-scanner/Cargo.toml
+++ b/snow-scanner/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "snow-scanner"
-version = "1.0.0"
+version = "1.1.0"
 authors = ["William Desportes <williamdes@wdes.fr>"]
 edition = "2021"
 rust-version = "1.81.0"  # MSRV
--- a/snow-scanner/README.md
+++ b/snow-scanner/README.md
@ -5,5 +5,39 @@ This project name is inspired by the Netflix series "The Snowpiercer"
 ## Run it

 ```sh
+SERVER_ADDRESS="127.0.0.1:8777" \
+DB_URL="mysql://db-user:db-pass@db-server/db-snow-scanner" \
+STATIC_DATA_DIR="$PWD/../data" \
 cargo run --release
 ```
+
+## Run in production
+
+The env file located at `/etc/snow-scanner/.env`:
+
+```env
+# Your public IP
+SERVER_ADDRESS="[2a10:ffff:ff:ff:fff::1]:80"
+DB_URL="mysql://db-user:db-pass@db-server/db-snow-scanner"
+STATIC_DATA_DIR="/usr/share/snow-scanner/data"
+# Adjust this
+ROCKET_LOG_LEVEL="debug"
+ROCKET_PROFILE="debug"
+# Setup TLS
+ROCKET_TLS='{certs="/etc/ssl/certs/cert.pem",key="/etc/ssl/private/key.pem", mutual={ca_certs="/etc/ssl/certs/cloudflare.crt",mandatory=true}}'
+```
+
+## Make a new release
+
+Pre-requirements: `cargo install cargo-deb`
+
+- Bump `Cargo.toml`
+- Commit it
+- Run `cd snow-scanner`
+- Run `cargo update`
+- Commit the changes to the lockfile
+- Run tests `cargo test`
+- Run `cargo deb`
+- Run `./debian/upload.sh target/debian/snow-scanner_1.1.0-1_amd64.deb`
+- Run `git tag -a -s -m "snow-scanner/1.1.0" snow-scanner/1.1.0`
+- Check `debdiff ../../snow-scanner_1.0.0-1_amd64.deb target/debian/snow-scanner_1.1.0-1_amd64.deb`
--- a/snow-scanner/debian/postinst
+++ b/snow-scanner/debian/postinst
@ -0,0 +1,21 @@
+#!/bin/sh
+# postinst script for snow-scanner
+
+set -eu
+
+if [ "$1" = "configure" ]; then
+
+	if ! getent passwd | grep -q "^snow-scanner:"; then
+		useradd --shell /bin/sh snow-scanner
+	fi
+
+	if [ ! -d /etc/snow-scanner ]; then
+		mkdir /etc/snow-scanner
+		chown snow-scanner:snow-scanner /etc/snow-scanner
+		chmod 770 /etc/snow-scanner
+	fi
+fi
+
+#DEBHELPER#
+
+exit 0
--- a/snow-scanner/debian/snow-scanner-worker.service
+++ b/snow-scanner/debian/snow-scanner-worker.service
@ -1,6 +1,8 @@
 [Unit]
 Description=Snow scanner worker
 After=network.target
+After=snow-scanner.service
+Requires=snow-scanner.service

 [Service]
 Type=simple
--- a/snow-scanner/src/event_bus.rs
+++ b/snow-scanner/src/event_bus.rs
@ -6,7 +6,8 @@ use hickory_resolver::Name;
 use rocket::futures::channel::mpsc as rocket_mpsc;
 use rocket::futures::StreamExt;
 use rocket::tokio;
-use snow_scanner_worker::detection::{detect_scanner_from_name, validate_ip};
+use snow_scanner_worker::detection::validate_ip;
+use snow_scanner_worker::scanners::ScannerNode;

 use crate::Scanner;

@ -57,9 +58,13 @@ impl EventBus {
                    return;
                }
                let name = Name::from_str(name.as_str()).unwrap();
-                match detect_scanner_from_name(&name) {
-                    Ok(Some(scanner_type)) => {
-                        match Scanner::find_or_new(ip, scanner_type, Some(name), db).await {
+                let scanner: Result<ScannerNode, String> = name.clone().try_into();
+
+                match scanner {
+                    Ok(scanner_type) => {
+                        match Scanner::find_or_new(ip, scanner_type.info.to_owned(), Some(name), db)
+                            .await
+                        {
                            Ok(scanner) => {
                                let _ = scanner.save(db).await;
                            }
@ -68,9 +73,6 @@ impl EventBus {
                            }
                        }
                    }
-                    Ok(None) => {
-                        error!("No name detected for: {:?}", name);
-                    }

                    Err(err) => {
                        error!("No name detected error: {:?}", err);
--- a/snow-scanner/src/main.rs
+++ b/snow-scanner/src/main.rs
@ -33,13 +33,16 @@ use rocket_ws::WebSocket;
 use server::Server;
 use weighted_rs::Weight;

-use snow_scanner_worker::detection::{
-    detect_scanner, get_dns_client, get_dns_server_config, validate_ip,
-};
-use snow_scanner_worker::modules::{Network, WorkerMessages};
-use snow_scanner_worker::scanners::IsStatic;
-use snow_scanner_worker::scanners::Scanners;
+use snow_scanner_worker::scanners::ScannerMethods;
 use snow_scanner_worker::utils::get_dns_rr;
+use snow_scanner_worker::{
+    detection::{get_dns_client, get_dns_server_config, validate_ip},
+    scanners::STRETCHOID,
+};
+use snow_scanner_worker::{
+    modules::{Network, WorkerMessages},
+    scanners::{ScannerData, ScannerNode},
+};

 use std::net::SocketAddr;
 use std::{
@ -125,14 +128,14 @@ impl FromFormField<'_> for SafeIpAddr {

 async fn handle_ip(
    query_address: IpAddr,
-) -> Result<(IpAddr, Option<Scanners>, ResolvedResult), ()> {
-    let ptr_result: Result<ResolvedResult, ()> = std::thread::spawn(move || {
+) -> Result<(IpAddr, Option<ScannerNode>, ResolvedResult), String> {
+    let ptr_result: Result<ResolvedResult, String> = std::thread::spawn(move || {
        let mut rr_dns_servers = get_dns_rr();
        let client = get_dns_client(&get_dns_server_config(&rr_dns_servers.next().unwrap()));
        let ptr_result: ResolvedResult = if let Ok(res) = get_ptr(query_address, client) {
            res
        } else {
-            return Err(());
+            return Err("Resolving error".to_string());
        };
        Ok(ptr_result)
    })
@ -140,17 +143,20 @@ async fn handle_ip(
    .unwrap();

    match ptr_result {
-        Ok(result) => match detect_scanner(&result) {
-            Ok(Some(scanner_type)) => {
-                if !validate_ip(query_address) {
-                    error!("Invalid IP address: {query_address}");
-                    return Err(());
+        Ok(result) => {
+            let scanner: Result<ScannerNode, String> = result.query.clone().try_into();
+
+            match scanner {
+                Ok(scanner_type) => {
+                    if !validate_ip(query_address) {
+                        error!("Invalid IP address: {query_address}");
+                        return Err("".to_string());
+                    }
+                    Ok((query_address, Some(scanner_type), result))
                }
-                Ok((query_address, Some(scanner_type), result))
+                Err(err) => Err(err),
            }
-            Ok(None) => Ok((query_address, None, result)),
-            Err(err) => Err(err),
-        },
+        }
        Err(err) => Err(err),
    }
 }
@ -243,7 +249,7 @@ async fn handle_scan(

                let msg = EventBusWriterEvent::BroadcastMessage(
                    WorkerMessages::DoWorkRequest {
-                        neworks: vec![Network(cidr)],
+                        networks: vec![Network(cidr)],
                    }
                    .into(),
                );
@ -262,45 +268,20 @@ pub struct ReportParams {
    ip: SafeIpAddr,
 }

-fn reply_contents_for_scanner_found(scanner: Scanner) -> HtmlContents {
-    HtmlContents(match scanner.scanner_name {
-        Scanners::Binaryedge => match scanner.last_checked_at {
-            Some(date) => format!(
-                "Reported a binaryedge ninja! <b>{}</b> known as {} since {date}.",
-                scanner.ip,
-                scanner.ip_ptr.unwrap_or("".to_string())
-            ),
-            None => format!(
-                "Reported a binaryedge ninja! <b>{}</b> known as {}.",
-                scanner.ip,
-                scanner.ip_ptr.unwrap_or("".to_string())
-            ),
-        },
-        Scanners::Stretchoid => match scanner.last_checked_at {
-            Some(date) => format!(
-                "Reported a stretchoid agent! <b>{}</b> known as {} since {date}.",
-                scanner.ip,
-                scanner.ip_ptr.unwrap_or("".to_string())
-            ),
-            None => format!(
-                "Reported a stretchoid agent! <b>{}</b> known as {}.",
-                scanner.ip,
-                scanner.ip_ptr.unwrap_or("".to_string())
-            ),
-        },
-        Scanners::Shadowserver => match scanner.last_checked_at {
-            Some(date) => format!(
-                "Reported a cloudy shadowserver ! <b>{}</b> known as {} since {date}.",
-                scanner.ip,
-                scanner.ip_ptr.unwrap_or("".to_string())
-            ),
-            None => format!(
-                "Reported a cloudy shadowserver ! <b>{}</b> known as {}.",
-                scanner.ip,
-                scanner.ip_ptr.unwrap_or("".to_string())
-            ),
-        },
-        _ => format!("Not supported"),
+fn reply_contents_for_scanner_found(scanner: Scanner, scanner_type: ScannerData) -> HtmlContents {
+    HtmlContents(match scanner.last_checked_at {
+        Some(date) => format!(
+            "Reported a {}! <b>{}</b> known as {} since {date}.",
+            scanner_type.funny_name,
+            scanner.ip,
+            scanner.ip_ptr.unwrap_or("".to_string())
+        ),
+        None => format!(
+            "Reported a {}! <b>{}</b> known as {}.",
+            scanner_type.funny_name,
+            scanner.ip,
+            scanner.ip_ptr.unwrap_or("".to_string())
+        ),
    })
 }

@ -310,13 +291,16 @@ async fn handle_report(mut db: DbConn, form: Form<ReportParams>) -> MultiReply {
        Ok((query_address, scanner_type, result)) => match scanner_type {
            Some(scanner_type) => match Scanner::find_or_new(
                query_address,
-                scanner_type,
+                scanner_type.info,
                result.result.clone(),
                &mut db,
            )
            .await
            {
-                Ok(scanner) => MultiReply::Content(reply_contents_for_scanner_found(scanner)),
+                Ok(scanner) => MultiReply::Content(reply_contents_for_scanner_found(
+                    scanner,
+                    scanner_type.info,
+                )),
                Err(err) => MultiReply::Error(ServerError(format!(
                    "The IP {} resolved as {} could not be saved, server error: {err}.",
                    form.ip.addr,
@ -389,7 +373,7 @@ async fn handle_get_collection(
 #[get("/scanners/<scanner_name>")]
 async fn handle_list_scanners(
    mut db: DbConn,
-    scanner_name: Scanners,
+    scanner_name: ScannerNode,
    app_configs: &State<AppConfigs>,
 ) -> MultiReply {
    let static_data_dir: String = app_configs.static_data_dir.clone();
@ -397,13 +381,11 @@ async fn handle_list_scanners(
        let mut path: PathBuf = PathBuf::new();
        path.push(static_data_dir);
        path.push("scanners");
-        path.push(match scanner_name {
-            Scanners::Stretchoid | Scanners::Binaryedge | Scanners::Shadowserver => {
-                panic!("This should not happen")
-            }
-            Scanners::Censys => "censys.txt".to_string(),
-            Scanners::InternetMeasurement => "internet-measurement.com.txt".to_string(),
-        });
+        path.push(
+            scanner_name
+                .static_file_name()
+                .expect("Static files should have a static file name"),
+        );

        return match NamedFile::open(path).await {
            Ok(file) => MultiReply::FileContents(file),
@ -411,7 +393,7 @@ async fn handle_list_scanners(
        };
    }

-    let scanners_list = match Scanner::list_names(scanner_name, &mut db).await {
+    let scanners_list = match Scanner::list_names(scanner_name.info, &mut db).await {
        Ok(data) => Ok(data),
        Err(err) => Err(err),
    };
@ -537,7 +519,7 @@ async fn report_counts<'a>(rocket: Rocket<rocket::Build>) -> Rocket<rocket::Buil
            span_error!("failed to connect to MySQL database" => error!("{e}"));
            panic!("aborting launch");
        });
-    match Scanner::list_names(Scanners::Stretchoid, &mut DbConnection(conn)).await {
+    match Scanner::list_names(STRETCHOID, &mut DbConnection(conn)).await {
        Ok(d) => info!("Found {} Stretchoid scanners", d.len()),
        Err(err) => error!("Unable to fetch Stretchoid scanners: {err}"),
    }
--- a/snow-scanner/src/models.rs
+++ b/snow-scanner/src/models.rs
@ -1,9 +1,10 @@
 use std::net::IpAddr;

-use crate::{DbConn, Scanners};
+use crate::DbConn;
 use chrono::{NaiveDateTime, Utc};
 use hickory_resolver::Name;
 use rocket_db_pools::diesel::{dsl::insert_into, prelude::*, result::Error as DieselError};
+use snow_scanner_worker::scanners::ScannerData;

 use crate::schema::scan_tasks::dsl::scan_tasks;
 use crate::schema::scanners::dsl::scanners;
@ -14,7 +15,7 @@ use crate::schema::scanners::dsl::scanners;
 pub struct Scanner {
    pub ip: String,
    pub ip_type: u8,
-    pub scanner_name: Scanners,
+    pub scanner_name: String,
    pub ip_ptr: Option<String>,
    pub created_at: NaiveDateTime,
    pub updated_at: Option<NaiveDateTime>,
@ -25,7 +26,7 @@ pub struct Scanner {
 impl Scanner {
    pub async fn find_or_new(
        query_address: IpAddr,
-        scanner_name: Scanners,
+        scanner_data: ScannerData<'static>,
        ptr: Option<Name>,
        conn: &mut DbConn,
    ) -> Result<Scanner, DieselError> {
@ -45,7 +46,7 @@ impl Scanner {
            Scanner {
                ip: query_address.to_string(),
                ip_type: ip_type,
-                scanner_name: scanner_name.clone(),
+                scanner_name: scanner_data.value.to_string(),
                ip_ptr: match ptr {
                    Some(ptr) => Some(ptr.to_string()),
                    None => None,
@ -79,15 +80,16 @@ impl Scanner {
    }

    pub async fn list_names(
-        scanner_name: Scanners,
+        scanner_data: ScannerData<'static>,
        conn: &mut DbConn,
    ) -> Result<Vec<String>, DieselError> {
        use crate::schema::scanners;
        use crate::schema::scanners::ip;
+        use crate::schema::scanners::scanner_name;

        scanners
            .select(ip)
-            .filter(scanners::scanner_name.eq(scanner_name.to_string()))
+            .filter(scanner_name.eq(scanner_data.value))
            .order((scanners::ip_type.desc(), scanners::created_at.desc()))
            .load::<String>(conn)
            .await
--- a/snow-scanner/src/server.rs
+++ b/snow-scanner/src/server.rs
@ -271,7 +271,7 @@ impl<'a> Worker<'a> {
                Ok(())
            }
            WorkerMessages::GetWorkRequest {} => {
-                worker_reply = Some(WorkerMessages::DoWorkRequest { neworks: vec![] });
+                worker_reply = Some(WorkerMessages::DoWorkRequest { networks: vec![] });
                Ok(())
            }
            WorkerMessages::DoWorkRequest { .. } | WorkerMessages::Invalid { .. } => {
--- a/snow-scanner/src/worker/detection.rs
+++ b/snow-scanner/src/worker/detection.rs
@ -1,12 +1,8 @@
 use std::net::IpAddr;
-use std::str::FromStr;
 use std::time::Duration;

-use crate::scanners::Scanners;
-use dns_ptr_resolver::ResolvedResult;
-
 use hickory_resolver::config::{NameServerConfigGroup, ResolverConfig, ResolverOpts};
-use hickory_resolver::{Name, Resolver};
+use hickory_resolver::Resolver;

 use crate::ip_addr::is_global_hardcoded;

@ -33,68 +29,3 @@ pub fn validate_ip(ip: IpAddr) -> bool {
    }
    return is_global_hardcoded(ip);
 }
-
-pub fn detect_scanner(ptr_result: &ResolvedResult) -> Result<Option<Scanners>, ()> {
-    match &ptr_result.result {
-        Some(name) => detect_scanner_from_name(&name),
-        None => Ok(None),
-    }
-}
-
-pub fn detect_scanner_from_name(name: &Name) -> Result<Option<Scanners>, ()> {
-    match name {
-        ref name
-            if name
-                .trim_to(2)
-                .eq_case(&Name::from_str("binaryedge.ninja.").expect("Should parse")) =>
-        {
-            Ok(Some(Scanners::Binaryedge))
-        }
-        ref name
-            if name
-                .trim_to(2)
-                .eq_case(&Name::from_str("stretchoid.com.").expect("Should parse")) =>
-        {
-            Ok(Some(Scanners::Stretchoid))
-        }
-        ref name
-            if name
-                .trim_to(2)
-                .eq_case(&Name::from_str("shadowserver.org.").expect("Should parse")) =>
-        {
-            Ok(Some(Scanners::Shadowserver))
-        }
-        &_ => Ok(None),
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_detect_scanner_from_name() {
-        let ptr = Name::from_str("scan-47e.shadowserver.org.").unwrap();
-
-        assert_eq!(
-            detect_scanner_from_name(&ptr).unwrap(),
-            Some(Scanners::Shadowserver)
-        );
-    }
-
-    #[test]
-    fn test_detect_scanner() {
-        let cname_ptr = Name::from_str("111.0-24.197.62.64.in-addr.arpa.").unwrap();
-        let ptr = Name::from_str("scan-47e.shadowserver.org.").unwrap();
-
-        assert_eq!(
-            detect_scanner(&ResolvedResult {
-                query: cname_ptr,
-                result: Some(ptr),
-                error: None
-            })
-            .unwrap(),
-            Some(Scanners::Shadowserver)
-        );
-    }
-}
--- a/snow-scanner/src/worker/modules.rs
+++ b/snow-scanner/src/worker/modules.rs
@ -15,7 +15,7 @@ pub enum WorkerMessages {
    #[serde(rename = "get_work")]
    GetWorkRequest {},
    #[serde(rename = "do_work")]
-    DoWorkRequest { neworks: Vec<Network> },
+    DoWorkRequest { networks: Vec<Network> },
    #[serde(rename = "scanner_found")]
    ScannerFoundResponse { name: String, address: IpAddr },
    #[serde(rename = "")]
@ -95,25 +95,25 @@ mod tests {

    #[test]
    fn deserialize_do_work_empty() {
-        let data = "{\"type\":\"do_work\",\"request\":{\"neworks\":[]}}";
+        let data = "{\"type\":\"do_work\",\"request\":{\"networks\":[]}}";
        let result: WorkerMessages = data.to_string().into();
        assert_eq!(
            result,
            WorkerMessages::DoWorkRequest {
-                neworks: [].to_vec()
+                networks: [].to_vec()
            }
        );
    }

    #[test]
    fn deserialize_do_work() {
-        let data = "{\"type\":\"do_work\",\"request\":{\"neworks\":[\"127.0.0.0/31\"]}}";
+        let data = "{\"type\":\"do_work\",\"request\":{\"networks\":[\"127.0.0.0/31\"]}}";
        let result: WorkerMessages = data.to_string().into();
        let cidr: IpCidr = IpCidr::from_str("127.0.0.0/31").unwrap();
        assert_eq!(
            result,
            WorkerMessages::DoWorkRequest {
-                neworks: [Network(cidr)].to_vec()
+                networks: [Network(cidr)].to_vec()
            }
        );
    }
--- a/snow-scanner/src/worker/scanners.rs
+++ b/snow-scanner/src/worker/scanners.rs
@ -5,112 +5,150 @@ use diesel::mysql::MysqlValue;
 use diesel::serialize;
 use diesel::serialize::IsNull;
 use diesel::sql_types::Text;
+use hickory_resolver::Name;
 use rocket::request::FromParam;
+use std::str::FromStr;

 use serde::{Deserialize, Deserializer};
-use std::fmt;
 use std::io::Write;

+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct ScannerData<'a> {
+    pub static_file_name: Option<&'a str>,
+    pub funny_name: &'a str,
+    pub display_name: &'a str,
+    pub value: &'a str,
+    pub dns_prefix: Option<&'a str>,
+}
+
+pub const STRETCHOID: ScannerData = ScannerData {
+    static_file_name: None,
+    funny_name: "stretchoid agent",
+    display_name: "stretchoid",
+    value: "stretchoid",
+    dns_prefix: Some("stretchoid.com."),
+};
+pub const BINARYEDGE: ScannerData = ScannerData {
+    static_file_name: None,
+    funny_name: "binaryedge ninja",
+    display_name: "binaryedge",
+    value: "binaryedge",
+    dns_prefix: Some("binaryedge.ninja."),
+};
+
+pub const SHADOWSERVER: ScannerData = ScannerData {
+    static_file_name: None,
+    funny_name: "cloudy shadowserver",
+    display_name: "shadowserver",
+    value: "shadowserver",
+    dns_prefix: Some("shadowserver.org."),
+};
+
+pub fn get_scanners() -> Vec<ScannerData<'static>> {
+    vec![
+        STRETCHOID,
+        BINARYEDGE,
+        SHADOWSERVER,
+        ScannerData {
+            static_file_name: Some("censys.txt"),
+            funny_name: "Censys node",
+            display_name: "censys",
+            value: "censys",
+            dns_prefix: None,
+        },
+        ScannerData {
+            static_file_name: Some("internet-measurement.com.txt"),
+            funny_name: "internet measurement probe",
+            display_name: "internet-measurement.com",
+            value: "internet-measurement.com",
+            dns_prefix: None,
+        },
+        ScannerData {
+            static_file_name: Some("anssi.txt"),
+            funny_name: "French ANSSI probe",
+            display_name: "anssi",
+            value: "anssi",
+            dns_prefix: None,
+        },
+    ]
+}
+
+pub type ScannerNode = ScannersWrapper<ScannerData<'static>>;
+
 #[derive(Debug, Clone, Copy, FromSqlRow, PartialEq)]
-pub enum Scanners {
-    Stretchoid,
-    Binaryedge,
-    Shadowserver,
-    Censys,
-    InternetMeasurement,
+pub struct ScannersWrapper<ScannerData> {
+    pub info: ScannerData,
 }

-pub trait IsStatic {
+pub trait ScannerMethods {
    fn is_static(self: &Self) -> bool;
+    fn static_file_name(self: &Self) -> Option<&str>;
+    fn funny_name(self: &Self) -> &str;
 }

-impl IsStatic for Scanners {
+impl ScannerMethods for ScannerNode {
    fn is_static(self: &Self) -> bool {
-        match self {
-            Scanners::Censys => true,
-            Scanners::InternetMeasurement => true,
-            _ => false,
-        }
+        self.static_file_name().is_some()
+    }
+
+    fn static_file_name(self: &Self) -> Option<&str> {
+        self.info.static_file_name
+    }
+
+    fn funny_name(self: &Self) -> &str {
+        self.info.funny_name
    }
 }

-impl FromParam<'_> for Scanners {
+impl FromParam<'_> for ScannerNode {
    type Error = String;

    fn from_param(param: &'_ str) -> Result<Self, Self::Error> {
-        match param {
-            "stretchoid" => Ok(Scanners::Stretchoid),
-            "binaryedge" => Ok(Scanners::Binaryedge),
-            "shadowserver" => Ok(Scanners::Shadowserver),
-            "stretchoid.txt" => Ok(Scanners::Stretchoid),
-            "binaryedge.txt" => Ok(Scanners::Binaryedge),
-            "shadowserver.txt" => Ok(Scanners::Shadowserver),
-            "censys.txt" => Ok(Scanners::Censys),
-            "internet-measurement.com.txt" => Ok(Scanners::InternetMeasurement),
-            v => Err(format!("Unknown value: {v}")),
-        }
+        param.try_into()
    }
 }

-impl<'de> Deserialize<'de> for Scanners {
+impl<'de> Deserialize<'de> for ScannerNode {
    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
    where
        D: Deserializer<'de>,
    {
        let s = <Vec<String>>::deserialize(deserializer)?;
        let k: &str = s[0].as_str();
-        match k {
-            "stretchoid" => Ok(Scanners::Stretchoid),
-            "binaryedge" => Ok(Scanners::Binaryedge),
-            "shadowserver" => Ok(Scanners::Shadowserver),
-            "stretchoid.txt" => Ok(Scanners::Stretchoid),
-            "binaryedge.txt" => Ok(Scanners::Binaryedge),
-            "shadowserver.txt" => Ok(Scanners::Shadowserver),
-            "censys.txt" => Ok(Scanners::Censys),
-            "internet-measurement.com.txt" => Ok(Scanners::InternetMeasurement),
-            v => Err(serde::de::Error::custom(format!(
-                "Unknown value: {}",
-                v.to_string()
-            ))),
+        match k.try_into() {
+            Ok(scanners) => Ok(scanners),
+            Err(v) => Err(serde::de::Error::custom(format!("Unknown value: {}", v))),
        }
    }
 }

-impl fmt::Display for Scanners {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "{}",
-            match self {
-                Self::Stretchoid => "stretchoid",
-                Self::Binaryedge => "binaryedge",
-                Self::Censys => "censys",
-                Self::InternetMeasurement => "internet-measurement.com",
-                Self::Shadowserver => "shadowserver",
-            }
-        )
+impl ToString for ScannerNode {
+    fn to_string(&self) -> String {
+        let res: &str = (*self).into();
+        res.to_string()
    }
 }

-impl serialize::ToSql<Text, Mysql> for Scanners {
+impl Into<&str> for ScannerNode {
+    fn into(self) -> &'static str {
+        self.info.display_name
+    }
+}
+
+impl serialize::ToSql<Text, Mysql> for ScannerNode {
    fn to_sql(&self, out: &mut serialize::Output<Mysql>) -> serialize::Result {
-        match *self {
-            Self::Stretchoid => out.write_all(b"stretchoid")?,
-            Self::Binaryedge => out.write_all(b"binaryedge")?,
-            Self::Censys => out.write_all(b"censys")?,
-            Self::InternetMeasurement => out.write_all(b"internet-measurement.com")?,
-            Self::Shadowserver => out.write_all(b"shadowserver")?,
-        };
+        let res: &str = (*self).into();
+        out.write_all(res.as_bytes())?;

        Ok(IsNull::No)
    }
 }

-impl deserialize::FromSql<Text, Mysql> for Scanners {
+impl deserialize::FromSql<Text, Mysql> for ScannerNode {
    fn from_sql(bytes: MysqlValue) -> deserialize::Result<Self> {
        let value = <String as deserialize::FromSql<Text, Mysql>>::from_sql(bytes)?;
        let value = &value as &str;
-        let value: Result<Scanners, String> = value.try_into();
+        let value: Result<ScannerNode, String> = value.try_into();
        match value {
            Ok(d) => Ok(d),
            Err(err) => Err(err.into()),
@ -118,16 +156,54 @@ impl deserialize::FromSql<Text, Mysql> for Scanners {
    }
 }

-impl TryInto<Scanners> for &str {
+// Used for FromSql & FromParam & Deserialize
+impl TryInto<ScannerNode> for &str {
    type Error = String;

-    fn try_into(self) -> Result<Scanners, Self::Error> {
-        match self {
-            "stretchoid" => Ok(Scanners::Stretchoid),
-            "binaryedge" => Ok(Scanners::Binaryedge),
-            "internet-measurement.com" => Ok(Scanners::InternetMeasurement),
-            "shadowserver" => Ok(Scanners::Shadowserver),
-            value => Err(format!("Invalid value: {value}")),
+    fn try_into(self) -> Result<ScannerNode, Self::Error> {
+        let value: String = self.replace(".txt", "").as_str().to_string();
+        match get_scanners()
+            .iter()
+            .find(|scanner| scanner.value.eq(&value))
+        {
+            Some(scanner) => Ok(ScannersWrapper { info: *scanner }),
+            None => Err(format!("Invalid value: {value}")),
        }
    }
 }
+
+// Used by the DNS logic
+impl TryInto<ScannerNode> for Name {
+    type Error = String;
+
+    fn try_into(self) -> Result<ScannerNode, Self::Error> {
+        let short_name = self.trim_to(2);
+        match get_scanners()
+            .iter()
+            .filter(|scanner| scanner.dns_prefix.is_some())
+            .find(|scanner| {
+                short_name.eq_case(
+                    &Name::from_str(scanner.dns_prefix.expect("Should have a DNS prefix"))
+                        .expect("Should parse"),
+                )
+            }) {
+            Some(scanner) => Ok(ScannersWrapper { info: *scanner }),
+            None => Err(format!("Invalid hostname: {self}")),
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use std::str::FromStr;
+
+    #[test]
+    fn test_detect_scanner_from_name() {
+        let ptr = Name::from_str("scan-47e.shadowserver.org.").unwrap();
+
+        let res: Result<ScannerNode, String> = ptr.try_into();
+
+        assert_eq!(res.unwrap().info, SHADOWSERVER);
+    }
+}
--- a/snow-scanner/src/worker/utils.rs
+++ b/snow-scanner/src/worker/utils.rs
@ -16,9 +16,9 @@ pub fn get_dns_rr() -> RoundrobinWeight<Vec<IpAddr>> {
        IpAddr::from_str("9.9.9.10").unwrap(),
        IpAddr::from_str("2.56.220.2").unwrap(), // G-Core DNS
        IpAddr::from_str("95.85.95.85").unwrap(), // G-Core DNS
-        IpAddr::from_str("193.110.81.0").unwrap(),   // dns0.eu	AS50902
-        IpAddr::from_str("185.253.5.0").unwrap(),    // dns0.eu	AS50902
-        IpAddr::from_str("74.82.42.42").unwrap(),    // Hurricane Electric	[AS6939]
+        IpAddr::from_str("193.110.81.0").unwrap(), // dns0.eu	AS50902
+        IpAddr::from_str("185.253.5.0").unwrap(), // dns0.eu	AS50902
+        IpAddr::from_str("74.82.42.42").unwrap(), // Hurricane Electric	[AS6939]
    ];

    let mut rr: RoundrobinWeight<Vec<IpAddr>> = RoundrobinWeight::new();
--- a/snow-scanner/src/worker/worker.rs
+++ b/snow-scanner/src/worker/worker.rs
@ -2,10 +2,9 @@ use std::{env, net::IpAddr};

 use chrono::{Duration, NaiveDateTime, Utc};
 use cidr::IpCidr;
-use detection::detect_scanner;
 use dns_ptr_resolver::{get_ptr, ResolvedResult};
 use log2::*;
-use scanners::Scanners;
+use scanners::ScannerNode;
 use tungstenite::stream::MaybeTlsStream;
 use tungstenite::{connect, Error, Message, WebSocket};
 use weighted_rs::Weight;
@ -160,14 +159,16 @@ impl Worker {
        for addr in addresses {
            let client = get_dns_client(&get_dns_server_config(&rr_dns_servers.next().unwrap()));
            match get_ptr(addr, client) {
-                Ok(result) => match detect_scanner(&result) {
-                    Ok(Some(scanner_name)) => {
-                        self.report_detection(scanner_name, addr, result);
-                    }
-                    Ok(None) => {}
+                Ok(result) => {
+                    let scanner: Result<ScannerNode, String> = result.query.clone().try_into();

-                    Err(err) => error!("Error detecting for {addr}: {:?}", err),
-                },
+                    match scanner {
+                        Ok(scanner_name) => {
+                            self.report_detection(scanner_name, addr, result);
+                        }
+                        Err(err) => error!("Error detecting for {addr}: {:?}", err),
+                    }
+                }
                Err(_) => {
                    //debug!("Error processing {addr}: {err}")
                }
@ -180,7 +181,12 @@ impl Worker {
        }
    }

-    fn report_detection(&mut self, scanner_name: Scanners, addr: IpAddr, result: ResolvedResult) {
+    fn report_detection(
+        &mut self,
+        scanner_name: ScannerNode,
+        addr: IpAddr,
+        result: ResolvedResult,
+    ) {
        info!("Detected {:?} for {addr}", scanner_name);
        let request = WorkerMessages::ScannerFoundResponse {
            name: result.result.unwrap().to_string(),
@ -195,9 +201,9 @@ impl Worker {

    pub fn receive_request(&mut self, server_request: WorkerMessages) -> &Worker {
        match server_request {
-            WorkerMessages::DoWorkRequest { neworks } => {
-                info!("Work request received for neworks: {:?}", neworks);
-                for cidr in neworks {
+            WorkerMessages::DoWorkRequest { networks } => {
+                info!("Work request received for networks: {:?}", networks);
+                for cidr in networks {
                    let cidr = cidr.0;
                    self.work_on_cidr(cidr);
                }
Author	SHA1	Message	Date
William Desportes	4fc5175a1c	Document how to release	2025-07-06 17:29:50 +02:00
William Desportes	4d705051a3	Add the lock file	2025-07-06 17:15:37 +02:00
William Desportes	a448cdd7c0	Bump to 1.1.0	2025-07-06 17:07:11 +02:00
William Desportes	d0bfabcf15	Add a postinst script	2025-07-06 17:06:38 +02:00
William Desportes	9e4496de19	Re-work the code to have one central implementation of scanners	2025-05-18 17:29:04 +02:00
William Desportes	816a9f1aaa	Improve the logic	2025-04-06 22:39:27 +02:00
William Desportes	a6da51aa0b	Add the ANSSI scanner to URLs	2025-04-06 22:27:12 +02:00
William Desportes	bee0c757e9	Drop a non used test	2025-04-06 22:26:01 +02:00
William Desportes	9593af7b66	Fix the worker logic	2025-04-06 22:22:01 +02:00
William Desportes	9fa4dad52b	Fix a typo on "neworks" -> "networks"	2025-04-06 21:22:24 +02:00
William Desportes	aac441630c	better systemd dependencies	2025-04-06 21:13:39 +02:00
William Desportes	b9657d2013	Document ENVs	2025-04-06 21:10:48 +02:00
William Desportes	b651f7ff66	Simplify the implementation of different scanner types	2025-04-06 20:27:03 +02:00
William Desportes	1d2ef921ff	Better documentation	2025-04-05 16:01:53 +02:00
William Desportes	c644bf482c	Add CERT-FR/ANSSI	2025-04-05 15:40:02 +02:00
William Desportes	44d243ea40	Drop old scripts	2025-04-05 15:30:41 +02:00
William Desportes	47154cceb0	Document microsoft email servers	2025-04-05 15:28:46 +02:00
William Desportes	ad243e3426	Drop not up date data	2025-04-05 15:20:13 +02:00
William Desportes	3cde09a3e8	Refresh Internet Measurement IPs	2025-04-05 15:11:41 +02:00
William Desportes	5a605fe7b9	New Censys IPs	2025-04-05 15:05:36 +02:00
William Desportes	6d26a33ceb	Drop not up date data	2025-04-05 15:00:47 +02:00
William Desportes	3a25ab4125	Update DigitalOcean data	2025-04-05 14:59:07 +02:00
William Desportes	675c79d94e	Update DigitalOcean data	2025-04-05 14:47:36 +02:00
William Desportes	11d2818ecc	Update the binaryedge by API IPs	2025-04-05 14:43:43 +02:00
William Desportes	7f270a8a50	More documentation	2025-04-05 14:39:01 +02:00
William Desportes	108b830c5c	New CloudFront IPs	2025-04-05 14:36:05 +02:00
William Desportes	3e7e4dd1b5	Drop some old data	2025-04-05 14:28:58 +02:00
William Desportes	85b58bb6f5	Merge #249 - Stretchoid Possible IP Ranges as of March 2025 Stretchoid Possible IP Ranges as of March 2025	2025-04-05 14:26:35 +02:00
Xorlent	98829e3b62	Stretchoid Possible IP Ranges as of March 2025	2025-03-27 13:15:24 -07:00