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

Feature: filter by hostname for Mullvad servers

Browse Source
This commit is contained in:
Quentin McGaw
2021-05-08 19:17:36 +00:00
parent a34769ae02
commit 2ec2f45c82
11 changed files with 382 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/provider/mullvad.go
View File

@@ -28,12 +28,14 @@ func newMullvad(servers []models.MullvadServer, timeNow timeNowFunc) *mullvad {
}
}
func (m *mullvad) filterServers(countries, cities, isps []string, owned bool) (servers []models.MullvadServer) {
func (m *mullvad) filterServers(countries, cities, hostnames,
isps []string, owned bool) (servers []models.MullvadServer) {
for _, server := range m.servers {
switch {
case
filterByPossibilities(server.Country, countries),
filterByPossibilities(server.City, cities),
filterByPossibilities(server.Hostname, hostnames),
filterByPossibilities(server.ISP, isps),
owned && !server.Owned:
default:
@@ -58,7 +60,8 @@ func (m *mullvad) GetOpenVPNConnection(selection configuration.ServerSelection)
return models.OpenVPNConnection{IP: selection.TargetIP, Port: port, Protocol: selection.Protocol}, nil
}
servers := m.filterServers(selection.Countries, selection.Cities, selection.ISPs, selection.Owned)
servers := m.filterServers(selection.Countries, selection.Hostnames,
selection.Cities, selection.ISPs, selection.Owned)
if len(servers) == 0 {
return connection, fmt.Errorf("no server found for countries %s, cities %s, ISPs %s and owned %t",
commaJoin(selection.Countries), commaJoin(selection.Cities), commaJoin(selection.ISPs), selection.Owned)