Merge branch 'develop' into feature/inspection-framework

Author: Safing

README.md

@@ -35,8 +35,8 @@ Think of a pi-hole for your computer. Or an ad-blocker that blocks ads on your w
 **Features/Settings:**
 
 - Select and activate block-lists
-- Manually black/whitelist domains
-  - You can whitelist domains in case something breaks
+- Manually block/allow domains
+  - You can allow domains in case something breaks
 - CNAME Blocking (block these new nasty "unblockable" ads/trackers)
 - Block all subdomains of a domain in the block-lists
 

cmds/portmaster-core/main.go

@@ -19,7 +19,7 @@ import (
 
 func main() {
 	// set information
-	info.Set("Portmaster", "0.5.0", "AGPLv3", true)
+	info.Set("Portmaster", "0.5.2", "AGPLv3", true)
 
 	// enable SPN client mode
 	conf.EnableClient(true)

cmds/portmaster-start/install_windows.go

@@ -19,8 +19,6 @@ import (
 	"golang.org/x/sys/windows/svc/mgr"
 )
 
-const exeSuffix = ".exe"
-
 func init() {
 	rootCmd.AddCommand(installCmd)
 	installCmd.AddCommand(installService)

cmds/portmaster-start/recover_linux.go

@@ -48,7 +48,7 @@ var recoverIPTablesCmd = &cobra.Command{
 
 		if filteredErrors != nil {
 			filteredErrors.ErrorFormat = formatNfqErrors
-			return filteredErrors
+			return filteredErrors.ErrorOrNil()
 		}
 
 		return nil

cmds/portmaster-start/service_windows.go

@@ -88,7 +88,7 @@ service:
 	return ssec, errno
 }
 
-func runService(cmd *cobra.Command, opts *Options, cmdArgs []string) error {
+func runService(_ *cobra.Command, opts *Options, cmdArgs []string) error {
 	// check if we are running interactively
 	isDebug, err := svc.IsAnInteractiveSession()
 	if err != nil {

core/events.go

@@ -5,12 +5,12 @@ import (
 
 	"github.com/safing/portbase/log"
 	"github.com/safing/portbase/modules"
+	"github.com/safing/portmaster/updates"
 )
 
 const (
 	eventShutdown = "shutdown"
 	eventRestart  = "restart"
-	restartCode   = 23
 )
 
 func registerEvents() {
@@ -43,8 +43,6 @@ func shutdown(ctx context.Context, _ interface{}) error {
 // restart restarts the Portmaster.
 func restart(ctx context.Context, data interface{}) error {
 	log.Info("core: user requested restart")
-	modules.SetExitStatusCode(restartCode)
-	// Do not use a worker, as this would block itself here.
-	go modules.Shutdown() //nolint:errcheck
+	updates.RestartNow()
 	return nil
 }

detection/dga/lms.go

@@ -4,16 +4,13 @@ import (
 	"strings"
 )
 
-// LmsScoreOfDomain calculates the mean longest meaningful substring of a domain. It follows some special rules to increase accuracy. It returns a value between 0 and 100, representing the length-based percentage of the meaningful substring.
+// LmsScoreOfDomain calculates the mean longest meaningful substring of a domain.
+// It follows some special rules to increase accuracy. It returns a value between
+// 0 and 100, representing the length-based percentage of the meaningful substring.
 func LmsScoreOfDomain(domain string) float64 {
 	var totalScore float64
 	domain = strings.ToLower(domain)
 	subjects := strings.Split(domain, ".")
-	// ignore the last two parts
-	if len(subjects) <= 3 {
-		return 100
-	}
-	subjects = subjects[:len(subjects)-3]
 	var totalLength int
 	for _, subject := range subjects {
 		totalLength += len(subject)
@@ -27,7 +24,9 @@ func LmsScoreOfDomain(domain string) float64 {
 	return totalScore
 }
 
-// LmsScore calculates the longest meaningful substring of a domain. It returns a value between 0 and 100, representing the length-based percentage of the meaningful substring.
+// LmsScore calculates the longest meaningful substring of a domain. It returns a
+// value between 0 and 100, representing the length-based percentage of the
+// meaningful substring.
 func LmsScore(subject string) float64 {
 	lmsStart := -1
 	lmsStop := -1

detection/dga/lms_test.go

@@ -5,8 +5,8 @@ import "testing"
 func TestLmsScoreOfDomain(t *testing.T) {
 	testDomain(t, "g.symcd.com.", 100, 100)
 	testDomain(t, "www.google.com.", 100, 100)
-	testDomain(t, "55ttt5.12abc3.test.com.", 50, 50)
-	testDomain(t, "mbtq6opnuodp34gcrma65fxacgxv5ukr7lq6xuhr4mhoibe7.yvqptrozfbnqyemchpovw3q5xwjibuxfsgb72mix3znhpfhc.i2n7jh2gadqaadck3zs3vg3hbv5pkmwzeay4gc75etyettbb.isi5mhmowtfriu33uxzmgvjur5g2p3tloynwohfrggee6fkn.meop7kqyd5gwxxa3.er.spotify.com.", 0, 30)
+	testDomain(t, "55ttt5.12abc3.test.com.", 68, 69)
+	testDomain(t, "mbtq6opnuodp34gcrma65fxacgxv5ukr7lq6xuhr4mhoibe7.yvqptrozfbnqyemchpovw3q5xwjibuxfsgb72mix3znhpfhc.i2n7jh2gadqaadck3zs3vg3hbv5pkmwzeay4gc75etyettbb.isi5mhmowtfriu33uxzmgvjur5g2p3tloynwohfrggee6fkn.meop7kqyd5gwxxa3.er.spotify.com.", 0, 31)
 }
 
 func testDomain(t *testing.T, domain string, min, max float64) {

firewall/interception/nfqexp/nfqexp.go

@@ -1,3 +1,5 @@
+// +build linux
+
 // Package nfqexp contains a nfqueue library experiment.
 package nfqexp
 

firewall/interception/nfqexp/packet.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package nfqexp
 
 import (