Merge pull request #162 from Wiscy-Security/main
Refactor last scripts, central logging, central directory for downloads, automation scriptpull/163/head
commit
ae3f68338a
|
@ -1,4 +1,5 @@
|
|||
# files download by generators
|
||||
tmp/*
|
||||
alexa_top-1m.csv.zip
|
||||
amazon_ip-ranges.json
|
||||
cisco_top-1m.csv.zip
|
||||
|
@ -18,3 +19,5 @@ top500.pages.csv
|
|||
top-1m.csv.zip
|
||||
public-dns-nameservers.csv
|
||||
ms-azure.json
|
||||
moz-top500.pages.csv
|
||||
moz-top500.domains.csv
|
||||
|
|
|
@ -0,0 +1,32 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
set -x
|
||||
|
||||
pushd tools
|
||||
python3 generate_alexa.py
|
||||
python3 generate-amazon-aws.py
|
||||
python3 generate-cisco.py
|
||||
python3 generate-cloudflare.py
|
||||
python3 generate-covid.py
|
||||
python3 generate-crl-ip-list.py
|
||||
python3 generate-disposal.py
|
||||
# TODO: Google page on Wikipedia does not exist anymore
|
||||
# Suggestion came to use a passivetotal whois search for org:Google LLC
|
||||
#python3 generate-google.py > lists/google/list.json
|
||||
python3 generate_majestic-million.py
|
||||
python3 generate-microsoft-azure.py
|
||||
python3 generate_mozilla_certificates.py
|
||||
python3 generate_moz-top500.py
|
||||
# Deprecate?
|
||||
#python3 generate-office365-cn.py > lists/microsoft-office365-cn/list.json
|
||||
python3 generate-office365.py
|
||||
python3 generate-publicdns.py
|
||||
python3 generate-tlds.py
|
||||
python3 generate_tranco.py
|
||||
python3 generate-university-domain-list.py
|
||||
python3 generate-vpn.py
|
||||
python3 generate-wikimedia.py
|
||||
popd
|
||||
|
||||
./jq_all_the_things.sh
|
File diff suppressed because it is too large
Load Diff
|
@ -20,6 +20,7 @@
|
|||
"108.175.48.0/22",
|
||||
"108.175.52.0/22",
|
||||
"108.175.56.0/22",
|
||||
"108.175.60.0/22",
|
||||
"111.51.66.0/24",
|
||||
"116.129.226.0/25",
|
||||
"116.129.226.128/26",
|
||||
|
@ -58,6 +59,8 @@
|
|||
"13.210.2.192/26",
|
||||
"13.210.67.128/26",
|
||||
"13.212.0.0/15",
|
||||
"13.212.3.128/26",
|
||||
"13.212.3.64/26",
|
||||
"13.224.0.0/14",
|
||||
"13.228.0.0/15",
|
||||
"13.228.69.0/24",
|
||||
|
@ -77,7 +80,14 @@
|
|||
"13.236.82.96/27",
|
||||
"13.239.158.0/29",
|
||||
"13.244.0.0/15",
|
||||
"13.244.121.0/26",
|
||||
"13.244.121.196/30",
|
||||
"13.244.122.0/24",
|
||||
"13.244.165.192/26",
|
||||
"13.244.176.128/26",
|
||||
"13.244.176.64/26",
|
||||
"13.244.35.128/26",
|
||||
"13.244.35.192/26",
|
||||
"13.248.0.0/20",
|
||||
"13.248.100.0/24",
|
||||
"13.248.101.0/24",
|
||||
|
@ -132,6 +142,7 @@
|
|||
"13.34.23.128/27",
|
||||
"13.34.23.160/27",
|
||||
"13.34.23.192/27",
|
||||
"13.34.23.224/27",
|
||||
"13.34.23.32/27",
|
||||
"13.34.23.64/27",
|
||||
"13.34.23.96/27",
|
||||
|
@ -139,14 +150,33 @@
|
|||
"13.34.24.160/27",
|
||||
"13.34.24.192/27",
|
||||
"13.34.24.96/27",
|
||||
"13.34.25.128/27",
|
||||
"13.34.25.160/27",
|
||||
"13.34.25.64/27",
|
||||
"13.34.25.96/27",
|
||||
"13.34.26.0/27",
|
||||
"13.34.26.128/27",
|
||||
"13.34.26.160/27",
|
||||
"13.34.26.192/27",
|
||||
"13.34.26.32/27",
|
||||
"13.34.26.64/27",
|
||||
"13.34.26.96/27",
|
||||
"13.34.27.0/27",
|
||||
"13.34.27.32/27",
|
||||
"13.34.27.64/27",
|
||||
"13.35.0.0/16",
|
||||
"13.48.0.0/15",
|
||||
"13.48.186.128/27",
|
||||
"13.48.186.160/27",
|
||||
"13.48.186.192/27",
|
||||
"13.48.32.0/24",
|
||||
"13.48.4.192/29",
|
||||
"13.48.4.200/30",
|
||||
"13.48.74.0/24",
|
||||
"13.49.126.128/26",
|
||||
"13.49.143.0/26",
|
||||
"13.49.143.64/26",
|
||||
"13.49.40.64/26",
|
||||
"13.52.0.0/16",
|
||||
"13.52.118.0/23",
|
||||
"13.52.146.192/26",
|
||||
|
@ -172,11 +202,22 @@
|
|||
"15.152.0.0/16",
|
||||
"15.156.0.0/15",
|
||||
"15.161.0.0/16",
|
||||
"15.161.135.0/26",
|
||||
"15.161.135.164/30",
|
||||
"15.161.135.64/27",
|
||||
"15.161.135.96/27",
|
||||
"15.161.136.0/24",
|
||||
"15.161.164.128/26",
|
||||
"15.161.192.0/26",
|
||||
"15.161.192.64/26",
|
||||
"15.161.68.128/26",
|
||||
"15.161.68.192/26",
|
||||
"15.164.0.0/15",
|
||||
"15.164.156.0/23",
|
||||
"15.164.243.192/27",
|
||||
"15.164.243.224/27",
|
||||
"15.164.243.32/27",
|
||||
"15.165.193.64/26",
|
||||
"15.177.0.0/18",
|
||||
"15.177.64.0/23",
|
||||
"15.177.66.0/23",
|
||||
|
@ -203,9 +244,19 @@
|
|||
"15.177.90.0/24",
|
||||
"15.177.91.0/24",
|
||||
"15.184.0.0/16",
|
||||
"15.184.1.128/26",
|
||||
"15.184.1.64/26",
|
||||
"15.185.0.0/16",
|
||||
"15.185.141.160/27",
|
||||
"15.185.141.192/26",
|
||||
"15.185.245.0/26",
|
||||
"15.185.33.192/26",
|
||||
"15.185.86.0/23",
|
||||
"15.185.91.32/27",
|
||||
"15.188.0.0/16",
|
||||
"15.188.184.0/24",
|
||||
"15.188.210.0/27",
|
||||
"15.188.210.128/26",
|
||||
"15.188.210.196/30",
|
||||
"15.188.210.200/30",
|
||||
"15.188.210.32/27",
|
||||
|
@ -225,7 +276,11 @@
|
|||
"15.200.0.0/16",
|
||||
"15.200.28.80/30",
|
||||
"15.206.0.0/15",
|
||||
"15.206.137.128/26",
|
||||
"15.206.137.192/26",
|
||||
"15.207.13.0/26",
|
||||
"15.207.13.128/25",
|
||||
"15.207.213.128/25",
|
||||
"15.221.0.0/24",
|
||||
"15.221.1.0/24",
|
||||
"15.221.16.0/22",
|
||||
|
@ -241,22 +296,29 @@
|
|||
"15.222.0.0/15",
|
||||
"15.222.16.96/27",
|
||||
"15.222.43.0/27",
|
||||
"15.222.43.128/26",
|
||||
"15.222.43.32/27",
|
||||
"15.223.100.0/24",
|
||||
"15.223.102.0/23",
|
||||
"15.228.0.0/15",
|
||||
"15.230.0.0/24",
|
||||
"15.228.1.128/26",
|
||||
"15.228.1.192/26",
|
||||
"15.228.1.64/26",
|
||||
"15.230.129.0/24",
|
||||
"15.230.130.0/24",
|
||||
"15.230.131.0/32",
|
||||
"15.230.131.1/32",
|
||||
"15.230.131.16/28",
|
||||
"15.230.131.2/32",
|
||||
"15.230.131.3/32",
|
||||
"15.230.131.32/28",
|
||||
"15.230.131.4/32",
|
||||
"15.230.131.48/28",
|
||||
"15.230.131.5/32",
|
||||
"15.230.131.6/32",
|
||||
"15.230.131.7/32",
|
||||
"15.230.131.8/32",
|
||||
"15.230.131.9/32",
|
||||
"15.230.131.64/28",
|
||||
"15.230.132.0/24",
|
||||
"15.230.133.0/28",
|
||||
"15.230.133.16/32",
|
||||
"15.230.18.0/24",
|
||||
"15.230.21.0/24",
|
||||
"15.230.22.0/24",
|
||||
|
@ -402,7 +464,10 @@
|
|||
"15.230.41.0/24",
|
||||
"15.230.42.0/24",
|
||||
"15.230.43.0/24",
|
||||
"15.230.49.0/24",
|
||||
"15.230.5.0/24",
|
||||
"15.230.50.0/24",
|
||||
"15.230.52.0/24",
|
||||
"15.230.6.0/24",
|
||||
"15.230.64.0/26",
|
||||
"15.230.64.128/26",
|
||||
|
@ -414,6 +479,9 @@
|
|||
"15.230.65.64/26",
|
||||
"15.230.66.0/26",
|
||||
"15.236.0.0/15",
|
||||
"15.236.155.192/26",
|
||||
"15.236.231.0/26",
|
||||
"15.236.231.64/26",
|
||||
"15.254.0.0/16",
|
||||
"150.222.10.0/24",
|
||||
"150.222.100.0/24",
|
||||
|
@ -485,6 +553,7 @@
|
|||
"150.222.135.0/24",
|
||||
"150.222.136.0/24",
|
||||
"150.222.138.0/24",
|
||||
"150.222.14.72/31",
|
||||
"150.222.140.0/24",
|
||||
"150.222.141.0/24",
|
||||
"150.222.142.0/24",
|
||||
|
@ -621,6 +690,8 @@
|
|||
"157.175.0.0/16",
|
||||
"160.1.0.0/16",
|
||||
"161.189.0.0/16",
|
||||
"161.189.66.128/26",
|
||||
"161.189.66.192/26",
|
||||
"162.213.232.0/24",
|
||||
"162.213.233.0/24",
|
||||
"162.213.234.0/23",
|
||||
|
@ -670,31 +741,51 @@
|
|||
"18.130.91.144/30",
|
||||
"18.130.91.148/30",
|
||||
"18.132.0.0/14",
|
||||
"18.132.146.192/26",
|
||||
"18.132.21.0/24",
|
||||
"18.132.22.0/23",
|
||||
"18.133.45.0/26",
|
||||
"18.133.45.64/26",
|
||||
"18.136.0.0/16",
|
||||
"18.138.0.0/15",
|
||||
"18.138.134.128/25",
|
||||
"18.138.244.0/23",
|
||||
"18.140.0.0/15",
|
||||
"18.141.148.0/26",
|
||||
"18.141.152.0/24",
|
||||
"18.141.154.0/23",
|
||||
"18.141.226.0/23",
|
||||
"18.141.238.0/26",
|
||||
"18.141.66.248/30",
|
||||
"18.141.66.252/30",
|
||||
"18.142.0.0/15",
|
||||
"18.144.0.0/15",
|
||||
"18.144.158.0/27",
|
||||
"18.144.158.64/26",
|
||||
"18.144.76.128/25",
|
||||
"18.153.0.0/16",
|
||||
"18.156.0.0/14",
|
||||
"18.156.52.0/24",
|
||||
"18.156.54.0/23",
|
||||
"18.157.237.128/26",
|
||||
"18.157.237.192/26",
|
||||
"18.157.71.192/26",
|
||||
"18.162.0.0/16",
|
||||
"18.163.0.0/16",
|
||||
"18.163.139.32/27",
|
||||
"18.163.201.0/26",
|
||||
"18.163.201.96/27",
|
||||
"18.163.66.0/23",
|
||||
"18.163.68.0/26",
|
||||
"18.166.0.0/15",
|
||||
"18.166.20.128/26",
|
||||
"18.166.20.192/26",
|
||||
"18.166.20.64/26",
|
||||
"18.168.0.0/14",
|
||||
"18.175.0.0/16",
|
||||
"18.176.0.0/15",
|
||||
"18.176.203.120/30",
|
||||
"18.177.156.192/26",
|
||||
"18.178.0.0/16",
|
||||
"18.179.0.0/16",
|
||||
"18.179.48.128/27",
|
||||
|
@ -702,9 +793,13 @@
|
|||
"18.180.0.0/15",
|
||||
"18.180.178.0/24",
|
||||
"18.180.180.0/23",
|
||||
"18.181.204.128/26",
|
||||
"18.181.204.192/26",
|
||||
"18.181.242.0/23",
|
||||
"18.182.0.0/16",
|
||||
"18.182.96.64/26",
|
||||
"18.183.0.0/16",
|
||||
"18.183.37.0/26",
|
||||
"18.184.0.0/15",
|
||||
"18.184.138.224/27",
|
||||
"18.184.2.128/25",
|
||||
|
@ -716,6 +811,7 @@
|
|||
"18.190.0.0/16",
|
||||
"18.191.0.0/16",
|
||||
"18.192.0.0/15",
|
||||
"18.192.142.0/23",
|
||||
"18.194.0.0/15",
|
||||
"18.196.0.0/15",
|
||||
"18.198.0.0/15",
|
||||
|
@ -738,12 +834,14 @@
|
|||
"18.229.100.0/26",
|
||||
"18.229.100.112/30",
|
||||
"18.229.100.116/30",
|
||||
"18.229.220.128/26",
|
||||
"18.229.220.192/26",
|
||||
"18.229.99.0/24",
|
||||
"18.230.0.0/16",
|
||||
"18.230.103.0/24",
|
||||
"18.230.104.0/23",
|
||||
"18.230.46.0/27",
|
||||
"18.230.46.128/26",
|
||||
"18.230.46.32/27",
|
||||
"18.231.0.0/16",
|
||||
"18.231.194.8/29",
|
||||
|
@ -831,6 +929,9 @@
|
|||
"2400:7fc0:2f00::/40",
|
||||
"2400:7fc0:4000::/40",
|
||||
"2400:7fc0:8000::/36",
|
||||
"2400:7fc0:83cc:cc00::/56",
|
||||
"2400:7fc0:83cc:cd00::/56",
|
||||
"2400:7fc0:83cc:ce00::/56",
|
||||
"2400:7fc0::/40",
|
||||
"2403:b300:ff00::/64",
|
||||
"2403:b300:ff00::36fc:4f80/122",
|
||||
|
@ -846,6 +947,9 @@
|
|||
"2404:c2c0:2f00::/40",
|
||||
"2404:c2c0:4000::/40",
|
||||
"2404:c2c0:8000::/36",
|
||||
"2404:c2c0:83cc:cc00::/56",
|
||||
"2404:c2c0:83cc:cd00::/56",
|
||||
"2404:c2c0:83cc:ce00::/56",
|
||||
"2404:c2c0::/40",
|
||||
"2406:da00:1000::/40",
|
||||
"2406:da00:2000::/40",
|
||||
|
@ -874,12 +978,18 @@
|
|||
"2406:da1e::/32",
|
||||
"2406:da70:1000::/40",
|
||||
"2406:da70:2000::/40",
|
||||
"2406:da70:2000::/56",
|
||||
"2406:da70:4000::/40",
|
||||
"2406:da70:4000::/56",
|
||||
"2406:da70:6000::/40",
|
||||
"2406:da70:8000::/40",
|
||||
"2406:da70:8000::/56",
|
||||
"2406:da70:a000::/40",
|
||||
"2406:da70:a000::/56",
|
||||
"2406:da70:c000::/40",
|
||||
"2406:da70:c000::/56",
|
||||
"2406:da70:e000::/40",
|
||||
"2406:da70:e000::/56",
|
||||
"2406:daa0:1000::/40",
|
||||
"2406:daa0:2000::/40",
|
||||
"2406:daa0:4000::/40",
|
||||
|
@ -962,6 +1072,8 @@
|
|||
"2600:1f00:c000::/40",
|
||||
"2600:1f00:e000::/40",
|
||||
"2600:1f01:4800::/47",
|
||||
"2600:1f01:4802::/47",
|
||||
"2600:1f01:4804::/47",
|
||||
"2600:1f01:4810::/47",
|
||||
"2600:1f01:4814::/47",
|
||||
"2600:1f01:4820::/47",
|
||||
|
@ -981,6 +1093,7 @@
|
|||
"2600:1f01:48d0::/47",
|
||||
"2600:1f01:48d2::/47",
|
||||
"2600:1f01:48e0::/47",
|
||||
"2600:1f01:48e2::/47",
|
||||
"2600:1f11::/36",
|
||||
"2600:1f12::/36",
|
||||
"2600:1f13::/36",
|
||||
|
@ -1001,13 +1114,19 @@
|
|||
"2600:1f1f::/36",
|
||||
"2600:1f60:6000::/40",
|
||||
"2600:1f70:1000::/40",
|
||||
"2600:1f70:1000::/56",
|
||||
"2600:1f70:2000::/40",
|
||||
"2600:1f70:4000::/40",
|
||||
"2600:1f70:4000::/56",
|
||||
"2600:1f70:5000::/40",
|
||||
"2600:1f70:6000::/40",
|
||||
"2600:1f70:6000::/56",
|
||||
"2600:1f70:8000::/40",
|
||||
"2600:1f70:8000::/56",
|
||||
"2600:1f70:c000::/40",
|
||||
"2600:1f70:c000::/56",
|
||||
"2600:1f70:e000::/40",
|
||||
"2600:1f70:e000::/56",
|
||||
"2600:1fa0:1000::/40",
|
||||
"2600:1fa0:2000::/40",
|
||||
"2600:1fa0:4000::/40",
|
||||
|
@ -1182,12 +1301,19 @@
|
|||
"2a05:d01c::/36",
|
||||
"2a05:d01e::/36",
|
||||
"2a05:d03a:2000::/40",
|
||||
"2a05:d03a:2000::/56",
|
||||
"2a05:d03a:4000::/40",
|
||||
"2a05:d03a:4000::/56",
|
||||
"2a05:d03a:6000::/40",
|
||||
"2a05:d03a:6000::/56",
|
||||
"2a05:d03a:8000::/40",
|
||||
"2a05:d03a:8000::/56",
|
||||
"2a05:d03a:a000::/40",
|
||||
"2a05:d03a:a000::/56",
|
||||
"2a05:d03a:c000::/40",
|
||||
"2a05:d03a:c000::/56",
|
||||
"2a05:d03a:e000::/40",
|
||||
"2a05:d03a:e000::/56",
|
||||
"2a05:d050:2000::/40",
|
||||
"2a05:d050:4000::/40",
|
||||
"2a05:d050:6000::/40",
|
||||
|
@ -1242,10 +1368,16 @@
|
|||
"3.10.127.32/27",
|
||||
"3.10.17.0/25",
|
||||
"3.10.17.128/25",
|
||||
"3.10.201.128/27",
|
||||
"3.10.201.192/26",
|
||||
"3.10.201.64/27",
|
||||
"3.101.0.0/16",
|
||||
"3.101.100.128/25",
|
||||
"3.101.114.0/26",
|
||||
"3.101.114.64/26",
|
||||
"3.101.52.208/30",
|
||||
"3.101.52.212/30",
|
||||
"3.101.87.0/26",
|
||||
"3.104.0.0/14",
|
||||
"3.104.82.0/23",
|
||||
"3.105.172.0/22",
|
||||
|
@ -1259,6 +1391,7 @@
|
|||
"3.113.218.76/30",
|
||||
"3.12.0.0/16",
|
||||
"3.12.216.0/22",
|
||||
"3.12.23.128/26",
|
||||
"3.12.23.88/30",
|
||||
"3.12.23.92/30",
|
||||
"3.120.0.0/14",
|
||||
|
@ -1268,9 +1401,13 @@
|
|||
"3.123.14.0/24",
|
||||
"3.123.15.0/25",
|
||||
"3.124.0.0/14",
|
||||
"3.127.48.128/26",
|
||||
"3.127.48.244/30",
|
||||
"3.127.48.248/30",
|
||||
"3.128.0.0/15",
|
||||
"3.128.56.128/26",
|
||||
"3.128.56.192/26",
|
||||
"3.128.56.64/26",
|
||||
"3.128.93.0/24",
|
||||
"3.13.0.0/16",
|
||||
"3.130.0.0/16",
|
||||
|
@ -1305,23 +1442,43 @@
|
|||
"3.227.250.128/25",
|
||||
"3.231.2.0/25",
|
||||
"3.234.232.224/27",
|
||||
"3.234.248.192/26",
|
||||
"3.235.112.0/21",
|
||||
"3.235.189.100/30",
|
||||
"3.235.189.96/30",
|
||||
"3.235.202.128/26",
|
||||
"3.236.169.0/25",
|
||||
"3.236.169.192/26",
|
||||
"3.236.32.0/22",
|
||||
"3.236.48.0/23",
|
||||
"3.236.94.128/25",
|
||||
"3.237.107.0/25",
|
||||
"3.24.0.0/14",
|
||||
"3.24.227.192/26",
|
||||
"3.248.0.0/13",
|
||||
"3.248.186.92/30",
|
||||
"3.248.244.0/26",
|
||||
"3.248.244.240/30",
|
||||
"3.249.28.0/23",
|
||||
"3.25.138.0/26",
|
||||
"3.25.138.64/26",
|
||||
"3.25.178.128/26",
|
||||
"3.25.37.64/26",
|
||||
"3.25.43.0/24",
|
||||
"3.25.44.0/23",
|
||||
"3.25.47.28/30",
|
||||
"3.25.47.32/30",
|
||||
"3.250.209.192/26",
|
||||
"3.250.210.0/23",
|
||||
"3.250.243.64/26",
|
||||
"3.250.244.0/26",
|
||||
"3.251.56.0/24",
|
||||
"3.251.62.128/25",
|
||||
"3.32.0.0/16",
|
||||
"3.34.0.0/15",
|
||||
"3.34.101.192/26",
|
||||
"3.34.228.0/26",
|
||||
"3.34.228.64/26",
|
||||
"3.34.37.0/24",
|
||||
"3.34.38.0/23",
|
||||
"3.34.89.192/30",
|
||||
|
@ -1329,9 +1486,34 @@
|
|||
"3.5.0.0/18",
|
||||
"3.5.128.0/22",
|
||||
"3.5.132.0/23",
|
||||
"3.5.134.0/23",
|
||||
"3.5.136.0/22",
|
||||
"3.5.140.0/22",
|
||||
"3.5.144.0/23",
|
||||
"3.5.146.0/23",
|
||||
"3.5.148.0/22",
|
||||
"3.5.152.0/21",
|
||||
"3.5.160.0/22",
|
||||
"3.5.164.0/22",
|
||||
"3.5.168.0/23",
|
||||
"3.5.208.0/22",
|
||||
"3.5.212.0/23",
|
||||
"3.5.216.0/22",
|
||||
"3.5.220.0/22",
|
||||
"3.5.224.0/22",
|
||||
"3.5.228.0/22",
|
||||
"3.5.232.0/22",
|
||||
"3.5.236.0/22",
|
||||
"3.5.240.0/22",
|
||||
"3.5.244.0/22",
|
||||
"3.5.248.0/22",
|
||||
"3.5.252.0/22",
|
||||
"3.5.64.0/21",
|
||||
"3.5.72.0/23",
|
||||
"3.5.76.0/22",
|
||||
"3.5.80.0/21",
|
||||
"3.6.0.0/15",
|
||||
"3.6.70.128/26",
|
||||
"3.6.70.76/30",
|
||||
"3.7.25.48/30",
|
||||
"3.8.0.0/14",
|
||||
|
@ -1342,8 +1524,11 @@
|
|||
"3.9.94.0/24",
|
||||
"3.91.171.128/25",
|
||||
"3.96.0.0/15",
|
||||
"3.96.143.128/26",
|
||||
"3.96.143.192/26",
|
||||
"3.96.2.68/30",
|
||||
"3.96.2.72/30",
|
||||
"3.96.84.0/26",
|
||||
"3.98.0.0/15",
|
||||
"34.192.0.0/12",
|
||||
"34.195.252.0/24",
|
||||
|
@ -1361,7 +1546,6 @@
|
|||
"34.224.0.0/12",
|
||||
"34.226.14.0/24",
|
||||
"34.228.4.208/28",
|
||||
"34.232.163.208/29",
|
||||
"34.240.0.0/13",
|
||||
"34.245.205.0/27",
|
||||
"34.245.205.64/27",
|
||||
|
@ -1403,7 +1587,12 @@
|
|||
"44.224.0.0/11",
|
||||
"44.227.178.0/24",
|
||||
"44.233.54.0/23",
|
||||
"44.234.106.0/23",
|
||||
"44.234.108.128/25",
|
||||
"44.234.113.64/26",
|
||||
"44.234.123.128/26",
|
||||
"44.234.123.64/26",
|
||||
"44.234.22.128/26",
|
||||
"44.234.54.0/23",
|
||||
"44.234.73.116/30",
|
||||
"44.234.73.120/30",
|
||||
|
@ -1556,7 +1745,10 @@
|
|||
"52.219.140.0/24",
|
||||
"52.219.144.0/22",
|
||||
"52.219.148.0/23",
|
||||
"52.219.156.0/22",
|
||||
"52.219.16.0/22",
|
||||
"52.219.160.0/23",
|
||||
"52.219.164.0/22",
|
||||
"52.219.20.0/22",
|
||||
"52.219.24.0/21",
|
||||
"52.219.32.0/21",
|
||||
|
@ -1650,8 +1842,15 @@
|
|||
"52.79.0.0/16",
|
||||
"52.8.0.0/16",
|
||||
"52.80.0.0/16",
|
||||
"52.80.197.0/25",
|
||||
"52.80.197.128/25",
|
||||
"52.80.198.0/25",
|
||||
"52.80.198.136/29",
|
||||
"52.81.0.0/16",
|
||||
"52.81.124.0/23",
|
||||
"52.81.167.128/27",
|
||||
"52.81.167.192/26",
|
||||
"52.81.232.0/26",
|
||||
"52.82.0.0/17",
|
||||
"52.82.1.0/29",
|
||||
"52.82.128.0/19",
|
||||
|
@ -1667,6 +1866,10 @@
|
|||
"52.82.188.0/22",
|
||||
"52.82.192.0/18",
|
||||
"52.83.0.0/16",
|
||||
"52.83.34.128/25",
|
||||
"52.83.35.0/25",
|
||||
"52.83.35.128/25",
|
||||
"52.83.5.0/26",
|
||||
"52.84.0.0/15",
|
||||
"52.86.0.0/15",
|
||||
"52.88.0.0/15",
|
||||
|
@ -1706,6 +1909,10 @@
|
|||
"52.93.126.244/32",
|
||||
"52.93.126.245/32",
|
||||
"52.93.126.76/32",
|
||||
"52.93.127.24/32",
|
||||
"52.93.127.25/32",
|
||||
"52.93.127.26/32",
|
||||
"52.93.127.27/32",
|
||||
"52.93.129.95/32",
|
||||
"52.93.131.217/32",
|
||||
"52.93.133.127/32",
|
||||
|
@ -1731,6 +1938,8 @@
|
|||
"52.93.149.0/24",
|
||||
"52.93.150.0/24",
|
||||
"52.93.151.0/24",
|
||||
"52.93.153.148/32",
|
||||
"52.93.153.149/32",
|
||||
"52.93.153.80/32",
|
||||
"52.93.156.0/22",
|
||||
"52.93.16.0/24",
|
||||
|
@ -1863,12 +2072,30 @@
|
|||
"52.93.20.0/24",
|
||||
"52.93.21.14/32",
|
||||
"52.93.21.15/32",
|
||||
"52.93.229.148/32",
|
||||
"52.93.229.149/32",
|
||||
"52.93.236.0/24",
|
||||
"52.93.237.0/24",
|
||||
"52.93.240.146/31",
|
||||
"52.93.240.148/31",
|
||||
"52.93.240.150/31",
|
||||
"52.93.240.152/31",
|
||||
"52.93.240.154/31",
|
||||
"52.93.240.156/31",
|
||||
"52.93.240.158/31",
|
||||
"52.93.240.160/31",
|
||||
"52.93.240.162/31",
|
||||
"52.93.240.164/31",
|
||||
"52.93.240.166/31",
|
||||
"52.93.240.168/31",
|
||||
"52.93.240.170/31",
|
||||
"52.93.240.172/31",
|
||||
"52.93.240.174/31",
|
||||
"52.93.240.176/31",
|
||||
"52.93.240.178/31",
|
||||
"52.93.240.180/31",
|
||||
"52.93.240.182/31",
|
||||
"52.93.240.184/31",
|
||||
"52.93.245.0/24",
|
||||
"52.93.247.0/25",
|
||||
"52.93.248.0/24",
|
||||
|
@ -2034,6 +2261,7 @@
|
|||
"52.95.176.0/24",
|
||||
"52.95.177.0/24",
|
||||
"52.95.178.0/23",
|
||||
"52.95.180.0/24",
|
||||
"52.95.192.0/20",
|
||||
"52.95.208.0/22",
|
||||
"52.95.212.0/22",
|
||||
|
@ -2366,8 +2594,6 @@
|
|||
"64.252.115.0/24",
|
||||
"64.252.116.0/24",
|
||||
"64.252.117.0/24",
|
||||
"64.252.118.0/24",
|
||||
"64.252.119.0/24",
|
||||
"64.252.128.0/18",
|
||||
"64.252.64.0/18",
|
||||
"64.252.64.0/24",
|
||||
|
@ -2408,6 +2634,11 @@
|
|||
"69.107.6.120/29",
|
||||
"69.107.6.160/29",
|
||||
"69.107.6.168/29",
|
||||
"69.107.6.176/29",
|
||||
"69.107.6.200/29",
|
||||
"69.107.6.208/29",
|
||||
"69.107.6.216/29",
|
||||
"69.107.6.224/29",
|
||||
"69.230.192.0/18",
|
||||
"69.231.128.0/18",
|
||||
"69.234.192.0/18",
|
||||
|
@ -2516,9 +2747,13 @@
|
|||
"99.82.176.0/21",
|
||||
"99.82.184.0/22",
|
||||
"99.82.188.0/22",
|
||||
"99.83.100.0/24",
|
||||
"99.83.128.0/17",
|
||||
"99.83.64.0/21",
|
||||
"99.83.96.0/24",
|
||||
"99.83.97.0/24",
|
||||
"99.83.98.0/24",
|
||||
"99.83.99.0/24",
|
||||
"99.84.0.0/16",
|
||||
"99.86.0.0/16",
|
||||
"99.87.0.0/22"
|
||||
|
@ -2530,5 +2765,5 @@
|
|||
],
|
||||
"name": "List of known Amazon AWS IP address ranges",
|
||||
"type": "cidr",
|
||||
"version": 20200810
|
||||
"version": 20200911
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -30,5 +30,5 @@
|
|||
],
|
||||
"name": "List of known Cloudflare IP ranges",
|
||||
"type": "cidr",
|
||||
"version": 20200721
|
||||
"version": 20200911
|
||||
}
|
||||
|
|
|
@ -762,5 +762,5 @@
|
|||
],
|
||||
"name": "Covid-19 Cyber Threat Coalition's Whitelist",
|
||||
"type": "hostname",
|
||||
"version": 20200721
|
||||
"version": 20200911
|
||||
}
|
||||
|
|
|
@ -106,5 +106,5 @@
|
|||
],
|
||||
"name": "Covid-19 Krassi's Whitelist",
|
||||
"type": "hostname",
|
||||
"version": 20200721
|
||||
"version": 20200911
|
||||
}
|
||||
|
|
|
@ -387,6 +387,6 @@
|
|||
"domain|ip"
|
||||
],
|
||||
"name": "CRL Warninglist",
|
||||
"type": "substring",
|
||||
"version": 20190301
|
||||
"type": "string",
|
||||
"version": 20200911
|
||||
}
|
||||
|
|
|
@ -896,6 +896,7 @@
|
|||
"empireanime.ga",
|
||||
"emstjzh.com",
|
||||
"emz.net",
|
||||
"enayu.com",
|
||||
"enterto.com",
|
||||
"envy17.com",
|
||||
"eoffice.top",
|
||||
|
@ -3143,5 +3144,5 @@
|
|||
],
|
||||
"name": "List of disposable email domains",
|
||||
"type": "substring",
|
||||
"version": 20200720
|
||||
"version": 20200911
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -126,6 +126,7 @@
|
|||
"102.133.219.176/29",
|
||||
"102.133.220.0/27",
|
||||
"102.133.220.128/26",
|
||||
"102.133.220.192/30",
|
||||
"102.133.220.64/26",
|
||||
"102.133.222.0/23",
|
||||
"102.133.224.0/20",
|
||||
|
@ -1094,6 +1095,7 @@
|
|||
"104.46.177.128/26",
|
||||
"104.46.177.192/26",
|
||||
"104.46.177.64/27",
|
||||
"104.46.178.4/30",
|
||||
"104.46.180.0/23",
|
||||
"104.46.192.0/20",
|
||||
"104.46.208.0/20",
|
||||
|
@ -1290,15 +1292,19 @@
|
|||
"13.105.24.0/24",
|
||||
"13.105.25.0/24",
|
||||
"13.105.26.0/24",
|
||||
"13.105.27.0/25",
|
||||
"13.105.36.0/27",
|
||||
"13.105.36.128/26",
|
||||
"13.105.36.192/26",
|
||||
"13.105.36.32/28",
|
||||
"13.105.36.48/28",
|
||||
"13.105.36.64/27",
|
||||
"13.105.36.96/27",
|
||||
"13.105.37.0/26",
|
||||
"13.105.37.128/26",
|
||||
"13.105.37.192/26",
|
||||
"13.105.37.64/26",
|
||||
"13.105.52.0/27",
|
||||
"13.105.52.128/26",
|
||||
"13.105.52.192/26",
|
||||
"13.105.52.32/27",
|
||||
|
@ -1323,9 +1329,14 @@
|
|||
"13.105.61.64/26",
|
||||
"13.105.66.0/27",
|
||||
"13.105.66.144/28",
|
||||
"13.105.66.192/26",
|
||||
"13.105.66.64/26",
|
||||
"13.105.67.0/25",
|
||||
"13.105.67.128/25",
|
||||
"13.105.74.128/26",
|
||||
"13.105.74.192/26",
|
||||
"13.105.74.48/28",
|
||||
"13.105.74.96/27",
|
||||
"13.106.38.142/32",
|
||||
"13.106.38.148/32",
|
||||
"13.106.54.19/32",
|
||||
|
@ -2112,9 +2123,12 @@
|
|||
"13.73.253.104/29",
|
||||
"13.73.253.112/29",
|
||||
"13.73.253.120/32",
|
||||
"13.73.253.122/31",
|
||||
"13.73.253.96/29",
|
||||
"13.73.254.192/29",
|
||||
"13.73.254.200/29",
|
||||
"13.73.254.208/29",
|
||||
"13.73.254.216/30",
|
||||
"13.73.254.224/27",
|
||||
"13.73.255.128/26",
|
||||
"13.73.255.32/27",
|
||||
|
@ -3568,6 +3582,7 @@
|
|||
"168.63.98.91/32",
|
||||
"191.232.138.0/23",
|
||||
"191.232.140.0/24",
|
||||
"191.232.16.0/21",
|
||||
"191.232.160.0/19",
|
||||
"191.232.161.75/32",
|
||||
"191.232.162.204/32",
|
||||
|
@ -3625,6 +3640,7 @@
|
|||
"191.233.14.128/26",
|
||||
"191.233.144.0/20",
|
||||
"191.233.16.0/20",
|
||||
"191.233.160.0/19",
|
||||
"191.233.192.0/18",
|
||||
"191.233.200.0/27",
|
||||
"191.233.201.0/27",
|
||||
|
@ -3680,6 +3696,7 @@
|
|||
"191.233.26.176/28",
|
||||
"191.233.26.64/28",
|
||||
"191.233.32.0/20",
|
||||
"191.233.48.0/21",
|
||||
"191.233.48.0/27",
|
||||
"191.233.49.0/27",
|
||||
"191.233.50.0/30",
|
||||
|
@ -3713,6 +3730,7 @@
|
|||
"191.233.69.227/32",
|
||||
"191.233.73.228/32",
|
||||
"191.233.76.85/32",
|
||||
"191.233.8.0/21",
|
||||
"191.233.8.0/28",
|
||||
"191.233.8.16/30",
|
||||
"191.233.8.20/31",
|
||||
|
@ -3747,6 +3765,7 @@
|
|||
"191.234.137.48/28",
|
||||
"191.234.138.128/29",
|
||||
"191.234.138.136/29",
|
||||
"191.234.138.148/30",
|
||||
"191.234.138.160/27",
|
||||
"191.234.139.0/26",
|
||||
"191.234.139.64/26",
|
||||
|
@ -3830,6 +3849,7 @@
|
|||
"191.234.2.139/32",
|
||||
"191.234.2.140/31",
|
||||
"191.234.2.142/32",
|
||||
"191.234.224.0/19",
|
||||
"191.234.32.0/19",
|
||||
"191.235.126.0/28",
|
||||
"191.235.126.144/28",
|
||||
|
@ -3940,6 +3960,7 @@
|
|||
"191.237.200.0/21",
|
||||
"191.237.208.0/20",
|
||||
"191.237.219.202/32",
|
||||
"191.237.224.0/21",
|
||||
"191.237.224.0/26",
|
||||
"191.237.224.64/26",
|
||||
"191.237.232.0/22",
|
||||
|
@ -4096,6 +4117,7 @@
|
|||
"20.150.12.0/23",
|
||||
"20.150.121.0/24",
|
||||
"20.150.122.0/24",
|
||||
"20.150.123.0/24",
|
||||
"20.150.124.0/24",
|
||||
"20.150.125.0/24",
|
||||
"20.150.126.0/24",
|
||||
|
@ -4280,6 +4302,7 @@
|
|||
"20.150.70.0/24",
|
||||
"20.150.71.0/24",
|
||||
"20.150.72.0/24",
|
||||
"20.150.73.0/24",
|
||||
"20.150.74.0/24",
|
||||
"20.150.75.0/24",
|
||||
"20.150.76.0/24",
|
||||
|
@ -4287,6 +4310,7 @@
|
|||
"20.150.78.0/24",
|
||||
"20.150.79.0/24",
|
||||
"20.150.8.0/23",
|
||||
"20.150.80.0/24",
|
||||
"20.150.81.0/24",
|
||||
"20.150.82.0/24",
|
||||
"20.150.83.0/24",
|
||||
|
@ -4357,6 +4381,7 @@
|
|||
"20.187.195.152/29",
|
||||
"20.187.196.0/27",
|
||||
"20.187.196.128/26",
|
||||
"20.187.196.192/30",
|
||||
"20.187.196.64/26",
|
||||
"20.187.198.0/23",
|
||||
"20.187.224.0/19",
|
||||
|
@ -4376,6 +4401,7 @@
|
|||
"20.188.39.105/32",
|
||||
"20.188.39.108/32",
|
||||
"20.188.39.126/32",
|
||||
"20.188.39.64/32",
|
||||
"20.188.40.44/32",
|
||||
"20.188.40.46/32",
|
||||
"20.188.41.240/32",
|
||||
|
@ -4824,6 +4850,7 @@
|
|||
"20.191.128.0/19",
|
||||
"20.191.160.0/19",
|
||||
"20.191.160.0/29",
|
||||
"20.191.160.112/30",
|
||||
"20.191.160.128/26",
|
||||
"20.191.160.192/26",
|
||||
"20.191.160.20/30",
|
||||
|
@ -5025,8 +5052,10 @@
|
|||
"20.194.68.64/26",
|
||||
"20.194.96.0/19",
|
||||
"20.195.0.0/18",
|
||||
"20.195.128.0/22",
|
||||
"20.195.136.0/21",
|
||||
"20.195.136.0/24",
|
||||
"20.195.144.0/21",
|
||||
"20.195.160.0/19",
|
||||
"20.195.192.0/18",
|
||||
"20.196.0.0/18",
|
||||
|
@ -5330,6 +5359,7 @@
|
|||
"20.37.68.0/27",
|
||||
"20.37.68.144/28",
|
||||
"20.37.68.160/27",
|
||||
"20.37.68.36/30",
|
||||
"20.37.68.40/29",
|
||||
"20.37.69.0/26",
|
||||
"20.37.69.128/25",
|
||||
|
@ -5441,6 +5471,7 @@
|
|||
"20.38.140.0/27",
|
||||
"20.38.140.128/27",
|
||||
"20.38.140.192/26",
|
||||
"20.38.141.12/30",
|
||||
"20.38.141.128/25",
|
||||
"20.38.141.16/28",
|
||||
"20.38.141.64/26",
|
||||
|
@ -5476,6 +5507,8 @@
|
|||
"20.38.149.192/30",
|
||||
"20.38.149.208/28",
|
||||
"20.38.150.0/23",
|
||||
"20.38.152.0/21",
|
||||
"20.38.152.0/28",
|
||||
"20.38.184.0/22",
|
||||
"20.38.188.0/22",
|
||||
"20.38.192.0/22",
|
||||
|
@ -5554,6 +5587,8 @@
|
|||
"20.39.15.16/28",
|
||||
"20.39.15.32/28",
|
||||
"20.39.15.48/29",
|
||||
"20.39.15.56/31",
|
||||
"20.39.15.60/30",
|
||||
"20.39.15.64/27",
|
||||
"20.39.160.0/21",
|
||||
"20.39.168.0/21",
|
||||
|
@ -5674,8 +5709,10 @@
|
|||
"20.40.224.128/26",
|
||||
"20.40.224.32/28",
|
||||
"20.40.224.48/30",
|
||||
"20.40.224.56/29",
|
||||
"20.40.224.64/26",
|
||||
"20.40.226.0/23",
|
||||
"20.40.32.0/21",
|
||||
"20.40.40.0/21",
|
||||
"20.40.48.0/20",
|
||||
"20.40.64.0/20",
|
||||
|
@ -5787,6 +5824,7 @@
|
|||
"20.41.69.4/30",
|
||||
"20.41.69.40/29",
|
||||
"20.41.69.48/31",
|
||||
"20.41.69.56/30",
|
||||
"20.41.69.64/27",
|
||||
"20.41.69.8/29",
|
||||
"20.41.70.0/23",
|
||||
|
@ -6023,6 +6061,7 @@
|
|||
"20.43.45.0/25",
|
||||
"20.43.45.224/29",
|
||||
"20.43.45.232/29",
|
||||
"20.43.45.244/30",
|
||||
"20.43.46.0/27",
|
||||
"20.43.46.128/26",
|
||||
"20.43.46.64/26",
|
||||
|
@ -6246,6 +6285,7 @@
|
|||
"20.45.115.128/29",
|
||||
"20.45.115.160/27",
|
||||
"20.45.116.0/26",
|
||||
"20.45.118.0/23",
|
||||
"20.45.120.0/21",
|
||||
"20.45.120.0/27",
|
||||
"20.45.121.0/27",
|
||||
|
@ -6292,6 +6332,7 @@
|
|||
"20.45.192.120/31",
|
||||
"20.45.192.122/31",
|
||||
"20.45.192.124/31",
|
||||
"20.45.192.126/31",
|
||||
"20.45.192.128/26",
|
||||
"20.45.192.192/28",
|
||||
"20.45.192.208/30",
|
||||
|
@ -6320,6 +6361,7 @@
|
|||
"20.45.198.88/29",
|
||||
"20.45.198.96/27",
|
||||
"20.45.199.128/25",
|
||||
"20.45.199.36/30",
|
||||
"20.45.199.64/26",
|
||||
"20.45.2.122/32",
|
||||
"20.45.3.127/32",
|
||||
|
@ -6484,12 +6526,15 @@
|
|||
"20.48.192.24/29",
|
||||
"20.48.192.32/27",
|
||||
"20.48.192.64/29",
|
||||
"20.48.192.80/30",
|
||||
"20.48.194.0/23",
|
||||
"20.49.0.0/18",
|
||||
"20.49.102.128/26",
|
||||
"20.49.102.16/29",
|
||||
"20.49.102.192/28",
|
||||
"20.49.102.208/30",
|
||||
"20.49.102.216/29",
|
||||
"20.49.102.224/30",
|
||||
"20.49.102.24/29",
|
||||
"20.49.102.32/28",
|
||||
"20.49.102.48/29",
|
||||
|
@ -6518,6 +6563,7 @@
|
|||
"20.49.114.128/27",
|
||||
"20.49.114.160/29",
|
||||
"20.49.114.176/29",
|
||||
"20.49.114.184/30",
|
||||
"20.49.114.20/30",
|
||||
"20.49.114.224/27",
|
||||
"20.49.114.24/29",
|
||||
|
@ -6539,6 +6585,7 @@
|
|||
"20.49.126.128/29",
|
||||
"20.49.126.136/29",
|
||||
"20.49.126.144/29",
|
||||
"20.49.126.152/30",
|
||||
"20.49.126.160/27",
|
||||
"20.49.126.224/27",
|
||||
"20.49.127.0/26",
|
||||
|
@ -6623,6 +6670,7 @@
|
|||
"20.50.68.112/29",
|
||||
"20.50.68.120/30",
|
||||
"20.50.68.124/31",
|
||||
"20.50.68.126/31",
|
||||
"20.50.68.128/29",
|
||||
"20.50.68.56/29",
|
||||
"20.50.68.96/28",
|
||||
|
@ -6656,6 +6704,7 @@
|
|||
"20.53.41.40/30",
|
||||
"20.53.41.48/28",
|
||||
"20.53.42.0/23",
|
||||
"20.53.44.0/30",
|
||||
"20.53.64.0/18",
|
||||
"20.54.0.0/17",
|
||||
"20.54.128.0/17",
|
||||
|
@ -6670,6 +6719,7 @@
|
|||
"20.58.0.0/18",
|
||||
"20.58.128.0/18",
|
||||
"20.58.192.0/18",
|
||||
"20.58.64.0/18",
|
||||
"20.59.0.0/18",
|
||||
"20.59.128.0/18",
|
||||
"20.59.192.0/18",
|
||||
|
@ -6684,6 +6734,7 @@
|
|||
"20.60.13.0/24",
|
||||
"20.60.130.0/24",
|
||||
"20.60.131.0/24",
|
||||
"20.60.132.0/23",
|
||||
"20.60.15.0/24",
|
||||
"20.60.16.0/24",
|
||||
"20.60.17.0/24",
|
||||
|
@ -6709,13 +6760,16 @@
|
|||
"20.61.96.160/29",
|
||||
"20.61.96.168/29",
|
||||
"20.61.96.176/29",
|
||||
"20.61.96.188/30",
|
||||
"20.61.97.0/27",
|
||||
"20.61.97.128/25",
|
||||
"20.61.97.64/27",
|
||||
"20.61.98.0/26",
|
||||
"20.61.98.64/31",
|
||||
"20.62.0.0/17",
|
||||
"20.62.128.0/17",
|
||||
"20.62.128.0/26",
|
||||
"20.62.128.144/30",
|
||||
"20.62.128.64/26",
|
||||
"20.62.130.0/23",
|
||||
"20.62.56.0/23",
|
||||
|
@ -7062,6 +7116,8 @@
|
|||
"23.97.112.0/25",
|
||||
"23.97.112.128/28",
|
||||
"23.97.112.64/26",
|
||||
"23.97.116.0/22",
|
||||
"23.97.120.0/21",
|
||||
"23.97.120.24/32",
|
||||
"23.97.120.25/32",
|
||||
"23.97.120.29/32",
|
||||
|
@ -7128,6 +7184,8 @@
|
|||
"23.98.107.208/28",
|
||||
"23.98.107.224/27",
|
||||
"23.98.107.28/30",
|
||||
"23.98.108.36/30",
|
||||
"23.98.108.40/31",
|
||||
"23.98.108.64/26",
|
||||
"23.98.110.0/23",
|
||||
"23.98.112.0/25",
|
||||
|
@ -7681,6 +7739,7 @@
|
|||
"40.122.65.162/32",
|
||||
"40.122.96.16/28",
|
||||
"40.123.0.0/17",
|
||||
"40.123.128.0/22",
|
||||
"40.123.16.16/28",
|
||||
"40.123.192.0/19",
|
||||
"40.123.204.26/32",
|
||||
|
@ -7820,6 +7879,7 @@
|
|||
"40.126.20.32/29",
|
||||
"40.126.200.0/24",
|
||||
"40.126.201.0/24",
|
||||
"40.126.207.0/24",
|
||||
"40.126.208.0/20",
|
||||
"40.126.21.0/24",
|
||||
"40.126.21.0/28",
|
||||
|
@ -8175,6 +8235,7 @@
|
|||
"40.64.134.176/28",
|
||||
"40.64.135.0/27",
|
||||
"40.64.135.128/25",
|
||||
"40.64.135.80/29",
|
||||
"40.64.64.0/18",
|
||||
"40.65.0.0/18",
|
||||
"40.65.106.154/32",
|
||||
|
@ -8294,6 +8355,7 @@
|
|||
"40.67.51.128/27",
|
||||
"40.67.51.160/27",
|
||||
"40.67.52.0/26",
|
||||
"40.67.54.0/23",
|
||||
"40.67.56.0/27",
|
||||
"40.67.57.0/27",
|
||||
"40.67.58.0/30",
|
||||
|
@ -8634,6 +8696,7 @@
|
|||
"40.74.143.235/32",
|
||||
"40.74.144.0/20",
|
||||
"40.74.144.0/27",
|
||||
"40.74.144.32/29",
|
||||
"40.74.145.0/27",
|
||||
"40.74.146.128/26",
|
||||
"40.74.146.16/28",
|
||||
|
@ -8731,7 +8794,9 @@
|
|||
"40.75.32.0/21",
|
||||
"40.75.32.0/27",
|
||||
"40.75.32.32/29",
|
||||
"40.75.32.40/29",
|
||||
"40.75.33.0/27",
|
||||
"40.75.33.32/29",
|
||||
"40.75.34.0/28",
|
||||
"40.75.34.128/26",
|
||||
"40.75.34.16/29",
|
||||
|
@ -8995,6 +9060,8 @@
|
|||
"40.78.198.0/23",
|
||||
"40.78.20.224/32",
|
||||
"40.78.200.0/21",
|
||||
"40.78.200.128/29",
|
||||
"40.78.201.128/29",
|
||||
"40.78.202.112/29",
|
||||
"40.78.202.120/29",
|
||||
"40.78.202.128/31",
|
||||
|
@ -9581,6 +9648,7 @@
|
|||
"40.80.172.120/29",
|
||||
"40.80.172.128/25",
|
||||
"40.80.172.16/30",
|
||||
"40.80.172.28/30",
|
||||
"40.80.172.32/28",
|
||||
"40.80.172.48/28",
|
||||
"40.80.172.64/27",
|
||||
|
@ -9723,6 +9791,7 @@
|
|||
"40.80.63.152/30",
|
||||
"40.80.63.160/27",
|
||||
"40.80.63.224/28",
|
||||
"40.80.63.240/30",
|
||||
"40.80.64.0/19",
|
||||
"40.80.96.0/20",
|
||||
"40.81.0.0/20",
|
||||
|
@ -10191,6 +10260,15 @@
|
|||
"40.87.170.192/31",
|
||||
"40.87.170.194/31",
|
||||
"40.87.170.196/30",
|
||||
"40.87.170.200/29",
|
||||
"40.87.170.208/30",
|
||||
"40.87.170.212/31",
|
||||
"40.87.170.214/31",
|
||||
"40.87.170.216/30",
|
||||
"40.87.170.220/30",
|
||||
"40.87.170.224/30",
|
||||
"40.87.170.228/30",
|
||||
"40.87.170.232/31",
|
||||
"40.87.172.0/22",
|
||||
"40.87.176.0/25",
|
||||
"40.87.176.128/27",
|
||||
|
@ -10214,12 +10292,15 @@
|
|||
"40.87.177.192/29",
|
||||
"40.87.177.200/30",
|
||||
"40.87.177.212/30",
|
||||
"40.87.177.216/31",
|
||||
"40.87.177.216/29",
|
||||
"40.87.177.32/27",
|
||||
"40.87.177.64/27",
|
||||
"40.87.177.96/28",
|
||||
"40.87.180.0/30",
|
||||
"40.87.180.12/31",
|
||||
"40.87.180.4/31",
|
||||
"40.87.180.6/31",
|
||||
"40.87.180.8/30",
|
||||
"40.87.182.0/30",
|
||||
"40.87.182.128/25",
|
||||
"40.87.182.16/29",
|
||||
|
@ -10304,9 +10385,8 @@
|
|||
"40.89.145.89/32",
|
||||
"40.89.145.93/32",
|
||||
"40.89.153.171/32",
|
||||
"40.89.153.54/32",
|
||||
"40.89.154.76/32",
|
||||
"40.89.156.151/32",
|
||||
"40.89.157.135/32",
|
||||
"40.89.157.7/32",
|
||||
"40.89.16.104/29",
|
||||
"40.89.16.112/29",
|
||||
|
@ -10357,6 +10437,7 @@
|
|||
"40.89.22.88/29",
|
||||
"40.89.224.0/19",
|
||||
"40.89.23.128/26",
|
||||
"40.89.23.36/30",
|
||||
"40.89.23.64/26",
|
||||
"40.89.240.144/28",
|
||||
"40.89.32.0/19",
|
||||
|
@ -10474,6 +10555,7 @@
|
|||
"40.90.139.36/32",
|
||||
"40.90.139.64/27",
|
||||
"40.90.139.96/27",
|
||||
"40.90.140.0/27",
|
||||
"40.90.140.128/27",
|
||||
"40.90.140.160/27",
|
||||
"40.90.140.192/27",
|
||||
|
@ -10533,6 +10615,7 @@
|
|||
"40.90.147.128/26",
|
||||
"40.90.147.192/27",
|
||||
"40.90.147.224/27",
|
||||
"40.90.147.32/27",
|
||||
"40.90.147.64/27",
|
||||
"40.90.147.96/27",
|
||||
"40.90.148.0/26",
|
||||
|
@ -10556,6 +10639,7 @@
|
|||
"40.90.151.0/26",
|
||||
"40.90.151.128/28",
|
||||
"40.90.151.144/28",
|
||||
"40.90.151.160/27",
|
||||
"40.90.151.224/27",
|
||||
"40.90.151.64/27",
|
||||
"40.90.151.96/27",
|
||||
|
@ -10942,6 +11026,7 @@
|
|||
"51.105.92.0/27",
|
||||
"51.105.92.176/28",
|
||||
"51.105.92.192/27",
|
||||
"51.105.92.52/30",
|
||||
"51.105.92.56/29",
|
||||
"51.105.93.0/26",
|
||||
"51.105.93.128/25",
|
||||
|
@ -10988,9 +11073,11 @@
|
|||
"51.107.148.128/26",
|
||||
"51.107.148.16/31",
|
||||
"51.107.148.192/26",
|
||||
"51.107.148.20/30",
|
||||
"51.107.148.24/29",
|
||||
"51.107.148.32/27",
|
||||
"51.107.148.64/29",
|
||||
"51.107.148.72/29",
|
||||
"51.107.148.80/28",
|
||||
"51.107.149.0/25",
|
||||
"51.107.149.128/26",
|
||||
|
@ -11085,6 +11172,8 @@
|
|||
"51.107.52.216/29",
|
||||
"51.107.52.224/27",
|
||||
"51.107.53.128/26",
|
||||
"51.107.53.36/30",
|
||||
"51.107.53.40/29",
|
||||
"51.107.53.64/26",
|
||||
"51.107.54.0/23",
|
||||
"51.107.56.0/27",
|
||||
|
@ -11287,6 +11376,7 @@
|
|||
"51.116.245.112/28",
|
||||
"51.116.245.128/27",
|
||||
"51.116.245.160/30",
|
||||
"51.116.245.168/30",
|
||||
"51.116.245.176/28",
|
||||
"51.116.245.192/27",
|
||||
"51.116.245.64/27",
|
||||
|
@ -11374,6 +11464,7 @@
|
|||
"51.116.60.160/27",
|
||||
"51.116.60.192/27",
|
||||
"51.116.60.224/28",
|
||||
"51.116.60.244/30",
|
||||
"51.116.60.32/28",
|
||||
"51.116.60.48/29",
|
||||
"51.116.60.56/29",
|
||||
|
@ -11413,6 +11504,7 @@
|
|||
"51.12.194.32/27",
|
||||
"51.12.195.0/27",
|
||||
"51.12.195.64/26",
|
||||
"51.12.196.0/23",
|
||||
"51.12.200.0/27",
|
||||
"51.12.201.0/27",
|
||||
"51.12.202.0/30",
|
||||
|
@ -11503,6 +11595,7 @@
|
|||
"51.12.42.32/27",
|
||||
"51.12.43.0/27",
|
||||
"51.12.43.64/26",
|
||||
"51.12.44.0/23",
|
||||
"51.12.96.0/27",
|
||||
"51.12.97.0/27",
|
||||
"51.12.98.0/30",
|
||||
|
@ -11806,6 +11899,7 @@
|
|||
"51.137.166.192/26",
|
||||
"51.137.166.28/30",
|
||||
"51.137.166.32/29",
|
||||
"51.137.166.44/30",
|
||||
"51.137.166.48/28",
|
||||
"51.137.167.0/26",
|
||||
"51.137.192.0/18",
|
||||
|
@ -12123,6 +12217,7 @@
|
|||
"51.143.201.0/24",
|
||||
"51.143.208.0/20",
|
||||
"51.143.208.0/26",
|
||||
"51.143.208.128/30",
|
||||
"51.143.208.64/26",
|
||||
"51.143.210.0/23",
|
||||
"51.143.224.0/19",
|
||||
|
@ -12194,8 +12289,9 @@
|
|||
"52.108.106.0/23",
|
||||
"52.108.108.0/23",
|
||||
"52.108.110.0/24",
|
||||
"52.108.111.0/24",
|
||||
"52.108.112.0/24",
|
||||
"52.108.113.0/24",
|
||||
"52.108.114.0/24",
|
||||
"52.108.115.0/24",
|
||||
"52.108.116.0/24",
|
||||
"52.108.128.0/24",
|
||||
|
@ -12397,6 +12493,7 @@
|
|||
"52.112.190.0/24",
|
||||
"52.112.191.0/24",
|
||||
"52.112.197.0/24",
|
||||
"52.112.200.0/22",
|
||||
"52.112.216.0/21",
|
||||
"52.112.229.0/24",
|
||||
"52.112.230.0/24",
|
||||
|
@ -12451,8 +12548,13 @@
|
|||
"52.113.37.0/24",
|
||||
"52.113.40.0/21",
|
||||
"52.113.48.0/20",
|
||||
"52.113.72.0/22",
|
||||
"52.113.76.0/23",
|
||||
"52.113.78.0/23",
|
||||
"52.113.83.0/24",
|
||||
"52.113.88.0/22",
|
||||
"52.113.9.0/24",
|
||||
"52.113.96.0/22",
|
||||
"52.114.0.0/21",
|
||||
"52.114.104.0/22",
|
||||
"52.114.108.0/22",
|
||||
|
@ -12571,6 +12673,12 @@
|
|||
"52.120.64.0/19",
|
||||
"52.120.96.0/19",
|
||||
"52.121.0.0/21",
|
||||
"52.121.100.0/22",
|
||||
"52.121.104.0/23",
|
||||
"52.121.106.0/23",
|
||||
"52.121.108.0/22",
|
||||
"52.121.116.0/22",
|
||||
"52.121.120.0/23",
|
||||
"52.121.16.0/21",
|
||||
"52.121.24.0/21",
|
||||
"52.121.32.0/22",
|
||||
|
@ -12737,6 +12845,7 @@
|
|||
"52.138.80.0/21",
|
||||
"52.138.88.0/21",
|
||||
"52.138.88.0/27",
|
||||
"52.138.88.32/29",
|
||||
"52.138.89.0/27",
|
||||
"52.138.90.0/28",
|
||||
"52.138.90.144/28",
|
||||
|
@ -12847,6 +12956,7 @@
|
|||
"52.140.109.0/25",
|
||||
"52.140.110.104/30",
|
||||
"52.140.110.112/28",
|
||||
"52.140.110.160/30",
|
||||
"52.140.110.192/26",
|
||||
"52.140.110.64/27",
|
||||
"52.140.110.96/29",
|
||||
|
@ -12961,6 +13071,7 @@
|
|||
"52.146.131.192/26",
|
||||
"52.146.131.32/29",
|
||||
"52.146.131.40/29",
|
||||
"52.146.131.48/30",
|
||||
"52.146.131.96/27",
|
||||
"52.146.134.0/23",
|
||||
"52.146.79.136/29",
|
||||
|
@ -13060,6 +13171,7 @@
|
|||
"52.150.155.0/24",
|
||||
"52.150.156.128/26",
|
||||
"52.150.156.32/30",
|
||||
"52.150.156.40/30",
|
||||
"52.150.156.64/26",
|
||||
"52.150.158.0/23",
|
||||
"52.150.36.187/32",
|
||||
|
@ -13605,6 +13717,7 @@
|
|||
"52.172.0.0/17",
|
||||
"52.172.112.0/28",
|
||||
"52.172.112.16/30",
|
||||
"52.172.112.20/30",
|
||||
"52.172.112.64/26",
|
||||
"52.172.114.0/23",
|
||||
"52.172.128.0/17",
|
||||
|
@ -15142,6 +15255,7 @@
|
|||
"52.253.186.0/24",
|
||||
"52.253.191.0/24",
|
||||
"52.253.196.0/24",
|
||||
"52.253.197.0/24",
|
||||
"52.253.203.0/24",
|
||||
"52.253.224.0/21",
|
||||
"52.253.224.223/32",
|
||||
|
@ -15415,5 +15529,5 @@
|
|||
],
|
||||
"name": "List of known Microsoft Azure Datacenter IP Ranges",
|
||||
"type": "cidr",
|
||||
"version": 20200811
|
||||
"version": 20200911
|
||||
}
|
||||
|
|
|
@ -173,5 +173,5 @@
|
|||
],
|
||||
"name": "List of known Office 365 IP address ranges",
|
||||
"type": "cidr",
|
||||
"version": 20200810
|
||||
"version": 20200911
|
||||
}
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
".flow.microsoft.com",
|
||||
".geotrust.com",
|
||||
".helpshift.com",
|
||||
".hip.live.com",
|
||||
".hockeyapp.net",
|
||||
".informationprotection.azure.com",
|
||||
".itunes.apple.com",
|
||||
|
@ -39,7 +40,6 @@
|
|||
".microsoftonline-p.com",
|
||||
".microsoftonline.com",
|
||||
".microsoftusercontent.com",
|
||||
".msappproxy.net",
|
||||
".msauth.net",
|
||||
".msauthimages.net",
|
||||
".msecnd.net",
|
||||
|
@ -144,7 +144,6 @@
|
|||
"cdnprod.myanalytics.microsoft.com",
|
||||
"cert.int-x3.letsencrypt.org",
|
||||
"cl2.apple.com",
|
||||
"client.hip.live.com",
|
||||
"clientconfig.microsoftonline-p.net",
|
||||
"companymanager.microsoftonline.com",
|
||||
"compass-ssl.microsoft.com",
|
||||
|
@ -232,7 +231,6 @@
|
|||
"officecdn.microsoft.com",
|
||||
"officecdn.microsoft.com.edgesuite.net",
|
||||
"officeclient.microsoft.com",
|
||||
"officeimg.vo.msecnd.net",
|
||||
"officepreviewredir.microsoft.com",
|
||||
"officeredir.microsoft.com",
|
||||
"officespeech.platform.bing.com",
|
||||
|
@ -344,5 +342,5 @@
|
|||
],
|
||||
"name": "List of known Office 365 URLs",
|
||||
"type": "string",
|
||||
"version": 20200810
|
||||
"version": 20200911
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -456,5 +456,5 @@
|
|||
],
|
||||
"name": "Fingerprint of trusted CA certificates",
|
||||
"type": "string",
|
||||
"version": 20200721
|
||||
"version": 20200911
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -1,30 +1,37 @@
|
|||
{
|
||||
"description": "Event contains one or more public IPv6 DNS resolvers as attribute with an IDS flag set",
|
||||
"list": [
|
||||
"2001:148f:fffe::1",
|
||||
"2001:148f:ffff::1",
|
||||
"2001:1608:10:25::1c04:b12f",
|
||||
"2001:1608:10:25::9249:d69b",
|
||||
"2001:19f0:6401:b3d:5400:2ff:fe5a:fb9f",
|
||||
"2001:41d0:203:4b1f:2:2:2:2",
|
||||
"2001:428:101:100:205:171:2:65",
|
||||
"2001:428::1",
|
||||
"2001:470:0:45::2",
|
||||
"2001:470:1f06:10b::2",
|
||||
"2001:470:1f1a:78e::2",
|
||||
"2001:470:2351:11::1",
|
||||
"2001:470:2351::1",
|
||||
"2001:4860:4860::8844",
|
||||
"2001:4860:4860::8888",
|
||||
"2001:4870:8000:3::5",
|
||||
"2001:4b8:2:101::602",
|
||||
"2001:4b8:3:201::902",
|
||||
"2001:67c:28a4::",
|
||||
"2001:67c:2b0::1",
|
||||
"2001:de4::102",
|
||||
"2001:840:2010:413::100",
|
||||
"2001:b000:168::2",
|
||||
"2001:bc8:32d7:307::301",
|
||||
"2405:8a00:8001::20",
|
||||
"240c::6644",
|
||||
"240c::6666",
|
||||
"2604:a880:0:1010::b:4001",
|
||||
"2606:4700:4700::1001",
|
||||
"2606:4700:4700::1111",
|
||||
"2606:ed00:2:babe::10",
|
||||
"2607:5300:203:1797::53",
|
||||
"2607:f130:0:d7::d41",
|
||||
"2607:5300:203:439c::102",
|
||||
"2607:5300:60:be0::1",
|
||||
"2610:a1:1018::34",
|
||||
"2620:fe::9",
|
||||
"2620:fe::fe",
|
||||
|
@ -37,7 +44,10 @@
|
|||
"2a02:2970:1002::18",
|
||||
"2a02:c205:3001:4558::1",
|
||||
"2a03:8600:1001::2",
|
||||
"2a03:b0c0:3:f0::157:2000"
|
||||
"2a09::",
|
||||
"2a09::1",
|
||||
"2a0d:2a00:1::2",
|
||||
"2a0d:2a00:2::2"
|
||||
],
|
||||
"matching_attributes": [
|
||||
"ip-src",
|
||||
|
@ -46,5 +56,5 @@
|
|||
],
|
||||
"name": "List of known IPv6 public DNS resolvers",
|
||||
"type": "string",
|
||||
"version": 20200811
|
||||
"version": 20200911
|
||||
}
|
||||
|
|
|
@ -787,7 +787,6 @@
|
|||
"MEN",
|
||||
"MENU",
|
||||
"MERCKMSD",
|
||||
"METLIFE",
|
||||
"MG",
|
||||
"MH",
|
||||
"MIAMI",
|
||||
|
@ -1518,5 +1517,5 @@
|
|||
],
|
||||
"name": "TLDs as known by IANA",
|
||||
"type": "string",
|
||||
"version": 20200811
|
||||
"version": 20200911
|
||||
}
|
||||
|
|
234494
lists/tranco/list.json
234494
lists/tranco/list.json
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -44,6 +44,7 @@
|
|||
"academiaga.ru",
|
||||
"academy.mia.by",
|
||||
"academy.sumy.ua",
|
||||
"academyart.edu",
|
||||
"acadiau.ca",
|
||||
"accimt.ac.lk",
|
||||
"accrapolytechnic.edu.gh",
|
||||
|
@ -360,6 +361,7 @@
|
|||
"arosmu.org",
|
||||
"arquitecturaucv.cl",
|
||||
"art.ac.ir",
|
||||
"art.edu",
|
||||
"art.olsztyn.pl",
|
||||
"artacademy.spb.ru",
|
||||
"arteiasi.ro",
|
||||
|
@ -3056,6 +3058,7 @@
|
|||
"impu.edu.cn",
|
||||
"imsciences.edu.pk",
|
||||
"imsu.edu.ng",
|
||||
"imt-atlantique.net",
|
||||
"imtlucca.it",
|
||||
"imtu.edu",
|
||||
"imu.edu.cn",
|
||||
|
@ -9670,5 +9673,5 @@
|
|||
],
|
||||
"name": "University domains",
|
||||
"type": "hostname",
|
||||
"version": 20200721
|
||||
"version": 20200911
|
||||
}
|
||||
|
|
|
@ -33023,5 +33023,5 @@
|
|||
],
|
||||
"name": "Specialized list of IPv4 addresses belonging to common VPN providers and datacenters",
|
||||
"type": "cidr",
|
||||
"version": 20200721
|
||||
"version": 20200911
|
||||
}
|
||||
|
|
|
@ -3017,5 +3017,5 @@
|
|||
],
|
||||
"name": "Specialized list of IPv6 addresses belonging to common VPN providers and datacenters",
|
||||
"type": "cidr",
|
||||
"version": 20200721
|
||||
"version": 20200911
|
||||
}
|
||||
|
|
|
@ -53,5 +53,5 @@
|
|||
],
|
||||
"name": "List of known Wikimedia address ranges",
|
||||
"type": "cidr",
|
||||
"version": 20200721
|
||||
"version": 20200911
|
||||
}
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
import json
|
||||
|
||||
from generator import download_to_file, get_version, write_to_file
|
||||
from generator import download_to_file, get_version, write_to_file, get_abspath_source_file
|
||||
|
||||
|
||||
def process(file, dst):
|
||||
with open(file, 'r') as json_file:
|
||||
with open(get_abspath_source_file(file), 'r') as json_file:
|
||||
amazon_aws_ip_list = json.load(json_file)
|
||||
l = []
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
import zipfile
|
||||
|
||||
from generator import download_to_file, get_version, write_to_file
|
||||
from generator import download_to_file, get_version, write_to_file, get_abspath_source_file
|
||||
|
||||
|
||||
def process(file):
|
||||
|
@ -53,7 +53,7 @@ def generate(sites, warninglist, dst):
|
|||
|
||||
|
||||
def get_lists(file):
|
||||
with zipfile.ZipFile(file, 'r') as cisco_lists:
|
||||
with zipfile.ZipFile(get_abspath_source_file(file), 'r') as cisco_lists:
|
||||
for name in cisco_lists.namelist():
|
||||
if name == "top-1m.csv":
|
||||
with cisco_lists.open(name) as cisco_list:
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from generator import download_to_file, get_version, write_to_file
|
||||
from generator import download_to_file, get_version, write_to_file, get_abspath_source_file
|
||||
|
||||
|
||||
def process(files, dst):
|
||||
|
@ -15,7 +15,7 @@ def process(files, dst):
|
|||
}
|
||||
|
||||
for file in files:
|
||||
with open(file, 'r') as f:
|
||||
with open(get_abspath_source_file(file), 'r') as f:
|
||||
ips = f.readlines()
|
||||
for ip in ips:
|
||||
warninglist['list'].append(ip.strip())
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from generator import download_to_file, get_version, write_to_file
|
||||
from generator import download_to_file, get_version, write_to_file, get_abspath_source_file
|
||||
|
||||
|
||||
def process(files, dst):
|
||||
|
@ -16,7 +16,7 @@ def process(files, dst):
|
|||
}
|
||||
|
||||
for file in files:
|
||||
with open(file, 'r') as f:
|
||||
with open(get_abspath_source_file(file), 'r') as f:
|
||||
ips = f.readlines()
|
||||
for ip in ips:
|
||||
warninglist['list'].append(ip.strip())
|
||||
|
|
|
@ -5,7 +5,7 @@ import json
|
|||
|
||||
from bs4 import BeautifulSoup
|
||||
|
||||
from generator import download, download_to_file, get_version, write_to_file
|
||||
from generator import download, download_to_file, get_version, write_to_file, get_abspath_source_file
|
||||
|
||||
|
||||
def get_json_url(page):
|
||||
|
@ -26,7 +26,7 @@ def process(file, dst):
|
|||
'type': 'cidr'
|
||||
}
|
||||
|
||||
with open(file, 'r') as json_file:
|
||||
with open(get_abspath_source_file(file), 'r') as json_file:
|
||||
ms_azure_ip_list = json.load(json_file)
|
||||
|
||||
for value in ms_azure_ip_list['values']:
|
||||
|
|
|
@ -5,7 +5,7 @@ import csv
|
|||
import ipaddress
|
||||
import logging
|
||||
|
||||
from generator import download_to_file, get_version, write_to_file
|
||||
from generator import download_to_file, get_version, write_to_file, get_abspath_source_file
|
||||
|
||||
|
||||
def process(file):
|
||||
|
@ -52,7 +52,7 @@ def generate(data_list, warninglist, dst):
|
|||
|
||||
def get_lists(file):
|
||||
|
||||
with open(file) as csv_file:
|
||||
with open(get_abspath_source_file(file)) as csv_file:
|
||||
servers_list = csv.reader(csv_file, delimiter=',', quotechar='"')
|
||||
|
||||
lipv4 = []
|
||||
|
|
|
@ -3,11 +3,12 @@
|
|||
|
||||
import zipfile
|
||||
|
||||
from generator import download_to_file, get_version, write_to_file
|
||||
from generator import (download_to_file, get_abspath_source_file, get_version,
|
||||
write_to_file)
|
||||
|
||||
|
||||
def process(file, dst):
|
||||
with zipfile.ZipFile(file, 'r') as alexa_lists:
|
||||
with zipfile.ZipFile(get_abspath_source_file(file), 'r') as alexa_lists:
|
||||
for name in alexa_lists.namelist():
|
||||
if name == "top-1m.csv":
|
||||
with alexa_lists.open(name) as top:
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from generator import download_to_file, get_version, write_to_file
|
||||
from generator import download_to_file, get_version, write_to_file, get_abspath_source_file
|
||||
|
||||
|
||||
def process(file, dst):
|
||||
|
||||
with open(file, newline='\n', encoding='utf-8', errors='replace') as csv_file:
|
||||
with open(get_abspath_source_file(file), newline='\n', encoding='utf-8', errors='replace') as csv_file:
|
||||
sites = csv_file.readlines()[:10000]
|
||||
|
||||
warninglist = {
|
||||
|
|
|
@ -1,69 +1,44 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import requests
|
||||
import datetime
|
||||
import json
|
||||
import csv
|
||||
import os
|
||||
|
||||
from generator import download_to_file, get_version, write_to_file, get_abspath_source_file
|
||||
|
||||
|
||||
# TODO: Include MozRank
|
||||
def process(files, dst):
|
||||
|
||||
moz_url_domains = "https://moz.com/top500/domains/csv"
|
||||
moz_url_pages = "https://moz.com/top500/pages/csv"
|
||||
warninglist = {
|
||||
'description': "Event contains one or more entries from the top 500 of the most used domains (Mozilla).",
|
||||
'version': get_version(),
|
||||
'name': "Top 500 domains and pages from https://moz.com/top500",
|
||||
'type': 'hostname',
|
||||
'list': [],
|
||||
'matching_attributes': ['hostname', 'domain', 'uri', 'url']
|
||||
}
|
||||
|
||||
moz_file_domains = "/tmp/top500.domains.csv"
|
||||
moz_file_pages = "/tmp/top500.pages.csv"
|
||||
for file in files:
|
||||
with open(get_abspath_source_file(file)) as csv_file:
|
||||
csv_reader = csv.reader(csv_file, delimiter=',')
|
||||
for row in csv_reader:
|
||||
v = row[1]
|
||||
warninglist['list'].append(v.rstrip().rstrip('/'))
|
||||
|
||||
user_agent = {"User-agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:46.0) Gecko/20100101 Firefox/46.0"}
|
||||
write_to_file(warninglist, dst)
|
||||
|
||||
rDomains = requests.get(moz_url_domains, headers=user_agent)
|
||||
rPages = requests.get(moz_url_pages, headers=user_agent)
|
||||
open(moz_file_domains, 'wb').write(rDomains.content)
|
||||
open(moz_file_pages, 'wb').write(rPages.content)
|
||||
|
||||
moz_warninglist = {}
|
||||
version = int(datetime.date.today().strftime('%Y%m%d'))
|
||||
if __name__ == '__main__':
|
||||
moz_domains_url = "https://moz.com/top-500/download/?table=top500Domains"
|
||||
#moz_pages_url = "https://moz.com/top500/pages/csv"
|
||||
|
||||
moz_warninglist['description'] = "Event contains one or more entries from the top 500 of the most used domains (Mozilla)."
|
||||
d = datetime.datetime.now()
|
||||
moz_warninglist['version'] = version
|
||||
moz_warninglist['name'] = "Top 500 domains and pages from https://moz.com/top500"
|
||||
moz_warninglist['type'] = 'hostname'
|
||||
moz_warninglist['list'] = []
|
||||
moz_warninglist['matching_attributes'] = ['hostname', 'domain', 'uri', 'url']
|
||||
moz_domains_file = "moz-top500.domains.csv"
|
||||
#moz_pages_file = "moz-top500.pages.csv"
|
||||
|
||||
with open(moz_file_domains) as csv_file:
|
||||
csv_reader = csv.reader(csv_file, delimiter=',')
|
||||
line_count = 0
|
||||
for row in csv_reader:
|
||||
if line_count == 0:
|
||||
#print(f'Column names are {", ".join(row)}')
|
||||
line_count += 1
|
||||
else:
|
||||
#print(f'\t{row[0]}. {row[1]}, MozTrust: {row[5]}.')
|
||||
v = row[1]
|
||||
moz_warninglist['list'].append(v.rstrip().rstrip('/'))
|
||||
line_count += 1
|
||||
moz_dst = 'moz-top500'
|
||||
|
||||
with open(moz_file_pages) as csv_file:
|
||||
csv_reader = csv.reader(csv_file, delimiter=',')
|
||||
line_count = 0
|
||||
for row in csv_reader:
|
||||
if line_count == 0:
|
||||
#print(f'Column names are {", ".join(row)}')
|
||||
line_count += 1
|
||||
else:
|
||||
#print(f'\t{row[0]}. {row[1]}, MozTrust: {row[5]}.')
|
||||
v = row[1]
|
||||
moz_warninglist['list'].append(v.rstrip().rstrip('/'))
|
||||
line_count += 1
|
||||
download_to_file(moz_domains_url, moz_domains_file)
|
||||
#download_to_file(moz_pages_url, moz_pages_file)
|
||||
|
||||
moz_warninglist['list'] = sorted(set(moz_warninglist['list']))
|
||||
print(json.dumps(moz_warninglist))
|
||||
|
||||
try:
|
||||
os.remove(moz_file_domains)
|
||||
os.remove(moz_file_pages)
|
||||
except:
|
||||
print(f'Perhaps {moz_file_domains}/{moz_file_pages} does not exist.')
|
||||
#process([moz_domains_file, moz_pages_file], moz_dst)
|
||||
process([moz_domains_file], moz_dst)
|
||||
|
|
|
@ -5,7 +5,7 @@ import csv
|
|||
|
||||
from OpenSSL.crypto import FILETYPE_PEM, load_certificate
|
||||
|
||||
from generator import download_to_file, get_version, write_to_file
|
||||
from generator import download_to_file, get_version, write_to_file, get_abspath_source_file
|
||||
|
||||
|
||||
def gethash(cert, digest):
|
||||
|
@ -14,7 +14,7 @@ def gethash(cert, digest):
|
|||
|
||||
def process(file, dst, type):
|
||||
hashes = set()
|
||||
with open(file, 'r') as f_in:
|
||||
with open(get_abspath_source_file(file), 'r') as f_in:
|
||||
for obj in csv.DictReader(f_in):
|
||||
pem = obj['PEM Info'].strip("'").replace(
|
||||
'\r', '').replace('\n\n', '\n')
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
import zipfile
|
||||
|
||||
from generator import download_to_file, get_version, write_to_file
|
||||
from generator import download_to_file, get_version, write_to_file, get_abspath_source_file
|
||||
|
||||
|
||||
def process(file):
|
||||
|
@ -42,7 +42,7 @@ def generate(sites, warninglist, dst):
|
|||
|
||||
|
||||
def get_lists(file):
|
||||
with zipfile.ZipFile(file, 'r') as tranco_lists:
|
||||
with zipfile.ZipFile(get_abspath_source_file(file), 'r') as tranco_lists:
|
||||
for name in tranco_lists.namelist():
|
||||
if name == 'top-1m.csv':
|
||||
with tranco_lists.open(name) as tranco:
|
||||
|
|
|
@ -3,49 +3,90 @@
|
|||
|
||||
import datetime
|
||||
import json
|
||||
from inspect import currentframe, getframeinfo
|
||||
from os import path
|
||||
import logging
|
||||
from inspect import currentframe, getframeinfo, getmodulename, stack
|
||||
from os import mkdir, path
|
||||
|
||||
import requests
|
||||
from dateutil.parser import parse as parsedate
|
||||
|
||||
|
||||
def init_logging():
|
||||
rel_path = getframeinfo(currentframe()).filename
|
||||
current_folder = path.dirname(path.abspath(rel_path))
|
||||
LOG_DIR = path.join(current_folder, '../generators.log')
|
||||
|
||||
logFormatter = logging.Formatter(
|
||||
"[%(asctime)s] %(levelname)s::%(funcName)s()::%(message)s")
|
||||
rootLogger = logging.getLogger()
|
||||
rootLogger.setLevel(logging.INFO)
|
||||
# Log to file
|
||||
fileHandler = logging.FileHandler(LOG_DIR)
|
||||
fileHandler.setFormatter(logFormatter)
|
||||
rootLogger.addHandler(fileHandler)
|
||||
# Log to console too
|
||||
''' consoleHandler = logging.StreamHandler()
|
||||
consoleHandler.setFormatter(logFormatter)
|
||||
rootLogger.addHandler(consoleHandler) '''
|
||||
return rootLogger
|
||||
|
||||
|
||||
init_logging()
|
||||
|
||||
|
||||
def download_to_file(url, file):
|
||||
user_agent = {"User-agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:46.0) Gecko/20100101 Firefox/46.0"}
|
||||
frame_records = stack()[1]
|
||||
caller = getmodulename(frame_records[1]).upper()
|
||||
|
||||
user_agent = {
|
||||
"User-agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:46.0) Gecko/20100101 Firefox/46.0"}
|
||||
try:
|
||||
r = requests.head(url, headers=user_agent)
|
||||
url_datetime = parsedate(r.headers['Last-Modified']).astimezone()
|
||||
file_datetime = datetime.datetime.fromtimestamp(
|
||||
path.getmtime(file)).astimezone()
|
||||
path.getmtime(get_abspath_source_file(file))).astimezone()
|
||||
|
||||
if(url_datetime > file_datetime):
|
||||
logging.info('{} File on server is newer, so downloading update to {}'.format(
|
||||
caller, get_abspath_source_file(file)))
|
||||
actual_download_to_file(url, file, user_agent)
|
||||
except (KeyError, FileNotFoundError) as ex:
|
||||
logging.warning(str(ex))
|
||||
else:
|
||||
logging.info(
|
||||
'{} File on server is older, nothing to do'.format(caller))
|
||||
except KeyError as exc:
|
||||
logging.warning('{} KeyError in the headers. the {} header was not sent by server {}. Downloading file'.format(
|
||||
caller, str(exc), url))
|
||||
actual_download_to_file(url, file, user_agent)
|
||||
|
||||
except FileNotFoundError as exc:
|
||||
logging.info(
|
||||
"{} File didn't exist, so downloading {} from {}".format(caller, file, url))
|
||||
actual_download_to_file(url, file, user_agent)
|
||||
except Exception as exc:
|
||||
logging.warning(
|
||||
'{} General exception occured: {}.'.format(caller, str(exc)))
|
||||
actual_download_to_file(url, file, user_agent)
|
||||
|
||||
|
||||
def actual_download_to_file(url, file, user_agent):
|
||||
r = requests.get(url, headers=user_agent)
|
||||
with open(file, 'wb') as fd:
|
||||
with open(get_abspath_source_file(file), 'wb') as fd:
|
||||
for chunk in r.iter_content(4096):
|
||||
fd.write(chunk)
|
||||
|
||||
|
||||
def process_stream(url):
|
||||
r = requests.get(url, stream=True)
|
||||
|
||||
|
||||
data_list = []
|
||||
for line in r.iter_lines():
|
||||
v = line.decode('utf-8')
|
||||
if not v.startswith("#"):
|
||||
if v:
|
||||
data_list.append(v)
|
||||
|
||||
|
||||
return data_list
|
||||
|
||||
|
||||
|
||||
def download(url):
|
||||
user_agent = {
|
||||
"User-agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:46.0) Gecko/20100101 Firefox/46.0"}
|
||||
|
@ -60,6 +101,15 @@ def get_abspath_list_file(dst):
|
|||
return path.abspath(path.realpath(real_path))
|
||||
|
||||
|
||||
def get_abspath_source_file(dst):
|
||||
rel_path = getframeinfo(currentframe()).filename
|
||||
current_folder = path.dirname(path.abspath(rel_path))
|
||||
tmp_path = path.join(current_folder, '../tmp/')
|
||||
if not path.exists(tmp_path):
|
||||
mkdir(tmp_path)
|
||||
return path.abspath(path.realpath(path.join(tmp_path, '{dst}'.format(dst=dst))))
|
||||
|
||||
|
||||
def get_version():
|
||||
return int(datetime.date.today().strftime('%Y%m%d'))
|
||||
|
||||
|
@ -70,7 +120,24 @@ def unique_sorted_warninglist(warninglist):
|
|||
|
||||
|
||||
def write_to_file(warninglist, dst):
|
||||
with open(get_abspath_list_file(dst), 'w') as data_file:
|
||||
json.dump(unique_sorted_warninglist(warninglist),
|
||||
data_file, indent=2, sort_keys=True)
|
||||
data_file.write("\n")
|
||||
frame_records = stack()[1]
|
||||
caller = getmodulename(frame_records[1]).upper()
|
||||
|
||||
try:
|
||||
with open(get_abspath_list_file(dst), 'w') as data_file:
|
||||
json.dump(unique_sorted_warninglist(warninglist),
|
||||
data_file, indent=2, sort_keys=True)
|
||||
data_file.write("\n")
|
||||
logging.info('New warninglist written to {}.'.format(
|
||||
get_abspath_list_file(dst)))
|
||||
except Exception as exc:
|
||||
logging.error(
|
||||
'{} General exception occured: {}.'.format(caller, str(exc)))
|
||||
|
||||
|
||||
def main():
|
||||
init_logging()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
Loading…
Reference in New Issue