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

Feature: update Surfshark servers information

Browse Source
This commit is contained in:
Quentin McGaw
2021-01-29 18:53:16 +00:00
parent 4abb8cd87f
commit 702eafae4c
4 changed files with 132 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/constants/servers.go
View File

@@ -38,7 +38,7 @@ func GetAllServers() (allServers models.AllServers) {
}, },
Surfshark: models.SurfsharkServers{ Surfshark: models.SurfsharkServers{
Version: 1, Version: 1,
Timestamp: 1599957644, Timestamp: 1611928188,
Servers: SurfsharkServers(), Servers: SurfsharkServers(),
}, },
Vyprvpn: models.VyprvpnServers{ Vyprvpn: models.VyprvpnServers{

2
internal/constants/servers_test.go
View File

@@ -148,7 +148,7 @@ func Test_timestamps(t *testing.T) {
"Surfshark": { "Surfshark": {
servers: allServers.Surfshark.Servers, servers: allServers.Surfshark.Servers,
timestamp: allServers.Surfshark.Timestamp, timestamp: allServers.Surfshark.Timestamp,
digest: "79484811", digest: "26955f20",
}, },
"Vyprvpn": { "Vyprvpn": {
servers: allServers.Vyprvpn.Servers, servers: allServers.Vyprvpn.Servers,

228
internal/constants/surfshark.go
View File

@@ -23,62 +23,63 @@ func SurfsharkRegionChoices() (choices []string) {
func SurfsharkServers() []models.SurfsharkServer { func SurfsharkServers() []models.SurfsharkServer {
return []models.SurfsharkServer{ return []models.SurfsharkServer{
{Region: "Albania", IPs: []net.IP{{31, 171, 152, 197}, {31, 171, 154, 147}}}, {Region: "Albania", IPs: []net.IP{{31, 171, 154, 163}, {31, 171, 154, 165}}},
{Region: "Argentina Buenos Aires", IPs: []net.IP{{91, 206, 168, 13}, {91, 206, 168, 24}}}, {Region: "Argentina Buenos Aires", IPs: []net.IP{{91, 206, 168, 58}, {91, 206, 168, 60}}},
{Region: "Australia Adelaide", IPs: []net.IP{{45, 248, 79, 67}, {45, 248, 79, 69}}}, {Region: "Australia Adelaide", IPs: []net.IP{{45, 248, 79, 67}, {45, 248, 79, 85}}},
{Region: "Australia Brisbane", IPs: []net.IP{{144, 48, 39, 107}, {144, 48, 39, 131}}}, {Region: "Australia Brisbane", IPs: []net.IP{{144, 48, 39, 69}, {144, 48, 39, 123}}},
{Region: "Australia Melbourne", IPs: []net.IP{{103, 192, 80, 141}, {144, 48, 38, 141}}}, {Region: "Australia Melbourne", IPs: []net.IP{{103, 192, 80, 133}, {144, 48, 38, 21}}},
{Region: "Australia Perth", IPs: []net.IP{{45, 248, 78, 45}, {124, 150, 139, 27}}}, {Region: "Australia Perth", IPs: []net.IP{{124, 150, 139, 35}, {124, 150, 139, 45}}},
{Region: "Australia Sydney", IPs: []net.IP{{45, 125, 247, 195}, {180, 149, 228, 117}}}, {Region: "Australia Sydney", IPs: []net.IP{{180, 149, 228, 171}, {180, 149, 228, 173}}},
{Region: "Australia US", IPs: []net.IP{{45, 76, 117, 108}}}, {Region: "Australia US", IPs: []net.IP{{45, 76, 117, 108}}},
{Region: "Austria", IPs: []net.IP{{5, 253, 207, 83}, {37, 120, 212, 131}}}, {Region: "Austria", IPs: []net.IP{{5, 253, 207, 83}, {37, 120, 212, 149}}},
{Region: "Azerbaijan", IPs: []net.IP{{94, 20, 21, 85}, {94, 20, 21, 87}}}, {Region: "Azerbaijan", IPs: []net.IP{{94, 20, 21, 85}}},
{Region: "Belgium", IPs: []net.IP{{5, 253, 205, 181}, {5, 253, 205, 213}}}, {Region: "Belgium", IPs: []net.IP{{91, 90, 123, 139}, {185, 210, 217, 187}}},
{Region: "Bosnia and Herzegovina", IPs: []net.IP{{185, 99, 3, 7}, {185, 212, 111, 41}}}, {Region: "Bosnia and Herzegovina", IPs: []net.IP{{185, 99, 3, 102}, {185, 99, 3, 205}}},
{Region: "Brazil", IPs: []net.IP{{191, 96, 73, 214}, {191, 96, 73, 216}}}, {Region: "Brazil", IPs: []net.IP{{191, 96, 13, 200}, {191, 96, 73, 232}}},
{Region: "Bulgaria", IPs: []net.IP{{37, 120, 152, 37}}}, {Region: "Bulgaria", IPs: []net.IP{{37, 120, 152, 39}, {217, 138, 202, 19}}},
{Region: "Canada Montreal", IPs: []net.IP{{172, 98, 82, 85}, {198, 8, 85, 19}}}, {Region: "Canada Montreal", IPs: []net.IP{{172, 98, 82, 227}, {198, 8, 85, 173}}},
{Region: "Canada Toronto", IPs: []net.IP{{68, 71, 244, 200}, {104, 200, 138, 163}}},
{Region: "Canada Toronto mp001", IPs: []net.IP{{138, 197, 151, 26}}}, {Region: "Canada Toronto mp001", IPs: []net.IP{{138, 197, 151, 26}}},
{Region: "Canada Toronto", IPs: []net.IP{{104, 200, 138, 152}, {162, 253, 71, 213}}},
{Region: "Canada US", IPs: []net.IP{{159, 203, 57, 80}}}, {Region: "Canada US", IPs: []net.IP{{159, 203, 57, 80}}},
{Region: "Canada Vancouver", IPs: []net.IP{{66, 115, 147, 79}, {66, 115, 147, 87}}}, {Region: "Canada Vancouver", IPs: []net.IP{{66, 115, 147, 72}, {198, 8, 92, 74}}},
{Region: "Chile", IPs: []net.IP{{31, 169, 121, 16}}}, {Region: "Chile", IPs: []net.IP{{31, 169, 121, 3}, {31, 169, 121, 5}}},
{Region: "Colombia", IPs: []net.IP{{45, 129, 32, 8}}}, {Region: "Colombia", IPs: []net.IP{{45, 129, 32, 5}, {45, 129, 32, 13}}},
{Region: "Costa Rica", IPs: []net.IP{{176, 227, 241, 19}, {176, 227, 241, 21}}}, {Region: "Costa Rica", IPs: []net.IP{{176, 227, 241, 29}, {176, 227, 241, 35}}},
{Region: "Croatia", IPs: []net.IP{{89, 164, 99, 109}, {89, 164, 99, 111}}}, {Region: "Croatia", IPs: []net.IP{{85, 10, 56, 190}, {89, 164, 99, 109}}},
{Region: "Cyprus", IPs: []net.IP{{195, 47, 194, 34}}}, {Region: "Cyprus", IPs: []net.IP{{195, 47, 194, 36}, {195, 47, 194, 54}}},
{Region: "Czech Republic", IPs: []net.IP{{185, 152, 64, 151}, {185, 152, 64, 178}}}, {Region: "Czech Republic", IPs: []net.IP{{193, 9, 112, 183}, {217, 138, 199, 181}}},
{Region: "Denmark", IPs: []net.IP{{37, 120, 194, 115}, {95, 174, 65, 71}}}, {Region: "Denmark", IPs: []net.IP{{193, 29, 107, 109}, {193, 29, 107, 125}}},
{Region: "Estonia", IPs: []net.IP{{165, 231, 163, 23}, {185, 174, 159, 69}}}, {Region: "Estonia", IPs: []net.IP{{165, 231, 163, 19}, {185, 174, 159, 69}}},
{Region: "Finland", IPs: []net.IP{{196, 244, 191, 179}, {196, 244, 191, 181}}}, {Region: "Finland", IPs: []net.IP{{196, 244, 191, 99}, {196, 244, 191, 109}}},
{Region: "France Bordeaux", IPs: []net.IP{{185, 108, 106, 67}, {185, 108, 106, 150}}}, {Region: "France Bordeaux", IPs: []net.IP{{185, 108, 106, 26}, {185, 108, 106, 102}}},
{Region: "France Marseilles", IPs: []net.IP{{185, 166, 84, 53}, {185, 166, 84, 75}}}, {Region: "France Marseilles", IPs: []net.IP{{185, 166, 84, 19}, {185, 166, 84, 55}}},
{Region: "France Paris", IPs: []net.IP{{45, 83, 90, 181}, {45, 89, 174, 103}}}, {Region: "France Paris", IPs: []net.IP{{45, 89, 174, 59}, {45, 89, 174, 103}}},
{Region: "France Sweden", IPs: []net.IP{{199, 247, 8, 20}}}, {Region: "France Sweden", IPs: []net.IP{{199, 247, 8, 20}}},
{Region: "Germany Berlin", IPs: []net.IP{{152, 89, 163, 19}, {217, 138, 216, 243}}}, {Region: "Germany Berlin", IPs: []net.IP{{193, 29, 106, 61}, {193, 29, 106, 131}}},
{Region: "Germany Frankfurt am Main", IPs: []net.IP{{185, 158, 135, 36}, {185, 220, 70, 83}}},
{Region: "Germany Frankfurt am Main st001", IPs: []net.IP{{45, 87, 212, 179}}}, {Region: "Germany Frankfurt am Main st001", IPs: []net.IP{{45, 87, 212, 179}}},
{Region: "Germany Frankfurt am Main st002", IPs: []net.IP{{45, 87, 212, 181}}}, {Region: "Germany Frankfurt am Main st002", IPs: []net.IP{{45, 87, 212, 181}}},
{Region: "Germany Frankfurt am Main st003", IPs: []net.IP{{45, 87, 212, 183}}}, {Region: "Germany Frankfurt am Main st003", IPs: []net.IP{{45, 87, 212, 183}}},
{Region: "Germany Frankfurt am Main st004", IPs: []net.IP{{195, 181, 174, 226}}},
{Region: "Germany Frankfurt am Main st005", IPs: []net.IP{{195, 181, 174, 228}}},
{Region: "Germany Frankfurt am Main", IPs: []net.IP{{138, 199, 19, 149}, {156, 146, 33, 85}}},
{Region: "Germany Frankfurt mp001", IPs: []net.IP{{46, 101, 189, 14}}}, {Region: "Germany Frankfurt mp001", IPs: []net.IP{{46, 101, 189, 14}}},
{Region: "Germany Munich", IPs: []net.IP{{178, 238, 231, 51}, {178, 238, 231, 55}}}, {Region: "Germany Munich", IPs: []net.IP{{79, 143, 191, 141}, {79, 143, 191, 231}}},
{Region: "Germany Nuremberg", IPs: []net.IP{{62, 171, 149, 162}, {62, 171, 151, 182}}}, {Region: "Germany Nuremberg", IPs: []net.IP{{62, 171, 151, 156}, {95, 111, 253, 65}}},
{Region: "Germany Singapour", IPs: []net.IP{{159, 89, 14, 157}}}, {Region: "Germany Singapour", IPs: []net.IP{{159, 89, 14, 157}}},
{Region: "Germany UK", IPs: []net.IP{{46, 101, 250, 73}}}, {Region: "Germany UK", IPs: []net.IP{{46, 101, 250, 73}}},
{Region: "Greece", IPs: []net.IP{{194, 150, 167, 34}, {194, 150, 167, 40}}}, {Region: "Greece", IPs: []net.IP{{194, 150, 167, 28}, {194, 150, 167, 44}}},
{Region: "Hong Kong", IPs: []net.IP{{84, 17, 57, 73}, {212, 102, 42, 201}}}, {Region: "Hong Kong", IPs: []net.IP{{212, 102, 42, 194}, {212, 102, 42, 211}}},
{Region: "Hungary", IPs: []net.IP{{37, 120, 144, 151}, {37, 120, 144, 213}}}, {Region: "Hungary", IPs: []net.IP{{37, 120, 144, 199}, {37, 120, 144, 243}}},
{Region: "Iceland", IPs: []net.IP{{82, 221, 128, 166}, {82, 221, 143, 243}}}, {Region: "Iceland", IPs: []net.IP{{82, 221, 128, 156}, {82, 221, 128, 169}}},
{Region: "India Chennai", IPs: []net.IP{{103, 108, 117, 118}, {103, 108, 117, 151}}}, {Region: "India Chennai", IPs: []net.IP{{103, 94, 27, 229}, {103, 108, 117, 151}}},
{Region: "India Indore", IPs: []net.IP{{103, 39, 132, 189}, {137, 59, 52, 109}}}, {Region: "India Indore", IPs: []net.IP{{103, 39, 132, 189}, {137, 59, 52, 109}}},
{Region: "India Mumbai", IPs: []net.IP{{103, 221, 233, 88}, {165, 231, 253, 147}}}, {Region: "India Mumbai", IPs: []net.IP{{103, 156, 50, 87}, {103, 156, 51, 45}}},
{Region: "India UK", IPs: []net.IP{{134, 209, 148, 122}}}, {Region: "India UK", IPs: []net.IP{{134, 209, 148, 122}}},
{Region: "Indonesia", IPs: []net.IP{{103, 120, 66, 214}, {103, 120, 66, 216}}}, {Region: "Indonesia", IPs: []net.IP{{103, 120, 66, 227}, {103, 148, 242, 165}}},
{Region: "Ireland", IPs: []net.IP{{185, 108, 128, 159}, {185, 108, 128, 181}}}, {Region: "Ireland", IPs: []net.IP{{5, 157, 13, 53}, {5, 157, 13, 109}}},
{Region: "Israel", IPs: []net.IP{{87, 239, 255, 109}}}, {Region: "Israel", IPs: []net.IP{{87, 239, 255, 107}, {87, 239, 255, 121}}},
{Region: "Italy Milan", IPs: []net.IP{{84, 17, 58, 148}, {185, 128, 27, 37}}}, {Region: "Italy Milan", IPs: []net.IP{{84, 17, 58, 152}, {212, 102, 54, 137}}},
{Region: "Italy Rome", IPs: []net.IP{{82, 102, 26, 61}, {82, 102, 26, 115}}}, {Region: "Italy Rome", IPs: []net.IP{{82, 102, 26, 91}, {82, 102, 26, 99}}},
{Region: "Japan Tokyo", IPs: []net.IP{{45, 87, 213, 5}, {103, 208, 221, 227}}},
{Region: "Japan Tokyo st001", IPs: []net.IP{{45, 87, 213, 19}}}, {Region: "Japan Tokyo st001", IPs: []net.IP{{45, 87, 213, 19}}},
{Region: "Japan Tokyo st002", IPs: []net.IP{{45, 87, 213, 21}}}, {Region: "Japan Tokyo st002", IPs: []net.IP{{45, 87, 213, 21}}},
{Region: "Japan Tokyo st003", IPs: []net.IP{{45, 87, 213, 23}}}, {Region: "Japan Tokyo st003", IPs: []net.IP{{45, 87, 213, 23}}},
@@ -86,100 +87,107 @@ func SurfsharkServers() []models.SurfsharkServer {
{Region: "Japan Tokyo st005", IPs: []net.IP{{217, 138, 212, 21}}}, {Region: "Japan Tokyo st005", IPs: []net.IP{{217, 138, 212, 21}}},
{Region: "Japan Tokyo st006", IPs: []net.IP{{82, 102, 28, 123}}}, {Region: "Japan Tokyo st006", IPs: []net.IP{{82, 102, 28, 123}}},
{Region: "Japan Tokyo st007", IPs: []net.IP{{82, 102, 28, 125}}}, {Region: "Japan Tokyo st007", IPs: []net.IP{{82, 102, 28, 125}}},
{Region: "Kazakhstan", IPs: []net.IP{{95, 57, 207, 200}}}, {Region: "Japan Tokyo st008", IPs: []net.IP{{89, 187, 161, 12}}},
{Region: "Korea", IPs: []net.IP{{61, 14, 210, 239}, {61, 97, 243, 112}}}, {Region: "Japan Tokyo st009", IPs: []net.IP{{89, 187, 161, 14}}},
{Region: "Latvia", IPs: []net.IP{{188, 92, 78, 140}, {188, 92, 78, 142}}}, {Region: "Japan Tokyo st010", IPs: []net.IP{{89, 187, 161, 17}}},
{Region: "Libya", IPs: []net.IP{{41, 208, 72, 157}, {41, 208, 72, 204}}}, {Region: "Japan Tokyo st011", IPs: []net.IP{{89, 187, 161, 19}}},
{Region: "Luxembourg", IPs: []net.IP{{185, 153, 151, 60}, {185, 153, 151, 83}}}, {Region: "Japan Tokyo st012", IPs: []net.IP{{89, 187, 161, 7}}},
{Region: "Malaysia", IPs: []net.IP{{42, 0, 30, 152}, {42, 0, 30, 209}}}, {Region: "Japan Tokyo st013", IPs: []net.IP{{89, 187, 161, 9}}},
{Region: "Mexico City Mexico", IPs: []net.IP{{194, 41, 112, 9}, {194, 41, 112, 19}}}, {Region: "Japan Tokyo", IPs: []net.IP{{45, 87, 213, 245}, {138, 199, 22, 135}}},
{Region: "Moldova", IPs: []net.IP{{178, 175, 128, 235}, {178, 175, 128, 237}}}, {Region: "Kazakhstan", IPs: []net.IP{{95, 57, 207, 200}, {95, 57, 207, 204}}},
{Region: "Netherlands Amsterdam", IPs: []net.IP{{89, 46, 223, 74}, {89, 46, 223, 217}}}, {Region: "Korea", IPs: []net.IP{{45, 130, 137, 14}, {45, 130, 137, 36}}},
{Region: "Latvia", IPs: []net.IP{{188, 92, 78, 140}, {188, 92, 78, 150}}},
{Region: "Libya", IPs: []net.IP{{41, 208, 72, 158}, {41, 208, 72, 207}}},
{Region: "Luxembourg", IPs: []net.IP{{185, 153, 151, 138}, {185, 153, 151, 164}}},
{Region: "Malaysia", IPs: []net.IP{{42, 0, 30, 211}, {42, 0, 30, 215}}},
{Region: "Mexico City Mexico", IPs: []net.IP{{194, 41, 112, 14}, {194, 41, 112, 33}}},
{Region: "Moldova", IPs: []net.IP{{178, 175, 128, 237}}},
{Region: "Netherlands Amsterdam mp001", IPs: []net.IP{{188, 166, 43, 117}}}, {Region: "Netherlands Amsterdam mp001", IPs: []net.IP{{188, 166, 43, 117}}},
{Region: "Netherlands Amsterdam st001", IPs: []net.IP{{81, 19, 209, 51}}}, {Region: "Netherlands Amsterdam st001", IPs: []net.IP{{81, 19, 209, 51}}},
{Region: "Netherlands Amsterdam", IPs: []net.IP{{89, 46, 223, 88}, {143, 244, 42, 91}}},
{Region: "Netherlands US", IPs: []net.IP{{188, 166, 98, 91}}}, {Region: "Netherlands US", IPs: []net.IP{{188, 166, 98, 91}}},
{Region: "New Zealand", IPs: []net.IP{{180, 149, 231, 67}}}, {Region: "New Zealand", IPs: []net.IP{{180, 149, 231, 45}, {180, 149, 231, 115}}},
{Region: "Nigeria", IPs: []net.IP{{102, 165, 23, 6}, {102, 165, 23, 42}}}, {Region: "Nigeria", IPs: []net.IP{{102, 165, 23, 6}, {102, 165, 23, 42}}},
{Region: "North Macedonia", IPs: []net.IP{{185, 225, 28, 93}, {185, 225, 28, 101}}}, {Region: "North Macedonia", IPs: []net.IP{{185, 225, 28, 83}, {185, 225, 28, 91}}},
{Region: "Norway", IPs: []net.IP{{45, 12, 223, 213}, {84, 247, 50, 69}}}, {Region: "Norway", IPs: []net.IP{{45, 12, 223, 195}, {45, 12, 223, 211}}},
{Region: "Paraguay", IPs: []net.IP{{181, 40, 18, 56}, {186, 16, 32, 163}}}, {Region: "Paraguay", IPs: []net.IP{{186, 16, 32, 168}, {186, 16, 32, 173}}},
{Region: "Philippines", IPs: []net.IP{{45, 134, 224, 10}, {45, 134, 224, 20}}}, {Region: "Philippines", IPs: []net.IP{{45, 134, 224, 8}, {45, 134, 224, 20}}},
{Region: "Poland Gdansk", IPs: []net.IP{{5, 187, 53, 51}}}, {Region: "Poland Gdansk", IPs: []net.IP{{5, 133, 8, 115}, {5, 133, 8, 117}}},
{Region: "Poland Warsaw", IPs: []net.IP{{185, 246, 208, 77}, {185, 246, 208, 105}}}, {Region: "Poland Warsaw", IPs: []net.IP{{5, 253, 206, 71}, {5, 253, 206, 227}}},
{Region: "Portugal Lisbon", IPs: []net.IP{{5, 154, 174, 26}, {5, 154, 174, 173}}}, {Region: "Portugal Lisbon", IPs: []net.IP{{5, 154, 174, 115}, {5, 154, 174, 173}}},
{Region: "Portugal Loule", IPs: []net.IP{{176, 61, 146, 111}, {176, 61, 146, 123}}}, {Region: "Portugal Loule", IPs: []net.IP{{176, 61, 146, 121}, {176, 61, 148, 60}}},
{Region: "Portugal Porto", IPs: []net.IP{{194, 39, 127, 242}}}, {Region: "Portugal Porto", IPs: []net.IP{{194, 39, 127, 163}, {194, 39, 127, 233}}},
{Region: "Romania", IPs: []net.IP{{86, 106, 137, 147}, {86, 106, 137, 149}}}, {Region: "Romania", IPs: []net.IP{{185, 102, 217, 155}, {185, 102, 217, 163}}},
{Region: "Russia Moscow", IPs: []net.IP{{213, 183, 56, 145}, {213, 183, 56, 160}}}, {Region: "Russia Moscow", IPs: []net.IP{{188, 92, 78, 198}}},
{Region: "Russia St. Petersburg", IPs: []net.IP{{213, 183, 54, 23}, {213, 183, 54, 165}}}, {Region: "Russia St. Petersburg", IPs: []net.IP{{185, 246, 88, 107}, {185, 246, 88, 109}}},
{Region: "Serbia", IPs: []net.IP{{37, 120, 193, 53}, {152, 89, 160, 211}}}, {Region: "Serbia", IPs: []net.IP{{152, 89, 160, 213}}},
{Region: "Singapore", IPs: []net.IP{{89, 187, 162, 186}, {89, 187, 163, 210}}},
{Region: "Singapore Hong Kong", IPs: []net.IP{{206, 189, 83, 129}}}, {Region: "Singapore Hong Kong", IPs: []net.IP{{206, 189, 83, 129}}},
{Region: "Singapore Netherlands", IPs: []net.IP{{104, 248, 148, 18}}},
{Region: "Singapore in", IPs: []net.IP{{128, 199, 193, 35}}}, {Region: "Singapore in", IPs: []net.IP{{128, 199, 193, 35}}},
{Region: "Singapore mp001", IPs: []net.IP{{206, 189, 94, 229}}}, {Region: "Singapore mp001", IPs: []net.IP{{206, 189, 94, 229}}},
{Region: "Singapore Netherlands", IPs: []net.IP{{104, 248, 148, 18}}},
{Region: "Singapore st001", IPs: []net.IP{{217, 138, 201, 91}}}, {Region: "Singapore st001", IPs: []net.IP{{217, 138, 201, 91}}},
{Region: "Singapore st002", IPs: []net.IP{{217, 138, 201, 93}}}, {Region: "Singapore st002", IPs: []net.IP{{217, 138, 201, 93}}},
{Region: "Singapore st003", IPs: []net.IP{{84, 247, 49, 19}}}, {Region: "Singapore st003", IPs: []net.IP{{84, 247, 49, 19}}},
{Region: "Singapore st004", IPs: []net.IP{{84, 247, 49, 21}}}, {Region: "Singapore st004", IPs: []net.IP{{84, 247, 49, 21}}},
{Region: "Slovekia", IPs: []net.IP{{193, 37, 255, 39}, {193, 37, 255, 41}}}, {Region: "Singapore", IPs: []net.IP{{89, 187, 163, 210}, {156, 146, 56, 137}}},
{Region: "Slovenia", IPs: []net.IP{{195, 158, 249, 38}, {195, 158, 249, 42}}}, {Region: "Slovekia", IPs: []net.IP{{185, 76, 8, 215}, {193, 37, 255, 35}}},
{Region: "South Africa", IPs: []net.IP{{154, 127, 49, 226}, {154, 127, 49, 232}}}, {Region: "Slovenia", IPs: []net.IP{{195, 158, 249, 48}, {195, 158, 249, 50}}},
{Region: "Spain Barcelona", IPs: []net.IP{{185, 188, 61, 15}, {185, 188, 61, 25}}}, {Region: "South Africa", IPs: []net.IP{{154, 16, 93, 53}, {154, 127, 50, 138}}},
{Region: "Spain Madrid", IPs: []net.IP{{188, 208, 141, 18}, {188, 208, 141, 20}}}, {Region: "Spain Barcelona", IPs: []net.IP{{37, 120, 142, 135}, {185, 188, 61, 45}}},
{Region: "Spain Valencia", IPs: []net.IP{{185, 153, 150, 48}, {196, 196, 150, 71}}}, {Region: "Spain Madrid", IPs: []net.IP{{188, 208, 141, 98}, {188, 208, 141, 114}}},
{Region: "Sweden", IPs: []net.IP{{45, 83, 91, 149}, {185, 76, 9, 41}}}, {Region: "Spain Valencia", IPs: []net.IP{{185, 153, 150, 52}, {196, 196, 150, 101}}},
{Region: "Switzerland", IPs: []net.IP{{84, 17, 53, 219}, {84, 17, 53, 221}}}, {Region: "Sweden", IPs: []net.IP{{45, 83, 91, 151}, {195, 181, 166, 226}}},
{Region: "Taiwan", IPs: []net.IP{{2, 58, 241, 5}, {2, 58, 241, 43}}}, {Region: "Switzerland", IPs: []net.IP{{84, 17, 53, 208}, {156, 146, 62, 36}}},
{Region: "Thailand", IPs: []net.IP{{45, 64, 186, 132}, {45, 64, 186, 163}}}, {Region: "Taiwan", IPs: []net.IP{{2, 58, 242, 131}, {103, 152, 151, 83}}},
{Region: "Turkey", IPs: []net.IP{{185, 195, 79, 5}, {185, 195, 79, 19}}}, {Region: "Thailand", IPs: []net.IP{{103, 253, 74, 7}}},
{Region: "Turkey Istanbul", IPs: []net.IP{{107, 150, 95, 155}, {107, 150, 95, 157}}}, {Region: "Turkey Istanbul", IPs: []net.IP{{107, 150, 95, 149}, {107, 150, 95, 163}}},
{Region: "Turkey", IPs: []net.IP{{185, 195, 79, 3}, {185, 195, 79, 5}}},
{Region: "UK France", IPs: []net.IP{{188, 166, 168, 247}}}, {Region: "UK France", IPs: []net.IP{{188, 166, 168, 247}}},
{Region: "UK Germany", IPs: []net.IP{{45, 77, 58, 16}}}, {Region: "UK Germany", IPs: []net.IP{{45, 77, 58, 16}}},
{Region: "UK Glasgow", IPs: []net.IP{{185, 108, 105, 157}}}, {Region: "UK Glasgow", IPs: []net.IP{{185, 108, 105, 35}, {185, 108, 105, 57}}},
{Region: "UK London", IPs: []net.IP{{178, 239, 166, 218}, {185, 44, 78, 164}}},
{Region: "UK London mp001", IPs: []net.IP{{206, 189, 119, 92}}}, {Region: "UK London mp001", IPs: []net.IP{{206, 189, 119, 92}}},
{Region: "UK London st001", IPs: []net.IP{{217, 146, 82, 83}}}, {Region: "UK London st001", IPs: []net.IP{{217, 146, 82, 83}}},
{Region: "UK London st002", IPs: []net.IP{{185, 134, 22, 80}}}, {Region: "UK London st002", IPs: []net.IP{{185, 134, 22, 80}}},
{Region: "UK London st003", IPs: []net.IP{{185, 134, 22, 92}}}, {Region: "UK London st003", IPs: []net.IP{{185, 134, 22, 92}}},
{Region: "UK London st004", IPs: []net.IP{{185, 44, 76, 186}}}, {Region: "UK London st004", IPs: []net.IP{{185, 44, 76, 186}}},
{Region: "UK London st005", IPs: []net.IP{{185, 44, 76, 188}}}, {Region: "UK London st005", IPs: []net.IP{{185, 44, 76, 188}}},
{Region: "UK Manchester", IPs: []net.IP{{193, 148, 17, 83}, {217, 138, 196, 91}}}, {Region: "UK London", IPs: []net.IP{{185, 44, 76, 167}, {185, 44, 77, 48}}},
{Region: "US Atlanta", IPs: []net.IP{{66, 115, 166, 147}, {66, 115, 166, 151}}}, {Region: "UK Manchester", IPs: []net.IP{{84, 252, 95, 149}, {194, 37, 96, 211}}},
{Region: "US Bend", IPs: []net.IP{{45, 43, 14, 95}}}, {Region: "Ukraine", IPs: []net.IP{{176, 107, 185, 71}, {176, 107, 185, 73}}},
{Region: "US Boston", IPs: []net.IP{{173, 237, 207, 13}, {199, 217, 107, 20}}}, {Region: "United Arab Emirates", IPs: []net.IP{{45, 9, 249, 245}, {176, 125, 231, 35}}},
{Region: "US Buffalo", IPs: []net.IP{{107, 174, 20, 130}}}, {Region: "US Atlanta", IPs: []net.IP{{66, 115, 175, 40}, {66, 115, 175, 42}}},
{Region: "US Charlotte", IPs: []net.IP{{66, 11, 124, 136}, {192, 154, 254, 135}}}, {Region: "US Bend", IPs: []net.IP{{45, 43, 14, 85}, {45, 43, 14, 93}}},
{Region: "US Chicago", IPs: []net.IP{{74, 119, 146, 197}, {89, 187, 182, 173}}}, {Region: "US Boston", IPs: []net.IP{{173, 237, 207, 62}, {173, 237, 207, 66}}},
{Region: "US Dallas", IPs: []net.IP{{66, 115, 177, 133}, {66, 115, 177, 158}}}, {Region: "US Buffalo", IPs: []net.IP{{107, 174, 20, 130}, {172, 93, 153, 146}}},
{Region: "US Denver", IPs: []net.IP{{212, 102, 44, 76}, {212, 102, 44, 98}}}, {Region: "US Charlotte", IPs: []net.IP{{155, 254, 31, 182}, {192, 154, 254, 137}}},
{Region: "US Gahanna", IPs: []net.IP{{104, 244, 209, 99}, {104, 244, 211, 171}}}, {Region: "US Chicago", IPs: []net.IP{{107, 152, 100, 21}, {143, 244, 60, 169}}},
{Region: "US Houston", IPs: []net.IP{{104, 148, 30, 53}, {199, 10, 64, 115}}}, {Region: "US Dallas", IPs: []net.IP{{66, 115, 177, 141}, {89, 187, 175, 165}}},
{Region: "US Kansas City", IPs: []net.IP{{173, 208, 202, 59}, {173, 208, 202, 61}}}, {Region: "US Denver", IPs: []net.IP{{212, 102, 44, 73}, {212, 102, 44, 81}}},
{Region: "US Las Vegas", IPs: []net.IP{{89, 187, 187, 149}, {185, 242, 5, 215}}}, {Region: "US Gahanna", IPs: []net.IP{{104, 244, 208, 229}, {104, 244, 211, 139}}},
{Region: "US Latham", IPs: []net.IP{{45, 43, 19, 74}, {45, 43, 19, 92}}}, {Region: "US Houston", IPs: []net.IP{{199, 10, 64, 165}, {199, 10, 64, 179}}},
{Region: "US Los Angeles", IPs: []net.IP{{38, 95, 110, 73}, {192, 111, 134, 202}}}, {Region: "US Kansas City", IPs: []net.IP{{69, 30, 249, 123}, {173, 208, 202, 59}}},
{Region: "US Maryland", IPs: []net.IP{{23, 82, 8, 173}, {23, 105, 163, 94}}}, {Region: "US Las Vegas", IPs: []net.IP{{45, 89, 173, 205}, {79, 110, 54, 117}}},
{Region: "US Miami", IPs: []net.IP{{89, 187, 173, 250}, {172, 83, 42, 143}}}, {Region: "US Latham", IPs: []net.IP{{45, 43, 19, 66}, {45, 43, 19, 74}}},
{Region: "US Los Angeles", IPs: []net.IP{{38, 95, 110, 67}, {192, 111, 134, 197}}},
{Region: "US Maryland", IPs: []net.IP{{23, 105, 160, 144}, {207, 244, 67, 149}}},
{Region: "US Miami", IPs: []net.IP{{172, 83, 42, 53}, {193, 37, 252, 197}}},
{Region: "US Netherlands", IPs: []net.IP{{142, 93, 58, 71}}}, {Region: "US Netherlands", IPs: []net.IP{{142, 93, 58, 71}}},
{Region: "US New York City", IPs: []net.IP{{84, 17, 35, 78}, {89, 187, 178, 92}}},
{Region: "US New York City mp001", IPs: []net.IP{{45, 55, 60, 159}}}, {Region: "US New York City mp001", IPs: []net.IP{{45, 55, 60, 159}}},
{Region: "US New York City st001", IPs: []net.IP{{92, 119, 177, 19}}}, {Region: "US New York City st001", IPs: []net.IP{{92, 119, 177, 19}}},
{Region: "US New York City st002", IPs: []net.IP{{92, 119, 177, 21}}}, {Region: "US New York City st002", IPs: []net.IP{{92, 119, 177, 21}}},
{Region: "US New York City st003", IPs: []net.IP{{92, 119, 177, 23}}}, {Region: "US New York City st003", IPs: []net.IP{{92, 119, 177, 23}}},
{Region: "US New York City st004", IPs: []net.IP{{193, 148, 18, 51}}}, {Region: "US New York City st004", IPs: []net.IP{{193, 148, 18, 51}}},
{Region: "US New York City st005", IPs: []net.IP{{193, 148, 18, 53}}}, {Region: "US New York City st005", IPs: []net.IP{{193, 148, 18, 53}}},
{Region: "US Orlando", IPs: []net.IP{{198, 147, 22, 135}, {198, 147, 22, 213}}}, {Region: "US New York City", IPs: []net.IP{{84, 17, 35, 111}, {172, 98, 75, 39}}},
{Region: "US Phoenix", IPs: []net.IP{{184, 170, 240, 179}, {199, 58, 187, 3}}}, {Region: "US Orlando", IPs: []net.IP{{66, 115, 182, 69}, {66, 115, 182, 106}}},
{Region: "US Phoenix", IPs: []net.IP{{23, 83, 128, 235}, {184, 170, 240, 179}}},
{Region: "US Portugal", IPs: []net.IP{{142, 93, 81, 242}}}, {Region: "US Portugal", IPs: []net.IP{{142, 93, 81, 242}}},
{Region: "US Saint Louis", IPs: []net.IP{{148, 72, 174, 43}, {148, 72, 174, 51}}}, {Region: "US Saint Louis", IPs: []net.IP{{148, 72, 169, 211}, {148, 72, 174, 36}}},
{Region: "US Salt Lake City", IPs: []net.IP{{104, 200, 131, 165}, {104, 200, 131, 249}}}, {Region: "US Salt Lake City", IPs: []net.IP{{104, 200, 131, 167}, {104, 200, 131, 172}}},
{Region: "US San Francisco", IPs: []net.IP{{107, 181, 166, 39}, {107, 181, 166, 83}}},
{Region: "US San Francisco mp001", IPs: []net.IP{{165, 232, 53, 25}}}, {Region: "US San Francisco mp001", IPs: []net.IP{{165, 232, 53, 25}}},
{Region: "US Seatle", IPs: []net.IP{{199, 229, 250, 163}}}, {Region: "US San Francisco", IPs: []net.IP{{185, 124, 240, 149}, {185, 124, 240, 155}}},
{Region: "US Tampa", IPs: []net.IP{{209, 216, 92, 197}, {209, 216, 92, 205}}}, {Region: "US Seatle", IPs: []net.IP{{198, 8, 80, 227}, {199, 229, 250, 163}}},
{Region: "Ukraine", IPs: []net.IP{{45, 9, 238, 23}, {45, 9, 238, 30}}}, {Region: "US Tampa", IPs: []net.IP{{209, 216, 92, 10}, {209, 216, 92, 220}}},
{Region: "United Arab Emirates", IPs: []net.IP{{45, 9, 250, 99}, {45, 9, 250, 103}}},
{Region: "Vietnam", IPs: []net.IP{{202, 143, 110, 29}, {202, 143, 110, 32}}}, {Region: "Vietnam", IPs: []net.IP{{202, 143, 110, 29}, {202, 143, 110, 32}}},
} }
} }

14
internal/updater/surfshark.go
View File

@@ -33,7 +33,7 @@ func (u *updater) updateSurfshark(ctx context.Context) (err error) {
//nolint:deadcode,unused //nolint:deadcode,unused
func findSurfsharkServersFromAPI(ctx context.Context, client network.Client, lookupIP lookupIPFunc) ( func findSurfsharkServersFromAPI(ctx context.Context, client network.Client, lookupIP lookupIPFunc) (
servers []models.SurfsharkServer, warnings []string, err error) { servers []models.SurfsharkServer, warnings []string, err error) {
const url = "https://my.surfshark.com/vpn/api/v1/server/clusters" const url = "https://my.surfshark.com/vpn/api/v4/server/clusters"
b, status, err := client.Get(ctx, url) b, status, err := client.Get(ctx, url)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
@@ -88,7 +88,9 @@ func findSurfsharkServersFromZip(ctx context.Context, client network.Client, loo
warnings = append(warnings, warning) warnings = append(warnings, warning)
} }
if err != nil { if err != nil {
return nil, warnings, fmt.Errorf("%w in %s", err, fileName) // treat error as warning and go to next file
warnings = append(warnings, err.Error()+" in "+fileName)
continue
} }
const repetition = 5 const repetition = 5
IPs, err := resolveRepeat(ctx, lookupIP, host, repetition) IPs, err := resolveRepeat(ctx, lookupIP, host, repetition)
@@ -199,6 +201,8 @@ func surfsharkSubdomainToRegion() (mapping map[string]string) {
"de-fra-st001": "Germany Frankfurt am Main st001", "de-fra-st001": "Germany Frankfurt am Main st001",
"de-fra-st002": "Germany Frankfurt am Main st002", "de-fra-st002": "Germany Frankfurt am Main st002",
"de-fra-st003": "Germany Frankfurt am Main st003", "de-fra-st003": "Germany Frankfurt am Main st003",
"de-fra-st004": "Germany Frankfurt am Main st004",
"de-fra-st005": "Germany Frankfurt am Main st005",
"de-muc": "Germany Munich", "de-muc": "Germany Munich",
"de-nue": "Germany Nuremberg", "de-nue": "Germany Nuremberg",
"de-sg": "Germany Singapour", "de-sg": "Germany Singapour",
@@ -235,6 +239,12 @@ func surfsharkSubdomainToRegion() (mapping map[string]string) {
"jp-tok-st005": "Japan Tokyo st005", "jp-tok-st005": "Japan Tokyo st005",
"jp-tok-st006": "Japan Tokyo st006", "jp-tok-st006": "Japan Tokyo st006",
"jp-tok-st007": "Japan Tokyo st007", "jp-tok-st007": "Japan Tokyo st007",
"jp-tok-st008": "Japan Tokyo st008",
"jp-tok-st009": "Japan Tokyo st009",
"jp-tok-st010": "Japan Tokyo st010",
"jp-tok-st011": "Japan Tokyo st011",
"jp-tok-st012": "Japan Tokyo st012",
"jp-tok-st013": "Japan Tokyo st013",
"kr-seo": "Korea", "kr-seo": "Korea",
"kz-ura": "Kazakhstan", "kz-ura": "Kazakhstan",
"lu-ste": "Luxembourg", "lu-ste": "Luxembourg",