From 2a41240212a234c2375e75bfbc898bc05c864123 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 7 Aug 2023 21:54:58 +0200 Subject: [PATCH] Fix updating feature flags --- go.mod | 2 +- go.sum | 4 ++++ network/connection.go | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 8a01b6f0..70bcfadf 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/safing/jess v0.3.1 github.com/safing/portbase v0.17.1 github.com/safing/portmaster-android/go v0.0.0-20230605085256-6abf4c495626 - github.com/safing/spn v0.6.11 + github.com/safing/spn v0.6.13 github.com/shirou/gopsutil v3.21.11+incompatible github.com/spf13/cobra v1.7.0 github.com/spkg/zipfs v0.7.1 diff --git a/go.sum b/go.sum index 2ce205fa..b2ae8f01 100644 --- a/go.sum +++ b/go.sum @@ -216,6 +216,10 @@ github.com/safing/spn v0.6.10 h1:4fFBb7UvUzoCcOSd8immOz1Buiuasy5C1/lxfVFacBQ= github.com/safing/spn v0.6.10/go.mod h1:Mh9bmkqFhO/dHNi9RWXzoXjQij893I4Lj8Wn4tQ0KZA= github.com/safing/spn v0.6.11 h1:Y4ZXypraNUi1Go7PrLgeCcZ2nzPEMmNk1Y9dhZHa/lo= github.com/safing/spn v0.6.11/go.mod h1:Mh9bmkqFhO/dHNi9RWXzoXjQij893I4Lj8Wn4tQ0KZA= +github.com/safing/spn v0.6.12 h1:LdQODfwzsNBipaMV3GH1REEzjJp48i38mYuHv+GyGAk= +github.com/safing/spn v0.6.12/go.mod h1:Mh9bmkqFhO/dHNi9RWXzoXjQij893I4Lj8Wn4tQ0KZA= +github.com/safing/spn v0.6.13 h1:aqFWQTPSs1RHLxpoyAt+uVG4v4Tgf96OpmLXGvQxo/I= +github.com/safing/spn v0.6.13/go.mod h1:Mh9bmkqFhO/dHNi9RWXzoXjQij893I4Lj8Wn4tQ0KZA= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/seehuhn/fortuna v1.0.1 h1:lu9+CHsmR0bZnx5Ay646XvCSRJ8PJTi5UYJwDBX68H0= diff --git a/network/connection.go b/network/connection.go index f2b2c3dc..0d8be294 100644 --- a/network/connection.go +++ b/network/connection.go @@ -587,8 +587,10 @@ func (conn *Connection) UpdateFeatures() error { if err != nil && !errors.Is(err, access.ErrNotLoggedIn) { return err } + // Caution: user may be nil! // Check if history may be used and if it is enabled for this application. + conn.HistoryEnabled = false if user.MayUse(account.FeatureHistory) { lProfile := conn.Process().Profile() if lProfile != nil { @@ -597,9 +599,7 @@ func (conn *Connection) UpdateFeatures() error { } // Check if bandwidth visibility may be used. - if user.MayUse(account.FeatureBWVis) { - conn.BandwidthEnabled = true - } + conn.BandwidthEnabled = user.MayUse(account.FeatureBWVis) return nil }