From 9d5514a9766aca14521f53b1e1a5456d66313fb7 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Sat, 17 Feb 2024 14:53:14 +0100 Subject: [PATCH 01/14] Update com.quexten.Goldwarden.metainfo.xml --- gui/com.quexten.Goldwarden.metainfo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/com.quexten.Goldwarden.metainfo.xml b/gui/com.quexten.Goldwarden.metainfo.xml index f03b3f3..18b7e54 100644 --- a/gui/com.quexten.Goldwarden.metainfo.xml +++ b/gui/com.quexten.Goldwarden.metainfo.xml @@ -36,7 +36,7 @@ Bernd Schoolmann mail@quexten.com - + From 04f25150af503aefc090273111297c0962e87214 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Sun, 18 Feb 2024 01:34:54 +0100 Subject: [PATCH 02/14] Add debug logging build --- .github/workflows/go.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 3e9c32c..ca33e0c 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -10,6 +10,23 @@ env: GO_VERSION: '1.20' jobs: + build_linux_x86_64_debug: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up Go + uses: actions/setup-go@v4 + with: + go-version: ${{ env.GO_VERSION }} + - name: Install libfido2-dev + run: sudo apt-get install -y libfido2-dev + - name: Build Debug + run: go build -tags debuglogging -o goldwarden_linux_x86_64_debug -v . + - uses: actions/upload-artifact@v3 + with: + name: goldwarden_linux_x86_64_debug + path: ./goldwarden_linux_x86_64_debug + build_linux_x86_64: runs-on: ubuntu-latest steps: From 0cd55f40523504abf6192930abfa93f80faa297b Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Sun, 18 Feb 2024 06:08:37 +0100 Subject: [PATCH 03/14] Attempt to fix socket path detection --- agent/unixsocketagent.go | 16 ++++++++++++++++ browserbiometrics/protocol.go | 19 +++++++++++++++++++ client/unixsocketclient.go | 21 +++++++++++++++++++++ main.go | 23 +---------------------- 4 files changed, 57 insertions(+), 22 deletions(-) diff --git a/agent/unixsocketagent.go b/agent/unixsocketagent.go index 149f1a5..85d2325 100644 --- a/agent/unixsocketagent.go +++ b/agent/unixsocketagent.go @@ -309,6 +309,22 @@ type AgentState struct { func StartUnixAgent(path string, runtimeConfig config.RuntimeConfig) error { 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 if runtimeConfig.UseMemguard { keyring = crypto.NewMemguardKeyring(nil) diff --git a/browserbiometrics/protocol.go b/browserbiometrics/protocol.go index cb75359..8eef4d2 100644 --- a/browserbiometrics/protocol.go +++ b/browserbiometrics/protocol.go @@ -105,7 +105,26 @@ func handlePayloadMessage(msg PayloadMessage, appID string) { case "biometricUnlock": logging.Debugf("Biometric unlock requested") // logging.Debugf("Biometrics authorized: %t", isAuthorized) + + home, err := os.UserHomeDir() + if err != nil { + panic(err) + } + + if runtimeConfig.GoldwardenSocketPath == "" { + if _, err := os.Stat(home + "/.goldwarden.sock"); err == nil { + runtimeConfig.GoldwardenSocketPath = home + "/.goldwarden.sock" + } else if _, err := os.Stat(home + "/.var/app/com.quexten.Goldwarden/data/goldwarden.sock"); err == nil { + runtimeConfig.GoldwardenSocketPath = home + "/.var/app/com.quexten.Goldwarden/data/goldwarden.sock" + } + + if _, err = os.Stat("/.flatpak-info"); err == nil { + runtimeConfig.GoldwardenSocketPath = home + "/.var/app/com.quexten.Goldwarden/data/goldwarden.sock" + } + } + logging.Debugf("Connecting to agent at path %s", runtimeConfig.GoldwardenSocketPath) + result, err := client.NewUnixSocketClient(runtimeConfig).SendToAgent(messages.GetBiometricsKeyRequest{}) if err != nil { logging.Errorf("Unable to send message to agent: %s", err.Error()) diff --git a/client/unixsocketclient.go b/client/unixsocketclient.go index b66571b..7ebc974 100644 --- a/client/unixsocketclient.go +++ b/client/unixsocketclient.go @@ -4,6 +4,7 @@ import ( "encoding/json" "io" "net" + "os" "github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/ipc/messages" @@ -52,6 +53,26 @@ func (client UnixSocketClient) SendToAgent(request interface{}) (interface{}, er } func (client UnixSocketClient) Connect() (UnixSocketConnection, error) { + runtimeConfig := client.runtimeConfig + home, err := os.UserHomeDir() + if err != nil { + panic(err) + } + if runtimeConfig.SSHAgentSocketPath == "" { + if _, err := os.Stat(home + "/.ssh-agent-socket"); err == nil { + runtimeConfig.SSHAgentSocketPath = home + "/.ssh-agent-socket" + } else if _, err := os.Stat(home + "/.var/app/com.quexten.Goldwarden/data/ssh-auth-sock"); err == nil { + runtimeConfig.SSHAgentSocketPath = home + "/.var/app/com.quexten.Goldwarden/data/ssh-auth-sock" + } + } + if runtimeConfig.GoldwardenSocketPath == "" { + if _, err := os.Stat(home + "/.goldwarden.sock"); err == nil { + runtimeConfig.GoldwardenSocketPath = home + "/.goldwarden.sock" + } else if _, err := os.Stat(home + "/.var/app/com.quexten.Goldwarden/data/goldwarden.sock"); err == nil { + runtimeConfig.GoldwardenSocketPath = home + "/.var/app/com.quexten.Goldwarden/data/goldwarden.sock" + } + } + c, err := net.Dial("unix", client.runtimeConfig.GoldwardenSocketPath) if err != nil { return UnixSocketConnection{}, err diff --git a/main.go b/main.go index 2948a95..b46ffb6 100644 --- a/main.go +++ b/main.go @@ -36,33 +36,12 @@ func main() { ConfigDirectory: configPath, } - home, err := os.UserHomeDir() - if err != nil { - panic(err) - } - if runtimeConfig.SSHAgentSocketPath == "" { - if _, err := os.Stat(home + "/.ssh-agent-socket"); err == nil { - runtimeConfig.SSHAgentSocketPath = home + "/.ssh-agent-socket" - } else if _, err := os.Stat(home + "/.var/app/com.quexten.Goldwarden/data/ssh-auth-sock"); err == nil { - runtimeConfig.SSHAgentSocketPath = home + "/.var/app/com.quexten.Goldwarden/data/ssh-auth-sock" - } - } - if runtimeConfig.GoldwardenSocketPath == "" { - if _, err := os.Stat(home + "/.goldwarden.sock"); err == nil { - runtimeConfig.GoldwardenSocketPath = home + "/.goldwarden.sock" - } else if _, err := os.Stat(home + "/.var/app/com.quexten.Goldwarden/data/goldwarden.sock"); err == nil { - runtimeConfig.GoldwardenSocketPath = home + "/.var/app/com.quexten.Goldwarden/data/goldwarden.sock" - } - } - - _, err = os.Stat("/.flatpak-info") + _, err := os.Stat("/.flatpak-info") isFlatpak := err == nil if isFlatpak { userHome, _ := os.UserHomeDir() runtimeConfig.ConfigDirectory = userHome + "/.var/app/com.quexten.Goldwarden/config/goldwarden.json" runtimeConfig.ConfigDirectory = strings.ReplaceAll(runtimeConfig.ConfigDirectory, "~", userHome) - runtimeConfig.SSHAgentSocketPath = userHome + "/.var/app/com.quexten.Goldwarden/data/ssh-auth-sock" - runtimeConfig.GoldwardenSocketPath = userHome + "/.var/app/com.quexten.Goldwarden/data/goldwarden.sock" } if len(os.Args) > 1 && (strings.Contains(os.Args[1], "com.8bit.bitwarden.json") || strings.Contains(os.Args[1], "chrome-extension://")) { From 80d476a9b529045b8c5fd2a439b31099ead74feb Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Sun, 18 Feb 2024 06:36:01 +0100 Subject: [PATCH 04/14] Add debug log for browser biometrics setup --- browserbiometrics/main.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/browserbiometrics/main.go b/browserbiometrics/main.go index bc65d2e..384c8f8 100644 --- a/browserbiometrics/main.go +++ b/browserbiometrics/main.go @@ -111,16 +111,20 @@ func detectAndInstallBrowsers(startPath string) error { if info.IsDir() && info.Name() == "native-messaging-hosts" { fmt.Printf("Found mozilla-like browser: %s\n", path) + fmt.Println("Removing old manifest and proxy script") os.Chown(path+"/com.8bit.bitwarden.json", 7, 7) os.Remove(path + "/com.8bit.bitwarden.json") os.Chown(path+"/goldwarden-proxy.sh", 7, 7) os.Remove(path + "/goldwarden-proxy.sh") + fmt.Println("Writing new manifest") manifest := strings.Replace(templateMozilla, "PATH", path+"/goldwarden-proxy.sh", 1) err = os.WriteFile(path+"/com.8bit.bitwarden.json", []byte(manifest), 0444) if err != nil { return err } + + fmt.Println("Writing new proxy script") err = os.WriteFile(path+"/goldwarden-proxy.sh", []byte(proxyScript), 0755) if err != nil { return err @@ -128,16 +132,20 @@ func detectAndInstallBrowsers(startPath string) error { } else if info.IsDir() && info.Name() == "NativeMessagingHosts" { fmt.Printf("Found chrome-like browser: %s\n", path) + fmt.Println("Removing old manifest and proxy script") os.Chown(path+"/com.8bit.bitwarden.json", 7, 7) os.Remove(path + "/com.8bit.bitwarden.json") os.Chown(path+"/goldwarden-proxy.sh", 7, 7) os.Remove(path + "/goldwarden-proxy.sh") + fmt.Println("Writing new manifest") manifest := strings.Replace(templateChrome, "PATH", path+"/goldwarden-proxy.sh", 1) err = os.WriteFile(path+"/com.8bit.bitwarden.json", []byte(manifest), 0444) if err != nil { return err } + + fmt.Println("Writing new proxy script") err = os.WriteFile(path+"/goldwarden-proxy.sh", []byte(proxyScript), 0755) if err != nil { return err From ac9251d0f4c7fdadbc0159354e79b4f4f86d1c89 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Wed, 21 Feb 2024 06:39:06 +0100 Subject: [PATCH 05/14] Add debugging info to cipherstring decryption --- agent/bitwarden/crypto/encstring.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agent/bitwarden/crypto/encstring.go b/agent/bitwarden/crypto/encstring.go index b61c503..f0b381f 100644 --- a/agent/bitwarden/crypto/encstring.go +++ b/agent/bitwarden/crypto/encstring.go @@ -47,13 +47,13 @@ func (s *EncString) UnmarshalText(data []byte) error { i := bytes.IndexByte(data, '.') if i < 0 { - return errors.New("invalid cipher string format") + return errors.New("invalid cipher string format, missign type. total length: " + strconv.Itoa(len(data))) } typStr := string(data[:i]) var err error if t, err := strconv.Atoi(typStr); err != nil { - return errors.New("invalid cipher string type") + return errors.New("invalid cipher string type, could not parse, length: " + strconv.Itoa(len(data))) } else { s.Type = EncStringType(t) } @@ -61,13 +61,13 @@ func (s *EncString) UnmarshalText(data []byte) error { switch s.Type { case AesCbc128_HmacSha256_B64, AesCbc256_HmacSha256_B64, AesCbc256_B64: default: - return errors.New("invalid cipher string type") + return errors.New("invalid cipher string type, unknown type: " + strconv.Itoa(int(s.Type))) } data = data[i+1:] parts := bytes.Split(data, []byte("|")) if len(parts) != 3 { - return errors.New("invalid cipher string format") + return errors.New("invalid cipher string format, missing parts, length: " + strconv.Itoa(len(data)) + "type: " + strconv.Itoa(int(s.Type))) } if s.IV, err = b64decode(parts[0]); err != nil { From ab431835d48d42afac0171f8449e5dfa7aa063e4 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Wed, 21 Feb 2024 06:42:10 +0100 Subject: [PATCH 06/14] Fix socket path in daemonize --- agent/unixsocketagent.go | 16 ---------------- cmd/daemonize.go | 19 ++++++++++++++++++- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/agent/unixsocketagent.go b/agent/unixsocketagent.go index 85d2325..149f1a5 100644 --- a/agent/unixsocketagent.go +++ b/agent/unixsocketagent.go @@ -309,22 +309,6 @@ type AgentState struct { func StartUnixAgent(path string, runtimeConfig config.RuntimeConfig) error { 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 if runtimeConfig.UseMemguard { keyring = crypto.NewMemguardKeyring(nil) diff --git a/cmd/daemonize.go b/cmd/daemonize.go index 8f4b9e9..7b274a1 100644 --- a/cmd/daemonize.go +++ b/cmd/daemonize.go @@ -2,6 +2,7 @@ package cmd import ( "fmt" + "os" "syscall" "github.com/awnumar/memguard" @@ -42,7 +43,23 @@ var daemonizeCmd = &cobra.Command{ 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 { panic(err) } From a93eab1033c557d7fd818b9aa7c04008445208dc Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Wed, 21 Feb 2024 06:58:57 +0100 Subject: [PATCH 07/14] Update Readme.md --- Readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 777369f..ea83aff 100644 --- a/Readme.md +++ b/Readme.md @@ -28,7 +28,8 @@ There is a flatpak that includes a small UI, autotype functionality and autostar [Download on Flathub](https://flathub.org/apps/details/com.quexten.Goldwarden) - + + #### CLI ##### Arch (AUR) From fe6a79924ac5526b6f84c9b0f3056940eb292153 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Thu, 22 Feb 2024 13:44:25 +0100 Subject: [PATCH 08/14] Update Readme.md --- Readme.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index ea83aff..2401688 100644 --- a/Readme.md +++ b/Readme.md @@ -1,4 +1,6 @@ -## Goldwarden + + +# Goldwarden Goldwarden is a Bitwarden compatible desktop client. It focuses on providing useful desktop features that the official tools do not (yet) have or are not willing to add, and enhanced security measures that other tools do not provide, such as: From ebbac558f18df440a736bc1c1f2f8c424ed0f531 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Thu, 22 Feb 2024 14:32:08 +0100 Subject: [PATCH 09/14] Update logo --- gui/goldwarden.svg | 54 ++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/gui/goldwarden.svg b/gui/goldwarden.svg index c26e20f..84703f9 100644 --- a/gui/goldwarden.svg +++ b/gui/goldwarden.svg @@ -24,11 +24,11 @@ inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" - inkscape:zoom="1.6792579" - inkscape:cx="142.62253" - inkscape:cy="292.09332" + inkscape:zoom="3.3585158" + inkscape:cx="193.53787" + inkscape:cy="151.55504" inkscape:window-width="3840" - inkscape:window-height="2091" + inkscape:window-height="2083" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" @@ -39,45 +39,39 @@ id="linearGradient17" inkscape:collect="always"> - - + id="linearGradient1" + x1="-11.825131" + y1="23.294865" + x2="107.26698" + y2="86.020233" + gradientUnits="userSpaceOnUse" /> + width="84" + height="84" + x="8" + y="8" + ry="11.519571" /> + transform="matrix(1.3540167,0,0,1.3477391,-44.781168,-16.956296)"> + From 9fbe5818afda1f7b20c7c9c8f0960db228c1d784 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Thu, 22 Feb 2024 14:33:22 +0100 Subject: [PATCH 10/14] Update logo --- gui/goldwarden.svg | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gui/goldwarden.svg b/gui/goldwarden.svg index 84703f9..7ce3ca4 100644 --- a/gui/goldwarden.svg +++ b/gui/goldwarden.svg @@ -26,7 +26,7 @@ inkscape:document-units="mm" inkscape:zoom="3.3585158" inkscape:cx="193.53787" - inkscape:cy="151.55504" + inkscape:cy="151.70392" inkscape:window-width="3840" inkscape:window-height="2083" inkscape:window-x="0" @@ -105,13 +105,5 @@ ry="2.0560377" transform="rotate(-120.06752)" /> - From 966da90491f117428793ec9ea000dffcf676e91e Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Thu, 22 Feb 2024 14:38:38 +0100 Subject: [PATCH 11/14] Fix incorrectly moved ssh socket path --- client/unixsocketclient.go | 4 ++-- cmd/daemonize.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/unixsocketclient.go b/client/unixsocketclient.go index 7ebc974..1da325e 100644 --- a/client/unixsocketclient.go +++ b/client/unixsocketclient.go @@ -59,8 +59,8 @@ func (client UnixSocketClient) Connect() (UnixSocketConnection, error) { panic(err) } if runtimeConfig.SSHAgentSocketPath == "" { - if _, err := os.Stat(home + "/.ssh-agent-socket"); err == nil { - runtimeConfig.SSHAgentSocketPath = home + "/.ssh-agent-socket" + if _, err := os.Stat(home + "/.goldwarden-ssh-agent.sock"); err == nil { + runtimeConfig.SSHAgentSocketPath = home + "/.goldwarden-ssh-agent.sock" } else if _, err := os.Stat(home + "/.var/app/com.quexten.Goldwarden/data/ssh-auth-sock"); err == nil { runtimeConfig.SSHAgentSocketPath = home + "/.var/app/com.quexten.Goldwarden/data/ssh-auth-sock" } diff --git a/cmd/daemonize.go b/cmd/daemonize.go index 7b274a1..3241451 100644 --- a/cmd/daemonize.go +++ b/cmd/daemonize.go @@ -53,7 +53,7 @@ var daemonizeCmd = &cobra.Command{ } } if runtimeConfig.SSHAgentSocketPath == "" { - runtimeConfig.SSHAgentSocketPath = home + "/.ssh-agent-socket" + runtimeConfig.SSHAgentSocketPath = home + "/.goldwarden-ssh-agent.sock" if isFlatpak { runtimeConfig.SSHAgentSocketPath = home + "/.var/app/com.quexten.Goldwarden/data/ssh-auth-sock" } From 8f01520b87407256d2d2ca35c7f35cf23a9a6a22 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Fri, 23 Feb 2024 05:53:32 +0100 Subject: [PATCH 12/14] Update PKGBUILD --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index a59f7ed..797e9bc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=goldwarden -pkgver=0.2.12 +pkgver=0.2.13 pkgrel=1 pkgdesc='A feature-packed Bitwarden compatible desktop integration' arch=('x86_64' 'aarch64') From 93a727260ad38c6e637c56e16a37ee6a21af3b9e Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Fri, 23 Feb 2024 05:54:20 +0100 Subject: [PATCH 13/14] Update com.quexten.Goldwarden.metainfo.xml --- gui/com.quexten.Goldwarden.metainfo.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/gui/com.quexten.Goldwarden.metainfo.xml b/gui/com.quexten.Goldwarden.metainfo.xml index 18b7e54..abce7ec 100644 --- a/gui/com.quexten.Goldwarden.metainfo.xml +++ b/gui/com.quexten.Goldwarden.metainfo.xml @@ -36,6 +36,7 @@ Bernd Schoolmann mail@quexten.com + From 8553e0d798cca1306a943ff1ba73571fd8be7ca7 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Fri, 23 Feb 2024 05:57:46 +0100 Subject: [PATCH 14/14] Add more logging to path selection --- cmd/daemonize.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmd/daemonize.go b/cmd/daemonize.go index 3241451..8f98aaf 100644 --- a/cmd/daemonize.go +++ b/cmd/daemonize.go @@ -47,15 +47,21 @@ var daemonizeCmd = &cobra.Command{ _, err := os.Stat("/.flatpak-info") isFlatpak := err == nil if runtimeConfig.GoldwardenSocketPath == "" { - runtimeConfig.GoldwardenSocketPath = home + "/.goldwarden.sock" if isFlatpak { + fmt.Println("Socket path is empty, overwriting with flatpak path.") runtimeConfig.GoldwardenSocketPath = home + "/.var/app/com.quexten.Goldwarden/data/goldwarden.sock" + } else { + fmt.Println("Socket path is empty, overwriting with default path.") + runtimeConfig.GoldwardenSocketPath = home + "/.goldwarden.sock" } } if runtimeConfig.SSHAgentSocketPath == "" { - runtimeConfig.SSHAgentSocketPath = home + "/.goldwarden-ssh-agent.sock" if isFlatpak { + fmt.Println("SSH Agent socket path is empty, overwriting with flatpak path.") runtimeConfig.SSHAgentSocketPath = home + "/.var/app/com.quexten.Goldwarden/data/ssh-auth-sock" + } else { + fmt.Println("SSH Agent socket path is empty, overwriting with default path.") + runtimeConfig.SSHAgentSocketPath = home + "/.goldwarden-ssh-agent.sock" } }