[WIP] New updater

safing · Aug 13, 2024 · 1310979 · 1310979
1 parent 68955fd
commit 1310979
Show file tree

Hide file tree

Showing 9 changed files with 671 additions and 262 deletions.
diff --git a/Earthfile b/Earthfile
@@ -462,17 +462,14 @@ tauri-build:
     # Our tauri app has externalBins configured so tauri will try to embed them when it finished compiling
     # the app. Make sure we copy portmaster-start and portmaster-core in all architectures supported.
     # See documentation for externalBins for more information on how tauri searches for the binaries.
-    COPY (+go-build/output --CMDS="portmaster-start portmaster-core" --GOOS="${GOOS}" --GOARCH="${GOARCH}" --GOARM="${GOARM}") /tmp/gobuild
+    COPY (+go-build/output --CMDS="portmaster-core" --GOOS="${GOOS}" --GOARCH="${GOARCH}" --GOARM="${GOARM}") /tmp/gobuild
 
     # Place them in the correct folder with the rust target tripple attached.
     FOR bin IN $(ls /tmp/gobuild)
         # ${bin$.*} does not work in SET commands unfortunately so we use a shell
         # snippet here:
         RUN set -e ; \
-            dest="./binaries/${bin}-${target}" ; \
-            if [ -z "${bin##*.exe}" ]; then \
-                dest="./binaries/${bin%.*}-${target}.exe" ; \
-            fi ; \
+            dest="./binaries/${bin}" ; \
             cp "/tmp/gobuild/${bin}" "${dest}" ;
     END
 

diff --git a/base/updater/get.go b/base/updater/get.go
@@ -1,12 +1,8 @@
 package updater
 
 import (
-	"context"
 	"errors"
 	"fmt"
-	"net/http"
-
-	"github.com/safing/portmaster/base/log"
 )
 
 // Errors returned by the updater package.
@@ -19,59 +15,60 @@ var (
 // GetFile returns the selected (mostly newest) file with the given
 // identifier or an error, if it fails.
 func (reg *ResourceRegistry) GetFile(identifier string) (*File, error) {
-	reg.RLock()
-	res, ok := reg.resources[identifier]
-	reg.RUnlock()
-	if !ok {
-		return nil, ErrNotFound
-	}
+	return nil, fmt.Errorf("invalid file: %s", identifier)
+	// reg.RLock()
+	// res, ok := reg.resources[identifier]
+	// reg.RUnlock()
+	// if !ok {
+	// 	return nil, ErrNotFound
+	// }
 
-	file := res.GetFile()
-	// check if file is available locally
-	if file.version.Available {
-		file.markActiveWithLocking()
+	// file := res.GetFile()
+	// // check if file is available locally
+	// if file.version.Available {
+	// 	file.markActiveWithLocking()
 
-		// Verify file, if configured.
-		_, err := file.Verify()
-		if err != nil && !errors.Is(err, ErrVerificationNotConfigured) {
-			// TODO: If verification is required, try deleting the resource and downloading it again.
-			return nil, fmt.Errorf("failed to verify file: %w", err)
-		}
+	// 	// Verify file, if configured.
+	// 	_, err := file.Verify()
+	// 	if err != nil && !errors.Is(err, ErrVerificationNotConfigured) {
+	// 		// TODO: If verification is required, try deleting the resource and downloading it again.
+	// 		return nil, fmt.Errorf("failed to verify file: %w", err)
+	// 	}
 
-		return file, nil
-	}
+	// 	return file, nil
+	// }
 
-	// check if online
-	if !reg.Online {
-		return nil, ErrNotAvailableLocally
-	}
+	// // check if online
+	// if !reg.Online {
+	// 	return nil, ErrNotAvailableLocally
+	// }
 
-	// check download dir
-	err := reg.tmpDir.Ensure()
-	if err != nil {
-		return nil, fmt.Errorf("could not prepare tmp directory for download: %w", err)
-	}
+	// // check download dir
+	// err := reg.tmpDir.Ensure()
+	// if err != nil {
+	// 	return nil, fmt.Errorf("could not prepare tmp directory for download: %w", err)
+	// }
 
-	// Start registry operation.
-	reg.state.StartOperation(StateFetching)
-	defer reg.state.EndOperation()
+	// // Start registry operation.
+	// reg.state.StartOperation(StateFetching)
+	// defer reg.state.EndOperation()
 
-	// download file
-	log.Tracef("%s: starting download of %s", reg.Name, file.versionedPath)
-	client := &http.Client{}
-	for tries := range 5 {
-		err = reg.fetchFile(context.TODO(), client, file.version, tries)
-		if err != nil {
-			log.Tracef("%s: failed to download %s: %s, retrying (%d)", reg.Name, file.versionedPath, err, tries+1)
-		} else {
-			file.markActiveWithLocking()
+	// // download file
+	// log.Tracef("%s: starting download of %s", reg.Name, file.versionedPath)
+	// client := &http.Client{}
+	// for tries := range 5 {
+	// 	err = reg.fetchFile(context.TODO(), client, file.version, tries)
+	// 	if err != nil {
+	// 		log.Tracef("%s: failed to download %s: %s, retrying (%d)", reg.Name, file.versionedPath, err, tries+1)
+	// 	} else {
+	// 		file.markActiveWithLocking()
 
-			// TODO: We just download the file - should we verify it again?
-			return file, nil
-		}
-	}
-	log.Warningf("%s: failed to download %s: %s", reg.Name, file.versionedPath, err)
-	return nil, err
+	// 		// TODO: We just download the file - should we verify it again?
+	// 		return file, nil
+	// 	}
+	// }
+	// log.Warningf("%s: failed to download %s: %s", reg.Name, file.versionedPath, err)
+	// return nil, err
 }
 
 // GetVersion returns the selected version of the given identifier.

diff --git a/desktop/tauri/src-tauri/tauri.conf.json5 b/desktop/tauri/src-tauri/tauri.conf.json5
@@ -72,6 +72,7 @@
         "release": "1",
         "files": {
           "/usr/lib/systemd/system/portmaster.service": "../../../packaging/linux/portmaster.service",
+          "/usr/lib/portmaster/portmaster-core": "binaries/portmaster-core",
           "/etc/xdg/autostart/portmaster.desktop": "../../../packaging/linux/portmaster-autostart.desktop"
         },
         "postInstallScript": "../../../packaging/linux/postinst",
@@ -91,10 +92,6 @@
         "template": "templates/main.wxs"
       }
     },
-    "externalBin": [
-      "binaries/portmaster-start",
-      "binaries/portmaster-core"
-    ],
     "targets": [
       "deb",
       "rpm",