Fix/1997 correct update app fingerprints

desktop/angular/src/app/pages/app-view/app-view.ts

@@ -218,28 +218,28 @@
       return;
     }
 
     if (!this.appProfile!.Config) {
       this.appProfile.Config = {}
     }
 
     // If the value has been "reset to global value" we need to
     // set the value to "undefined".
     if (event.isDefault) {
       setAppSetting(this.appProfile!.Config, event.key, undefined);
     } else {
       setAppSetting(this.appProfile!.Config, event.key, event.value);
     }
 
     // Actually safe the profile
     this.profileService.saveProfile(this.appProfile!).subscribe({
       next: () => {
         if (!!event.accepted) {
           event.accepted();
         }
       },
       error: (err) => {
         // if there's a callback function for errors call it.
         if (!!event.rejected) {
           event.rejected(err);
         }
 
@@ -275,15 +275,33 @@
       return;
     }
 
+    const source = this.appProfile.Source;
+    const id = this.appProfile.ID;
+
     this.dialog
       .create(EditProfileDialog, {
         backdrop: true,
         autoclose: false,
-        data: `${this.appProfile.Source}/${this.appProfile.ID}`,
+        data: `${source}/${id}`,
       })
       .onAction('deleted', () => {
         // navigate to the app overview if it has been deleted.
         this.router.navigate(['/app/']);
+      })
+      .onAction('saved', () => {
+        // After save, the backend may have migrated the profile to a new ID
+        // (when fingerprints changed). Verify it still exists at the same ID;
+        // if not, navigate to the overview so the user can re-open the app
+        // and the component reinitializes with the correct new profile.
+        this.profileService.getAppProfile(`${source}/${id}`).subscribe({
+          error: () => {
+            this.actionIndicator.info(
+              'Profile ID Changed',
+              'The fingerprint change caused the profile to be re-keyed. You can find the app in the app list to continue editing.'
+            );
+            this.router.navigate(['/app/']);
+          },
+        });
       });
   }
 
@@ -301,13 +319,13 @@
       .cleanProfileHistory(this.appProfile.Source + '/' + this.appProfile.ID)
       .subscribe({
         next: (res) => {
           observer.next!(res);
           this.historyAvailableSince = null;
           this.connectionsInHistory = 0;
           this.cdr.markForCheck();
         },
         error: (err) => {
           observer.error!(err);
         },
       });
   }
@@ -397,11 +415,11 @@
         distinctUntilChanged()
       ),
     ]).subscribe(
       async ([profile, queryMap, global, allSettings, viewSetting]) => {
         const previousProfile = this.appProfile;
 
         if (!!profile) {
           const key = profile![0].Source + '/' + profile![0].ID;
 
           const query: Condition = {
             profile: key,
@@ -442,7 +460,7 @@
             .subscribe((result) => {
               if (result.length > 0) {
                 this.historyAvailableSince = new Date(
                   result[0].first_connection!
                 );
                 this.connectionsInHistory = result[0].totalCount;
               } else {
@@ -477,7 +495,7 @@
 
         this._loading = false;
 
         if (!!this.appProfile?.PresentationPath) {
           let parts: string[] = [];
           let sep = '/';
           if (this.appProfile.PresentationPath[0] === '/') {
@@ -501,7 +519,7 @@
 
         // if we have a profile flatten it's configuration map to something
         // more useful.
         if (!!this.appProfile) {
           profileConfig = flattenProfileConfig(this.appProfile.Config);
         }
 
@@ -519,7 +537,7 @@
         //    the action button would fail and the user would not notice something
         //    changing.
         //
         if (!!this.highlightSettingKey) {
           if (profileConfig[this.highlightSettingKey] === undefined) {
             this.viewSettingChange.next('all');
           }

service/profile/database.go

@@ -2,6 +2,7 @@ package profile
 
 import (
 	"errors"
+	"fmt"
 	"strings"
 
 	"github.com/safing/portmaster/base/config"
@@ -61,8 +62,26 @@ func startProfileUpdateChecker() error {
 					return errors.New("subscription canceled")
 				}
 
-				// Get active profile.
 				scopedID := strings.TrimPrefix(r.Key(), ProfilesDBPath)
+
+				// Check if fingerprints changed such that the profile ID needs to be
+				// re-derived. This must run before the activeProfile lookup so that it
+				// also applies when the app is not currently running.
+				if !r.Meta().IsDeleted() {
+					if receivedProfile, parseErr := EnsureProfile(r); parseErr == nil && !receivedProfile.savedInternally {
+						if len(receivedProfile.Fingerprints) > 0 &&
+							DeriveProfileID(receivedProfile.Fingerprints) != receivedProfile.ID {
+							if renameErr := migrateProfileOnFingerprintChange(receivedProfile); renameErr != nil {
+								log.Errorf("profile: failed to rename profile %s after fingerprint change: %s", scopedID, renameErr)
+							}
+							// The rename saves a new profile and deletes the old one, each of
+							// which produces its own feed event. Skip further processing here.
+							continue profileFeed
+						}
+					}
+				}
+
+				// Get active profile.
 				activeProfile := getActiveProfile(scopedID)
 				if activeProfile == nil {
 					// Check if profile is being deleted.
@@ -109,7 +128,7 @@ type databaseHook struct {
 	database.HookBase
 }
 
-// UsesPrePut implements the Hook interface and returns false.
+// UsesPrePut implements the Hook interface and returns true.
 func (h *databaseHook) UsesPrePut() bool {
 	return true
 }
@@ -133,6 +152,13 @@ func (h *databaseHook) PrePut(r record.Record) (record.Record, error) {
 	// prepare profile
 	profile.prepProfile()
 
+	// Validate fingerprints: reject saves with unparseable fingerprints (e.g. bad regex)
+	// to prevent a profile from being saved in a state where it can never match.
+	_, fpErr := ParseFingerprints(profile.Fingerprints, profile.LinkedPath)
+	if fpErr != nil {
+		return nil, fmt.Errorf("invalid fingerprint: %w", fpErr)
+	}
+
 	// parse config
 	err = profile.parseConfig()
 	if err != nil {

service/profile/merge.go

@@ -6,7 +6,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/safing/portmaster/base/database"
 	"github.com/safing/portmaster/base/database/record"
+	"github.com/safing/portmaster/base/log"
 	"github.com/safing/portmaster/service/profile/binmeta"
 )
 
@@ -102,3 +104,61 @@ func addFingerprints(existing, add []Fingerprint, from string) []Fingerprint {
 
 	return existing
 }
+
+// migrateProfileOnFingerprintChange creates a new profile whose ID is derived
+// from the updated fingerprints, copies all settings from the old profile,
+// deletes the old profile, and emits EventMigrated. This mirrors the pattern
+// used by MergeProfiles and ensures that:
+//   - history DB entries are migrated (via EventMigrated → netquery handler)
+//   - active connections are re-attributed (via EventDelete → reAttributeConnections)
+//   - future connections find the profile via normal fingerprint matching
+func migrateProfileOnFingerprintChange(old *Profile) error {
+	newDerivedID := DeriveProfileID(old.Fingerprints)
+
+	// Abort if a profile with the target ID already exists — the user may have
+	// set fingerprints that conflict with another existing profile.
+	_, existsErr := profileDB.Get(ProfilesDBPath + MakeScopedID(old.Source, newDerivedID))
+	if existsErr == nil {
+		log.Debugf("profile: skipping rename of %s: target ID %s already exists", old.ScopedID(), newDerivedID)
+		return nil
+	}
+	if !errors.Is(existsErr, database.ErrNotFound) {
+		return fmt.Errorf("failed to check for existing profile %s: %w", newDerivedID, existsErr)
+	}
+
+	// Build the new profile. ID is left empty so New() derives it from Fingerprints.
+	newProfile := New(&Profile{
+		Source:              old.Source,
+		Name:                old.Name,
+		Description:         old.Description,
+		Warning:             old.Warning,
+		WarningLastUpdated:  old.WarningLastUpdated,
+		Homepage:            old.Homepage,
+		Icon:                old.Icon,
+		IconType:            old.IconType,
+		Icons:               old.Icons,
+		LinkedPath:          old.LinkedPath,
+		PresentationPath:    old.PresentationPath,
+		UsePresentationPath: old.UsePresentationPath,
+		Fingerprints:        old.Fingerprints,
+		Config:              old.Config,
+		LastEdited:          time.Now().Unix(),
+		Internal:            old.Internal,
+	})
+	// Preserve the original creation timestamp (New() always overwrites it).
+	newProfile.Created = old.Created
+
+	if err := newProfile.Save(); err != nil {
+		return fmt.Errorf("failed to save renamed profile: %w", err)
+	}
+
+	if err := old.delete(); err != nil {
+		return fmt.Errorf("failed to delete old profile %s: %w", old.ScopedID(), err)
+	}
+
+	module.EventMigrated.Submit([]string{old.ScopedID(), newProfile.ScopedID()})
+	log.Infof("profile: renamed profile %q from %s to %s due to fingerprint change",
+		old.Name, old.ScopedID(), newProfile.ScopedID())
+
+	return nil
+}