From 5ffb6373219ae7d818e07452727ea7f248b0a08c Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 17 Mar 2025 16:10:38 +0100 Subject: [PATCH 1/2] Remove geoip db loading fallback with binary index --- service/intel/geoip/database.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/service/intel/geoip/database.go b/service/intel/geoip/database.go index 711fafdf..85ddadde 100644 --- a/service/intel/geoip/database.go +++ b/service/intel/geoip/database.go @@ -56,15 +56,8 @@ func (ub *updateBroadcaster) AvailableUpdate() *updates.Artifact { // Get artifact. artifact, err := module.instance.IntelUpdates().GetFile(ub.dbName) if err != nil { - // Check if the geoip database is included in the binary index instead. - // TODO: Remove when intelhub builds the geoip database. - if artifact2, err2 := module.instance.BinaryUpdates().GetFile(ub.dbName); err2 == nil { - artifact = artifact2 - err = nil - } else { - log.Warningf("geoip: failed to get geoip update: %s", err) - return nil - } + log.Warningf("geoip: failed to get geoip update: %s", err) + return nil } // Return artifact if not yet initialized. From a2b44d73cabb09b556b1a6e521a93da885203eb7 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 17 Mar 2025 16:13:33 +0100 Subject: [PATCH 2/2] Make sure main directory exists when starting updater module --- service/updates/module.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/service/updates/module.go b/service/updates/module.go index fa6dc3ab..315c3657 100644 --- a/service/updates/module.go +++ b/service/updates/module.go @@ -16,6 +16,7 @@ import ( "github.com/safing/jess" "github.com/safing/portmaster/base/log" "github.com/safing/portmaster/base/notifications" + "github.com/safing/portmaster/base/utils" "github.com/safing/portmaster/service/mgr" ) @@ -170,6 +171,12 @@ func New(instance instance, name string, cfg Config) (*Updater, error) { return nil, fmt.Errorf("config is invalid: %w", err) } + // Make sure main dir exists. + err := utils.EnsureDirectory(module.cfg.Directory, utils.PublicReadExecPermission) + if err != nil { + return nil, fmt.Errorf("create update target directory: %s", module.cfg.DownloadDirectory) + } + // Create Workers. module.updateCheckWorkerMgr = m.NewWorkerMgr("update checker", module.updateCheckWorker, nil) module.upgradeWorkerMgr = m.NewWorkerMgr("upgrader", module.upgradeWorker, nil)