From 9f163e3638aa5cbe754f9308ff5754c50fb4b5ea Mon Sep 17 00:00:00 2001
From: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>
Date: Mon, 17 Jun 2024 21:52:25 +0200
Subject: [PATCH] checking if error is not server closed and closing the client
 after operations are done

---
 .gitignore                 |  1 +
 cmd/root.go                |  6 ++++--
 hack/rootCA.pem            | 22 ----------------------
 pkg/bitwarden/bitwarden.go |  7 ++++---
 pkg/server/server.go       | 11 +++++------
 5 files changed, 14 insertions(+), 33 deletions(-)
 delete mode 100644 hack/rootCA.pem

diff --git a/.gitignore b/.gitignore
index d723441..4d5df68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ go.work.sum
 bin/
 dist/
 hack/cert-manager.yaml
+hack/rootCA.pem
diff --git a/cmd/root.go b/cmd/root.go
index ce7b85f..32a18ec 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -16,7 +16,9 @@ package cmd
 
 import (
 	"context"
+	"errors"
 	"log/slog"
+	"net/http"
 	"os"
 	"os/signal"
 	"syscall"
@@ -54,8 +56,8 @@ const timeout = 15 * time.Second
 func runServeCmd(_ *cobra.Command, _ []string) error {
 	svr := server.NewServer(rootArgs.server)
 	go func() {
-		if err := svr.Run(context.Background()); err != nil {
-			slog.Error("server stopped", "error", err)
+		if err := svr.Run(context.Background()); err != nil && !errors.Is(err, http.ErrServerClosed) {
+			slog.Error("server stopped unexpectedly", "error", err)
 		}
 	}()
 
diff --git a/hack/rootCA.pem b/hack/rootCA.pem
deleted file mode 100644
index 1d43d53..0000000
--- a/hack/rootCA.pem
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDszCCApugAwIBAgIRAMGiIBGuNGKQ6WoBh4Pgh8gwDQYJKoZIhvcNAQELBQAw
-QzEcMBoGA1UEChMTZXh0ZXJuYWwtc2VjcmV0cy5pbzEjMCEGA1UEAxMaY2VydC1t
-YW5hZ2VyLWJpdHdhcmRlbi10bHMwHhcNMjQwNjE3MTUyNzQ2WhcNMjQwOTE1MTUy
-NzQ2WjBDMRwwGgYDVQQKExNleHRlcm5hbC1zZWNyZXRzLmlvMSMwIQYDVQQDExpj
-ZXJ0LW1hbmFnZXItYml0d2FyZGVuLXRsczCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAKY2TajHugsYOYx//BIciEiREv0y3Lg3fqEZ6kZTy+57ezZExSY7
-uC64gNCG+kxefIxQK1NQwmr+9kl79X0Q/pgOXWqCY5NRpD4DJqsA/x2h2STiudzC
-oz1zBeInSM0efDup/vcJrMz2YoPcYDRD1udI2FdN00pJ6OpT3bkcLWJvggwK8l+Y
-yr+nKc6Hxn7xvwFwIehN5F3/Fgn6vpIrLByTahtFMdRnMjqNxKZeC3ZxWt1ihJRl
-fy77se8ZWVe9XfJgk+Mp/k+OJ1335Fvk9Jo+l+dHjihCSavUt82aDdc41Q2q3rFW
-YSmUhRJZG2vddY/SUUljuhMVLG5i/5aMl2UCAwEAAaOBoTCBnjAOBgNVHQ8BAf8E
-BAMCAqQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUYWIK8nHS0w3Q11svWlbp
-nwH4crowXAYDVR0RBFUwU4IuYml0d2FyZGVuLXNkay1zZXJ2ZXIuZGVmYXVsdC5z
-dmMuY2x1c3Rlci5sb2NhbIIJbG9jYWxob3N0hwR/AAABhxAAAAAAAAAAAAAAAAAA
-AAABMA0GCSqGSIb3DQEBCwUAA4IBAQA/lO/q2O+OjJinSnebh9ph+lWxXm4/2bSN
-L1nCiJsTF5B41Gqi5CpyDd/OEpLZ0YnV/r+CLLoCTR9m87HJACi+GQU9k4EKq4qx
-VfMesusMqQjxnIHtUZgruNJ5q7yXDNuJiq1Hsl/SOY5EV1XQwRag2VrxjGwNdqwD
-pv/edqGyYf2+KoM2ZjqvBsHfZhHdDrdHwdbH4LTfKC9OHj0TSPAT/ZOSnyO21u/a
-bJ4ecxOfskY4TS05hS23ue6JqQkMEncKhXwpEH3/msD9Rx1F7Qi7g7xOr7SWA+fw
-Po/3R8gLLrdbjCorvkw7fZs24iYuBsGn9UOULzb2ggYGgXYyJLcP
------END CERTIFICATE-----
diff --git a/pkg/bitwarden/bitwarden.go b/pkg/bitwarden/bitwarden.go
index 9a7322b..d975370 100644
--- a/pkg/bitwarden/bitwarden.go
+++ b/pkg/bitwarden/bitwarden.go
@@ -17,6 +17,7 @@ package bitwarden
 import (
 	"context"
 	"fmt"
+	"log/slog"
 	"net/http"
 
 	"github.com/bitwarden/sdk-go"
@@ -74,12 +75,12 @@ func Login(req *LoginRequest) (sdk.BitwardenClientInterface, error) {
 	identityURL := setOrDefault(req.IdentityURL, defaultIdentityURL)
 	statePath := setOrDefault(req.StatePath, defaultStatePath)
 
-	// TODO: Cache the client... or the session?
+	// Client is closed in the calling handlers.
+	slog.Debug("constructed client with api and identity url", "api", apiURL, "identityUrl", identityURL, "statePath", statePath)
 	bitwardenClient, err := sdk.NewBitwardenClient(&apiURL, &identityURL)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to create client: %w", err)
 	}
-	defer bitwardenClient.Close()
 
 	if err := bitwardenClient.AccessTokenLogin(req.AccessToken, &statePath); err != nil {
 		return nil, fmt.Errorf("bitwarden login: %w", err)
diff --git a/pkg/server/server.go b/pkg/server/server.go
index 6f9b1f3..7205e08 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -97,10 +97,11 @@ func (s *Server) getSecretHandler(w http.ResponseWriter, r *http.Request) {
 
 		return
 	}
+	defer c.Close()
 
 	secretResponse, err := c.Secrets().Get(request.ID)
 	if err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
+		http.Error(w, "failed to get secret: "+err.Error(), http.StatusBadRequest)
 
 		return
 	}
@@ -108,10 +109,6 @@ func (s *Server) getSecretHandler(w http.ResponseWriter, r *http.Request) {
 	s.handleResponse(secretResponse, w)
 }
 
-type DeleteSecretRequest struct {
-	SecretIDs []string `json:"secretIds"`
-}
-
 func (s *Server) deleteSecretHandler(w http.ResponseWriter, r *http.Request) {
 	request := &sdk.SecretsDeleteRequest{}
 	c, err := s.getClient(r, &request)
@@ -120,6 +117,7 @@ func (s *Server) deleteSecretHandler(w http.ResponseWriter, r *http.Request) {
 
 		return
 	}
+	defer c.Close()
 
 	response, err := c.Secrets().Delete(request.IDS)
 	if err != nil {
@@ -139,10 +137,11 @@ func (s *Server) createSecretHandler(w http.ResponseWriter, r *http.Request) {
 
 		return
 	}
+	defer c.Close()
 
 	response, err := c.Secrets().Create(request.Key, request.Value, request.Note, request.OrganizationID, request.ProjectIDS)
 	if err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
+		http.Error(w, "failed to create secret: "+err.Error(), http.StatusBadRequest)
 
 		return
 	}