Improve profile getting and updating to fix interference

profile/active.go

@@ -7,8 +7,8 @@ import (
 )
 
 const (
-	activeProfileCleanerTickDuration = 1 * time.Minute
+	activeProfileCleanerTickDuration = 5 * time.Minute
-	activeProfileCleanerThreshold    = 5 * time.Minute
+	activeProfileCleanerThreshold    = 1 * time.Hour
 )
 
 var (

profile/database.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/safing/portbase/config"
+	"github.com/safing/portbase/log"
 
 	"github.com/safing/portbase/database"
 	"github.com/safing/portbase/database/query"
@@ -41,24 +42,37 @@ func registerValidationDBHook() (err error) {
 }
 
 func startProfileUpdateChecker() error {
+	module.StartServiceWorker("update active profiles", 0, func(ctx context.Context) (err error) {
 		profilesSub, err := profileDB.Subscribe(query.New(profilesDBPath))
 		if err != nil {
 			return err
 		}
+		defer func() {
+			err := profilesSub.Cancel()
+			if err != nil {
+				log.Warningf("profile: failed to cancel subscription for updating active profiles: %s", err)
+			}
+		}()
 
-	module.StartServiceWorker("update active profiles", 0, func(ctx context.Context) (err error) {
 		for {
 			select {
 			case r := <-profilesSub.Feed:
-				// check if nil
+				// Check if subscription was canceled.
 				if r == nil {
 					return errors.New("subscription canceled")
 				}
 
-				// mark as outdated
+				// Don't mark profiles as outdated that are saved internally, as
+				// profiles only exist once in memory.
+				p, ok := r.(*Profile)
+				if ok && p.savedInternally {
+					return
+				}
+
+				// Mark profile as outdated.
 				markActiveProfileAsOutdated(strings.TrimPrefix(r.Key(), profilesDBPath))
 			case <-ctx.Done():
-				return profilesSub.Cancel()
+				return nil
 			}
 		}
 	})

profile/get.go

@@ -2,16 +2,16 @@ package profile
 
 import (
 	"errors"
+	"sync"
 
 	"github.com/safing/portbase/database"
 
 	"github.com/safing/portbase/database/query"
 	"github.com/safing/portbase/database/record"
 	"github.com/safing/portbase/log"
-	"golang.org/x/sync/singleflight"
 )
 
-var getProfileSingleInflight singleflight.Group
+var getProfileLock sync.Mutex
 
 // GetProfile fetches a profile. This function ensures that the loaded profile
 // is shared among all callers. You must always supply both the scopedID and
@@ -22,13 +22,12 @@ func GetProfile(source profileSource, id, linkedPath string) ( //nolint:gocognit
 	profile *Profile,
 	err error,
 ) {
-	// Select correct key for single in flight.
+	// Globally lock getting a profile.
-	singleInflightKey := linkedPath
+	// This does not happen too often, and it ensures we really have integrity
-	if singleInflightKey == "" {
+	// and no race conditions.
-		singleInflightKey = makeScopedID(source, id)
+	getProfileLock.Lock()
-	}
+	defer getProfileLock.Unlock()
 
-	p, err, _ := getProfileSingleInflight.Do(singleInflightKey, func() (interface{}, error) {
 	var previousVersion *Profile
 
 	// Fetch profile depending on the available information.
@@ -109,15 +108,6 @@ func GetProfile(source profileSource, id, linkedPath string) ( //nolint:gocognit
 	addActiveProfile(profile)
 
 	return profile, nil
-	})
-	if err != nil {
-		return nil, err
-	}
-	if p == nil {
-		return nil, errors.New("profile getter returned nil")
-	}
-
-	return p.(*Profile), nil
 }
 
 // getProfile fetches the profile for the given scoped ID.
@@ -181,6 +171,9 @@ func prepProfile(r record.Record) (*Profile, error) {
 		log.Errorf("profiles: profile %s has (partly) invalid configuration: %s", profile.ID, err)
 	}
 
+	// Set saved internally to suppress outdating profiles if saving internally.
+	profile.savedInternally = true
+
 	// return parsed profile
 	return profile, nil
 }

profile/profile.go

@@ -140,6 +140,9 @@ type Profile struct { //nolint:maligned // not worth the effort
 	// Lifecycle Management
 	outdated   *abool.AtomicBool
 	lastActive *int64
+
+	// savedInternally is set to true for profiles that are saved internally.
+	savedInternally bool
 }
 
 func (profile *Profile) prepConfig() (err error) {
@@ -231,6 +234,7 @@ func New(
 		LinkedPath:      linkedPath,
 		Created:         time.Now().Unix(),
 		Config:          customConfig,
+		savedInternally: true,
 	}
 
 	// Generate random ID if none is given.