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/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,15 +1,13 @@
 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.133.101.0/24
 5.135.0.0/16
 5.172.36.0/24
 5.175.162.0/24
-5.175.164.0/24
 5.175.168.0/24
 5.175.179.0/24
 5.175.187.0/24
@@ -19,6 +17,7 @@
 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
@@ -350,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
@@ -366,7 +363,6 @@
 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
@@ -414,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
@@ -432,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
@@ -472,6 +467,7 @@
 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

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