Refactor status package to use portbase/runtime.

core/base/global.go

@@ -9,7 +9,6 @@ import (
 	"github.com/safing/portbase/dataroot"
 	"github.com/safing/portbase/info"
 	"github.com/safing/portbase/modules"
-	"github.com/safing/portbase/modules/subsystems"
 )
 
 // Default Values (changeable for testing)
@@ -66,8 +65,5 @@ func globalPrep() error {
 	// set api listen address
 	api.SetDefaultAPIListenAddress(DefaultAPIListenAddress)
 
-	// set subsystem status dir
-	subsystems.SetDatabaseKeySpace("core:status/subsystems")
-
 	return nil
 }

core/config.go

@@ -36,6 +36,7 @@ func registerConfig() error {
 		DefaultValue:   defaultDevMode,
 		Annotations: config.Annotations{
 			config.DisplayOrderAnnotation: 127,
+			config.CategoryAnnotation:     "Development",
 		},
 	})
 	if err != nil {
@@ -52,6 +53,7 @@ func registerConfig() error {
 		DefaultValue:   true, // TODO: turn off by default on unsupported systems
 		Annotations: config.Annotations{
 			config.DisplayOrderAnnotation: 32,
+			config.CategoryAnnotation:     "General",
 		},
 	})
 	if err != nil {

firewall/config.go

@@ -36,6 +36,7 @@ func registerConfig() error {
 		DefaultValue:   true,
 		Annotations: config.Annotations{
 			config.DisplayOrderAnnotation: cfgOptionPermanentVerdictsOrder,
+			config.CategoryAnnotation:     "Advanced",
 		},
 	})
 	if err != nil {
@@ -53,6 +54,7 @@ func registerConfig() error {
 		DefaultValue:   true,
 		Annotations: config.Annotations{
 			config.DisplayOrderAnnotation: cfgOptionAskWithSystemNotificationsOrder,
+			config.CategoryAnnotation:     "General",
 		},
 	})
 	if err != nil {
@@ -70,6 +72,7 @@ func registerConfig() error {
 		Annotations: config.Annotations{
 			config.DisplayOrderAnnotation: cfgOptionAskTimeoutOrder,
 			config.UnitAnnotation:         "seconds",
+			config.CategoryAnnotation:     "General",
 		},
 	})
 	if err != nil {

firewall/filter.go

@@ -31,6 +31,9 @@ func init() {
 			ExpertiseLevel: config.ExpertiseLevelUser,
 			ReleaseLevel:   config.ReleaseLevelBeta,
 			DefaultValue:   true,
+			Annotations: config.Annotations{
+				config.CategoryAnnotation: "General",
+			},
 		},
 	)
 }

firewall/prompt.go

@@ -46,18 +46,16 @@ func prompt(conn *network.Connection, pkt packet.Packet) { //nolint:gocognit //
 		// do not save response to profile
 		saveResponse = false
 	} else {
-		// create new notification
-		n = (&notifications.Notification{
-			ID:      nID,
-			Type:    notifications.Prompt,
-			Expires: time.Now().Add(nTTL).Unix(),
-		})
+		var (
+			msg     string
+			actions []notifications.Action
+		)
 
 		// add message and actions
 		switch {
 		case conn.Inbound:
-			n.Message = fmt.Sprintf("Application %s wants to accept connections from %s (%d/%d)", conn.Process(), conn.Entity.IP.String(), conn.Entity.Protocol, conn.Entity.Port)
-			n.AvailableActions = []*notifications.Action{
+			msg = fmt.Sprintf("Application %s wants to accept connections from %s (%d/%d)", conn.Process(), conn.Entity.IP.String(), conn.Entity.Protocol, conn.Entity.Port)
+			actions = []notifications.Action{
 				{
 					ID:   permitServingIP,
 					Text: "Permit",
@@ -68,8 +66,8 @@ func prompt(conn *network.Connection, pkt packet.Packet) { //nolint:gocognit //
 				},
 			}
 		case conn.Entity.Domain == "": // direct connection
-			n.Message = fmt.Sprintf("Application %s wants to connect to %s (%d/%d)", conn.Process(), conn.Entity.IP.String(), conn.Entity.Protocol, conn.Entity.Port)
-			n.AvailableActions = []*notifications.Action{
+			msg = fmt.Sprintf("Application %s wants to connect to %s (%d/%d)", conn.Process(), conn.Entity.IP.String(), conn.Entity.Protocol, conn.Entity.Port)
+			actions = []notifications.Action{
 				{
 					ID:   permitIP,
 					Text: "Permit",
@@ -81,11 +79,11 @@ func prompt(conn *network.Connection, pkt packet.Packet) { //nolint:gocognit //
 			}
 		default: // connection to domain
 			if pkt != nil {
-				n.Message = fmt.Sprintf("Application %s wants to connect to %s (%s %d/%d)", conn.Process(), conn.Entity.Domain, conn.Entity.IP.String(), conn.Entity.Protocol, conn.Entity.Port)
+				msg = fmt.Sprintf("Application %s wants to connect to %s (%s %d/%d)", conn.Process(), conn.Entity.Domain, conn.Entity.IP.String(), conn.Entity.Protocol, conn.Entity.Port)
 			} else {
-				n.Message = fmt.Sprintf("Application %s wants to connect to %s", conn.Process(), conn.Entity.Domain)
+				msg = fmt.Sprintf("Application %s wants to connect to %s", conn.Process(), conn.Entity.Domain)
 			}
-			n.AvailableActions = []*notifications.Action{
+			actions = []notifications.Action{
 				{
 					ID:   permitDomainAll,
 					Text: "Permit all",
@@ -100,8 +98,8 @@ func prompt(conn *network.Connection, pkt packet.Packet) { //nolint:gocognit //
 				},
 			}
 		}
-		// save new notification
-		n.Save()
+
+		n = notifications.NotifyPrompt(nID, msg, actions...)
 	}
 
 	// wait for response/timeout

nameserver/takeover.go

@@ -47,11 +47,10 @@ func checkForConflictingService() error {
 	// wait for a short duration for the other service to shut down
 	time.Sleep(10 * time.Millisecond)
 
-	// notify user
-	(&notifications.Notification{
-		ID:      "nameserver-stopped-conflicting-service",
-		Message: fmt.Sprintf("Portmaster stopped a conflicting name service (pid %d) to gain required system integration.", pid),
-	}).Save()
+	notifications.NotifyInfo(
+		"namserver-stopped-conflicting-service",
+		fmt.Sprintf("Portmaster stopped a conflicting name service (pid %d) to gain required system integration.", pid),
+	)
 
 	// restart via service-worker logic
 	return fmt.Errorf("%w: stopped conflicting name service with pid %d", modules.ErrRestartNow, pid)

process/config.go

@@ -22,6 +22,7 @@ func registerConfiguration() error {
 		DefaultValue:   true,
 		Annotations: config.Annotations{
 			config.DisplayOrderAnnotation: 144,
+			config.CategoryAnnotation:     "Development",
 		},
 	})
 	if err != nil {

profile/config.go

@@ -103,6 +103,7 @@ func registerConfiguration() error {
 		Annotations: config.Annotations{
 			config.DisplayHintAnnotation:  config.DisplayHintOneOf,
 			config.DisplayOrderAnnotation: cfgOptionDefaultActionOrder,
+			config.CategoryAnnotation:     "General",
 		},
 		PossibleValues: []config.PossibleValue{
 			{
@@ -138,6 +139,7 @@ func registerConfiguration() error {
 		Annotations: config.Annotations{
 			config.DisplayOrderAnnotation: cfgOptionDisableAutoPermitOrder,
 			config.DisplayHintAnnotation:  status.DisplayHintSecurityLevel,
+			config.CategoryAnnotation: "Advanced",
 		},
 		PossibleValues: status.SecurityLevelValues,
 	})
@@ -175,15 +177,16 @@ Examples:
 
 	// Endpoint Filter List
 	err = config.Register(&config.Option{
-		Name:         "Endpoint Filter List",
+		Name:         "Outgoing Rules",
 		Key:          CfgOptionEndpointsKey,
-		Description:  "Filter outgoing connections by matching the destination endpoint. Network Scope restrictions still apply.",
+		Description:  "Rules that apply to outgoing network connections. Network Scope restrictions still apply.",
 		Help:         filterListHelp,
 		OptType:      config.OptTypeStringArray,
 		DefaultValue: []string{},
 		Annotations: config.Annotations{
 			config.DisplayHintAnnotation:  endpoints.DisplayHintEndpointList,
 			config.DisplayOrderAnnotation: cfgOptionEndpointsOrder,
+			config.CategoryAnnotation:     "Rules",
 		},
 		ValidationRegex: `^(\+|\-) [A-z0-9\.:\-*/]+( [A-z0-9/]+)?$`,
 	})
@@ -195,15 +198,16 @@ Examples:
 
 	// Service Endpoint Filter List
 	err = config.Register(&config.Option{
-		Name:         "Service Endpoint Filter List",
+		Name:         "Incoming Rules",
 		Key:          CfgOptionServiceEndpointsKey,
-		Description:  "Filter incoming connections by matching the source endpoint. Network Scope restrictions and the inbound permission still apply. Also not that the implicit default action of this list is to always block.",
+		Description:  "Rules that apply to incoming network connections. Network Scope restrictions and the inbound permission still apply. Also not that the implicit default action of this list is to always block.",
 		Help:         filterListHelp,
 		OptType:      config.OptTypeStringArray,
 		DefaultValue: []string{"+ Localhost"},
 		Annotations: config.Annotations{
 			config.DisplayHintAnnotation:  endpoints.DisplayHintEndpointList,
 			config.DisplayOrderAnnotation: cfgOptionServiceEndpointsOrder,
+			config.CategoryAnnotation:     "Rules",
 		},
 		ValidationRegex: `^(\+|\-) [A-z0-9\.:\-*/]+( [A-z0-9/]+)?$`,
 	})
@@ -223,6 +227,7 @@ Examples:
 		Annotations: config.Annotations{
 			config.DisplayHintAnnotation:  "filter list",
 			config.DisplayOrderAnnotation: cfgOptionFilterListsOrder,
+			config.CategoryAnnotation:     "Rules",
 		},
 		ValidationRegex: `^[a-zA-Z0-9\-]+$`,
 	})
@@ -243,6 +248,7 @@ Examples:
 		Annotations: config.Annotations{
 			config.DisplayHintAnnotation:  status.DisplayHintSecurityLevel,
 			config.DisplayOrderAnnotation: cfgOptionFilterCNAMEOrder,
+			config.CategoryAnnotation: "DNS",
 		},
 		PossibleValues: status.SecurityLevelValues,
 	})
@@ -263,6 +269,7 @@ Examples:
 		Annotations: config.Annotations{
 			config.DisplayHintAnnotation:  status.DisplayHintSecurityLevel,
 			config.DisplayOrderAnnotation: cfgOptionFilterSubDomainsOrder,
+			config.CategoryAnnotation: "DNS",
 		},
 	})
 	if err != nil {
@@ -283,6 +290,7 @@ Examples:
 		Annotations: config.Annotations{
 			config.DisplayHintAnnotation:  status.DisplayHintSecurityLevel,
 			config.DisplayOrderAnnotation: cfgOptionBlockScopeLocalOrder,
+			config.CategoryAnnotation:     "Scopes & Types",
 		},
 	})
 	if err != nil {
@@ -302,6 +310,7 @@ Examples:
 		Annotations: config.Annotations{
 			config.DisplayHintAnnotation:  status.DisplayHintSecurityLevel,
 			config.DisplayOrderAnnotation: cfgOptionBlockScopeLANOrder,
+			config.CategoryAnnotation:     "Scopes & Types",
 		},
 	})
 	if err != nil {
@@ -321,6 +330,7 @@ Examples:
 		Annotations: config.Annotations{
 			config.DisplayHintAnnotation:  status.DisplayHintSecurityLevel,
 			config.DisplayOrderAnnotation: cfgOptionBlockScopeInternetOrder,
+			config.CategoryAnnotation:     "Scopes & Types",
 		},
 	})
 	if err != nil {
@@ -340,6 +350,7 @@ Examples:
 		Annotations: config.Annotations{
 			config.DisplayHintAnnotation:  status.DisplayHintSecurityLevel,
 			config.DisplayOrderAnnotation: cfgOptionBlockP2POrder,
+			config.CategoryAnnotation:     "Scopes & Types",
 		},
 	})
 	if err != nil {
@@ -359,6 +370,7 @@ Examples:
 		Annotations: config.Annotations{
 			config.DisplayHintAnnotation:  status.DisplayHintSecurityLevel,
 			config.DisplayOrderAnnotation: cfgOptionBlockInboundOrder,
+			config.CategoryAnnotation:     "Scopes & Types",
 		},
 	})
 	if err != nil {
@@ -379,6 +391,7 @@ Examples:
 		Annotations: config.Annotations{
 			config.DisplayHintAnnotation:  status.DisplayHintSecurityLevel,
 			config.DisplayOrderAnnotation: cfgOptionEnforceSPNOrder,
+			config.CategoryAnnotation: "Advanced",
 		},
 	})
 	if err != nil {
@@ -400,6 +413,7 @@ Examples:
 		Annotations: config.Annotations{
 			config.DisplayHintAnnotation:  status.DisplayHintSecurityLevel,
 			config.DisplayOrderAnnotation: cfgOptionRemoveOutOfScopeDNSOrder,
+			config.CategoryAnnotation: "DNS",
 		},
 	})
 	if err != nil {
@@ -421,6 +435,7 @@ Examples:
 		Annotations: config.Annotations{
 			config.DisplayHintAnnotation:  status.DisplayHintSecurityLevel,
 			config.DisplayOrderAnnotation: cfgOptionRemoveBlockedDNSOrder,
+			config.CategoryAnnotation: "DNS",
 		},
 	})
 	if err != nil {
@@ -441,6 +456,7 @@ Examples:
 		Annotations: config.Annotations{
 			config.DisplayHintAnnotation:  status.DisplayHintSecurityLevel,
 			config.DisplayOrderAnnotation: cfgOptionDomainHeuristicsOrder,
+			config.CategoryAnnotation: "DNS",
 		},
 	})
 	if err != nil {
@@ -461,6 +477,7 @@ Examples:
 		Annotations: config.Annotations{
 			config.DisplayHintAnnotation:  status.DisplayHintSecurityLevel,
 			config.DisplayOrderAnnotation: cfgOptionPreventBypassingOrder,
+			config.CategoryAnnotation: "Advanced",
 		},
 	})
 	if err != nil {