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

Filter Privado servers by hostnames only

Browse Source
This commit is contained in:
Quentin McGaw
2020-11-09 23:17:22 +00:00
parent f1e4b9937b
commit 40ed070f21
12 changed files with 222 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
internal/provider/privado.go
View File

@@ -26,17 +26,10 @@ func newPrivado(servers []models.PrivadoServer, timeNow timeNowFunc) *privado {
}
}
func (s *privado) filterServers(cities []string, numbers []uint16) (servers []models.PrivadoServer) {
numbersStr := make([]string, len(numbers))
for i := range numbers {
numbersStr[i] = fmt.Sprintf("%d", numbers[i])
}
func (s *privado) filterServers(hostnames []string) (servers []models.PrivadoServer) {
for _, server := range s.servers {
numberStr := fmt.Sprintf("%d", server.Number)
switch {
case
filterByPossibilities(server.City, cities),
filterByPossibilities(numberStr, numbersStr):
case filterByPossibilities(server.Hostname, hostnames):
default:
servers = append(servers, server)
}
@@ -44,20 +37,6 @@ func (s *privado) filterServers(cities []string, numbers []uint16) (servers []mo
return servers
}
func makePrivadoHostname(city string, number uint16) string {
numberString := ""
const ten, hundred = 10, 100
switch {
case number < ten:
numberString = fmt.Sprintf("00%d", number)
case number < hundred:
numberString = fmt.Sprintf("0%d", number)
default:
numberString = fmt.Sprintf("%d", number)
}
return fmt.Sprintf("%s-%s.vpn.privado.io", city, numberString)
}
func (s *privado) GetOpenVPNConnection(selection models.ServerSelection) (
connection models.OpenVPNConnection, err error) {
var port uint16 = 1194
@@ -71,7 +50,7 @@ func (s *privado) GetOpenVPNConnection(selection models.ServerSelection) (
return models.OpenVPNConnection{IP: selection.TargetIP, Port: port, Protocol: selection.Protocol}, nil
}
servers := s.filterServers(selection.Cities, selection.Numbers)
servers := s.filterServers(selection.Hostnames)
if len(servers) == 0 {
return connection, fmt.Errorf("no server found for cities %s and server numbers %v",
commaJoin(selection.Cities), selection.Numbers)
@@ -83,7 +62,7 @@ func (s *privado) GetOpenVPNConnection(selection models.ServerSelection) (
IP: servers[i].IP,
Port: port,
Protocol: selection.Protocol,
Hostname: makePrivadoHostname(servers[i].City, servers[i].Number),
Hostname: servers[i].Hostname,
}
connections = append(connections, connection)
}