admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: HideMyAss: Cote d'Ivoire server country

Browse Source
This commit is contained in:
Quentin McGaw (desktop)
2021-09-21 23:56:53 +00:00
parent 6bcbaf085d
commit c22e0e9db7
2 changed files with 154 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

264
internal/storage/servers.json
View File

@@ -3047,7 +3047,7 @@
}, },
"hidemyass": { "hidemyass": {
"version": 1, "version": 1,
"timestamp": 1627008307, "timestamp": 1632268040,
"servers": [ "servers": [
{ {
"country": "Afghanistan", "country": "Afghanistan",
@@ -3213,11 +3213,11 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"5.253.207.3",
"91.132.139.115", "91.132.139.115",
"94.198.41.94", "94.198.41.94",
"94.198.41.110", "94.198.41.110",
"94.198.41.142", "94.198.41.142",
"185.183.107.147",
"185.183.107.163", "185.183.107.163",
"185.210.219.99", "185.210.219.99",
"185.244.212.30", "185.244.212.30",
@@ -3403,13 +3403,10 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"5.62.51.21", "181.215.238.207",
"5.62.51.41", "185.54.230.50",
"179.61.215.95", "185.54.230.130",
"181.215.238.143", "185.54.230.170"
"191.96.4.71",
"191.96.5.163",
"191.96.13.191"
] ]
}, },
{ {
@@ -3504,13 +3501,13 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"51.161.54.15",
"51.161.66.111", "51.161.66.111",
"54.39.219.127", "54.39.219.127",
"144.217.105.207",
"158.69.234.207", "158.69.234.207",
"192.99.89.207", "192.99.89.207",
"192.99.110.143", "192.99.110.159",
"192.99.110.159" "198.27.103.191"
] ]
}, },
{ {
@@ -3581,8 +3578,13 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"5.62.34.40", "5.62.41.133",
"5.62.34.44" "5.62.41.169",
"5.62.41.181",
"84.17.46.134",
"185.246.210.130",
"185.246.210.162",
"212.102.38.186"
] ]
}, },
{ {
@@ -3728,9 +3730,6 @@
"185.246.210.130", "185.246.210.130",
"185.246.210.146", "185.246.210.146",
"185.246.210.162", "185.246.210.162",
"185.246.210.178",
"185.246.210.194",
"212.102.38.173",
"212.102.38.186" "212.102.38.186"
] ]
}, },
@@ -3743,14 +3742,15 @@
"udp": true, "udp": true,
"ips": [ "ips": [
"2.58.46.195", "2.58.46.195",
"2.58.46.211", "37.120.232.78",
"37.120.232.110", "37.120.232.110",
"37.120.232.126", "37.120.232.126",
"37.120.232.142",
"95.174.65.142", "95.174.65.142",
"95.174.65.158", "95.174.65.158",
"185.212.169.174",
"185.212.169.190", "185.212.169.190",
"185.212.169.206", "185.212.169.206"
"185.212.169.222"
] ]
}, },
{ {
@@ -3907,7 +3907,7 @@
"ips": [ "ips": [
"185.77.217.16", "185.77.217.16",
"185.77.217.31", "185.77.217.31",
"185.77.217.46", "185.77.217.61",
"185.77.217.76", "185.77.217.76",
"185.77.217.91", "185.77.217.91",
"185.77.217.106" "185.77.217.106"
@@ -3921,15 +3921,12 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"62.210.11.96", "84.17.43.90",
"62.210.15.189", "84.17.43.103",
"84.17.43.77", "84.17.43.116",
"185.93.2.50",
"185.93.2.66",
"185.93.2.98",
"185.93.2.114", "185.93.2.114",
"195.154.43.224", "212.83.174.92",
"212.83.165.54" "212.83.190.239"
] ]
}, },
{ {
@@ -3977,7 +3974,6 @@
"udp": true, "udp": true,
"ips": [ "ips": [
"5.62.41.121", "5.62.41.121",
"5.62.41.133",
"5.62.41.145", "5.62.41.145",
"5.62.41.157", "5.62.41.157",
"5.62.41.169", "5.62.41.169",
@@ -4148,10 +4144,8 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"37.120.144.94", "37.120.144.78",
"185.94.190.174", "185.189.114.62",
"185.128.26.113",
"185.128.26.126",
"185.252.223.62" "185.252.223.62"
] ]
}, },
@@ -4175,8 +4169,14 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"5.62.34.8", "5.62.41.121",
"5.62.34.12" "5.62.41.133",
"5.62.41.145",
"84.17.46.158",
"84.17.46.206",
"84.17.46.251",
"185.246.210.178",
"212.102.38.173"
] ]
}, },
{ {
@@ -4187,8 +4187,18 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"5.62.34.16", "5.62.41.133",
"5.62.34.20" "5.62.41.145",
"5.62.41.157",
"5.62.41.169",
"84.17.46.134",
"84.17.46.158",
"84.17.46.182",
"84.17.46.251",
"185.246.210.130",
"185.246.210.146",
"185.246.210.178",
"185.246.210.194"
] ]
}, },
{ {
@@ -4226,7 +4236,6 @@
"78.153.199.5", "78.153.199.5",
"78.153.199.29", "78.153.199.29",
"78.153.199.243", "78.153.199.243",
"78.153.199.254",
"81.17.242.165", "81.17.242.165",
"146.70.48.78", "146.70.48.78",
"146.70.48.94" "146.70.48.94"
@@ -4256,8 +4265,8 @@
"ips": [ "ips": [
"45.87.184.15", "45.87.184.15",
"45.87.184.31", "45.87.184.31",
"45.87.184.47",
"45.87.184.79", "45.87.184.79",
"45.87.184.95",
"84.17.58.168", "84.17.58.168",
"84.17.58.213", "84.17.58.213",
"84.17.59.45", "84.17.59.45",
@@ -4469,8 +4478,7 @@
"92.38.162.123", "92.38.162.123",
"92.38.162.148", "92.38.162.148",
"92.38.162.151", "92.38.162.151",
"92.38.172.25", "92.38.172.25"
"92.223.88.149"
] ]
}, },
{ {
@@ -4529,10 +4537,11 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"185.54.231.26", "5.62.41.157",
"185.54.231.43", "84.17.46.134",
"185.54.231.60", "84.17.46.206",
"185.54.231.77" "84.17.46.251",
"185.246.210.178"
] ]
}, },
{ {
@@ -4741,8 +4750,7 @@
"84.17.46.134", "84.17.46.134",
"84.17.46.158", "84.17.46.158",
"84.17.46.182", "84.17.46.182",
"84.17.46.206", "84.17.46.206"
"84.17.46.251"
] ]
}, },
{ {
@@ -4851,14 +4859,11 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"185.101.32.16",
"185.101.32.32",
"185.101.32.48", "185.101.32.48",
"185.101.32.174", "217.170.201.254",
"217.170.203.128", "217.170.203.128",
"217.170.204.160", "217.170.204.160",
"217.170.204.223", "217.170.204.223",
"217.170.206.15",
"217.170.206.31" "217.170.206.31"
] ]
}, },
@@ -4990,7 +4995,6 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"84.17.55.13",
"84.17.55.26", "84.17.55.26",
"185.246.208.34", "185.246.208.34",
"185.246.208.130", "185.246.208.130",
@@ -5005,12 +5009,9 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"89.26.241.161", "91.250.240.113",
"91.250.240.209", "91.250.240.193",
"91.250.240.225", "194.39.126.135"
"194.39.126.119",
"194.39.126.135",
"195.158.248.46"
] ]
}, },
{ {
@@ -5057,10 +5058,13 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"92.223.85.20",
"92.223.85.75", "92.223.85.75",
"92.223.85.77",
"92.223.85.106", "92.223.85.106",
"92.223.85.113", "92.223.85.113",
"92.223.86.8" "92.223.86.8",
"92.223.86.46"
] ]
}, },
{ {
@@ -5095,11 +5099,9 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"5.62.19.39",
"5.62.19.47", "5.62.19.47",
"5.62.19.55", "5.62.19.55",
"5.62.19.63", "5.62.19.63"
"5.62.19.71"
] ]
}, },
{ {
@@ -5304,7 +5306,6 @@
"ips": [ "ips": [
"102.165.47.160", "102.165.47.160",
"102.165.47.176", "102.165.47.176",
"154.70.155.128",
"154.70.155.144" "154.70.155.144"
] ]
}, },
@@ -5316,7 +5317,6 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"185.54.229.25",
"185.54.229.41", "185.54.229.41",
"185.54.229.57", "185.54.229.57",
"185.54.229.73" "185.54.229.73"
@@ -5330,14 +5330,8 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"31.13.188.3",
"82.102.17.126", "82.102.17.126",
"82.102.17.206",
"82.102.17.238",
"82.102.17.254",
"89.38.226.238", "89.38.226.238",
"89.38.226.254",
"185.183.106.126",
"217.138.218.126" "217.138.218.126"
] ]
}, },
@@ -5409,13 +5403,11 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"31.3.152.106",
"31.3.152.118", "31.3.152.118",
"31.3.152.122", "31.3.152.170",
"31.3.152.192", "31.3.153.140",
"37.46.121.240", "37.46.121.240",
"128.127.105.164", "128.127.105.164"
"128.127.105.192"
] ]
}, },
{ {
@@ -5426,7 +5418,9 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"84.17.52.141",
"84.17.52.154", "84.17.52.154",
"84.17.52.167",
"84.17.52.180", "84.17.52.180",
"84.17.52.240", "84.17.52.240",
"89.187.165.179" "89.187.165.179"
@@ -5452,13 +5446,17 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"172.107.246.62", "5.62.41.121",
"172.107.246.110", "5.62.41.133",
"172.107.246.126", "5.62.41.145",
"172.107.246.142", "5.62.41.157",
"172.107.246.174", "5.62.41.169",
"172.107.246.190", "5.62.41.181",
"172.107.246.206" "84.17.46.182",
"185.246.210.130",
"185.246.210.146",
"185.246.210.178",
"185.246.210.194"
] ]
}, },
{ {
@@ -5614,11 +5612,15 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"62.128.217.69", "62.128.207.110",
"62.128.217.85", "62.128.217.85",
"62.128.217.112", "62.128.217.112",
"109.169.34.23", "80.75.64.66",
"109.169.34.42" "87.117.225.146",
"87.117.225.160",
"87.117.225.174",
"109.169.34.42",
"109.169.34.62"
] ]
}, },
{ {
@@ -5629,11 +5631,13 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"5.62.43.193", "5.62.43.202",
"5.62.43.218", "5.62.43.218",
"5.62.43.229", "5.62.43.229",
"77.234.43.130", "77.234.43.130",
"77.234.43.166" "77.234.43.166",
"77.234.43.175",
"77.234.43.185"
] ]
}, },
{ {
@@ -5644,12 +5648,12 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"62.128.217.69", "62.128.207.110",
"80.75.64.66", "62.128.217.85",
"62.128.217.112",
"87.117.225.146", "87.117.225.146",
"87.117.225.160", "87.117.225.160",
"109.169.34.23", "109.169.34.23",
"109.169.34.42",
"109.169.34.62" "109.169.34.62"
] ]
}, },
@@ -5697,14 +5701,12 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"23.83.130.37", "23.83.130.34",
"23.83.130.143",
"23.83.131.98",
"23.83.131.211", "23.83.131.211",
"23.83.131.215", "23.83.131.215",
"23.83.132.155", "23.83.132.155",
"23.83.185.20", "23.83.132.176",
"23.83.185.35" "23.83.185.20"
] ]
}, },
{ {
@@ -5728,14 +5730,12 @@
"udp": true, "udp": true,
"ips": [ "ips": [
"67.201.33.54", "67.201.33.54",
"162.253.68.145", "107.181.178.97",
"162.253.68.161", "143.244.51.66",
"162.253.68.177", "162.253.68.177",
"162.253.68.209",
"162.253.68.241", "162.253.68.241",
"192.252.220.17", "192.252.220.49"
"192.252.220.33",
"192.252.220.49",
"192.252.220.60"
] ]
}, },
{ {
@@ -5771,9 +5771,10 @@
"udp": true, "udp": true,
"ips": [ "ips": [
"171.22.76.15", "171.22.76.15",
"171.22.76.31", "171.22.76.47",
"171.22.76.63", "171.22.76.63",
"171.22.76.79" "171.22.76.79",
"171.22.76.95"
] ]
}, },
{ {
@@ -5785,9 +5786,12 @@
"udp": true, "udp": true,
"ips": [ "ips": [
"5.62.24.15", "5.62.24.15",
"5.62.24.31",
"5.62.24.46", "5.62.24.46",
"5.62.24.61", "5.62.24.61",
"66.115.181.241" "66.115.181.161",
"66.115.181.209",
"66.115.181.225"
] ]
}, },
{ {
@@ -5824,15 +5828,17 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"154.16.241.127",
"154.16.241.255", "154.16.241.255",
"181.214.54.79",
"181.214.58.176", "181.214.58.176",
"181.214.61.48", "181.214.61.48",
"181.214.98.31", "181.214.61.64",
"181.214.99.159",
"181.214.102.159",
"181.214.107.31", "181.214.107.31",
"181.214.107.47", "181.214.107.47",
"181.215.127.240" "181.214.107.63",
"181.215.127.240",
"191.101.170.30"
] ]
}, },
{ {
@@ -5927,10 +5933,12 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"38.146.55.35",
"38.146.55.115", "38.146.55.115",
"38.146.57.205",
"38.146.57.253",
"38.242.7.243", "38.242.7.243",
"154.3.129.61", "154.3.129.61",
"154.3.129.77",
"154.3.222.163" "154.3.222.163"
] ]
}, },
@@ -6014,8 +6022,7 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"76.164.192.254", "76.164.200.114",
"76.164.193.82",
"76.164.202.190", "76.164.202.190",
"76.164.205.194", "76.164.205.194",
"76.164.224.211", "76.164.224.211",
@@ -6042,13 +6049,11 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"156.146.36.90", "156.146.36.103",
"156.146.36.116", "156.146.36.116",
"195.181.168.173",
"195.181.168.187",
"212.102.33.50", "212.102.33.50",
"212.102.33.77",
"212.102.33.90", "212.102.33.90",
"212.102.33.144",
"212.102.33.176", "212.102.33.176",
"212.102.33.192", "212.102.33.192",
"212.102.33.208", "212.102.33.208",
@@ -6064,6 +6069,8 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"104.247.208.78",
"104.247.208.94",
"104.247.208.110", "104.247.208.110",
"104.247.208.126", "104.247.208.126",
"104.247.208.142", "104.247.208.142",
@@ -6175,9 +6182,11 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"89.187.164.86", "89.187.164.144",
"89.187.164.160",
"89.187.164.176", "89.187.164.176",
"156.146.38.154",
"212.102.40.13",
"212.102.40.141",
"212.102.40.154" "212.102.40.154"
] ]
}, },
@@ -6194,7 +6203,8 @@
"199.189.106.239", "199.189.106.239",
"199.189.106.245", "199.189.106.245",
"199.189.106.251", "199.189.106.251",
"209.95.34.73" "209.95.34.73",
"209.95.56.199"
] ]
}, },
{ {
@@ -6230,14 +6240,16 @@
"tcp": true, "tcp": true,
"udp": true, "udp": true,
"ips": [ "ips": [
"66.115.149.17", "66.115.149.65",
"66.115.149.49", "66.115.149.81",
"66.115.149.97", "66.115.149.97",
"66.115.149.113", "172.98.86.150",
"172.98.86.182", "199.187.211.46",
"172.98.86.188", "199.187.211.92",
"199.187.211.187", "199.187.211.142",
"199.187.211.157",
"199.187.211.232", "199.187.211.232",
"199.187.211.247",
"199.229.250.241" "199.229.250.241"
] ]
}, },
@@ -114061,4 +114073,4 @@
} }
] ]
} }
} }

18
internal/updater/providers/hidemyass/url.go
View File

@@ -27,8 +27,13 @@ func parseOpenvpnURL(url, protocol string) (country, region, city string) {
city = parts[2] city = parts[2]
} }
return camelCaseToWords(country), camelCaseToWords(region), country = camelCaseToWords(country)
camelCaseToWords(city) region = camelCaseToWords(region)
city = camelCaseToWords(city)
country = mutateSpecialCountryCases(country)
return country, region, city
} }
func camelCaseToWords(camelCase string) (words string) { func camelCaseToWords(camelCase string) (words string) {
@@ -42,3 +47,12 @@ func camelCaseToWords(camelCase string) (words string) {
} }
return words return words
} }
func mutateSpecialCountryCases(country string) string {
switch country {
case "Coted`Ivoire":
return "Cote d'Ivoire"
default:
return country
}
}