vaultwarden/goldwarden-vaultwarden-bitwarden-client
1
0
Fork 0
mirror of https://github.com/quexten/goldwarden.git synced 2025-02-02 04:56:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move config file

Browse Source
This commit is contained in:
Bernd Schoolmann 2023-12-28 13:41:07 +01:00
parent 258b17c278
commit b51a017bae
No known key found for this signature in database
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
agent/config/config.go
View File

@ -9,6 +9,7 @@ import (
"errors" "errors"
"os" "os"
"runtime/debug" "runtime/debug"
"strings"
"sync" "sync"
"github.com/google/uuid" "github.com/google/uuid"
@ -25,7 +26,7 @@ const (
KDFIterations = 2 KDFIterations = 2
KDFMemory = 2 * 1024 * 1024 KDFMemory = 2 * 1024 * 1024
KDFThreads = 8 KDFThreads = 8
DefaultConfigPath = "~/.config/goldwarden.json" DefaultConfigPath = "~/.config/goldwarden/goldwarden.json"
) )
type RuntimeConfig struct { type RuntimeConfig struct {
@ -372,6 +373,11 @@ func (config *Config) WriteConfig() error {
// write to disk // write to disk
os.Remove(config.ConfigFile.RuntimeConfig.ConfigDirectory) os.Remove(config.ConfigFile.RuntimeConfig.ConfigDirectory)
parentDirectory := config.ConfigFile.RuntimeConfig.ConfigDirectory[:len(config.ConfigFile.RuntimeConfig.ConfigDirectory)-len("/goldwarden.json")]
if _, err := os.Stat(parentDirectory); os.IsNotExist(err) {
os.Mkdir(parentDirectory, 0700)
}
file, err := os.OpenFile(config.ConfigFile.RuntimeConfig.ConfigDirectory, os.O_CREATE|os.O_WRONLY, 0600) file, err := os.OpenFile(config.ConfigFile.RuntimeConfig.ConfigDirectory, os.O_CREATE|os.O_WRONLY, 0600)
if err != nil { if err != nil {
return err return err
@ -386,6 +392,21 @@ func (config *Config) WriteConfig() error {
} }
func ReadConfig(rtCfg RuntimeConfig) (Config, error) { func ReadConfig(rtCfg RuntimeConfig) (Config, error) {
userHome, _ := os.UserHomeDir()
oldPath := strings.ReplaceAll("~/.config/goldwarden.json", "~", userHome)
newPathParent := strings.ReplaceAll("~/.config/goldwarden", "~", userHome)
newPath := strings.ReplaceAll("~/.config/goldwarden/goldwarden.json", "~", userHome)
// Migrate old config
if _, err := os.Stat(oldPath); err == nil {
if _, err := os.Stat(newPath); err != nil {
if _, err := os.Stat(newPathParent); os.IsNotExist(err) {
os.Mkdir(newPathParent, 0700)
}
os.Rename(oldPath, newPath)
}
}
file, err := os.Open(rtCfg.ConfigDirectory) file, err := os.Open(rtCfg.ConfigDirectory)
if err != nil { if err != nil {
key := NewBuffer(32, rtCfg.UseMemguard) key := NewBuffer(32, rtCfg.UseMemguard)

5
agent/processsecurity/unix.go
View File

@ -6,12 +6,11 @@ import (
"time" "time"
"github.com/godbus/dbus/v5" "github.com/godbus/dbus/v5"
"golang.org/x/sys/unix"
) )
func DisableDumpable() error { func DisableDumpable() error {
return unix.Prctl(unix.PR_SET_DUMPABLE, 0, 0, 0, 0) // return unix.Prctl(unix.PR_SET_DUMPABLE, 0, 0, 0, 0)
// return nil return nil
} }
func MonitorLocks(onlock func()) error { func MonitorLocks(onlock func()) error {

7
cmd/daemonize.go
View File

@ -18,6 +18,13 @@ var daemonizeCmd = &cobra.Command{
websocketDisabled := runtimeConfig.WebsocketDisabled websocketDisabled := runtimeConfig.WebsocketDisabled
sshDisabled := runtimeConfig.DisableSSHAgent sshDisabled := runtimeConfig.DisableSSHAgent
_, err := os.Stat("/.flatpak-info")
isFlatpak := err == nil
if isFlatpak {
runtimeConfig.ConfigDirectory = "~/.var/app/com.quexten.Goldwarden/config/goldwarden.json"
println("Flatpak Config directory: " + runtimeConfig.ConfigDirectory)
}
if websocketDisabled { if websocketDisabled {
println("Websocket disabled") println("Websocket disabled")
} }