pfBlocker - fix alias array check before loop, fix duplicates on autmatic rules and update country lists

1 files changed, 185 insertions, 82 deletions

diff --git a/config/pf-blocker/lists/South_America_cidr.txt b/config/pf-blocker/lists/South_America_cidr.txt
index d4f0bd0c..b9c34558 100755
--- a/config/pf-blocker/lists/South_America_cidr.txt
+++ b/config/pf-blocker/lists/South_America_cidr.txt
@@ -3,8 +3,8 @@
 # Total Subnets: 60,140,544
 # Country: ARGENTINA
 # ISO Code: AR
-# Total Networks: 651
-# Total Subnets:  14,092,544
+# Total Networks: 691
+# Total Subnets:  14,425,856
 24.232.0.0/16
 66.60.0.0/18
 140.191.0.0/16
@@ -24,8 +24,10 @@
 181.16.128.0/17
 181.20.0.0/14
 181.28.0.0/14
-181.46.0.0/15
+181.46.0.0/16
+181.47.0.0/16
 181.80.0.0/12
+181.164.0.0/14
 186.0.128.0/21
 186.0.136.0/21
 186.0.152.0/22
@@ -44,7 +46,8 @@
 186.13.0.0/16
 186.18.0.0/16
 186.19.0.0/16
-186.22.0.0/15
+186.22.0.0/16
+186.23.0.0/16
 186.26.64.0/19
 186.26.96.0/20
 186.33.0.0/18
@@ -54,12 +57,14 @@
 186.56.0.0/17
 186.56.128.0/17
 186.57.0.0/16
-186.58.0.0/15
+186.58.0.0/16
+186.59.0.0/16
 186.60.0.0/14
 186.64.0.0/18
 186.64.64.0/19
 186.96.0.0/18
 186.96.128.0/18
+186.96.192.0/21
 186.96.200.0/21
 186.96.208.0/20
 186.96.224.0/20
@@ -69,12 +74,16 @@
 186.108.0.0/14
 186.122.0.0/16
 186.123.0.0/16
-186.124.0.0/15
-186.126.0.0/15
+186.124.0.0/16
+186.125.0.0/16
+186.126.0.0/16
+186.127.0.0/16
 186.128.0.0/14
 186.132.0.0/14
-186.136.0.0/15
-186.138.0.0/15
+186.136.0.0/16
+186.137.0.0/16
+186.138.0.0/16
+186.139.0.0/16
 186.140.0.0/14
 186.148.128.0/19
 186.148.200.0/21
@@ -82,7 +91,8 @@
 186.148.232.0/21
 186.148.240.0/21
 186.148.248.0/21
-186.152.0.0/15
+186.152.0.0/16
+186.153.0.0/16
 186.157.0.0/16
 186.182.0.0/16
 186.189.0.0/17
@@ -162,7 +172,8 @@
 190.15.224.0/19
 190.16.0.0/16
 190.17.0.0/16
-190.18.0.0/15
+190.18.0.0/16
+190.19.0.0/16
 190.30.0.0/16
 190.31.0.0/16
 190.48.0.0/16
@@ -172,6 +183,7 @@
 190.52.32.0/21
 190.52.40.0/21
 190.52.56.0/21
+190.52.208.0/20
 190.55.0.0/18
 190.55.64.0/18
 190.55.128.0/18
@@ -190,11 +202,17 @@
 190.96.112.0/20
 190.97.0.0/19
 190.97.32.0/19
+190.97.120.0/21
 190.98.128.0/19
 190.98.160.0/19
 190.99.64.0/21
 190.99.80.0/21
 190.103.0.0/20
+190.103.16.0/21
+190.103.24.0/22
+190.103.80.0/22
+190.103.84.0/22
+190.103.88.0/21
 190.103.128.0/20
 190.103.176.0/22
 190.103.192.0/20
@@ -217,10 +235,12 @@
 190.107.96.0/20
 190.107.112.0/20
 190.107.240.0/21
+190.108.76.0/22
 190.108.192.0/22
 190.108.224.0/20
 190.108.240.0/20
 190.109.16.0/20
+190.109.32.0/19
 190.110.176.0/21
 190.110.184.0/21
 190.110.224.0/19
@@ -273,29 +293,42 @@
 190.124.252.0/22
 190.136.0.0/16
 190.137.0.0/16
-190.138.0.0/15
+190.138.0.0/16
+190.139.0.0/16
 190.151.136.0/21
 190.151.144.0/20
 190.151.160.0/20
-190.172.0.0/15
-190.174.0.0/15
-190.176.0.0/15
-190.178.0.0/15
+190.172.0.0/16
+190.173.0.0/16
+190.174.0.0/16
+190.175.0.0/16
+190.176.0.0/16
+190.177.0.0/16
+190.178.0.0/16
+190.179.0.0/16
 190.180.144.0/22
 190.181.64.0/18
+190.182.128.0/17
 190.183.0.0/18
 190.183.64.0/18
 190.183.128.0/18
 190.183.192.0/19
 190.183.224.0/19
 190.184.192.0/22
+190.184.208.0/21
+190.184.220.0/22
+190.184.224.0/20
 190.184.240.0/20
 190.185.128.0/18
 190.185.192.0/18
-190.188.0.0/15
-190.190.0.0/15
-190.192.0.0/15
-190.194.0.0/15
+190.188.0.0/16
+190.189.0.0/16
+190.190.0.0/16
+190.191.0.0/16
+190.192.0.0/16
+190.193.0.0/16
+190.194.0.0/16
+190.195.0.0/16
 190.196.224.0/20
 190.197.128.0/18
 190.197.192.0/18
@@ -316,11 +349,15 @@
 190.220.0.0/17
 190.220.128.0/17
 190.221.0.0/16
-190.224.0.0/15
-190.226.0.0/15
+190.224.0.0/16
+190.225.0.0/16
+190.226.0.0/16
+190.227.0.0/16
 190.228.0.0/14
-190.244.0.0/15
-190.246.0.0/15
+190.244.0.0/16
+190.245.0.0/16
+190.246.0.0/16
+190.247.0.0/16
 196.32.64.0/19
 199.248.144.0/24
 200.0.17.0/24
@@ -476,7 +513,6 @@
 200.49.128.0/19
 200.49.192.0/19
 200.49.224.0/20
-200.49.248.0/21
 200.50.160.0/20
 200.50.176.0/20
 200.50.240.0/21
@@ -618,6 +654,8 @@
 200.123.192.0/20
 200.124.96.0/20
 200.124.112.0/21
+200.124.122.0/24
+200.124.123.0/24
 200.125.64.0/19
 200.125.96.0/19
 200.126.128.0/19
@@ -626,7 +664,8 @@
 200.127.0.0/17
 200.127.128.0/17
 201.176.0.0/14
-201.180.0.0/15
+201.180.0.0/16
+201.181.0.0/16
 201.212.0.0/17
 201.212.128.0/17
 201.213.0.0/16
@@ -635,6 +674,7 @@
 201.217.224.0/20
 201.219.64.0/19
 201.219.96.0/20
+201.219.160.0/19
 201.220.160.0/20
 201.220.176.0/20
 201.221.96.0/20
@@ -658,14 +698,16 @@
 216.244.192.0/18
 # Country: BOLIVIA
 # ISO Code: BO
-# Total Networks: 53
-# Total Subnets:  529,152
+# Total Networks: 55
+# Total Subnets:  561,920
 166.114.0.0/16
 167.157.0.0/16
 186.0.156.0/22
 186.2.0.0/18
 186.2.64.0/18
 186.27.0.0/18
+186.27.64.0/18
+186.121.192.0/18
 190.0.248.0/21
 190.3.184.0/21
 190.11.64.0/20
@@ -715,8 +757,8 @@
 201.222.96.0/19
 # Country: BRAZIL
 # ISO Code: BR
-# Total Networks: 275
-# Total Subnets:  46,466,816
+# Total Networks: 278
+# Total Subnets:  48,572,160
 139.82.0.0/16
 143.54.0.0/16
 143.106.0.0/16
@@ -744,6 +786,7 @@
 177.32.0.0/11
 177.64.0.0/11
 177.96.0.0/11
+177.128.0.0/11
 186.192.0.0/11
 186.224.0.0/11
 187.0.0.0/11
@@ -982,7 +1025,8 @@
 200.14.35.0/24
 200.14.36.0/24
 200.17.0.0/16
-200.18.0.0/15
+200.18.0.0/16
+200.19.0.0/16
 200.20.0.0/16
 200.96.0.0/13
 200.128.0.0/9
@@ -992,10 +1036,11 @@
 201.48.0.0/12
 201.64.0.0/11
 206.221.80.0/20
+213.144.160.0/19
 # Country: CHILE
 # ISO Code: CL
-# Total Networks: 470
-# Total Subnets:  7,058,688
+# Total Networks: 484
+# Total Subnets:  7,354,624
 146.83.0.0/16
 146.155.0.0/16
 152.74.0.0/16
@@ -1020,6 +1065,10 @@
 170.18.0.0/16
 181.42.0.0/16
 181.72.0.0/14
+181.160.0.0/16
+181.161.0.0/16
+181.172.0.0/16
+181.173.0.0/16
 186.9.0.0/17
 186.9.128.0/17
 186.10.0.0/17
@@ -1027,7 +1076,8 @@
 186.11.0.0/16
 186.20.0.0/16
 186.21.0.0/16
-186.34.0.0/15
+186.34.0.0/16
+186.35.0.0/16
 186.36.0.0/16
 186.37.0.0/16
 186.40.0.0/17
@@ -1035,10 +1085,13 @@
 186.41.0.0/16
 186.65.128.0/17
 186.67.0.0/16
-186.78.0.0/15
+186.78.0.0/16
+186.79.0.0/16
 186.103.128.0/17
-186.104.0.0/15
-186.106.0.0/15
+186.104.0.0/16
+186.105.0.0/16
+186.106.0.0/16
+186.107.0.0/16
 186.148.0.0/18
 186.148.208.0/22
 186.156.0.0/17
@@ -1069,7 +1122,8 @@
 190.22.128.0/17
 190.44.0.0/16
 190.45.0.0/16
-190.46.0.0/15
+190.46.0.0/16
+190.47.0.0/16
 190.54.0.0/17
 190.54.128.0/17
 190.82.0.0/18
@@ -1084,6 +1138,7 @@
 190.96.32.0/19
 190.96.64.0/19
 190.97.168.0/22
+190.97.172.0/22
 190.98.192.0/18
 190.99.88.0/22
 190.100.0.0/16
@@ -1105,8 +1160,10 @@
 190.123.64.0/20
 190.151.0.0/17
 190.153.128.0/17
-190.160.0.0/15
-190.162.0.0/15
+190.160.0.0/16
+190.161.0.0/16
+190.162.0.0/16
+190.163.0.0/16
 190.164.0.0/17
 190.164.128.0/17
 190.171.128.0/18
@@ -1434,7 +1491,9 @@
 200.126.112.0/20
 201.186.0.0/16
 201.187.0.0/17
-201.188.0.0/15
+201.187.128.0/17
+201.188.0.0/16
+201.189.0.0/16
 201.214.0.0/17
 201.214.128.0/17
 201.215.0.0/16
@@ -1468,19 +1527,21 @@
 216.155.64.0/19
 # Country: COLOMBIA
 # ISO Code: CO
-# Total Networks: 276
-# Total Subnets:  8,747,264
+# Total Networks: 294
+# Total Subnets:  8,814,336
 66.231.64.0/20
 157.253.0.0/16
 168.176.0.0/16
 181.48.0.0/13
-181.68.0.0/15
+181.68.0.0/16
+181.69.0.0/16
 181.128.0.0/13
 181.144.0.0/13
 186.0.0.0/18
 186.0.64.0/18
 186.1.160.0/19
 186.1.248.0/21
+186.27.128.0/17
 186.28.0.0/16
 186.29.0.0/16
 186.30.0.0/16
@@ -1500,8 +1561,13 @@
 186.121.0.0/17
 186.144.0.0/14
 186.154.0.0/16
-186.168.0.0/15
-186.170.0.0/15
+186.159.0.0/18
+186.159.64.0/19
+186.159.112.0/22
+186.168.0.0/16
+186.169.0.0/16
+186.170.0.0/16
+186.171.0.0/16
 186.180.0.0/16
 186.181.0.0/16
 190.0.0.0/19
@@ -1546,10 +1612,13 @@
 190.28.0.0/16
 190.29.0.0/16
 190.52.0.0/19
-190.60.0.0/15
+190.60.0.0/16
+190.61.0.0/16
 190.65.0.0/16
-190.66.0.0/15
-190.68.0.0/15
+190.66.0.0/16
+190.67.0.0/16
+190.68.0.0/16
+190.69.0.0/16
 190.70.0.0/17
 190.70.128.0/17
 190.71.0.0/16
@@ -1567,6 +1636,7 @@
 190.97.128.0/19
 190.97.192.0/19
 190.99.128.0/17
+190.102.160.0/19
 190.102.192.0/20
 190.102.208.0/20
 190.103.96.0/20
@@ -1581,7 +1651,8 @@
 190.121.144.0/20
 190.124.96.0/19
 190.125.0.0/16
-190.126.0.0/15
+190.126.0.0/16
+190.127.0.0/16
 190.128.0.0/19
 190.128.32.0/19
 190.128.64.0/18
@@ -1591,8 +1662,10 @@
 190.143.64.0/18
 190.144.0.0/14
 190.151.192.0/18
-190.156.0.0/15
-190.158.0.0/15
+190.156.0.0/16
+190.157.0.0/16
+190.158.0.0/16
+190.159.0.0/16
 190.165.0.0/18
 190.165.64.0/18
 190.165.128.0/17
@@ -1605,8 +1678,10 @@
 190.240.128.0/17
 190.242.0.0/16
 190.243.0.0/16
-190.248.0.0/15
-190.250.0.0/15
+190.248.0.0/16
+190.249.0.0/16
+190.250.0.0/16
+190.251.0.0/16
 190.252.0.0/14
 198.51.71.0/24
 200.0.0.0/21
@@ -1720,7 +1795,9 @@
 200.122.192.0/19
 200.122.224.0/20
 200.122.240.0/20
-201.184.0.0/15
+200.124.124.0/23
+201.184.0.0/16
+201.185.0.0/16
 201.190.64.0/18
 201.216.0.0/19
 201.216.32.0/19
@@ -1748,8 +1825,8 @@
 216.241.0.0/19
 # Country: ECUADOR
 # ISO Code: EC
-# Total Networks: 216
-# Total Subnets:  1,723,136
+# Total Networks: 221
+# Total Subnets:  1,791,744
 157.100.0.0/16
 186.0.144.0/21
 186.3.0.0/18
@@ -1767,8 +1844,10 @@
 186.65.0.0/18
 186.66.0.0/17
 186.66.128.0/17
-186.68.0.0/15
-186.70.0.0/15
+186.68.0.0/16
+186.69.0.0/16
+186.70.0.0/16
+186.71.0.0/16
 186.101.0.0/16
 186.178.0.0/16
 190.8.180.0/22
@@ -1790,6 +1869,7 @@
 190.95.192.0/19
 190.95.224.0/19
 190.96.96.0/21
+190.96.104.0/21
 190.99.72.0/21
 190.107.64.0/20
 190.107.232.0/21
@@ -1811,6 +1891,7 @@
 190.154.128.0/17
 190.155.0.0/17
 190.155.128.0/17
+190.184.216.0/22
 190.214.0.0/17
 190.214.128.0/17
 192.188.44.0/24
@@ -1957,6 +2038,7 @@
 200.125.192.0/19
 200.125.224.0/19
 200.126.0.0/19
+201.183.0.0/16
 201.217.64.0/19
 201.217.96.0/19
 201.218.0.0/19
@@ -1988,11 +2070,12 @@
 190.124.220.0/22
 # Country: PARAGUAY
 # ISO Code: PY
-# Total Networks: 31
-# Total Subnets:  361,216
+# Total Networks: 32
+# Total Subnets:  365,312
 181.40.0.0/16
 186.0.188.0/22
 186.2.192.0/19
+186.2.224.0/20
 186.16.0.0/17
 186.16.128.0/17
 186.17.0.0/16
@@ -2023,10 +2106,12 @@
 201.217.32.0/19
 # Country: PERU
 # ISO Code: PE
-# Total Networks: 91
-# Total Subnets:  2,367,488
+# Total Networks: 100
+# Total Subnets:  2,435,072
 161.132.0.0/16
-181.64.0.0/15
+181.64.0.0/16
+181.65.0.0/16
+181.176.0.0/16
 186.160.0.0/14
 190.8.128.0/19
 190.11.208.0/20
@@ -2036,7 +2121,8 @@
 190.40.128.0/17
 190.41.0.0/17
 190.41.128.0/17
-190.42.0.0/15
+190.42.0.0/16
+190.43.0.0/16
 190.52.112.0/20
 190.81.0.0/18
 190.81.64.0/18
@@ -2044,18 +2130,24 @@
 190.102.128.0/19
 190.105.240.0/20
 190.108.80.0/21
+190.108.88.0/21
 190.113.192.0/19
-190.116.0.0/15
+190.116.0.0/16
+190.117.0.0/16
 190.118.0.0/16
 190.124.48.0/21
 190.187.0.0/17
 190.187.128.0/17
 190.222.0.0/16
 190.223.0.0/16
-190.232.0.0/15
-190.234.0.0/15
-190.236.0.0/15
-190.238.0.0/15
+190.232.0.0/16
+190.233.0.0/16
+190.234.0.0/16
+190.235.0.0/16
+190.236.0.0/16
+190.237.0.0/16
+190.238.0.0/16
+190.239.0.0/16
 192.102.84.0/24
 200.0.107.0/24
 200.0.110.0/24
@@ -2129,8 +2221,8 @@
 200.2.176.0/20
 # Country: URUGUAY
 # ISO Code: UY
-# Total Networks: 60
-# Total Subnets:  1,178,368
+# Total Networks: 62
+# Total Subnets:  1,180,416
 164.73.0.0/16
 186.8.0.0/18
 186.8.64.0/18
@@ -2147,7 +2239,8 @@
 190.112.200.0/22
 190.132.0.0/16
 190.133.0.0/16
-190.134.0.0/15
+190.134.0.0/16
+190.135.0.0/16
 192.146.237.0/24
 200.0.88.0/24
 200.0.204.0/22
@@ -2187,18 +2280,21 @@
 200.125.48.0/20
 201.217.128.0/19
 201.217.160.0/19
+201.219.224.0/21
 201.221.0.0/20
 201.221.16.0/20
 201.221.32.0/20
 201.221.48.0/20
 # Country: VENEZUELA
 # ISO Code: VE
-# Total Networks: 137
-# Total Subnets:  5,031,936
+# Total Networks: 146
+# Total Subnets:  5,037,056
 129.90.0.0/16
 150.185.0.0/16
-150.186.0.0/15
-150.188.0.0/15
+150.186.0.0/16
+150.187.0.0/16
+150.188.0.0/16
+150.189.0.0/16
 158.160.0.0/16
 159.90.0.0/16
 161.196.0.0/16
@@ -2212,11 +2308,15 @@
 186.26.0.0/18
 186.26.128.0/17
 186.88.0.0/13
-186.164.0.0/15
+186.96.64.0/20
+186.164.0.0/16
+186.165.0.0/16
 186.166.0.0/16
 186.167.0.0/16
-186.184.0.0/15
-186.186.0.0/15
+186.184.0.0/16
+186.185.0.0/16
+186.186.0.0/16
+186.187.0.0/16
 186.188.0.0/17
 190.6.0.0/18
 190.8.164.0/22
@@ -2229,10 +2329,12 @@
 190.72.0.0/14
 190.76.0.0/16
 190.77.0.0/16
-190.78.0.0/15
+190.78.0.0/16
+190.79.0.0/16
 190.93.44.0/22
 190.94.192.0/19
 190.94.224.0/19
+190.103.28.0/22
 190.103.32.0/20
 190.103.48.0/20
 190.111.120.0/22
@@ -2250,7 +2352,8 @@
 190.170.64.0/18
 190.170.128.0/18
 190.170.192.0/18
-190.198.0.0/15
+190.198.0.0/16
+190.199.0.0/16
 190.200.0.0/13
 192.65.152.0/24
 200.0.65.0/24