Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-10 04:36:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-1202: Do not update package if it's version older than launcher

Browse Source
This commit is contained in:
Alexander Bilyak
2021-09-21 13:56:27 +02:00
committed by Jakub Cuth
parent e940d9f6fe
commit f21f583d05
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/launcher/main.go
View File

@ -24,6 +24,7 @@ import (
"path/filepath" "path/filepath"
"runtime" "runtime"
"github.com/Masterminds/semver/v3"
"github.com/ProtonMail/gopenpgp/v2/crypto" "github.com/ProtonMail/gopenpgp/v2/crypto"
"github.com/ProtonMail/proton-bridge/internal/config/useragent" "github.com/ProtonMail/proton-bridge/internal/config/useragent"
"github.com/ProtonMail/proton-bridge/internal/constants" "github.com/ProtonMail/proton-bridge/internal/constants"
@ -86,7 +87,7 @@ func main() { // nolint[funlen]
versioner := versioner.New(updatesPath) versioner := versioner.New(updatesPath)
exe, err := getPathToExecutable(ExeName, versioner, kr, reporter) exe, err := getPathToUpdatedExecutable(ExeName, versioner, kr, reporter)
if err != nil { if err != nil {
if exe, err = getFallbackExecutable(ExeName, versioner); err != nil { if exe, err = getFallbackExecutable(ExeName, versioner); err != nil {
logrus.WithError(err).Fatal("Failed to find any launchable executable") logrus.WithError(err).Fatal("Failed to find any launchable executable")
@ -142,7 +143,7 @@ func appendLauncherPath(path string, args []string) []string {
return res return res
} }
func getPathToExecutable( func getPathToUpdatedExecutable(
name string, name string,
versioner *versioner.Versioner, versioner *versioner.Versioner,
kr *crypto.KeyRing, kr *crypto.KeyRing,
@ -153,6 +154,11 @@ func getPathToExecutable(
return "", errors.Wrap(err, "failed to list available versions") return "", errors.Wrap(err, "failed to list available versions")
} }
currentVersion, err := semver.StrictNewVersion(constants.Version)
if err != nil {
logrus.WithField("version", constants.Version).WithError(err).Error("Failed to parse current version")
}
for _, version := range versions { for _, version := range versions {
vlog := logrus.WithField("version", version) vlog := logrus.WithField("version", version)
@ -170,6 +176,11 @@ func getPathToExecutable(
continue continue
} }
// Skip versions that are less or equal to launcher version.
if currentVersion != nil && !version.SemVer().GreaterThan(currentVersion) {
continue
}
exe, err := version.GetExecutable(name) exe, err := version.GetExecutable(name)
if err != nil { if err != nil {
vlog.WithError(err).Error("Failed to get executable") vlog.WithError(err).Error("Failed to get executable")
@ -179,7 +190,7 @@ func getPathToExecutable(
return exe, nil return exe, nil
} }
return "", errors.New("no available versions") return "", errors.New("no available newer versions")
} }
func getFallbackExecutable(name string, versioner *versioner.Versioner) (string, error) { func getFallbackExecutable(name string, versioner *versioner.Versioner) (string, error) {

4
internal/versioner/version.go
View File

@ -59,6 +59,10 @@ func (v *Version) Equal(version *semver.Version) bool {
return v.version.Equal(version) return v.version.Equal(version)
} }
func (v *Version) SemVer() *semver.Version {
return v.version
}
// VerifyFiles verifies all files in the version directory. // VerifyFiles verifies all files in the version directory.
func (v *Version) VerifyFiles(kr *crypto.KeyRing) error { func (v *Version) VerifyFiles(kr *crypto.KeyRing) error {
fileBytes, err := ioutil.ReadFile(filepath.Join(v.path, sumFile)) // nolint[gosec] fileBytes, err := ioutil.ReadFile(filepath.Join(v.path, sumFile)) // nolint[gosec]