Update subnet

Fix discord(cloudflare) subnet regression

Subnets/IPv4/Discord.lst

@@ -7,3 +7,4 @@
 35.208.0.0/12
 5.200.14.128/25
 66.22.192.0/18
+104.16.0.0/12

Subnets/IPv4/Meta.lst

@@ -30,6 +30,7 @@
 129.134.144.0/24
 129.134.147.0/24
 129.134.148.0/23
+129.134.150.0/24
 129.134.154.0/23
 129.134.156.0/22
 129.134.160.0/22

Subnets/IPv4/digitalocean.lst

@@ -143,10 +143,10 @@
 168.144.0.0/21
 168.144.12.0/22
 168.144.16.0/20
-168.144.32.0/20
-168.144.48.0/22
+168.144.32.0/19
 168.144.64.0/18
-168.144.128.0/20
+168.144.128.0/19
+168.144.160.0/20
 170.64.128.0/17
 174.138.0.0/17
 178.62.0.0/16

Subnets/IPv4/discord.lst

@@ -7,3 +7,4 @@
 35.208.0.0/12
 5.200.14.128/25
 66.22.192.0/18
+104.16.0.0/12

Subnets/IPv4/meta.lst

@@ -30,6 +30,7 @@
 129.134.144.0/24
 129.134.147.0/24
 129.134.148.0/23
+129.134.150.0/24
 129.134.154.0/23
 129.134.156.0/22
 129.134.160.0/22

Subnets/IPv4/ovh.lst

@@ -9,8 +9,6 @@
 5.172.36.0/24
 5.175.162.0/24
 5.175.168.0/24
-5.175.179.0/24
-5.175.187.0/24
 5.175.195.0/24
 5.178.106.0/24
 5.178.110.0/24
@@ -71,7 +69,6 @@
 43.226.0.0/23
 45.39.79.0/24
 45.43.142.0/24
-45.62.167.0/24
 45.66.82.0/23
 45.92.60.0/22
 45.94.49.0/24
@@ -93,6 +90,7 @@
 46.203.128.0/22
 46.203.140.0/22
 46.236.211.0/24
+46.236.217.0/24
 46.244.32.0/20
 50.114.91.0/24
 51.38.0.0/16
@@ -127,12 +125,12 @@
 66.92.161.0/24
 66.92.168.0/24
 66.179.218.0/23
-67.63.54.0/24
 68.65.214.0/24
 68.232.108.0/24
 69.17.37.0/24
 69.72.31.0/24
 72.251.0.0/17
+76.9.104.0/23
 77.73.34.0/24
 77.74.120.0/23
 77.74.122.0/24
@@ -148,6 +146,7 @@
 80.71.226.0/24
 80.87.206.0/24
 80.240.94.0/24
+81.168.80.0/24
 82.21.139.0/24
 82.22.15.0/24
 82.22.25.0/24
@@ -173,7 +172,6 @@
 82.39.156.0/22
 82.39.176.0/21
 82.39.216.0/22
-82.39.221.0/24
 82.39.224.0/22
 82.40.0.0/20
 82.40.16.0/22
@@ -223,21 +221,20 @@
 87.76.170.0/24
 87.98.128.0/17
 87.229.51.0/24
+87.232.84.0/24
 88.216.221.0/24
 88.218.34.0/24
 89.19.44.0/24
 89.125.172.0/24
 89.126.233.0/24
-89.144.22.0/24
-89.144.54.0/24
 91.90.88.0/21
 91.121.0.0/16
-91.124.14.0/24
 91.124.192.0/24
 91.124.199.0/24
 91.134.0.0/16
 91.198.19.0/24
 91.199.32.0/24
+91.209.58.0/24
 91.213.192.0/24
 91.224.117.0/24
 91.246.38.0/24
@@ -256,12 +253,15 @@
 96.62.105.0/24
 103.5.12.0/22
 103.82.16.0/22
+103.166.228.0/24
 103.167.178.0/23
+103.168.196.0/23
 103.170.116.0/23
 103.189.191.0/24
 103.199.80.0/24
 103.206.156.0/23
 103.239.50.0/24
+103.244.227.0/24
 104.164.137.0/24
 104.167.16.0/24
 104.222.182.0/24
@@ -279,7 +279,6 @@
 109.122.15.0/24
 109.122.20.0/24
 109.122.58.0/24
-109.122.194.0/23
 109.176.40.0/21
 109.176.48.0/21
 109.176.153.0/24
@@ -292,9 +291,9 @@
 135.125.0.0/16
 135.148.0.0/16
 136.0.95.0/24
+136.143.200.0/24
 137.74.0.0/16
 137.83.50.0/24
-138.249.2.0/24
 139.99.0.0/16
 141.11.1.0/24
 141.11.18.0/24
@@ -337,6 +336,7 @@
 142.252.51.0/24
 142.252.115.0/24
 142.252.127.0/24
+143.14.59.0/24
 143.14.231.0/24
 143.20.66.0/24
 143.20.195.0/24
@@ -359,12 +359,12 @@
 148.135.192.0/24
 148.222.40.0/22
 148.222.120.0/22
+149.5.230.0/24
 149.56.0.0/16
 149.202.0.0/16
 151.80.0.0/16
 151.240.1.0/24
 151.241.68.0/24
-151.242.59.0/24
 151.242.103.0/24
 151.243.6.0/24
 151.243.120.0/24
@@ -382,7 +382,10 @@
 151.247.217.0/24
 152.228.128.0/17
 155.117.5.0/24
+155.117.6.0/24
+155.117.13.0/24
 155.117.127.0/24
+155.117.197.0/24
 155.117.210.0/24
 155.117.212.0/23
 155.117.233.0/24
@@ -421,19 +424,15 @@
 180.131.145.0/24
 181.41.194.0/24
 184.174.96.0/23
-184.174.99.0/24
 185.2.48.0/23
 185.5.39.0/24
 185.10.200.0/22
 185.12.32.0/23
-185.15.68.0/22
 185.30.212.0/23
 185.45.160.0/22
 185.68.137.0/24
-185.79.139.0/24
 185.95.157.0/24
 185.101.104.0/24
-185.112.182.0/24
 185.113.138.0/24
 185.113.249.0/24
 185.127.28.0/24
@@ -461,8 +460,8 @@
 185.255.28.0/24
 188.68.164.0/22
 188.165.0.0/16
-188.209.140.0/24
 188.255.193.0/24
+191.44.92.0/24
 191.44.97.0/24
 191.44.98.0/23
 191.96.140.0/23
@@ -502,6 +501,7 @@
 195.38.19.0/24
 195.62.72.0/23
 195.66.30.0/23
+195.144.5.0/24
 198.27.64.0/18
 198.49.103.0/24
 198.50.128.0/17
@@ -546,7 +546,6 @@
 213.186.32.0/19
 213.218.214.0/24
 213.251.128.0/18
-216.24.221.0/24
 216.183.120.0/24
 216.203.15.0/24
 216.211.218.0/24

Subnets/IPv6/Meta.lst

@@ -13,7 +13,7 @@
 2a03:2887:ff22::/47
 2a03:2887:ff27::/48
 2a03:2887:ff28::/46
-2a03:2887:ff2f::/48
+2a03:2887:ff2e::/47
 2a03:2887:ff30::/48
 2a03:2887:ff33::/48
 2a03:2887:ff37::/48
@@ -32,6 +32,7 @@
 2a03:2887:ff62::/47
 2a03:2887:ff64::/46
 2a03:2887:ff68::/46
+2a03:2887:ff6f::/48
 2a03:2887:ff70::/46
 2c0f:ef78:3::/48
 2c0f:ef78:5::/48

Subnets/IPv6/meta.lst

@@ -13,7 +13,7 @@
 2a03:2887:ff22::/47
 2a03:2887:ff27::/48
 2a03:2887:ff28::/46
-2a03:2887:ff2f::/48
+2a03:2887:ff2e::/47
 2a03:2887:ff30::/48
 2a03:2887:ff33::/48
 2a03:2887:ff37::/48
@@ -32,6 +32,7 @@
 2a03:2887:ff62::/47
 2a03:2887:ff64::/46
 2a03:2887:ff68::/46
+2a03:2887:ff6f::/48
 2a03:2887:ff70::/46
 2c0f:ef78:3::/48
 2c0f:ef78:5::/48

convert.py

@@ -292,7 +292,12 @@ if __name__ == '__main__':
     # Ukraine
     Path("Ukraine").mkdir(parents=True, exist_ok=True)
 
-    urllib.request.urlretrieve("https://uablacklist.net/domains.txt", "uablacklist-domains.lst")
+    with urllib.request.urlopen("https://raw.githubusercontent.com/uablacklist/uablacklist.net/master/gen/scripts/domains.json") as resp:
+        uablacklist_data = json.loads(resp.read().decode())
+    with open("uablacklist-domains.lst", 'w') as f:
+        for domain in uablacklist_data.keys():
+            f.write(f"{domain}\n")
+
     urllib.request.urlretrieve("https://raw.githubusercontent.com/zhovner/zaborona_help/master/config/domainsdb.txt", "zaboronahelp-domains.lst")
 
     ua_lists = ['uablacklist-domains.lst', 'zaboronahelp-domains.lst', uaDomainsSrc]

get-subnets.py

@@ -36,6 +36,11 @@ DISCORD_VOICE_V6='https://iplist.opencck.org/?format=text&data=cidr6&site=discor
 
 DISCORD = 'discord.lst'
 
+# todo: parse this dynamically!
+DISCORD_CF_V4 = [
+    '104.16.0.0/12',
+]
+
 TELEGRAM_CIDR_URL = 'https://core.telegram.org/resources/cidr.txt'
 
 CLOUDFLARE_V4='https://www.cloudflare.com/ips-v4'
@@ -161,6 +166,7 @@ if __name__ == '__main__':
     # Discord voice
     print(f'Fetching {DISCORD}...')
     ipv4_discord, ipv6_discord = download_subnets(DISCORD_VOICE_V4, DISCORD_VOICE_V6)
+    ipv4_discord.extend(DISCORD_CF_V4)
     write_subnets_to_file(ipv4_discord, f'{IPv4_DIR}/{DISCORD}')
     write_subnets_to_file(ipv6_discord, f'{IPv6_DIR}/{DISCORD}')