Fix immediate profile application, update endpoint domain syntax

profile/active.go

@@ -1,6 +1,10 @@
 package profile
 
-import "sync"
+import (
+	"sync"
+
+	"github.com/Safing/portbase/log"
+)
 
 var (
 	activeProfileSets     = make(map[string]*Set)
@@ -8,47 +12,64 @@ var (
 )
 
 func activateProfileSet(set *Set) {
-	set.Lock()
-	defer set.Unlock()
 	activeProfileSetsLock.Lock()
 	defer activeProfileSetsLock.Unlock()
-	activeProfileSets[set.profiles[0].ID] = set
+	set.Lock()
+	defer set.Unlock()
+	activeProfileSets[set.id] = set
+	log.Tracef("profile: activated profile set %s", set.id)
 }
 
 // DeactivateProfileSet marks a profile set as not active.
 func DeactivateProfileSet(set *Set) {
-	set.Lock()
-	defer set.Unlock()
 	activeProfileSetsLock.Lock()
 	defer activeProfileSetsLock.Unlock()
-	delete(activeProfileSets, set.profiles[0].ID)
+	set.Lock()
+	defer set.Unlock()
+	delete(activeProfileSets, set.id)
+	log.Tracef("profile: deactivated profile set %s", set.id)
 }
 
-func updateActiveUserProfile(profile *Profile) {
-	activeProfileSetsLock.RLock()
-	defer activeProfileSetsLock.RUnlock()
-	activeSet, ok := activeProfileSets[profile.ID]
-	if ok {
-		activeSet.Lock()
-		defer activeSet.Unlock()
-		activeSet.profiles[0] = profile
-	}
-}
-
-func updateActiveStampProfile(profile *Profile) {
+func updateActiveProfile(profile *Profile, userProfile bool) {
 	activeProfileSetsLock.RLock()
 	defer activeProfileSetsLock.RUnlock()
 
+	var activeProfile *Profile
+	var profilesUpdated bool
+
+	// iterate all active profile sets
 	for _, activeSet := range activeProfileSets {
 		activeSet.Lock()
-		activeProfile := activeSet.profiles[2]
+
+		if userProfile {
+			activeProfile = activeSet.profiles[0]
+		} else {
+			activeProfile = activeSet.profiles[2]
+		}
+
+		// check if profile exists (for stamp profiles)
 		if activeProfile != nil {
 			activeProfile.Lock()
+
+			// check if the stamp profile has the same ID
 			if activeProfile.ID == profile.ID {
-				activeSet.profiles[2] = profile
+				if userProfile {
+					activeSet.profiles[0] = profile
+					log.Infof("profile: updated active user profile %s (%s)", profile.ID, profile.LinkedPath)
+				} else {
+					activeSet.profiles[2] = profile
+					log.Infof("profile: updated active stamp profile %s", profile.ID)
+				}
+				profilesUpdated = true
 			}
+
 			activeProfile.Unlock()
 		}
+
 		activeSet.Unlock()
 	}
+
+	if profilesUpdated {
+		increaseUpdateVersion()
+	}
 }