diff --git a/ranges/urbanvpn.txt b/ranges/urbanvpn.txt new file mode 100644 index 0000000..d44c6fe --- /dev/null +++ b/ranges/urbanvpn.txt @@ -0,0 +1,272 @@ +5.42.206.146/32 +146.70.241.122/32 +38.165.230.210/32 +190.103.177.162/32 +38.165.230.130/32 +103.50.33.107/32 +103.50.33.200/32 +38.165.230.218/32 +103.50.33.186/32 +103.50.33.21/32 +38.165.230.194/32 +130.195.222.54/32 +94.198.41.242/32 +94.198.41.218/32 +144.48.39.114/32 +144.48.37.141/32 +103.108.229.143/32 +144.48.38.138/32 +144.48.38.146/32 +139.99.209.67/32 +182.54.232.23/32 +144.48.37.111/32 +144.48.38.35/32 +45.125.247.13/32 +45.248.77.67/32 +139.99.148.8/32 +139.99.148.18/32 +45.128.133.202/32 +89.249.73.26/32 +146.70.176.222/32 +37.120.236.26/32 +193.107.70.113/32 +37.120.152.186/32 +185.216.32.26/32 +190.186.42.50/32 +177.54.147.116/32 +177.54.146.84/32 +177.54.157.16/32 +108.181.68.187/32 +189.1.173.19/32 +140.174.187.15/32 +108.181.68.87/32 +140.174.187.17/32 +178.172.217.19/32 +178.172.217.13/32 +173.209.63.146/32 +67.43.236.226/32 +148.113.221.150/32 +148.113.221.152/32 +173.209.51.250/32 +104.245.146.82/32 +135.84.180.228/32 +173.209.48.162/32 +173.209.49.50/32 +179.43.152.90/32 +146.70.135.14/32 +208.69.78.7/32 +66.163.116.199/32 +102.220.17.118/32 +200.63.100.12/32 +45.250.252.93/32 +45.250.252.51/32 +43.252.167.94/32 +43.252.167.96/32 +103.219.169.75/32 +138.121.203.146/32 +200.122.181.11/32 +157.97.132.199/32 +185.191.206.100/32 +217.138.220.50/32 +217.138.220.226/32 +217.138.220.94/32 +89.163.221.18/32 +193.108.116.248/32 +193.108.116.232/32 +23.160.72.45/32 +23.160.72.205/32 +23.160.72.218/32 +23.158.56.244/32 +23.160.72.50/32 +51.38.111.185/32 +51.38.121.218/32 +85.114.138.43/32 +5.104.107.251/32 +82.103.131.250/32 +146.70.42.202/32 +89.45.7.250/32 +193.36.116.234/32 +197.140.142.218/32 +197.140.142.163/32 +38.165.231.22/32 +46.22.223.178/32 +95.153.32.34/32 +95.153.31.102/32 +188.214.122.162/32 +188.214.122.18/32 +140.174.184.53/32 +167.17.71.36/32 +66.163.118.37/32 +188.164.196.6/32 +108.181.121.42/32 +83.143.242.74/32 +194.34.134.21/32 +79.137.101.250/32 +37.187.194.214/32 +139.64.167.194/32 +139.64.167.210/32 +51.68.100.204/32 +51.68.240.51/32 +51.77.190.70/32 +51.77.190.29/32 +51.77.190.60/32 +185.245.80.156/32 +185.145.201.31/32 +51.89.153.211/32 +51.89.173.123/32 +38.114.120.157/32 +78.129.229.29/32 +57.129.140.187/32 +198.244.253.161/32 +216.106.188.185/32 +5.180.211.94/32 +185.164.139.44/32 +185.174.110.2/32 +139.28.176.106/32 +172.99.190.183/32 +145.239.6.2/32 +212.84.160.58/32 +172.99.190.215/32 +88.150.230.5/32 +188.93.91.2/32 +188.93.90.66/32 +169.255.56.147/32 +95.129.46.100/32 +170.80.111.119/32 +169.150.222.197/32 +190.92.9.46/32 +178.218.162.117/32 +185.104.187.130/32 +185.252.223.226/32 +185.252.223.210/32 +45.64.98.114/32 +202.162.204.214/32 +202.162.204.223/32 +185.252.222.170/32 +188.241.178.86/32 +185.253.73.216/32 +182.54.236.193/32 +182.54.236.194/32 +148.113.8.93/32 +148.113.0.105/32 +148.113.47.86/32 +148.113.0.104/32 +148.113.47.56/32 +37.235.49.61/32 +37.235.49.103/32 +91.193.5.182/32 +216.106.191.184/32 +66.163.119.139/32 +82.212.103.6/32 +82.212.77.242/32 +103.108.230.50/32 +180.149.230.197/32 +103.108.230.52/32 +180.149.230.169/32 +103.108.230.31/32 +103.108.230.51/32 +5.180.44.194/32 +180.149.230.241/32 +102.68.86.97/32 +91.213.233.111/32 +91.213.233.176/32 +79.110.55.34/32 +61.255.174.11/32 +140.174.179.129/32 +38.54.124.170/32 +185.120.77.104/32 +185.64.104.88/32 +93.115.25.31/32 +23.109.137.14/32 +23.109.136.82/32 +23.109.136.154/32 +23.109.136.54/32 +23.109.136.58/32 +23.109.136.146/32 +109.248.149.173/32 +154.70.207.190/32 +171.22.254.19/32 +171.22.254.144/32 +201.150.33.188/32 +201.150.33.172/32 +201.150.35.76/32 +202.87.221.113/32 +202.73.12.14/32 +202.73.12.60/32 +169.255.57.58/32 +131.196.35.40/32 +167.17.70.173/32 +172.99.188.95/32 +51.15.16.66/32 +185.181.61.141/32 +83.143.82.62/32 +83.143.82.58/32 +180.149.231.103/32 +180.149.231.76/32 +103.75.11.41/32 +180.149.231.99/32 +180.149.231.71/32 +200.74.244.7/32 +190.97.163.17/32 +138.186.143.50/32 +103.103.0.21/32 +112.199.95.186/32 +103.152.255.235/32 +57.128.235.172/32 +57.128.235.170/32 +151.115.88.238/32 +199.255.116.5/32 +38.158.220.26/32 +185.113.141.65/32 +185.113.140.26/32 +185.113.140.45/32 +38.165.233.7/32 +38.165.233.30/32 +146.70.254.146/32 +188.212.101.130/32 +146.70.52.62/32 +146.70.52.54/32 +146.70.231.130/32 +146.70.52.94/32 +146.70.167.70/32 +95.143.193.15/32 +169.255.56.62/32 +116.251.217.47/32 +116.251.216.100/32 +103.200.209.250/32 +15.235.145.238/32 +103.253.27.6/32 +195.80.150.194/32 +195.80.150.202/32 +193.37.255.2/32 +185.245.85.126/32 +119.59.98.133/32 +119.59.98.74/32 +188.213.34.178/32 +185.169.64.46/32 +188.213.34.126/32 +130.195.216.2/32 +185.189.161.137/32 +103.4.29.100/32 +194.28.84.109/32 +176.103.50.127/32 +176.103.54.71/32 +146.70.228.82/32 +167.17.66.82/32 +169.197.83.34/32 +169.197.85.171/32 +169.197.85.170/32 +169.197.142.208/32 +38.128.66.22/32 +38.68.134.126/32 +162.251.62.66/32 +23.154.136.106/32 +169.197.85.172/32 +169.197.85.173/32 +169.197.85.174/32 +179.27.200.30/32 +45.228.67.28/32 +103.97.125.216/32 +103.9.78.107/32 +129.232.237.178/32 +129.232.237.210/32 \ No newline at end of file diff --git a/ranges/vpnly.txt b/ranges/vpnly.txt new file mode 100644 index 0000000..8c2d08a --- /dev/null +++ b/ranges/vpnly.txt @@ -0,0 +1,53 @@ +46.229.253.218/32 +195.74.93.252/32 +78.31.67.36/32 +89.163.144.107/32 +46.229.253.197/32 +89.163.144.21/32 +89.163.144.37/32 +46.229.253.212/32 +5.199.143.248/32 +195.74.93.75/32 +213.202.219.29/32 +195.74.93.73/32 +5.104.111.246/32 +195.74.93.74/32 +46.229.253.195/32 +78.31.67.70/32 +208.87.241.235/32 +108.181.0.171/32 +208.87.240.255/32 +108.181.4.69/32 +208.87.241.221/32 +208.87.242.23/32 +108.181.0.21/32 +108.181.1.241/32 +208.87.240.19/32 +208.87.242.199/32 +108.181.3.149/32 +208.87.242.111/32 +108.181.3.145/32 +108.181.0.109/32 +45.12.133.12/32 +104.168.10.152/32 +64.31.63.35/32 +104.168.10.60/32 +45.12.133.22/32 +94.232.247.205/32 +104.168.10.210/32 +94.232.247.207/32 +64.31.63.233/32 +64.31.63.245/32 +104.168.10.80/32 +64.31.63.133/32 +104.168.10.61/32 +45.12.133.18/32 +104.168.10.168/32 +46.229.243.197/32 +46.229.243.200/32 +108.181.59.34/32 +46.229.243.199/32 +46.229.243.201/32 +108.181.58.33/32 +46.229.243.203/32 +46.229.243.178/32 diff --git a/src/utils/ranges.ts b/src/utils/ranges.ts index 6508df8..1f59e04 100644 --- a/src/utils/ranges.ts +++ b/src/utils/ranges.ts @@ -9,7 +9,6 @@ export interface BlockedIpResult { const IPV6_BITS = 128n const IPV6_FULL_MASK = (1n << IPV6_BITS) - 1n -const toBlockLists = ['expressvpn', '1clickvpn'] type ParsedIp = | { version: 4; value: number } @@ -173,7 +172,7 @@ export async function checkIpRanges(ip: string): Promise { for (const cidr of cidrs) { if (isIpInCidr(parsedIp, cidr)) { return { - blocked: toBlockLists.includes(path.basename(fileName, '.txt')), + blocked: path.basename(fileName, '.txt') != 'cloudflare', list: path.basename(fileName, '.txt'), range: cidr } diff --git a/src/utils/slop.ts b/src/utils/slop.ts index 34bc19e..b89f9c9 100644 --- a/src/utils/slop.ts +++ b/src/utils/slop.ts @@ -93,6 +93,7 @@ async function parseSlop(id: string, title: string, description: string, channel const cachedSlop = await redis.get(`slop:${id}`) if (cachedSlop) return cachedSlop == 'true' ? true : false + return false const { is_slop, reasoning } = await analyseSlop(id , title, description) if (reasoning != 'failed to parse') await redis.set(`slop:${id}`, is_slop.toString(), 'EX', 60 * 60 * 24 * 7)