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

Fix servers filtering for PIA

Browse Source
This commit is contained in:
Quentin McGaw
2020-10-18 23:44:16 +00:00
parent af606463ea
commit 302adb26d7
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/provider/piav3.go
View File

@@ -140,8 +140,8 @@ func filterPIAOldServers(servers []models.PIAOldServer, regions []string) (filte
switch { switch {
case filterByPossibilities(server.Region, regions): case filterByPossibilities(server.Region, regions):
default: default:
servers = append(servers, server) filtered = append(filtered, server)
} }
} }
return servers return filtered
} }

7
internal/provider/piav4.go
View File

@@ -251,10 +251,10 @@ func filterPIAServers(servers []models.PIAServer, regions []string) (filtered []
switch { switch {
case filterByPossibilities(server.Region, regions): case filterByPossibilities(server.Region, regions):
default: default:
servers = append(servers, server) filtered = append(filtered, server)
} }
} }
return servers return filtered
} }
func newPIAv4HTTPClient(serverName string) (client *http.Client, err error) { func newPIAv4HTTPClient(serverName string) (client *http.Client, err error) {
@@ -266,6 +266,7 @@ func newPIAv4HTTPClient(serverName string) (client *http.Client, err error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("cannot parse PIA root certificate: %w", err) return nil, fmt.Errorf("cannot parse PIA root certificate: %w", err)
} }
// certificate.DNSNames = []string{serverName, "10.0.0.1"}
rootCAs := x509.NewCertPool() rootCAs := x509.NewCertPool()
rootCAs.AddCert(certificate) rootCAs.AddCert(certificate)
TLSClientConfig := &tls.Config{ TLSClientConfig := &tls.Config{
@@ -384,7 +385,7 @@ func fetchPIAToken(fileManager files.FileManager, client *http.Client) (token st
url := url.URL{ url := url.URL{
Scheme: "https", Scheme: "https",
User: url.UserPassword(username, password), User: url.UserPassword(username, password),
Host: "10.0.0.1", Host: "185.216.33.146",
Path: "/authv3/generateToken", Path: "/authv3/generateToken",
} }
request, err := http.NewRequest(http.MethodGet, url.String(), nil) request, err := http.NewRequest(http.MethodGet, url.String(), nil)