github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use interception config only when ready

Browse Source
This commit is contained in:
Daniel
2022-10-11 14:49:57 +02:00
parent 694dfb5b46
commit e5a0f06f97
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firewall/api.go
View File

@@ -63,7 +63,7 @@ func startAPIAuth() {
} }
func apiAuthenticator(r *http.Request, s *http.Server) (token *api.AuthToken, err error) { func apiAuthenticator(r *http.Request, s *http.Server) (token *api.AuthToken, err error) {
if devMode() { if configReady.IsSet() && devMode() {
return &api.AuthToken{ return &api.AuthToken{
Read: api.PermitSelf, Read: api.PermitSelf,
Write: api.PermitSelf, Write: api.PermitSelf,

6
firewall/config.go
View File

@@ -1,6 +1,8 @@
package firewall package firewall
import ( import (
"github.com/tevino/abool"
"github.com/safing/portbase/api" "github.com/safing/portbase/api"
"github.com/safing/portbase/config" "github.com/safing/portbase/config"
"github.com/safing/portbase/notifications" "github.com/safing/portbase/notifications"
@@ -119,6 +121,8 @@ var (
filterEnabled config.BoolOption filterEnabled config.BoolOption
tunnelEnabled config.BoolOption tunnelEnabled config.BoolOption
useCommunityNodes config.BoolOption useCommunityNodes config.BoolOption
configReady = abool.New()
) )
func getConfig() { func getConfig() {
@@ -128,4 +132,6 @@ func getConfig() {
filterEnabled = config.Concurrent.GetAsBool(CfgOptionEnableFilterKey, true) filterEnabled = config.Concurrent.GetAsBool(CfgOptionEnableFilterKey, true)
tunnelEnabled = config.Concurrent.GetAsBool(captain.CfgOptionEnableSPNKey, false) tunnelEnabled = config.Concurrent.GetAsBool(captain.CfgOptionEnableSPNKey, false)
useCommunityNodes = config.Concurrent.GetAsBool(captain.CfgOptionUseCommunityNodesKey, true) useCommunityNodes = config.Concurrent.GetAsBool(captain.CfgOptionUseCommunityNodesKey, true)
configReady.Set()
} }