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

Multi options filters, fixes #231 (#262)

Browse Source 
* OWNED environment variable for Mullvad
* CSV are now accepted for all servers filtering environment variables
This commit is contained in:
Quentin McGaw
2020-10-18 17:15:42 -04:00
committed by GitHub
parent c932f48a95
commit af606463ea
26 changed files with 247 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
internal/params/mullvad.go
View File

@@ -5,25 +5,25 @@ import (
libparams "github.com/qdm12/golibs/params"
)
// GetMullvadCountry obtains the country for the Mullvad server from the
// GetMullvadCountries obtains the countries for the Mullvad servers from the
// environment variable COUNTRY
func (r *reader) GetMullvadCountry() (country string, err error) {
func (r *reader) GetMullvadCountries() (countries []string, err error) {
choices := append(constants.MullvadCountryChoices(), "")
return r.envParams.GetValueIfInside("COUNTRY", choices)
return r.envParams.GetCSVInPossibilities("COUNTRY", choices)
}
// GetMullvadCity obtains the city for the Mullvad server from the
// GetMullvadCity obtains the cities for the Mullvad servers from the
// environment variable CITY
func (r *reader) GetMullvadCity() (country string, err error) {
func (r *reader) GetMullvadCities() (cities []string, err error) {
choices := append(constants.MullvadCityChoices(), "")
return r.envParams.GetValueIfInside("CITY", choices)
return r.envParams.GetCSVInPossibilities("CITY", choices)
}
// GetMullvadISP obtains the ISP for the Mullvad server from the
// GetMullvadISPs obtains the ISPs for the Mullvad servers from the
// environment variable ISP
func (r *reader) GetMullvadISP() (isp string, err error) {
func (r *reader) GetMullvadISPs() (isps []string, err error) {
choices := append(constants.MullvadISPChoices(), "")
return r.envParams.GetValueIfInside("ISP", choices)
return r.envParams.GetCSVInPossibilities("ISP", choices)
}
// GetMullvadPort obtains the port to reach the Mullvad server on from the
@@ -32,3 +32,9 @@ func (r *reader) GetMullvadPort() (port uint16, err error) {
n, err := r.envParams.GetEnvIntRange("PORT", 0, 65535, libparams.Default("0"))
return uint16(n), err
}
// GetMullvadOwned obtains if the server should be owned by Mullvad or not from the
// environment variable OWNED
func (r *reader) GetMullvadOwned() (owned bool, err error) {
return r.envParams.GetYesNo("OWNED", libparams.Default("no"))
}