Add secondary persistence verification and UI integration

machinery/src/cloud/Cloud.go

@@ -1162,3 +1162,174 @@ func VerifyPersistence(c *gin.Context, configDirectory string) {
 		})
 	}
 }
+
+// VerifySecondaryPersistence godoc
+// @Router /api/persistence/secondary/verify [post]
+// @ID verify-persistence
+// @Security Bearer
+// @securityDefinitions.apikey Bearer
+// @in header
+// @name Authorization
+// @Tags persistence
+// @Param config body models.Config true "Config"
+// @Summary Will verify the secondary persistence.
+// @Description Will verify the secondary persistence.
+// @Success 200 {object} models.APIResponse
+func VerifySecondaryPersistence(c *gin.Context, configDirectory string) {
+
+	var config models.Config
+	err := c.BindJSON(&config)
+	if err != nil || config.Cloud != "" {
+
+		if config.Cloud == "kstorage" || config.Cloud == "kerberosvault" {
+
+			uri := config.KStorageSecondary.URI
+			accessKey := config.KStorageSecondary.AccessKey
+			secretAccessKey := config.KStorageSecondary.SecretAccessKey
+			directory := config.KStorageSecondary.Directory
+			provider := config.KStorageSecondary.Provider
+
+			if err == nil && uri != "" && accessKey != "" && secretAccessKey != "" {
+
+				var client *http.Client
+				if os.Getenv("AGENT_TLS_INSECURE") == "true" {
+					tr := &http.Transport{
+						TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+					}
+					client = &http.Client{Transport: tr}
+				} else {
+					client = &http.Client{}
+				}
+
+				req, err := http.NewRequest("POST", uri+"/ping", nil)
+				if err == nil {
+					req.Header.Add("X-Kerberos-Storage-AccessKey", accessKey)
+					req.Header.Add("X-Kerberos-Storage-SecretAccessKey", secretAccessKey)
+					resp, err := client.Do(req)
+
+					if err == nil {
+						body, err := io.ReadAll(resp.Body)
+						defer resp.Body.Close()
+						if err == nil && resp.StatusCode == http.StatusOK {
+
+							if provider != "" || directory != "" {
+
+								// Generate a random name.
+								timestamp := time.Now().Unix()
+								fileName := strconv.FormatInt(timestamp, 10) +
+									"_6-967003_" + config.Name + "_200-200-400-400_24_769.mp4"
+
+								// Open test-480p.mp4
+								file, err := os.Open(configDirectory + "/data/test-480p.mp4")
+								if err != nil {
+									msg := "cloud.VerifyPersistence(kerberosvault): error reading test-480p.mp4: " + err.Error()
+									log.Log.Error(msg)
+									c.JSON(400, models.APIResponse{
+										Data: msg,
+									})
+								}
+								defer file.Close()
+
+								req, err := http.NewRequest("POST", uri+"/storage", file)
+								if err == nil {
+
+									req.Header.Set("Content-Type", "video/mp4")
+									req.Header.Set("X-Kerberos-Storage-CloudKey", config.HubKey)
+									req.Header.Set("X-Kerberos-Storage-AccessKey", accessKey)
+									req.Header.Set("X-Kerberos-Storage-SecretAccessKey", secretAccessKey)
+									req.Header.Set("X-Kerberos-Storage-Provider", provider)
+									req.Header.Set("X-Kerberos-Storage-FileName", fileName)
+									req.Header.Set("X-Kerberos-Storage-Device", config.Key)
+									req.Header.Set("X-Kerberos-Storage-Capture", "IPCamera")
+									req.Header.Set("X-Kerberos-Storage-Directory", directory)
+
+									var client *http.Client
+									if os.Getenv("AGENT_TLS_INSECURE") == "true" {
+										tr := &http.Transport{
+											TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+										}
+										client = &http.Client{Transport: tr}
+									} else {
+										client = &http.Client{}
+									}
+
+									resp, err := client.Do(req)
+
+									if err == nil {
+										if resp != nil {
+											body, err := io.ReadAll(resp.Body)
+											defer resp.Body.Close()
+											if err == nil {
+												if resp.StatusCode == 200 {
+													msg := "cloud.VerifySecondaryPersistence(kerberosvault): Upload allowed using the credentials provided (" + accessKey + ", " + secretAccessKey + ")"
+													log.Log.Info(msg)
+													c.JSON(200, models.APIResponse{
+														Data: body,
+													})
+												} else {
+													msg := "cloud.VerifySecondaryPersistence(kerberosvault): Something went wrong while verifying your persistence settings. Make sure your provider is the same as the storage provider in your Kerberos Vault, and the relevant storage provider is configured properly."
+													log.Log.Error(msg)
+													c.JSON(400, models.APIResponse{
+														Data: msg,
+													})
+												}
+											}
+										}
+									} else {
+										msg := "cloud.VerifySecondaryPersistence(kerberosvault): Upload of fake recording failed: " + err.Error()
+										log.Log.Error(msg)
+										c.JSON(400, models.APIResponse{
+											Data: msg,
+										})
+									}
+								} else {
+									msg := "cloud.VerifySecondaryPersistence(kerberosvault): Something went wrong while creating /storage POST request." + err.Error()
+									log.Log.Error(msg)
+									c.JSON(400, models.APIResponse{
+										Data: msg,
+									})
+								}
+							} else {
+								msg := "cloud.VerifySecondaryPersistence(kerberosvault): Provider and/or directory is missing from the request."
+								log.Log.Error(msg)
+								c.JSON(400, models.APIResponse{
+									Data: msg,
+								})
+							}
+						} else {
+							msg := "cloud.VerifySecondaryPersistence(kerberosvault): Something went wrong while verifying storage credentials: " + string(body)
+							log.Log.Error(msg)
+							c.JSON(400, models.APIResponse{
+								Data: msg,
+							})
+						}
+					} else {
+						msg := "cloud.VerifySecondaryPersistence(kerberosvault): Something went wrong while verifying storage credentials:" + err.Error()
+						log.Log.Error(msg)
+						c.JSON(400, models.APIResponse{
+							Data: msg,
+						})
+					}
+				} else {
+					msg := "cloud.VerifySecondaryPersistence(kerberosvault): Something went wrong while verifying storage credentials:" + err.Error()
+					log.Log.Error(msg)
+					c.JSON(400, models.APIResponse{
+						Data: msg,
+					})
+				}
+			} else {
+				msg := "cloud.VerifySecondaryPersistence(kerberosvault): please fill-in the required Kerberos Vault credentials."
+				log.Log.Error(msg)
+				c.JSON(400, models.APIResponse{
+					Data: msg,
+				})
+			}
+		}
+	} else {
+		msg := "cloud.VerifySecondaryPersistence(): No persistence was specified, so do not know what to verify:" + err.Error()
+		log.Log.Error(msg)
+		c.JSON(400, models.APIResponse{
+			Data: msg,
+		})
+	}
+}

machinery/src/cloud/kerberos_vault.go

@@ -48,7 +48,6 @@ func UploadKerberosVault(configuration *models.Configuration, fileName string) (
 	}
 
 	publicKey := config.KStorage.CloudKey
-	// This is the new way ;)
 	if config.HubKey != "" {
 		publicKey = config.HubKey
 	}
@@ -93,13 +92,78 @@ func UploadKerberosVault(configuration *models.Configuration, fileName string) (
 					return true, true, nil
 				} else {
 					log.Log.Info("UploadKerberosVault: Upload Failed, " + resp.Status + ", " + string(body))
-					return false, true, nil
+				}
+			}
+		}
+	} else {
+		log.Log.Info("UploadKerberosVault: Upload Failed, " + err.Error())
+	}
+
+	// We might need to check if we can upload to our secondary storage.
+
+	if config.KStorageSecondary.AccessKey == "" ||
+		config.KStorageSecondary.SecretAccessKey == "" ||
+		config.KStorageSecondary.Directory == "" ||
+		config.KStorageSecondary.URI == "" {
+		log.Log.Info("UploadKerberosVault: Secondary Kerberos Vault not properly configured.")
+	} else {
+		log.Log.Info("UploadKerberosVault: Uploading to Secondary Kerberos Vault (" + config.KStorageSecondary.URI + ")")
+
+		file, err = os.OpenFile(fullname, os.O_RDWR, 0755)
+		if file != nil {
+			defer file.Close()
+		}
+		if err != nil {
+			err := "UploadKerberosVault: Upload Failed, file doesn't exists anymore."
+			log.Log.Info(err)
+			return false, false, errors.New(err)
+		}
+
+		req, err := http.NewRequest("POST", config.KStorageSecondary.URI+"/storage", file)
+		if err != nil {
+			errorMessage := "UploadKerberosVault: error reading request, " + config.KStorageSecondary.URI + "/storage: " + err.Error()
+			log.Log.Error(errorMessage)
+			return false, true, errors.New(errorMessage)
+		}
+		req.Header.Set("Content-Type", "video/mp4")
+		req.Header.Set("X-Kerberos-Storage-CloudKey", publicKey)
+		req.Header.Set("X-Kerberos-Storage-AccessKey", config.KStorageSecondary.AccessKey)
+		req.Header.Set("X-Kerberos-Storage-SecretAccessKey", config.KStorageSecondary.SecretAccessKey)
+		req.Header.Set("X-Kerberos-Storage-Provider", config.KStorageSecondary.Provider)
+		req.Header.Set("X-Kerberos-Storage-FileName", fileName)
+		req.Header.Set("X-Kerberos-Storage-Device", config.Key)
+		req.Header.Set("X-Kerberos-Storage-Capture", "IPCamera")
+		req.Header.Set("X-Kerberos-Storage-Directory", config.KStorageSecondary.Directory)
+
+		var client *http.Client
+		if os.Getenv("AGENT_TLS_INSECURE") == "true" {
+			tr := &http.Transport{
+				TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+			}
+			client = &http.Client{Transport: tr}
+		} else {
+			client = &http.Client{}
+		}
+
+		resp, err := client.Do(req)
+		if resp != nil {
+			defer resp.Body.Close()
+		}
+
+		if err == nil {
+			if resp != nil {
+				body, err := ioutil.ReadAll(resp.Body)
+				if err == nil {
+					if resp.StatusCode == 200 {
+						log.Log.Info("UploadKerberosVault: Upload Finished to secondary, " + resp.Status + ", " + string(body))
+						return true, true, nil
+					} else {
+						log.Log.Info("UploadKerberosVault: Upload Failed to secondary, " + resp.Status + ", " + string(body))
+					}
 				}
 			}
 		}
 	}
 
-	errorMessage := "UploadKerberosVault: Upload Failed, " + err.Error()
-	log.Log.Info(errorMessage)
-	return false, true, errors.New(errorMessage)
+	return false, true, nil
 }

machinery/src/models/Config.go

@@ -153,12 +153,12 @@ type S3 struct {
 // KStorage contains the credentials of the Kerberos Storage/Kerberos Cloud instance.
 // By defining KStorage you can make your recordings available in the cloud, at a centrel place.
 type KStorage struct {
-	URI             string `json:"uri,omitempty" bson:"uri,omitempty"`
-	CloudKey        string `json:"cloud_key,omitempty" bson:"cloud_key,omitempty"` /* old way, remove this */
-	AccessKey       string `json:"access_key,omitempty" bson:"access_key,omitempty"`
-	SecretAccessKey string `json:"secret_access_key,omitempty" bson:"secret_access_key,omitempty"`
-	Provider        string `json:"provider,omitempty" bson:"provider,omitempty"`
-	Directory       string `json:"directory,omitempty" bson:"directory,omitempty"`
+	URI             string `json:"uri" bson:"uri"`
+	CloudKey        string `json:"cloud_key" bson:"cloud_key"` /* old way, remove this */
+	AccessKey       string `json:"access_key" bson:"access_key"`
+	SecretAccessKey string `json:"secret_access_key" bson:"secret_access_key"`
+	Provider        string `json:"provider" bson:"provider"`
+	Directory       string `json:"directory" bson:"directory"`
 }
 
 // Dropbox integration

machinery/src/routers/http/routes.go

@@ -54,16 +54,21 @@ func AddRoutes(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware, configDirect
 			components.UpdateConfig(c, configDirectory, configuration, communication)
 		})
 
-		// Will verify the current hub settings.
+		// Will verify the hub settings.
 		api.POST("/hub/verify", func(c *gin.Context) {
 			cloud.VerifyHub(c)
 		})
 
-		// Will verify the current persistence settings.
+		// Will verify the persistence settings.
 		api.POST("/persistence/verify", func(c *gin.Context) {
 			cloud.VerifyPersistence(c, configDirectory)
 		})
 
+		// Will verify the secondary persistence settings.
+		api.POST("/persistence/secondary/verify", func(c *gin.Context) {
+			cloud.VerifySecondaryPersistence(c, configDirectory)
+		})
+
 		// Camera specific methods. Doesn't require any authorization.
 		// These are available for anyone, but require the agent, to reach
 		// the camera.

ui/src/pages/Settings/Settings.jsx

@@ -64,6 +64,9 @@ class Settings extends React.Component {
       verifyPersistenceSuccess: false,
       verifyPersistenceError: false,
       verifyPersistenceMessage: '',
+      verifySecondaryPersistenceSuccess: false,
+      verifySecondaryPersistenceError: false,
+      verifySecondaryPersistenceMessage: '',
       verifyCameraSuccess: false,
       verifyCameraError: false,
       verifyCameraMessage: '',
@@ -592,6 +595,9 @@ class Settings extends React.Component {
       verifyPersistenceSuccess,
       verifyPersistenceError,
       verifyPersistenceMessage,
+      verifySecondaryPersistenceSuccess,
+      verifySecondaryPersistenceError,
+      verifySecondaryPersistenceMessage,
       verifyCameraSuccess,
       verifyCameraError,
       verifyCameraErrorMessage,
@@ -853,6 +859,20 @@ class Settings extends React.Component {
             )} :${verifyPersistenceMessage}`}
           />
         )}
+        {verifySecondaryPersistenceSuccess && (
+          <InfoBar
+            type="success"
+            message={t('settings.info.verify_persistence_success')}
+          />
+        )}
+        {verifySecondaryPersistenceError && (
+          <InfoBar
+            type="alert"
+            message={`${t(
+              'settings.info.verify_persistence_error'
+            )} :${verifySecondaryPersistenceMessage}`}
+          />
+        )}
         <div className="stats grid-container --two-columns">
           <div>
             {/* General settings block */}