vaultwarden/goldwarden-vaultwarden-bitwarden-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix socket path in daemonize

Browse Source
This commit is contained in:
Bernd Schoolmann 2024-02-21 06:42:10 +01:00
parent ac9251d0f4
commit ab431835d4
No known key found for this signature in database
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
agent/unixsocketagent.go
View File

@ -309,22 +309,6 @@ type AgentState struct {
func StartUnixAgent(path string, runtimeConfig config.RuntimeConfig) error { func StartUnixAgent(path string, runtimeConfig config.RuntimeConfig) error {
ctx := context.Background() ctx := context.Background()
home, _ := os.UserHomeDir()
_, err := os.Stat("/.flatpak-info")
isFlatpak := err == nil
if runtimeConfig.GoldwardenSocketPath == "" {
runtimeConfig.GoldwardenSocketPath = home + "/.goldwarden.sock"
if isFlatpak {
runtimeConfig.GoldwardenSocketPath = home + "/.var/app/com.quexten.Goldwarden/data/goldwarden.sock"
}
}
if runtimeConfig.SSHAgentSocketPath == "" {
runtimeConfig.SSHAgentSocketPath = home + "/.ssh-agent-socket"
if isFlatpak {
runtimeConfig.SSHAgentSocketPath = home + "/.var/app/com.quexten.Goldwarden/data/ssh-auth-sock"
}
}
var keyring crypto.Keyring var keyring crypto.Keyring
if runtimeConfig.UseMemguard { if runtimeConfig.UseMemguard {
keyring = crypto.NewMemguardKeyring(nil) keyring = crypto.NewMemguardKeyring(nil)

19
cmd/daemonize.go
View File

@ -2,6 +2,7 @@ package cmd
import ( import (
"fmt" "fmt"
"os"
"syscall" "syscall"
"github.com/awnumar/memguard" "github.com/awnumar/memguard"
@ -42,7 +43,23 @@ var daemonizeCmd = &cobra.Command{
memguard.SafeExit(0) memguard.SafeExit(0)
} }
err := agent.StartUnixAgent(runtimeConfig.GoldwardenSocketPath, runtimeConfig) home, _ := os.UserHomeDir()
_, err := os.Stat("/.flatpak-info")
isFlatpak := err == nil
if runtimeConfig.GoldwardenSocketPath == "" {
runtimeConfig.GoldwardenSocketPath = home + "/.goldwarden.sock"
if isFlatpak {
runtimeConfig.GoldwardenSocketPath = home + "/.var/app/com.quexten.Goldwarden/data/goldwarden.sock"
}
}
if runtimeConfig.SSHAgentSocketPath == "" {
runtimeConfig.SSHAgentSocketPath = home + "/.ssh-agent-socket"
if isFlatpak {
runtimeConfig.SSHAgentSocketPath = home + "/.var/app/com.quexten.Goldwarden/data/ssh-auth-sock"
}
}
err = agent.StartUnixAgent(runtimeConfig.GoldwardenSocketPath, runtimeConfig)
if err != nil { if err != nil {
panic(err) panic(err)
} }