fix(main/proton-bridge): fixes #18394

This commit is contained in:
Twaik Yont 2023-11-02 12:53:55 +02:00
parent 1bbc60122c
commit 0d5d0a87a6
2 changed files with 79 additions and 2 deletions

View File

@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://github.com/ProtonMail/proton-bridge
TERMUX_PKG_DESCRIPTION="ProtonMail Bridge application"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_VERSION="3.6.1"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=git+https://github.com/ProtonMail/proton-bridge
TERMUX_PKG_GIT_BRANCH=v${TERMUX_PKG_VERSION}
TERMUX_PKG_MAINTAINER="Radomír Polách <rp@t4d.cz>"
@ -22,6 +23,5 @@ termux_step_make() {
}
termux_step_make_install() {
install -Dm700 "${TERMUX_PKG_SRCDIR}"/proton-bridge \
"${TERMUX_PREFIX}"/bin/proton-bridge
install -Dm700 "${TERMUX_PKG_SRCDIR}"/bridge "${TERMUX_PREFIX}"/bin/proton-bridge
}

View File

@ -0,0 +1,77 @@
--- cache/tmp-checkout/internal/updater/updater.go 2023-11-02 08:43:50.875810511 +0200
+++ src/internal/updater/updater.go 2023-11-02 12:51:01.408228041 +0200
@@ -18,16 +18,12 @@
package updater
import (
- "bytes"
"context"
- "encoding/json"
- "fmt"
"io"
"github.com/Masterminds/semver/v3"
"github.com/ProtonMail/gopenpgp/v2/crypto"
"github.com/pkg/errors"
- "github.com/sirupsen/logrus"
)
var (
@@ -62,56 +58,9 @@
}
func (u *Updater) GetVersionInfo(ctx context.Context, downloader Downloader, channel Channel) (VersionInfo, error) {
- b, err := downloader.DownloadAndVerify(
- ctx,
- u.verifier,
- u.getVersionFileURL(),
- u.getVersionFileURL()+".sig",
- )
- if err != nil {
- return VersionInfo{}, err
- }
-
- var versionMap VersionMap
-
- if err := json.Unmarshal(b, &versionMap); err != nil {
- return VersionInfo{}, err
- }
-
- version, ok := versionMap[channel]
- if !ok {
- return VersionInfo{}, errors.New("no updates available for this channel")
- }
-
- return version, nil
+ return VersionInfo{}, errors.New("no updates available for this channel")
}
func (u *Updater) InstallUpdate(ctx context.Context, downloader Downloader, update VersionInfo) error {
- if u.installer.IsAlreadyInstalled(update.Version) {
- return ErrUpdateAlreadyInstalled
- }
-
- b, err := downloader.DownloadAndVerify(
- ctx,
- u.verifier,
- update.Package,
- update.Package+".sig",
- )
- if err != nil {
- return ErrDownloadVerify
- }
-
- if err := u.installer.InstallUpdate(update.Version, bytes.NewReader(b)); err != nil {
- logrus.WithError(err).Error("Failed to install update")
- return ErrInstall
- }
-
return nil
}
-
-// getVersionFileURL returns the URL of the version file.
-// For example:
-// - https://protonmail.com/download/bridge/version_linux.json
-func (u *Updater) getVersionFileURL() string {
- return fmt.Sprintf("%v/%v/version_%v.json", Host, u.product, u.platform)
-}