github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(filterlists): Semantic version comparison for filter lists index file

Browse Source 
Avoid false positives, like: "2025.04.14" != "2025.4.14"
This commit is contained in:
Alexandr Stelnykovych
2025-08-05 15:33:14 +03:00
parent 440e605123
commit 645438bbf4
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
service/intel/filterlists/index.go
View File

@@ -7,6 +7,7 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/hashicorp/go-version"
"github.com/safing/portmaster/base/database" "github.com/safing/portmaster/base/database"
"github.com/safing/portmaster/base/database/record" "github.com/safing/portmaster/base/database/record"
"github.com/safing/portmaster/base/log" "github.com/safing/portmaster/base/log"
@@ -167,6 +168,16 @@ var (
listIndexUpdateLock sync.Mutex listIndexUpdateLock sync.Mutex
) )
// Compares two version strings and returns true only if both are successfully parsed and equal
func areSemversEqual(v1, v2 string) bool {
parsedV1, err1 := version.NewSemver(v1)
parsedV2, err2 := version.NewSemver(v2)
if err1 != nil || err2 != nil {
return false
}
return parsedV1.Equal(parsedV2)
}
func updateListIndex() error { func updateListIndex() error {
listIndexUpdateLock.Lock() listIndexUpdateLock.Lock()
defer listIndexUpdateLock.Unlock() defer listIndexUpdateLock.Unlock()
@@ -188,7 +199,9 @@ func updateListIndex() error {
log.Info("filterlists: index not in cache, starting update") log.Info("filterlists: index not in cache, starting update")
case err != nil: case err != nil:
log.Warningf("filterlists: failed to load index from cache, starting update: %s", err) log.Warningf("filterlists: failed to load index from cache, starting update: %s", err)
case listIndexUpdate.Version != strings.TrimPrefix(index.Version, "v"): case listIndexUpdate.Version != strings.TrimPrefix(index.Version, "v") &&
// Avoid false positives by checking if the version is actually different (e.g. "2025.04.14 == 2025.4.14")
!areSemversEqual(listIndexUpdate.Version, index.Version):
log.Infof( log.Infof(
"filterlists: index from cache is outdated, starting update (%s != %s)", "filterlists: index from cache is outdated, starting update (%s != %s)",
strings.TrimPrefix(index.Version, "v"), strings.TrimPrefix(index.Version, "v"),