yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

fix(BRIDGE-69): explicitly handle semver panic for last bridge version from vault

Browse Source
This commit is contained in:
Atanas Janeshliev
2024-05-21 14:20:25 +02:00
parent 28ae54b5ca
commit e7713fa785
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/vault/settings.go
View File

@ -18,11 +18,13 @@
package vault package vault
import ( import (
"fmt"
"math" "math"
"math/rand" "math/rand"
"time" "time"
"github.com/Masterminds/semver/v3" "github.com/Masterminds/semver/v3"
"github.com/ProtonMail/proton-bridge/v3/internal/constants"
"github.com/ProtonMail/proton-bridge/v3/internal/updater" "github.com/ProtonMail/proton-bridge/v3/internal/updater"
"github.com/ProtonMail/proton-bridge/v3/internal/useragent" "github.com/ProtonMail/proton-bridge/v3/internal/useragent"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@ -200,7 +202,14 @@ func (vault *Vault) SetTelemetryDisabled(telemetryDisabled bool) error {
// GetLastVersion returns the last version of the bridge that was run. // GetLastVersion returns the last version of the bridge that was run.
func (vault *Vault) GetLastVersion() *semver.Version { func (vault *Vault) GetLastVersion() *semver.Version {
return semver.MustParse(vault.getSafe().Settings.LastVersion) lastVersion := vault.getSafe().Settings.LastVersion
version, err := semver.NewVersion(lastVersion)
if err != nil {
logrus.WithError(err).Error(fmt.Sprintf("Error encountered when trying to get last version from vault: %s", lastVersion))
version, _ = semver.NewVersion(constants.Version)
}
return version
} }
// SetLastVersion sets the last version of the bridge that was run. // SetLastVersion sets the last version of the bridge that was run.