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

Merge branch 'develop' into feature/new-installer

Browse Source
This commit is contained in:
Vladimir Stoilov
2025-01-14 15:30:57 +02:00
parent fed64e6fbd f021ec2444
commit 5039e9efca
40 changed files with 929 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
service/netquery/database.go
View File

@@ -19,6 +19,7 @@ import (
"github.com/safing/portmaster/base/config"
"github.com/safing/portmaster/base/log"
"github.com/safing/portmaster/base/utils"
"github.com/safing/portmaster/service/netquery/orm"
"github.com/safing/portmaster/service/network"
"github.com/safing/portmaster/service/network/netutils"
@@ -131,6 +132,10 @@ func New(dbPath string) (*Database, error) {
if err := os.MkdirAll(historyParentDir, 0o0700); err != nil {
return nil, fmt.Errorf("failed to ensure database directory exists: %w", err)
}
err := utils.EnsureDirectory(historyParentDir, utils.AdminOnlyPermission)
if err != nil {
return nil, fmt.Errorf("failed to set permission to folder %s: %w", historyParentDir, err)
}
// Get file location of history database.
historyFile := filepath.Join(historyParentDir, "history.db")
@@ -229,6 +234,10 @@ func VacuumHistory(ctx context.Context) (err error) {
if err := os.MkdirAll(historyParentDir, 0o0700); err != nil {
return fmt.Errorf("failed to ensure database directory exists: %w", err)
}
err = utils.EnsureDirectory(historyParentDir, utils.AdminOnlyPermission)
if err != nil {
return fmt.Errorf("failed to set permission to folder %s: %w", historyParentDir, err)
}
// Get file location of history database.
historyFile := filepath.Join(historyParentDir, "history.db")