BUG/MINOR: always check if storage-dir is acceptable

Author: oktalz

configuration/cluster_sync.go

@@ -219,6 +219,12 @@ func (c *ClusterSync) monitorBootstrapKey() {
 			if err != nil {
 				log.Warning(err)
 			}
+			// check if storage key is ok
+			errStorageDir := CheckIfStorageDirIsOK(data["storage-dir"], c.cfg)
+			if errStorageDir != err {
+				log.Error(errStorageDir)
+				continue
+			}
 			url := fmt.Sprintf("%s://%s", data["schema"], data["address"])
 			c.cfg.Cluster.URL.Store(url)
 			c.cfg.Cluster.Port.Store(func() int {

configuration/misc.go

@@ -18,9 +18,14 @@ package configuration
 import (
 	"encoding/base64"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
+	"path"
 	"syscall"
+
+	"github.com/haproxytech/client-native/v2/misc"
+	"github.com/haproxytech/client-native/v2/storage"
 )
 
 func DecodeBootstrapKey(key string) (map[string]string, error) {
@@ -52,3 +57,29 @@ func fileExists(filename string) bool {
 	}
 	return !info.IsDir()
 }
+
+func CheckIfStorageDirIsOK(storageDir string, config *Configuration) error {
+	if storageDir == "" {
+		return errors.New("storage-dir in bootstrap key is empty")
+	}
+	_, errStorage := misc.CheckOrCreateWritableDirectory(storageDir)
+	if errStorage != nil {
+		return errStorage
+	}
+	dirs := []storage.FileType{
+		storage.BackupsType, storage.MapsType, storage.SSLType,
+		storage.SpoeTransactionsType, storage.SpoeType,
+		storage.TransactionsType,
+		storage.FileType("certs-cluster"),
+	}
+	for _, dir := range dirs {
+		_, errStorage := misc.CheckOrCreateWritableDirectory(path.Join(storageDir, string(dir)))
+		if errStorage != nil {
+			return errStorage
+		}
+	}
+	config.Cluster.StorageDir.Store(storageDir)
+	config.HAProxy.ClusterTLSCertDir = path.Join(storageDir, "certs-cluster")
+	config.Cluster.CertificateDir.Store(path.Join(storageDir, "certs-cluster"))
+	return nil
+}

handlers/cluster.go

@@ -17,14 +17,11 @@ package handlers
 
 import (
 	"fmt"
-	"path"
 
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/google/renameio"
 	client_native "github.com/haproxytech/client-native/v2"
-	"github.com/haproxytech/client-native/v2/misc"
 	"github.com/haproxytech/client-native/v2/models"
-	"github.com/haproxytech/client-native/v2/storage"
 
 	"github.com/haproxytech/dataplaneapi/configuration"
 	"github.com/haproxytech/dataplaneapi/haproxy"
@@ -104,28 +101,11 @@ func (h *CreateClusterHandlerImpl) Handle(params cluster.PostClusterParams, prin
 		if err != nil {
 			return h.err406(err, nil)
 		}
-		storageDir := key["storage-dir"]
-		if storageDir != "" {
-			_, errStorage := misc.CheckOrCreateWritableDirectory(storageDir)
-			if errStorage != nil {
-				return h.err409(errStorage, nil)
-			}
-			dirs := []storage.FileType{
-				storage.BackupsType, storage.MapsType, storage.SSLType,
-				storage.SpoeTransactionsType, storage.SpoeType,
-				storage.TransactionsType,
-				storage.FileType("certs-cluster"),
-			}
-			for _, dir := range dirs {
-				_, errStorage := misc.CheckOrCreateWritableDirectory(path.Join(storageDir, string(dir)))
-				if errStorage != nil {
-					return h.err409(errStorage, nil)
-				}
-			}
-			h.Config.Cluster.StorageDir.Store(storageDir)
-			h.Config.HAProxy.ClusterTLSCertDir = path.Join(storageDir, "certs-cluster")
-			h.Config.Cluster.CertificateDir.Store(path.Join(storageDir, "certs-cluster"))
+		errStorageDir := configuration.CheckIfStorageDirIsOK(key["storage-dir"], h.Config)
+		if errStorageDir != nil {
+			return h.err409(errStorageDir, nil)
 		}
+
 		// enforcing API advertising options
 		if a := params.AdvertisedAddress; a != nil {
 			h.Config.APIOptions.APIAddress = *a