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

Feat: WeVPN support (#591)

Browse Source
This commit is contained in:
Quentin McGaw
2021-09-23 07:58:13 -07:00
committed by GitHub
parent 3cd26a9f61
commit d8e008606f
36 changed files with 1533 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/storage/hardcoded_test.go
View File

@@ -128,6 +128,11 @@ func Test_versions(t *testing.T) {
version: allServers.Vyprvpn.Version,
digest: "58de06d8",
},
"Wevpn": {
model: models.WevpnServer{},
version: allServers.Wevpn.Version,
digest: "f4daa186",
},
"Windscribe": {
model: models.WindscribeServer{},
version: allServers.Windscribe.Version,

16
internal/storage/merge.go
View File

@@ -49,6 +49,7 @@ func (s *Storage) mergeServers(hardcoded, persisted models.AllServers) models.Al
Torguard: s.mergeTorguard(hardcoded.Torguard, persisted.Torguard),
VPNUnlimited: s.mergeVPNUnlimited(hardcoded.VPNUnlimited, persisted.VPNUnlimited),
Vyprvpn: s.mergeVyprvpn(hardcoded.Vyprvpn, persisted.Vyprvpn),
Wevpn: s.mergeWevpn(hardcoded.Wevpn, persisted.Wevpn),
Windscribe: s.mergeWindscribe(hardcoded.Windscribe, persisted.Windscribe),
}
}
@@ -279,6 +280,21 @@ func (s *Storage) mergeVyprvpn(hardcoded, persisted models.VyprvpnServers) model
return persisted
}
func (s *Storage) mergeWevpn(hardcoded, persisted models.WevpnServers) models.WevpnServers {
if persisted.Timestamp <= hardcoded.Timestamp {
return hardcoded
}
versionDiff := int(hardcoded.Version) - int(persisted.Version)
if versionDiff > 0 {
s.logVersionDiff("WeVPN", versionDiff)
return hardcoded
}
s.logTimeDiff("WeVPN", persisted.Timestamp, hardcoded.Timestamp)
return persisted
}
func (s *Storage) mergeWindscribe(hardcoded, persisted models.WindscribeServers) models.WindscribeServers {
if persisted.Timestamp <= hardcoded.Timestamp {
return hardcoded

629
internal/storage/servers.json
View File

@@ -107914,6 +107914,633 @@
}
]
},
"wevpn": {
"version": 1,
"timestamp": 1632407719,
"servers": [
{
"city": "Amsterdam",
"hostname": "amsterdam.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"89.238.177.234"
]
},
{
"city": "Athens",
"hostname": "athens.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"185.51.134.210"
]
},
{
"city": "Atlanta",
"hostname": "atlanta.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"104.223.91.146"
]
},
{
"city": "Auckland",
"hostname": "auckland.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"103.108.94.226"
]
},
{
"city": "Belgrade",
"hostname": "belgrade.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"37.120.193.170"
]
},
{
"city": "Brussels",
"hostname": "brussels.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"77.243.191.178"
]
},
{
"city": "Bucharest",
"hostname": "bucharest.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"86.105.25.162"
]
},
{
"city": "Budapest",
"hostname": "budapest.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"185.128.26.130"
]
},
{
"city": "Buenos Aires",
"hostname": "buenosaires.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"131.255.4.140"
]
},
{
"city": "Cairo",
"hostname": "cairo.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"188.214.122.138"
]
},
{
"city": "Chennai",
"hostname": "chennai.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"169.38.107.52"
]
},
{
"city": "Chicago",
"hostname": "chicago.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"69.39.239.57"
]
},
{
"city": "Copenhagen",
"hostname": "copenhagen.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"37.120.194.82"
]
},
{
"city": "Dallas",
"hostname": "dallas.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"194.110.112.74"
]
},
{
"city": "Denizli",
"hostname": "bursa.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"95.173.161.240"
]
},
{
"city": "Denver",
"hostname": "denver.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"70.39.71.2"
]
},
{
"city": "Dubai",
"hostname": "dubai.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"217.138.193.42"
]
},
{
"city": "Dublin",
"hostname": "dublin.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"217.138.222.138"
]
},
{
"city": "Frankfurt",
"hostname": "frankfurt.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"45.141.152.178"
]
},
{
"city": "Hanoi",
"hostname": "hanoi.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"188.214.152.194"
]
},
{
"city": "Helsinki",
"hostname": "helsinki.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"185.212.149.152"
]
},
{
"city": "Hong Kong",
"hostname": "hongkong.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"84.17.37.55"
]
},
{
"city": "Jakarta",
"hostname": "jakarta.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"45.133.181.58"
]
},
{
"city": "Johannesburg",
"hostname": "johannesburg.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"102.165.20.38"
]
},
{
"city": "Kiev",
"hostname": "kyiv.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"37.19.218.197"
]
},
{
"city": "Lagos",
"hostname": "lagos.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"102.129.144.142"
]
},
{
"city": "Lisbon",
"hostname": "lisbon.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"185.90.57.152"
]
},
{
"city": "London",
"hostname": "london.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"45.141.154.2"
]
},
{
"city": "London-PF",
"hostname": "london-pf.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"77.243.177.78"
]
},
{
"city": "Los Angeles",
"hostname": "losangeles.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"45.152.182.82"
]
},
{
"city": "Los Angeles-PF",
"hostname": "losangeles-pf.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"66.55.92.75"
]
},
{
"city": "Luxembourg",
"hostname": "luxembourg.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"5.253.204.194"
]
},
{
"city": "Madrid",
"hostname": "madrid.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"45.152.183.242"
]
},
{
"city": "Manchester",
"hostname": "manchester.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"86.106.136.98"
]
},
{
"city": "Manila",
"hostname": "manila.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"188.214.125.106"
]
},
{
"city": "Melbourne",
"hostname": "melbourne.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"116.206.230.130"
]
},
{
"city": "Mexico City",
"hostname": "mexico.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"169.57.35.97"
]
},
{
"city": "Miami",
"hostname": "miami.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"96.47.224.2"
]
},
{
"city": "Milan",
"hostname": "milan.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"217.138.197.138"
]
},
{
"city": "Montreal",
"hostname": "montreal.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"217.138.200.242"
]
},
{
"city": "Moscow",
"hostname": "moscow.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"80.93.181.194"
]
},
{
"city": "New Jersey",
"hostname": "newjersey.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"23.226.131.146"
]
},
{
"city": "New York",
"hostname": "newyork.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"217.138.206.106"
]
},
{
"city": "New York-PF",
"hostname": "newyork-pf.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"188.241.179.2"
]
},
{
"city": "Oslo",
"hostname": "oslo.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"84.247.50.10"
]
},
{
"city": "Oulu",
"hostname": "oulu.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"188.126.89.174"
]
},
{
"city": "Paris",
"hostname": "paris.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"37.120.136.234"
]
},
{
"city": "Phoenix",
"hostname": "phoenix.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"170.130.15.34"
]
},
{
"city": "Prague",
"hostname": "prague.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"217.138.199.138"
]
},
{
"city": "Salt Lake City",
"hostname": "saltlakecity.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"107.182.234.233"
]
},
{
"city": "San Jose",
"hostname": "sanjose.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"169.62.109.140"
]
},
{
"city": "Sao Paulo",
"hostname": "saopaulo.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"177.54.152.89"
]
},
{
"city": "Seattle",
"hostname": "seattle.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"104.140.21.178"
]
},
{
"city": "Seoul",
"hostname": "seoul.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"169.56.83.206"
]
},
{
"city": "Sibu",
"hostname": "kualalumpur.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"223.25.246.4"
]
},
{
"city": "Singapore",
"hostname": "singapore.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"84.17.38.144"
]
},
{
"city": "Sofia",
"hostname": "sofia.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"217.138.221.42"
]
},
{
"city": "St Petersburg",
"hostname": "petersburg.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"82.202.220.242"
]
},
{
"city": "Stockholm",
"hostname": "stockholm.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"45.83.91.66"
]
},
{
"city": "Sydney",
"hostname": "sydney.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"46.102.153.106"
]
},
{
"city": "Taipei",
"hostname": "taipei.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"188.214.106.98"
]
},
{
"city": "Tel Aviv",
"hostname": "telaviv.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"193.43.72.242"
]
},
{
"city": "Tokyo",
"hostname": "tokyo.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"84.17.34.8"
]
},
{
"city": "Toronto",
"hostname": "toronto.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"184.75.208.234"
]
},
{
"city": "Vancouver",
"hostname": "vancouver.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"71.19.249.109"
]
},
{
"city": "Vienna",
"hostname": "vienna.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"37.120.212.162"
]
},
{
"city": "Warsaw",
"hostname": "warsaw.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"217.138.209.122"
]
},
{
"city": "Washington DC",
"hostname": "washington.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"70.32.0.208"
]
},
{
"city": "Zurich",
"hostname": "zurich.wevpn.com",
"tcp": false,
"udp": true,
"ips": [
"37.120.137.82"
]
}
]
},
"windscribe": {
"version": 1,
"timestamp": 1629420754,
@@ -115123,4 +115750,4 @@
}
]
}
}
}

1
internal/storage/sync.go
View File

@@ -30,6 +30,7 @@ func countServers(allServers models.AllServers) int {
len(allServers.Torguard.Servers) +
len(allServers.VPNUnlimited.Servers) +
len(allServers.Vyprvpn.Servers) +
len(allServers.Wevpn.Servers) +
len(allServers.Windscribe.Servers)
}