From 306de8feda984acca33670708a55a90a0e1623ee Mon Sep 17 00:00:00 2001 From: Quentin McGaw Date: Sat, 7 May 2022 19:03:38 +0000 Subject: [PATCH] chore(constants): add `internal/provider/privateinternetacess/presets` package --- internal/configuration/settings/openvpn.go | 3 ++- internal/configuration/settings/openvpnselection.go | 10 +++++----- internal/constants/privateinternetaccess.go | 7 ------- internal/provider/privateinternetaccess/connection.go | 6 +++--- internal/provider/privateinternetaccess/openvpnconf.go | 5 +++-- .../provider/privateinternetaccess/presets/presets.go | 7 +++++++ 6 files changed, 20 insertions(+), 18 deletions(-) delete mode 100644 internal/constants/privateinternetaccess.go create mode 100644 internal/provider/privateinternetaccess/presets/presets.go diff --git a/internal/configuration/settings/openvpn.go b/internal/configuration/settings/openvpn.go index 2824d28e..ce9eeca7 100644 --- a/internal/configuration/settings/openvpn.go +++ b/internal/configuration/settings/openvpn.go @@ -10,6 +10,7 @@ import ( "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/openvpn/extract" "github.com/qdm12/gluetun/internal/openvpn/parse" + "github.com/qdm12/gluetun/internal/provider/privateinternetaccess/presets" "github.com/qdm12/gotree" ) @@ -275,7 +276,7 @@ func (o *OpenVPN) setDefaults(vpnProvider string) { var defaultEncPreset string if vpnProvider == providers.PrivateInternetAccess { - defaultEncPreset = constants.PIAEncryptionPresetStrong + defaultEncPreset = presets.Strong } o.PIAEncPreset = helpers.DefaultStringPtr(o.PIAEncPreset, defaultEncPreset) diff --git a/internal/configuration/settings/openvpnselection.go b/internal/configuration/settings/openvpnselection.go index 2935bc40..3a0c4c4b 100644 --- a/internal/configuration/settings/openvpnselection.go +++ b/internal/configuration/settings/openvpnselection.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/qdm12/gluetun/internal/configuration/settings/helpers" - "github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/gluetun/internal/constants/providers" + "github.com/qdm12/gluetun/internal/provider/privateinternetaccess/presets" "github.com/qdm12/gotree" ) @@ -106,9 +106,9 @@ func (o OpenVPNSelection) validate(vpnProvider string) (err error) { // Validate EncPreset if vpnProvider == providers.PrivateInternetAccess { validEncryptionPresets := []string{ - constants.PIAEncryptionPresetNone, - constants.PIAEncryptionPresetNormal, - constants.PIAEncryptionPresetStrong, + presets.None, + presets.Normal, + presets.Strong, } if !helpers.IsOneOf(*o.PIAEncPreset, validEncryptionPresets...) { return fmt.Errorf("%w: %s; valid presets are %s", @@ -150,7 +150,7 @@ func (o *OpenVPNSelection) setDefaults(vpnProvider string) { var defaultEncPreset string if vpnProvider == providers.PrivateInternetAccess { - defaultEncPreset = constants.PIAEncryptionPresetStrong + defaultEncPreset = presets.Strong } o.PIAEncPreset = helpers.DefaultStringPtr(o.PIAEncPreset, defaultEncPreset) } diff --git a/internal/constants/privateinternetaccess.go b/internal/constants/privateinternetaccess.go deleted file mode 100644 index 2a05a9ff..00000000 --- a/internal/constants/privateinternetaccess.go +++ /dev/null @@ -1,7 +0,0 @@ -package constants - -const ( - PIAEncryptionPresetNone = "none" - PIAEncryptionPresetNormal = "normal" - PIAEncryptionPresetStrong = "strong" -) diff --git a/internal/provider/privateinternetaccess/connection.go b/internal/provider/privateinternetaccess/connection.go index 65dcf755..cb720c66 100644 --- a/internal/provider/privateinternetaccess/connection.go +++ b/internal/provider/privateinternetaccess/connection.go @@ -2,8 +2,8 @@ package privateinternetaccess import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/gluetun/internal/models" + "github.com/qdm12/gluetun/internal/provider/privateinternetaccess/presets" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -12,10 +12,10 @@ func (p *PIA) GetConnection(selection settings.ServerSelection) ( // Set port defaults depending on encryption preset. var defaults utils.ConnectionDefaults switch *selection.OpenVPN.PIAEncPreset { - case constants.PIAEncryptionPresetNone, constants.PIAEncryptionPresetNormal: + case presets.None, presets.Normal: defaults.OpenVPNTCPPort = 502 defaults.OpenVPNUDPPort = 1198 - case constants.PIAEncryptionPresetStrong: + case presets.Strong: defaults.OpenVPNTCPPort = 501 defaults.OpenVPNUDPPort = 1197 } diff --git a/internal/provider/privateinternetaccess/openvpnconf.go b/internal/provider/privateinternetaccess/openvpnconf.go index ddc4cf99..fd3f2b05 100644 --- a/internal/provider/privateinternetaccess/openvpnconf.go +++ b/internal/provider/privateinternetaccess/openvpnconf.go @@ -4,6 +4,7 @@ import ( "github.com/qdm12/gluetun/internal/configuration/settings" "github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/gluetun/internal/models" + "github.com/qdm12/gluetun/internal/provider/privateinternetaccess/presets" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -20,12 +21,12 @@ func (p *PIA) BuildConf(connection models.Connection, crlVerifyNormalPreset = "MIICWDCCAUAwDQYJKoZIhvcNAQENBQAwgegxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTETMBEGA1UEBxMKTG9zQW5nZWxlczEgMB4GA1UEChMXUHJpdmF0ZSBJbnRlcm5ldCBBY2Nlc3MxIDAeBgNVBAsTF1ByaXZhdGUgSW50ZXJuZXQgQWNjZXNzMSAwHgYDVQQDExdQcml2YXRlIEludGVybmV0IEFjY2VzczEgMB4GA1UEKRMXUHJpdmF0ZSBJbnRlcm5ldCBBY2Nlc3MxLzAtBgkqhkiG9w0BCQEWIHNlY3VyZUBwcml2YXRlaW50ZXJuZXRhY2Nlc3MuY29tFw0xNjA3MDgxOTAwNDZaFw0zNjA3MDMxOTAwNDZaMCYwEQIBARcMMTYwNzA4MTkwMDQ2MBECAQYXDDE2MDcwODE5MDA0NjANBgkqhkiG9w0BAQ0FAAOCAQEAQZo9X97ci8EcPYu/uK2HB152OZbeZCINmYyluLDOdcSvg6B5jI+ffKN3laDvczsG6CxmY3jNyc79XVpEYUnq4rT3FfveW1+Ralf+Vf38HdpwB8EWB4hZlQ205+21CALLvZvR8HcPxC9KEnev1mU46wkTiov0EKc+EdRxkj5yMgv0V2Reze7AP+NQ9ykvDScH4eYCsmufNpIjBLhpLE2cuZZXBLcPhuRzVoU3l7A9lvzG9mjA5YijHJGHNjlWFqyrn1CfYS6koa4TGEPngBoAziWRbDGdhEgJABHrpoaFYaL61zqyMR6jC0K2ps9qyZAN74LEBedEfK7tBOzWMwr58A==" //nolint:lll ) switch *settings.PIAEncPreset { - case constants.PIAEncryptionPresetNormal: + case presets.Normal: providerSettings.Ciphers = []string{constants.AES128cbc} providerSettings.Auth = constants.SHA1 providerSettings.CRLVerify = crlVerifyNormalPreset providerSettings.CA = caNormalPreset - case constants.PIAEncryptionPresetNone: + case presets.None: providerSettings.Ciphers = []string{"none"} providerSettings.Auth = "none" providerSettings.CRLVerify = crlVerifyNormalPreset diff --git a/internal/provider/privateinternetaccess/presets/presets.go b/internal/provider/privateinternetaccess/presets/presets.go new file mode 100644 index 00000000..d66efc09 --- /dev/null +++ b/internal/provider/privateinternetaccess/presets/presets.go @@ -0,0 +1,7 @@ +package presets + +const ( + None = "none" + Normal = "normal" + Strong = "strong" +)