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

feat(surfshark): Wireguard support (#587)

Browse Source
This commit is contained in:
Quentin McGaw
2022-08-26 10:55:46 -04:00
committed by GitHub
parent 4ace99f318
commit 5989f29035
14 changed files with 2792 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/provider/surfshark/updater/api.go
View File

@@ -10,9 +10,9 @@ import (
"github.com/qdm12/gluetun/internal/provider/surfshark/servers"
)
// Note: no multi-hop and some servers are missing from their API.
// Note: no multi-hop and some OpenVPN servers are missing from their API.
func addServersFromAPI(ctx context.Context, client *http.Client,
hts hostToServer) (err error) {
hts hostToServers) (err error) {
data, err := fetchAPI(ctx, client)
if err != nil {
return err
@@ -21,12 +21,18 @@ func addServersFromAPI(ctx context.Context, client *http.Client,
locationData := servers.LocationData()
hostToLocation := hostToLocation(locationData)
const tcp, udp = true, true
for _, serverData := range data {
locationData := hostToLocation[serverData.Host] // TODO remove in v4
retroLoc := locationData.RetroLoc // empty string if the host has no retro-compatible region
hts.add(serverData.Host, serverData.Region, serverData.Country,
tcp, udp := true, true // OpenVPN servers from API supports both TCP and UDP
hts.addOpenVPN(serverData.Host, serverData.Region, serverData.Country,
serverData.Location, retroLoc, tcp, udp)
if serverData.PubKey != "" {
hts.addWireguard(serverData.Host, serverData.Region, serverData.Country,
serverData.Location, retroLoc, serverData.PubKey)
}
}
return nil
@@ -41,6 +47,7 @@ type serverData struct {
Region string `json:"region"`
Country string `json:"country"`
Location string `json:"location"`
PubKey string `json:"pubKey"`
}
func fetchAPI(ctx context.Context, client *http.Client) (