From 094de89a3eae44ccba57faf8cc6a81aa4d901837 Mon Sep 17 00:00:00 2001 From: "Quentin McGaw (desktop)" Date: Thu, 9 Sep 2021 21:36:14 +0000 Subject: [PATCH] Fix: `PIA_ENCRYPTION` default value outside Docker - Defaults to `strong` instead of strong certificate string - No impact on Docker images since variable is set to `strong` in Dockerfile - Only read `PIA_ENCRYPTION` if service provider is PIA --- internal/configuration/openvpn.go | 7 ++----- internal/configuration/privateinternetaccess.go | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/internal/configuration/openvpn.go b/internal/configuration/openvpn.go index 103afc88..cdcfafcd 100644 --- a/internal/configuration/openvpn.go +++ b/internal/configuration/openvpn.go @@ -158,14 +158,11 @@ func (settings *OpenVPN) read(r reader, serviceProvider string) (err error) { return err } - settings.EncPreset, err = getPIAEncryptionPreset(r) - if err != nil { - return err - } - switch serviceProvider { case constants.Cyberghost: err = settings.readCyberghost(r) + case constants.PrivateInternetAccess: + settings.EncPreset, err = getPIAEncryptionPreset(r) case constants.VPNUnlimited: err = settings.readVPNUnlimited(r) } diff --git a/internal/configuration/privateinternetaccess.go b/internal/configuration/privateinternetaccess.go index 14fa2e89..4a7d3a07 100644 --- a/internal/configuration/privateinternetaccess.go +++ b/internal/configuration/privateinternetaccess.go @@ -65,7 +65,7 @@ func getPIAEncryptionPreset(r reader) (encryptionPreset string, err error) { encryptionPreset, err = r.env.Inside("PIA_ENCRYPTION", []string{constants.PIAEncryptionPresetNone, constants.PIAEncryptionPresetNormal, constants.PIAEncryptionPresetStrong}, params.RetroKeys([]string{"ENCRYPTION"}, r.onRetroActive), - params.Default(constants.PIACertificateStrong), + params.Default(constants.PIAEncryptionPresetStrong), ) if err != nil { return "", fmt.Errorf("environment variable PIA_ENCRYPTION: %w", err)