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

Cleanup sockets

Browse Source
This commit is contained in:
Bernd Schoolmann 2024-02-04 01:58:04 +01:00
parent 4afd6ef9b1
commit f135e8b302
No known key found for this signature in database
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/bitwarden/websocket.go
View File

@ -5,7 +5,6 @@ import (
"context" "context"
"net/url" "net/url"
"os" "os"
"os/signal"
"time" "time"
"github.com/awnumar/memguard" "github.com/awnumar/memguard"
@ -71,9 +70,6 @@ func RunWebsocketDaemon(ctx context.Context, vault *vault.Vault, cfg *config.Con
} }
func connectToWebsocket(ctx context.Context, vault *vault.Vault, cfg *config.Config) error { func connectToWebsocket(ctx context.Context, vault *vault.Vault, cfg *config.Config) error {
interrupt := make(chan os.Signal, 1)
signal.Notify(interrupt, os.Interrupt)
url, err := url.Parse(cfg.ConfigFile.NotificationsUrl) url, err := url.Parse(cfg.ConfigFile.NotificationsUrl)
if err != nil { if err != nil {
return err return err

25
cmd/daemonize.go
View File

@ -1,8 +1,8 @@
package cmd package cmd
import ( import (
"os" "fmt"
"os/signal" "syscall"
"github.com/awnumar/memguard" "github.com/awnumar/memguard"
"github.com/quexten/goldwarden/agent" "github.com/quexten/goldwarden/agent"
@ -26,16 +26,27 @@ var daemonizeCmd = &cobra.Command{
println("SSH agent disabled") println("SSH agent disabled")
} }
go func() { cleanup := func() {
signalChannel := make(chan os.Signal, 1) fmt.Println("removing sockets and exiting")
signal.Notify(signalChannel, os.Interrupt) fmt.Println("unlinking", runtimeConfig.GoldwardenSocketPath)
<-signalChannel err := syscall.Unlink(runtimeConfig.GoldwardenSocketPath)
if err != nil {
fmt.Println(err)
}
fmt.Println("unlinking", runtimeConfig.SSHAgentSocketPath)
err = syscall.Unlink(runtimeConfig.SSHAgentSocketPath)
if err != nil {
fmt.Println(err)
}
fmt.Println("memguard wiping memory and exiting")
memguard.SafeExit(0) memguard.SafeExit(0)
}() }
err := agent.StartUnixAgent(runtimeConfig.GoldwardenSocketPath, runtimeConfig) err := agent.StartUnixAgent(runtimeConfig.GoldwardenSocketPath, runtimeConfig)
if err != nil { if err != nil {
panic(err) panic(err)
} }
cleanup()
}, },
} }