fix/uablacklist

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

@@ -37,7 +37,7 @@
 129.134.168.0/21
 129.134.176.0/20
 129.134.194.0/23
-129.134.196.0/24
+129.134.196.0/23
 157.240.0.0/17
 157.240.128.0/23
 157.240.131.0/24

Subnets/IPv4/cloudfront.lst

@@ -107,6 +107,7 @@
 108.138.0.0/15
 120.253.241.160/27
 3.173.128.0/18
+51.74.192.0/18
 64.252.64.0/18
 13.113.196.64/26
 13.113.203.0/24

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

@@ -37,7 +37,7 @@
 129.134.168.0/21
 129.134.176.0/20
 129.134.194.0/23
-129.134.196.0/24
+129.134.196.0/23
 157.240.0.0/17
 157.240.128.0/23
 157.240.131.0/24

Subnets/IPv4/ovh.lst

@@ -1,22 +1,23 @@
 2.26.132.0/24
 2.26.153.0/24
 2.26.166.0/24
-2.27.172.0/24
-2.27.243.0/24
+2.27.97.0/24
 2.58.172.0/24
 5.39.0.0/17
-5.83.153.0/24
 5.133.101.0/24
 5.135.0.0/16
-5.175.164.0/24
+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
 5.182.19.0/24
 5.183.214.0/24
 5.196.0.0/16
+5.231.121.0/24
 5.231.207.0/24
 8.7.244.0/24
 8.18.128.0/24
@@ -117,7 +118,6 @@
 62.141.62.0/24
 63.251.117.0/24
 64.81.171.0/24
-64.83.69.0/24
 64.94.92.0/23
 64.95.150.0/23
 64.225.244.0/23
@@ -154,6 +154,7 @@
 82.22.51.0/24
 82.22.118.0/24
 82.24.96.0/22
+82.24.190.0/24
 82.25.146.0/23
 82.26.81.0/24
 82.26.176.0/20
@@ -195,6 +196,7 @@
 82.41.212.0/22
 82.41.224.0/21
 82.47.36.0/23
+82.47.185.0/24
 82.117.230.0/23
 82.117.245.0/24
 82.129.0.0/22
@@ -218,7 +220,6 @@
 84.32.10.0/24
 85.217.144.0/23
 86.54.26.0/24
-87.76.144.0/24
 87.76.170.0/24
 87.98.128.0/17
 87.229.51.0/24
@@ -226,6 +227,8 @@
 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
@@ -235,7 +238,6 @@
 91.134.0.0/16
 91.198.19.0/24
 91.199.32.0/24
-91.199.42.0/24
 91.213.192.0/24
 91.224.117.0/24
 91.246.38.0/24
@@ -281,6 +283,7 @@
 109.176.40.0/21
 109.176.48.0/21
 109.176.153.0/24
+114.129.44.0/24
 117.18.104.0/24
 123.100.227.0/24
 128.0.118.0/24
@@ -300,7 +303,6 @@
 141.11.39.0/24
 141.11.45.0/24
 141.11.74.0/23
-141.11.96.0/24
 141.11.107.0/24
 141.11.187.0/24
 141.11.250.0/24
@@ -347,8 +349,6 @@
 144.225.178.0/24
 145.79.151.0/24
 145.239.0.0/16
-146.19.38.0/24
-146.19.48.0/24
 146.59.0.0/16
 146.103.10.0/24
 147.135.0.0/16
@@ -363,14 +363,12 @@
 149.202.0.0/16
 151.80.0.0/16
 151.240.1.0/24
-151.240.24.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
 151.243.160.0/22
-151.243.166.0/24
 151.243.236.0/24
 151.244.78.0/24
 151.245.54.0/24
@@ -378,6 +376,7 @@
 151.245.238.0/24
 151.246.177.0/24
 151.246.190.0/24
+151.247.15.0/24
 151.247.37.0/24
 151.247.192.0/24
 151.247.217.0/24
@@ -395,6 +394,7 @@
 162.19.0.0/16
 162.141.71.0/24
 162.212.35.0/24
+163.5.50.0/24
 163.5.62.0/24
 163.5.149.0/24
 163.5.187.0/24
@@ -410,7 +410,6 @@
 167.148.193.0/24
 167.234.38.0/24
 167.253.62.0/24
-168.222.23.0/24
 168.222.49.0/24
 168.222.183.0/24
 168.222.243.0/24
@@ -419,7 +418,6 @@
 172.83.201.0/24
 176.31.0.0/16
 178.32.0.0/15
-178.214.214.0/24
 180.131.145.0/24
 181.41.194.0/24
 184.174.96.0/23
@@ -429,13 +427,13 @@
 185.10.200.0/22
 185.12.32.0/23
 185.15.68.0/22
-185.19.33.0/24
 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
@@ -465,8 +463,11 @@
 188.165.0.0/16
 188.209.140.0/24
 188.255.193.0/24
+191.44.97.0/24
+191.44.98.0/23
 191.96.140.0/23
 191.101.150.0/24
+191.101.218.0/24
 192.30.124.0/24
 192.70.246.0/23
 192.95.0.0/18
@@ -474,7 +475,6 @@
 192.109.11.0/24
 192.124.170.0/24
 192.124.180.0/24
-192.144.79.0/24
 192.152.126.0/24
 192.177.90.0/24
 192.207.105.0/24
@@ -523,6 +523,8 @@
 206.206.126.0/24
 207.166.205.0/24
 207.166.206.0/24
+207.180.13.0/24
+207.230.127.0/24
 207.244.209.0/24
 209.71.36.0/24
 209.101.164.0/24
@@ -534,7 +536,6 @@
 212.74.39.0/24
 212.100.171.0/24
 212.134.90.0/24
-212.134.97.0/24
 212.135.160.0/24
 212.192.253.0/24
 213.32.0.0/17
@@ -555,4 +556,3 @@
 217.65.73.0/24
 217.182.0.0/16
 217.217.26.0/24
-222.167.192.0/24

Subnets/IPv6/Meta.lst

@@ -11,6 +11,7 @@
 2a03:2887:ff1e::/48
 2a03:2887:ff20::/48
 2a03:2887:ff22::/47
+2a03:2887:ff27::/48
 2a03:2887:ff28::/46
 2a03:2887:ff2f::/48
 2a03:2887:ff30::/48

Subnets/IPv6/cloudfront.lst

@@ -13,6 +13,7 @@
 2600:9000:1000::/36
 2600:9000:2000::/36
 2400:7fc0:500::/40
+2001:3fc6:20::/43
 2600:9000:4000::/36
 2600:9000:fff::/48
 2409:8c00:2421:400::/56
@@ -20,7 +21,6 @@
 2600:9000:5308::/45
 2600:9000:f534::/46
 2600:f0f0:601::/48
-2600:f0f1:14::/48
 2600:9000:f520::/44
 2600:9000:5320::/43
 2600:9000:5310::/44

Subnets/IPv6/meta.lst

@@ -11,6 +11,7 @@
 2a03:2887:ff1e::/48
 2a03:2887:ff20::/48
 2a03:2887:ff22::/47
+2a03:2887:ff27::/48
 2a03:2887:ff28::/46
 2a03:2887:ff2f::/48
 2a03:2887:ff30::/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]
@@ -329,9 +334,11 @@ if __name__ == '__main__':
     # Discord (domains + UDP subnets on high ports)
     discord_subnets = lines_from_file('Subnets/IPv4/discord.lst')
     discord_domains = lines_from_file('Services/discord.lst')
+    discord_cf_subnets = ["104.16.0.0/12"]
     srs_rule('discord', [
         {"domain_suffix": discord_domains},
         {"network": ["udp"], "ip_cidr": discord_subnets, "port_range": ["50000:65535"]},
+        {"network": ["udp"], "ip_cidr": discord_cf_subnets, "port_range": ["19000:20000"]},
     ])
 
     # Mihomo main

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}')