Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
20 changed files
with
2,038 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,6 +54,7 @@ body: | |
| - PrivateVPN | ||
| - ProtonVPN | ||
| - PureVPN | ||
| - SlickVPN | ||
| - Surfshark | ||
| - TorGuard | ||
| - VPNUnlimited | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package slickvpn | ||
|
|
||
| import ( | ||
| "github.com/qdm12/gluetun/internal/configuration/settings" | ||
| "github.com/qdm12/gluetun/internal/models" | ||
| "github.com/qdm12/gluetun/internal/provider/utils" | ||
| ) | ||
|
|
||
| func (p *Provider) GetConnection(selection settings.ServerSelection) ( | ||
| connection models.Connection, err error) { | ||
| defaults := utils.NewConnectionDefaults(0, 443, 0) //nolint:gomnd | ||
| return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package slickvpn | ||
|
|
||
| import ( | ||
| "github.com/qdm12/gluetun/internal/configuration/settings" | ||
| "github.com/qdm12/gluetun/internal/constants/openvpn" | ||
| "github.com/qdm12/gluetun/internal/models" | ||
| "github.com/qdm12/gluetun/internal/provider/utils" | ||
| ) | ||
|
|
||
| func (p *Provider) OpenVPNConfig(connection models.Connection, | ||
| settings settings.OpenVPN) (lines []string) { | ||
| const pingSeconds = 10 | ||
| const bufSize = 393216 | ||
| providerSettings := utils.OpenVPNProviderSettings{ | ||
| RemoteCertTLS: true, | ||
| AuthUserPass: true, | ||
| Ciphers: []string{ | ||
| openvpn.AES256cbc, | ||
| }, | ||
| Ping: pingSeconds, | ||
| SndBuf: bufSize, | ||
| RcvBuf: bufSize, | ||
| CA: "MIIDQDCCAqmgAwIBAgIJAM8Brk2pUr0KMA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEMMAoGA1UEBxMDVlBOMQwwCgYDVQQKEwNWUE4xDDAKBgNVBAsTA1ZQTjEMMAoGA1UEAxMDVlBOMQwwCgYDVQQpEwNWUE4xEjAQBgkqhkiG9w0BCQEWA1ZQTjAeFw0xMjAzMDMwMjExNDJaFw0yMjAzMDEwMjExNDJaMHQxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEMMAoGA1UEBxMDVlBOMQwwCgYDVQQKEwNWUE4xDDAKBgNVBAsTA1ZQTjEMMAoGA1UEAxMDVlBOMQwwCgYDVQQpEwNWUE4xEjAQBgkqhkiG9w0BCQEWA1ZQTjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwY2K08N7or1Br/EsD9XBon7gs7dKflWYuymgMLJfeMFWuJloNdsn+3GARIhYBbN6zhvFGFE214qKPqAydW1WmIIK7KoC0sgndr+Vk/au9gssFzVmmvr6+WN/nfo2L9KvvBMoYLrMAiyw/D4cRapZi2pXJLcMDfC+p1VWAX8TYWkCAwEAAaOB2TCB1jAdBgNVHQ4EFgQUmyvO4rTnu5/ABnp0FngU+SdR8WAwgaYGA1UdIwSBnjCBm4AUmyvO4rTnu5/ABnp0FngU+SdR8WCheKR2MHQxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEMMAoGA1UEBxMDVlBOMQwwCgYDVQQKEwNWUE4xDDAKBgNVBAsTA1ZQTjEMMAoGA1UEAxMDVlBOMQwwCgYDVQQpEwNWUE4xEjAQBgkqhkiG9w0BCQEWA1ZQToIJAM8Brk2pUr0KMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAoB0kOuGvrzPBTIRXIDHCCxBMdny+3sKAOllmH4+51j2aWhAJ4Pyc/yBTYyQGNoriABjmNzp+R05oiaxAD3vTgR80juKDPtQb8LoGLBF18gL7Vtc3+hJXcJasXZaDSSoyh5f+TtGvytIT+eceJWIrKnFXzlHOvKlyLkcZn15gwKQ=", //nolint:lll | ||
| ExtraLines: []string{ | ||
| "redirect-gateway", | ||
| }, | ||
| } | ||
| return utils.OpenVPNConfig(providerSettings, connection, settings) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package slickvpn | ||
|
|
||
| import ( | ||
| "math/rand" | ||
| "net/http" | ||
|
|
||
| "github.com/qdm12/gluetun/internal/constants/providers" | ||
| "github.com/qdm12/gluetun/internal/provider/common" | ||
| "github.com/qdm12/gluetun/internal/provider/slickvpn/updater" | ||
| "github.com/qdm12/gluetun/internal/provider/utils" | ||
| ) | ||
|
|
||
| type Provider struct { | ||
| storage common.Storage | ||
| randSource rand.Source | ||
| utils.NoPortForwarder | ||
| common.Fetcher | ||
| } | ||
|
|
||
| func New(storage common.Storage, randSource rand.Source, | ||
| client *http.Client, updaterWarner common.Warner, | ||
| parallelResolver common.ParallelResolver) *Provider { | ||
| return &Provider{ | ||
| storage: storage, | ||
| randSource: randSource, | ||
| NoPortForwarder: utils.NewNoPortForwarding(providers.SlickVPN), | ||
| Fetcher: updater.New(client, updaterWarner, parallelResolver), | ||
| } | ||
| } | ||
|
|
||
| func (p *Provider) Name() string { | ||
| return providers.SlickVPN | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package updater | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
| "github.com/qdm12/gluetun/internal/updater/resolver" | ||
| ) | ||
|
|
||
| func parallelResolverSettings(hosts []string) (settings resolver.ParallelSettings) { | ||
| const ( | ||
| maxFailRatio = 0.1 | ||
| maxDuration = 20 * time.Second | ||
| betweenDuration = time.Second | ||
| maxNoNew = 2 | ||
| maxFails = 2 | ||
| ) | ||
| return resolver.ParallelSettings{ | ||
| Hosts: hosts, | ||
| MaxFailRatio: maxFailRatio, | ||
| Repeat: resolver.RepeatSettings{ | ||
| MaxDuration: maxDuration, | ||
| BetweenDuration: betweenDuration, | ||
| MaxNoNew: maxNoNew, | ||
| MaxFails: maxFails, | ||
| SortIPs: true, | ||
| }, | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| package updater | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "fmt" | ||
| "sort" | ||
|
|
||
| "github.com/qdm12/gluetun/internal/constants/vpn" | ||
| "github.com/qdm12/gluetun/internal/models" | ||
| "github.com/qdm12/gluetun/internal/provider/common" | ||
| "github.com/qdm12/gluetun/internal/updater/openvpn" | ||
| ) | ||
|
|
||
| var ErrNotEnoughServers = errors.New("not enough servers found") | ||
|
|
||
| func (u *Updater) FetchServers(ctx context.Context, minServers int) ( | ||
| servers []models.Server, err error) { | ||
| hostToData, err := fetchAndParseWebsite(ctx, u.client) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("fetching and parsing website: %w", err) | ||
| } | ||
|
|
||
| openvpnURLs := make([]string, 0, len(hostToData)) | ||
| for _, data := range hostToData { | ||
| openvpnURLs = append(openvpnURLs, data.ovpnURL) | ||
| } | ||
|
|
||
| if len(openvpnURLs) < minServers { | ||
| return nil, fmt.Errorf("%w: %d and expected at least %d", | ||
| common.ErrNotEnoughServers, len(openvpnURLs), minServers) | ||
| } | ||
|
|
||
| const failEarly = false // some URLs from the website are not valid | ||
| udpHostToURL, errors := openvpn.FetchMultiFiles(ctx, u.client, openvpnURLs, failEarly) | ||
| for _, err := range errors { | ||
| u.warner.Warn(fmt.Sprintf("fetching OpenVPN files: %s", err)) | ||
| } | ||
|
|
||
| if len(udpHostToURL) < minServers { | ||
| return nil, fmt.Errorf("%w: %d and expected at least %d", | ||
| common.ErrNotEnoughServers, len(udpHostToURL), minServers) | ||
| } | ||
|
|
||
| hosts := make([]string, 0, len(udpHostToURL)) | ||
| for host := range udpHostToURL { | ||
| hosts = append(hosts, host) | ||
| } | ||
|
|
||
| resolveSettings := parallelResolverSettings(hosts) | ||
| hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings) | ||
| for _, warning := range warnings { | ||
| u.warner.Warn(warning) | ||
| } | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if len(hostToIPs) < minServers { | ||
| return nil, fmt.Errorf("%w: %d and expected at least %d", | ||
| common.ErrNotEnoughServers, len(hosts), minServers) | ||
| } | ||
|
|
||
| servers = make([]models.Server, 0, len(hostToIPs)) | ||
| for host, IPs := range hostToIPs { | ||
| _, udp := udpHostToURL[host] | ||
|
|
||
| serverData := hostToData[host] | ||
|
|
||
| server := models.Server{ | ||
| VPN: vpn.OpenVPN, | ||
| Region: serverData.region, | ||
| Country: serverData.country, | ||
| City: serverData.city, | ||
| Hostname: host, | ||
| UDP: udp, | ||
| IPs: IPs, | ||
| } | ||
| servers = append(servers, server) | ||
| } | ||
|
|
||
| sort.Sort(models.SortableServers(servers)) | ||
|
|
||
| return servers, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package updater | ||
|
|
||
| import ( | ||
| "net/http" | ||
|
|
||
| "github.com/qdm12/gluetun/internal/provider/common" | ||
| ) | ||
|
|
||
| type Updater struct { | ||
| client *http.Client | ||
| parallelResolver common.ParallelResolver | ||
| warner common.Warner | ||
| } | ||
|
|
||
| func New(client *http.Client, warner common.Warner, | ||
| parallelResolver common.ParallelResolver) *Updater { | ||
| return &Updater{ | ||
| client: client, | ||
| parallelResolver: parallelResolver, | ||
| warner: warner, | ||
| } | ||
| } |
Oops, something went wrong.